From cb29ab20addb052b27cf7d90c17c78908e6f466f Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 15 Jan 2026 12:58:05 +0100 Subject: [PATCH 1/9] Patches for v144 --- .../Add-AllowUserCertificates-flag.patch | 12 +- ...dd-Alt-D-hotkey-to-focus-address-bar.patch | 2 +- .../Add-IsCleartextPermitted-flag.patch | 2 +- ...tialLowEndModeOnMidRangeDevices-flag.patch | 6 +- .../Add-a-flag-to-disable-GamePad-API.patch | 27 +- .../Add-a-proxy-configuration-page.patch | 31 +- .../Add-bookmark-import-export-actions.patch | 42 +- build/patches/Add-cromite-flags-support.patch | 127 +++--- build/patches/Add-cromite-test-support.patch | 28 +- ...dd-custom-tab-intents-privacy-option.patch | 52 +-- build/patches/Add-exit-menu-item.patch | 12 +- ...g-for-omnibox-autocomplete-filtering.patch | 6 +- ...nfigure-maximum-connections-per-host.patch | 41 +- .../Add-flag-to-disable-IPv6-probes.patch | 2 +- ...-to-disable-external-intent-requests.patch | 34 +- .../Add-flag-to-disable-vibration.patch | 4 +- ...-switch-for-unsupported-clangd-flags.patch | 24 +- .../Add-menu-item-to-view-source.patch | 12 +- .../Add-option-to-disable-snapshots.patch | 22 +- ...-to-not-persist-tabs-across-sessions.patch | 14 +- .../Add-option-to-use-home-page-as-NTP.patch | 32 +- build/patches/Add-search-engine.patch | 14 +- .../Add-setting-to-clear-data-on-exit.patch | 85 ++-- ...d-setting-to-invert-tap-and-long-tap.patch | 60 +-- build/patches/Add-site-engagement-flag.patch | 4 +- ...-support-for-ISupportHelpAndFeedback.patch | 6 +- .../Add-support-for-writing-URIs.patch | 2 +- build/patches/Add-webGL-site-setting.patch | 12 +- build/patches/Add-webRTC-site-settings.patch | 20 +- ...PiP-if-PopupsAndRedirects-are-active.patch | 2 +- ...ow-building-without-enable_reporting.patch | 56 +-- ...ow-building-without-supervised-users.patch | 14 +- .../Allow-playing-audio-in-background.patch | 4 +- ...ays-open-browser-controls-in-new-tab.patch | 6 +- .../patches/Android-Pixel-Perfect-Mode.patch | 236 +++++------ ...roid-Toolbar-Scroll-Ablation-setting.patch | 2 +- ...roid-fonts-fingerprinting-mitigation.patch | 30 +- ...ioBuffer-AnalyserNode-fp-mitigations.patch | 24 +- .../patches/Battery-API-return-nothing.patch | 2 +- ...Block-gateway-attacks-via-websockets.patch | 6 +- ...k-leakage-of-urls-in-sandbox-iframes.patch | 6 +- .../Bookmarks-select-all-menu-entry.patch | 2 +- build/patches/Bromite-auto-updater.patch | 70 +-- .../Bromite-subresource-adblocker.patch | 50 +-- .../Bubble-Locking-on-UI-DevTools.patch | 2 +- build/patches/Change-popup-site-setting.patch | 2 +- .../patches/Chrome-web-store-protection.patch | 26 +- ...ORS-Preflight-Cache-on-clearing-data.patch | 14 +- build/patches/Client-hints-overrides.patch | 16 +- .../patches/Close-Sessions-On-Ip-Change.patch | 6 +- ...romite-Branding--improve-settings-ui.patch | 10 +- build/patches/Cromite-Branding.patch | 22 +- build/patches/Customize-selection-popup.patch | 14 +- ...ctionary-suggestions-for-the-Omnibox.patch | 10 +- ...ble-Accessibility-service-by-default.patch | 2 +- .../Disable-Android-Tab-Declutter.patch | 2 +- .../Disable-CSSDynamicRangeLimit.patch | 2 +- build/patches/Disable-Compose-feature.patch | 2 +- ...ble-Compression-Dictionary-Transport.patch | 2 +- .../Disable-Device-Attributes-API.patch | 4 +- build/patches/Disable-FedCm.patch | 14 +- .../Disable-GetInstalledRelatedApps-API.patch | 2 +- build/patches/Disable-PrivacyGuide.patch | 2 +- build/patches/Disable-Real-Box.patch | 34 +- ...vation-Across-Same-Origin-Navigation.patch | 2 +- build/patches/Disable-TLS-resumption.patch | 2 +- build/patches/Disable-UA-full-version.patch | 28 +- build/patches/Disable-Viewport-Segments.patch | 2 +- ...ooth-by-default-in-desktop-platforms.patch | 2 +- build/patches/Disable-WebGPU.patch | 8 +- .../patches/Disable-all-predictors-code.patch | 398 ++++++++---------- build/patches/Disable-all-promo-dialogs.patch | 4 +- .../Disable-conversion-measurement-api.patch | 88 ++-- build/patches/Disable-crash-reporting.patch | 8 +- ...devtools-remote-and-custom-protocols.patch | 4 +- ...Disable-fetching-of-all-field-trials.patch | 63 ++- build/patches/Disable-idle-detection.patch | 2 +- ...media-router-and-remoting-by-default.patch | 4 +- .../Disable-minidump-upload-scheduling.patch | 4 +- .../Disable-omission-of-URL-elements.patch | 6 +- .../patches/Disable-plugins-enumeration.patch | 2 +- .../Disable-prefers-reduced-motion.patch | 2 +- ...ers-reduced-transparency-media-query.patch | 2 +- ...e-privacy-issues-in-password-manager.patch | 8 +- build/patches/Disable-privacy-sandbox.patch | 36 +- .../patches/Disable-ranker-url-fetcher.patch | 4 +- ...e-references-to-fonts.googleapis.com.patch | 14 +- ...sts-for-single-word-Omnibar-searches.patch | 6 +- build/patches/Disable-safety-check.patch | 20 +- .../Disable-smart-selection-by-default.patch | 8 +- ...isable-some-signed-exchange-features.patch | 2 +- ...isable-speechSynthesis-getVoices-API.patch | 10 +- .../Disable-text-fragments-by-default.patch | 8 +- .../Disable-third-party-origin-trials.patch | 14 +- build/patches/Disable-update-scheduler.patch | 2 +- build/patches/Disable-various-metrics.patch | 24 +- ...allow-Android-App-Scheme-as-referrer.patch | 2 +- .../Do-not-build-API-keys-infobar.patch | 6 +- .../Do-not-compile-QR-code-sharing.patch | 10 +- .../patches/Do-not-link-with-libatomic.patch | 2 +- .../Do-not-store-passwords-by-default.patch | 4 +- build/patches/DoH-improvements.patch | 16 +- ...ndroid-Dynamic-Performance-Framework.patch | 12 +- build/patches/Enable-Cert-Management-UI.patch | 2 +- .../Enable-Certificate-Transparency.patch | 2 +- .../Enable-ClientHello-Segmentation.patch | 6 +- .../Enable-Do-Not-Track-by-default.patch | 18 +- ...le-Document-Open-Inheritance-Removal.patch | 4 +- build/patches/Enable-HEVC-by-default.patch | 2 +- ...ctOriginIsolation-and-SitePerProcess.patch | 4 +- build/patches/Enable-component-updater.patch | 61 ++- ...e-darken-websites-checkbox-in-themes.patch | 2 +- .../Enable-extension-in-incognito.patch | 123 +++--- .../patches/Enable-gwp-asan-on-Android.patch | 11 +- .../Enable-menu-on-reload-button.patch | 4 +- .../Enable-network-isolation-features.patch | 14 +- ...le-platform-aac-audio-and-h264-video.patch | 4 +- ...le-search-engine-settings-desktop-ui.patch | 46 +- build/patches/Enable-share-intent.patch | 32 +- ...ivation-of-the-js-debugger-statement.patch | 30 +- .../Experimental-user-scripts-support.patch | 62 +-- build/patches/Eyeo-Adblock-for-Cromite.patch | 38 +- build/patches/Fix-chromium-build-bugs.patch | 12 +- .../Fonts-fingerprinting-mitigation.patch | 40 +- .../Force-use-vpython3-for-some-scripts.patch | 16 +- .../Guard-for-user-agent-reduction.patch | 10 +- ...ing-against-incognito-mode-detection.patch | 4 +- ...story-number-of-days-privacy-setting.patch | 46 +- .../patches/Improve-the-browser-sandbox.patch | 2 +- build/patches/Internal-firewall.patch | 42 +- .../Invalidate-components-public-key.patch | 12 +- build/patches/JIT-site-settings.patch | 10 +- .../Keep-ComputePressure-disabled.patch | 2 +- .../patches/Keep-Manta-Service-Disabled.patch | 2 +- .../patches/Keep-disabled-FetchLaterAPI.patch | 10 +- ...ep-disabled-WebViewMediaIntegrityApi.patch | 6 +- .../Keep-empty-tabs-between-sessions.patch | 4 +- ...-allow-screenshots-in-Incognito-mode.patch | 2 +- build/patches/Keyboard-protection-flag.patch | 4 +- .../Lock-Profile-Cookie-Database.patch | 6 +- ...ing-attributes-in-some-html-elements.patch | 14 +- build/patches/Logcat-crash-reports-UI.patch | 7 +- .../Media-fingerprinting-mitigations.patch | 2 +- .../patches/Modify-default-preferences.patch | 14 +- ...nt-settings-back-to-privacy-settings.patch | 18 +- .../Multiple-fingerprinting-mitigations.patch | 38 +- build/patches/Never-fetch-popular-sites.patch | 4 +- ...er-treat-Proguard-warnings-as-errors.patch | 2 +- build/patches/OpenSearch-miscellaneous.patch | 34 +- .../patches/Override-Navigator-Language.patch | 2 +- .../Override-the-MV2-deprecation.patch | 2 +- .../Partition-Blink-memory-cache.patch | 30 +- .../patches/Partition-HSTS-cache-by-NAK.patch | 68 +-- .../Partition-blobs-by-top-frame-URL.patch | 12 +- ...ning-all-cookies-by-top-frame-domain.patch | 70 +-- ...vate-network-access-content-settings.patch | 19 +- ...redential-fingerprinting-mitigations.patch | 8 +- ...-modal-dialog-flag-to-close-all-tabs.patch | 8 +- ...e-introduce-override_build_timestamp.patch | 4 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 10 +- build/patches/Remove-EV-certificates.patch | 4 +- ...referrals-in-cross-origin-navigation.patch | 44 +- ...th-header-upon-cross-origin-redirect.patch | 2 +- .../Remove-binary-blob-integrations.patch | 208 ++++----- .../Remove-detection-of-captive-portals.patch | 4 +- build/patches/Remove-help-menu-item.patch | 22 +- .../Remove-navigator.connection-info.patch | 10 +- .../Remove-segmentation-platform.patch | 6 +- ...t-for-device-memory-and-cpu-recovery.patch | 6 +- ...Remove-voice-recognition-integration.patch | 131 +++--- ...ndow-name-on-cross-origin-navigation.patch | 4 +- ...ore-BookmarkToolbar-setCurrentFolder.patch | 2 +- .../Restore-LastTabStandingTracker.patch | 10 +- .../Restore-Search-Ready-Omnibox-flag.patch | 10 +- .../Restore-Simplified-NTP-launch.patch | 72 ++-- ...-button-in-top-toolbar-customization.patch | 18 +- .../Restore-chrome-password-store.patch | 67 +-- .../Restore-offline-indicator-v2-flag.patch | 10 +- ...emove-disable-pull-to-refresh-effect.patch | 14 +- ...l-of-execution-context-address-space.patch | 30 +- ...script-content-setting-secondary-url.patch | 10 +- .../Set-caret-blink-interval-to-default.patch | 2 +- .../Set-the-screen-frame-rate-to-60-Hz.patch | 10 +- build/patches/Show-NTP-at-startup.patch | 22 +- ...tings-for-cookies-javascript-and-ads.patch | 48 +-- build/patches/Site-setting-for-images.patch | 18 +- ...gling-Ptr-Detection-via-BackupRefPtr.patch | 6 +- .../Temp-disable-UseContextSnapshot.patch | 2 +- ...e-experimental-web-platform-features.patch | 2 +- ...use-PREVIEW-for-IDCompositionDevice5.patch | 2 +- build/patches/Timezone-customization.patch | 24 +- .../Use-64-bit-WebView-processes.patch | 14 +- .../Use-browser-navigation-handler.patch | 6 +- .../Use-list-mode-for-tab-switcher.patch | 51 +-- build/patches/Viewport-Protection-flag.patch | 50 +-- ...Add-some-prefs-to-secure-preferences.patch | 2 +- build/patches/WIN-Disable-first-run.patch | 2 +- build/patches/WIN-Fix-log-to-file.patch | 10 +- build/patches/WIN-enable-pdf-plugin.patch | 2 +- ...message-for-unsupported-hardware-aes.patch | 12 +- build/patches/Welcome-screen.patch | 6 +- build/patches/add-browser-policy.patch | 64 +-- ...load-of-clang-for-windows-crossbuild.patch | 14 +- build/patches/autofill-miscellaneous.patch | 37 +- build/patches/bromite-build-utils.patch | 10 +- .../disable-WebView-variations-support.patch | 4 +- .../disable-appending-variations-header.patch | 2 +- ...ot-block-build-incompatible-profiles.patch | 2 +- .../eyeo-133.0.6943.49-android_api.patch | 16 +- .../eyeo-133.0.6943.49-android_settings.patch | 4 +- build/patches/eyeo-133.0.6943.49-base.patch | 52 +-- ...yeo-133.0.6943.49-chrome_integration.patch | 54 +-- .../eyeo-133.0.6943.49-extension_api.patch | 12 +- .../kill-Location-fall-back-to-system.patch | 4 +- build/patches/kill-Vision.patch | 2 +- ...ofile-resetter-disable-send-settings.patch | 2 +- ...hromium-Disable-Network-Time-Tracker.patch | 2 +- ...d-chromium-Disable-intranet-detector.patch | 2 +- ...gled-chromium-Disable-profile-avatar.patch | 2 +- ...romium-Disable-translate-integration.patch | 51 ++- ...ed-chromium-Disable-untraceable-URLs.patch | 2 +- ...chromium-Disable-webRTC-log-uploader.patch | 2 +- ...ed-chromium-no-special-hosts-domains.patch | 144 ++++--- ...RTC-do-not-expose-local-IP-addresses.patch | 4 +- 224 files changed, 2325 insertions(+), 2471 deletions(-) diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index abb1d341..cc9623ba 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -249,6 +249,7 @@ import org.chromium.content_public.browser.LoadUrlParams; +@@ -255,6 +255,7 @@ import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.common.ContentSwitches; @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.printing.PrintManagerDelegateImpl; import org.chromium.printing.PrintingController; import org.chromium.printing.PrintingControllerImpl; -@@ -1082,6 +1083,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -1096,6 +1097,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity super.onStartWithNative(); ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier()); @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -194,6 +194,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -196,6 +196,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedPerformanceStudy, &feed::kFeedRecyclerBinderUnmountOnDetach, &feed::kFeedShowSignInCommand, @@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY = "AdaptiveButtonInTopToolbarPageSummary"; public static final String ANDROID_ANIMATED_PROGRESS_BAR_IN_BROWSER = -@@ -805,6 +806,8 @@ public abstract class ChromeFeatureList { +@@ -820,6 +821,8 @@ public abstract class ChromeFeatureList { public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn = newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true); public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true); @@ -68,14 +68,14 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sAppSpecificHistoryViewIntent = newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true); public static final CachedFlag sAsyncNotificationManager = -@@ -1128,6 +1131,7 @@ public abstract class ChromeFeatureList { +@@ -1136,6 +1139,7 @@ public abstract class ChromeFeatureList { sAccountForSuppressedKeyboardInsets, sAndroidAnimatedProgressBarInBrowser, sAndroidAnimatedProgressBarInViz, + sAllowUserCertificates, sAndroidAppIntegrationModule, sAndroidAppIntegrationMultiDataSource, - sAndroidBottomToolbar, + sAndroidAutoMintedTwa, diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc new file mode 100644 --- /dev/null diff --git a/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch b/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch index ec717c85..57a99c4f 100644 --- a/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch +++ b/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java -@@ -903,6 +903,12 @@ public class KeyboardShortcuts { +@@ -904,6 +904,12 @@ public class KeyboardShortcuts { KeyEvent.KEYCODE_ESCAPE, KeyEvent.META_CTRL_ON); } diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index 090c933f..47a97c10 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -44,7 +44,7 @@ new file mode 100644 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -413,6 +413,11 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -400,6 +400,11 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { } } diff --git a/build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch b/build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch index 5db63725..c0faed7e 100644 --- a/build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch +++ b/build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch @@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/base/features.cc b/base/features.cc --- a/base/features.cc +++ b/base/features.cc -@@ -202,6 +202,10 @@ bool IsReducePPMsEnabled() { +@@ -200,6 +200,10 @@ bool IsReducePPMsEnabled() { return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed); } @@ -23,9 +23,9 @@ diff --git a/base/features.cc b/base/features.cc +SET_CROMITE_FEATURE_DISABLED(kPartialLowEndModeOnMidRangeDevices); +#endif + - void Init(EmitThreadControllerProfilerMetadata - emit_thread_controller_profiler_metadata) { + void Init() { g_is_reduce_ppms_enabled.store(FeatureList::IsEnabled(kReducePPMs), + std::memory_order_relaxed); diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc diff --git a/build/patches/Add-a-flag-to-disable-GamePad-API.patch b/build/patches/Add-a-flag-to-disable-GamePad-API.patch index 19a693a2..f0ee02e0 100644 --- a/build/patches/Add-a-flag-to-disable-GamePad-API.patch +++ b/build/patches/Add-a-flag-to-disable-GamePad-API.patch @@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -8969,9 +8969,9 @@ +@@ -9186,9 +9186,9 @@ "expiry_milestone": 150 }, { @@ -32,7 +32,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -264,6 +264,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() { +@@ -262,6 +262,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() { {wf::EnablePaymentApp, raw_ref(features::kServiceWorkerPaymentApps)}, {wf::EnablePeriodicBackgroundSync, raw_ref(features::kPeriodicBackgroundSync)}, @@ -56,7 +56,7 @@ new file mode 100644 diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc --- a/device/gamepad/public/cpp/gamepad_features.cc +++ b/device/gamepad/public/cpp/gamepad_features.cc -@@ -40,4 +40,12 @@ bool IsGamepadMultitouchEnabled() { +@@ -53,4 +53,12 @@ bool IsGamepadMultitouchEnabled() { return false; } @@ -72,12 +72,17 @@ diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/publ diff --git a/device/gamepad/public/cpp/gamepad_features.h b/device/gamepad/public/cpp/gamepad_features.h --- a/device/gamepad/public/cpp/gamepad_features.h +++ b/device/gamepad/public/cpp/gamepad_features.h -@@ -16,8 +16,10 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch); +@@ -17,6 +17,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch); GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE( kEnableSimulatedGamepadDataFetcher); GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kGamepadRawInputChangeEvent); +GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kRestrictGamepadAccess); + #if BUILDFLAG(IS_WIN) + GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kIgnorePS5GamepadsInWgi); +@@ -27,6 +28,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kAllowlistHidrawGamepads); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + GAMEPAD_FEATURES_EXPORT bool IsGamepadMultitouchEnabled(); +GAMEPAD_FEATURES_EXPORT bool IsRestrictGamepadAccessEnabled(); @@ -91,10 +96,10 @@ diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/t #include "base/auto_reset.h" #include "device/gamepad/public/cpp/gamepads.h" +#include "device/gamepad/public/cpp/gamepad_features.h" - #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h" - #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h" #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-blink.h" -@@ -114,6 +115,9 @@ void RecordGamepadsForIdentifiabilityStudy( + #include "third_party/blink/public/platform/task_type.h" + #include "third_party/blink/renderer/bindings/modules/v8/v8_gamepad_mapping_type.h" +@@ -86,6 +87,9 @@ NavigatorGamepad& NavigatorGamepad::From(Navigator& navigator) { HeapVector> NavigatorGamepad::getGamepads( Navigator& navigator, ExceptionState& exception_state) { @@ -104,10 +109,10 @@ diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/t if (!navigator.DomWindow()) { // Using an existing NavigatorGamepad if one exists, but don't create one // for a detached window, as its subclasses depend on a non-null window. -@@ -420,6 +424,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() { - - void NavigatorGamepad::DispatchGamepadEvent(const AtomicString& event_name, - Gamepad* gamepad) { +@@ -428,6 +432,8 @@ void NavigatorGamepad::MaybeDispatchGamepadEvents( + void NavigatorGamepad::DispatchGamepadConnectionChangedEvent( + const AtomicString& event_name, + Gamepad* gamepad) { + if (::features::IsRestrictGamepadAccessEnabled()) + return; // Ensure that we're blocking re-entrancy. diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 7ef4f8b3..bca3eea0 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -78,7 +78,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -102,6 +102,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection"; private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; @@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -410,6 +410,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -411,6 +411,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back(chrome::kChromeUISettingsURL16); #endif builtins_to_provide.push_back(chrome::kChromeUIVersionURL16); @@ -100,7 +100,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -233,6 +233,9 @@ +@@ -239,6 +239,9 @@ @@ -197,7 +197,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -211,6 +211,8 @@ +@@ -212,6 +212,8 @@ #include "printing/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h" @@ -206,7 +206,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #if BUILDFLAG(ENABLE_BACKGROUND_MODE) #include "chrome/browser/background/extensions/background_mode_manager.h" #endif -@@ -1565,6 +1567,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1314,6 +1316,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { component_updater::RegisterPrefs(registry); domain_reliability::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -673,7 +673,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -58,6 +58,9 @@ +@@ -59,6 +59,9 @@ #include "extensions/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" @@ -683,7 +683,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u #if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER) #include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h" #endif -@@ -428,7 +431,7 @@ void RegisterChromeWebUIConfigs() { +@@ -438,7 +441,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); #endif @@ -1154,7 +1154,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -191,6 +191,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals"; +@@ -197,6 +197,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals"; inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/"; inline constexpr char kChromeUINewTabHost[] = "newtab"; inline constexpr char kChromeUINewTabFooterHost[] = "newtab-footer"; @@ -1166,15 +1166,16 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc --- a/components/proxy_config/pref_proxy_config_tracker_impl.cc +++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc -@@ -253,14 +253,14 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig( +@@ -550,7 +550,7 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig( // static void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterDictionaryPref(proxy_config::prefs::kProxy, - ProxyConfigDictionary::CreateSystem()); + ProxyConfigDictionary::CreateDirect()); - } - - // static + registry->RegisterListPref(proxy_config::prefs::kProxyOverrideRules); + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + registry->RegisterIntegerPref( +@@ -562,7 +562,7 @@ void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) { void PrefProxyConfigTrackerImpl::RegisterProfilePrefs( PrefRegistrySimple* registry) { registry->RegisterDictionaryPref(proxy_config::prefs::kProxy, @@ -1183,7 +1184,7 @@ diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/compone registry->RegisterBooleanPref(proxy_config::prefs::kUseSharedProxies, false); registry->RegisterListPref(proxy_config::prefs::kProxyOverrideRules); #if !BUILDFLAG(IS_CHROMEOS) -@@ -410,6 +410,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig( +@@ -716,6 +716,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig( if (proxy_dict.GetBypassList(&proxy_bypass)) { proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass); } @@ -1196,7 +1197,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro +++ b/components/proxy_config/proxy_config_dictionary.cc @@ -30,6 +30,8 @@ const char kProxyPacMandatory[] = "pac_mandatory"; // String containing proxy bypass rules. For a specification of the - // expected syntax see net::ProxyBypassRules::ParseFromString(). + // expected syntax see net::ProxyHostMatchingRules::ParseFromString(). const char kProxyBypassList[] = "bypass_list"; +// Boolean telling whether to reverse the meaning of the bypass list. +const char kProxyReverseBypass[] = "reverse_bypass"; @@ -1420,7 +1421,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_config.h --- a/net/proxy_resolution/proxy_config.h +++ b/net/proxy_resolution/proxy_config.h -@@ -107,6 +107,9 @@ class NET_EXPORT ProxyConfig { +@@ -106,6 +106,9 @@ class NET_EXPORT ProxyConfig { void ParseFromString(std::string_view proxy_rules, bool allow_bracketed_proxy_chains = false, bool is_quic_allowed = false); diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 1c0c71fc..5a290585 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -200,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java -@@ -25,6 +25,7 @@ import org.chromium.base.supplier.OneshotSupplier; +@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.R; @@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.bookmarks.BookmarkPage; -@@ -77,7 +78,7 @@ import java.util.function.Supplier; +@@ -79,7 +80,7 @@ import java.util.function.Supplier; */ @NullMarked public class NativePageFactory { @@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final BrowserControlsManager mBrowserControlsManager; private final Supplier<@Nullable Tab> mCurrentTabSupplier; -@@ -102,7 +103,7 @@ public class NativePageFactory { +@@ -104,7 +105,7 @@ public class NativePageFactory { private final MultiInstanceManager mMultiInstanceManager; public NativePageFactory( @@ -226,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat BottomSheetController sheetController, BrowserControlsManager browserControlsManager, Supplier<@Nullable Tab> currentTabSupplier, -@@ -180,7 +181,7 @@ public class NativePageFactory { +@@ -182,7 +183,7 @@ public class NativePageFactory { @VisibleForTesting static class NativePageBuilder { @@ -235,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final Supplier mNewTabPageCreationTracker; private final BrowserControlsManager mBrowserControlsManager; -@@ -293,7 +294,7 @@ public class NativePageFactory { +@@ -299,7 +300,7 @@ public class NativePageFactory { mTabModelSelector, mEdgeToEdgeControllerSupplier), mActivity.getComponentName(), @@ -247,7 +247,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -200,6 +200,8 @@ static_library("browser") { +@@ -207,6 +207,8 @@ static_library("browser") { "bad_message.h", "bookmarks/bookmark_model_factory.cc", "bookmarks/bookmark_model_factory.h", @@ -256,7 +256,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "bookmarks/chrome_bookmark_client.cc", "bookmarks/chrome_bookmark_client.h", "bookmarks/managed_bookmark_service_factory.cc", -@@ -1588,6 +1590,13 @@ static_library("browser") { +@@ -1573,6 +1575,13 @@ static_library("browser") { "webdata_services/web_data_service_factory.cc", ] @@ -270,7 +270,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -3711,8 +3720,6 @@ static_library("browser") { +@@ -3733,8 +3742,6 @@ static_library("browser") { "bookmarks/bookmark_expanded_state_tracker.h", "bookmarks/bookmark_expanded_state_tracker_factory.cc", "bookmarks/bookmark_expanded_state_tracker_factory.h", @@ -282,7 +282,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc -@@ -68,6 +68,28 @@ +@@ -64,6 +64,28 @@ #include "content/public/browser/web_contents.h" #include "url/gurl.h" @@ -311,7 +311,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse // Must come after all headers that specialize FromJniType() / ToJniType(). #include "chrome/browser/bookmarks/android/jni_headers/BookmarkBridge_jni.h" -@@ -296,6 +318,10 @@ BookmarkBridge::~BookmarkBridge() { +@@ -292,6 +314,10 @@ BookmarkBridge::~BookmarkBridge() { partner_bookmarks_shim_observation_.Reset(); bookmark_model_observation_.Reset(); profile_observation_.Reset(); @@ -322,7 +322,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv* env) { -@@ -847,6 +873,172 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -843,6 +869,172 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -770,7 +770,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows /** Keeps track of whether drag is enabled / active for bookmark lists. */ private class BookmarkDragStateDelegate implements DragStateDelegate { private BookmarkDelegate mBookmarkDelegate; -@@ -658,6 +704,14 @@ class BookmarkManagerMediator +@@ -646,6 +692,14 @@ class BookmarkManagerMediator mNativePage = nativePage; } @@ -785,7 +785,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows /** See BookmarkManager(Coordinator)#updateForUrl */ void updateForUrl(String url) { // Bookmark model is null if the manager has been destroyed. -@@ -830,6 +884,235 @@ class BookmarkManagerMediator +@@ -818,6 +872,235 @@ class BookmarkManagerMediator } } @@ -1246,7 +1246,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -262,6 +262,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -264,6 +264,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kAuxiliarySearchHistoryDonation, &kBlockIntentsWhileLocked, &kBookmarkPaneAndroid, @@ -1257,7 +1257,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -712,6 +712,7 @@ public abstract class ChromeFeatureList { +@@ -713,6 +713,7 @@ public abstract class ChromeFeatureList { "UseLibunwindstackNativeUnwinderAndroid"; public static final String VERIFY_QWACS = "VerifyQWACs"; public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService"; @@ -1320,7 +1320,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** Whether Chrome is set as the default browser. Default value is false. */ public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser"; -@@ -1092,6 +1094,7 @@ public final class ChromePreferenceKeys { +@@ -1125,6 +1127,7 @@ public final class ChromePreferenceKeys { AUXILIARY_SEARCH_SCHEMA_VERSION, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1331,7 +1331,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -252,6 +252,24 @@ CHAR_LIMIT guidelines: +@@ -264,6 +264,24 @@ CHAR_LIMIT guidelines: Sites @@ -1569,8 +1569,8 @@ diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_fil diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc --- a/ui/shell_dialogs/select_file_dialog_android.cc +++ b/ui/shell_dialogs/select_file_dialog_android.cc -@@ -171,6 +171,12 @@ void SelectFileDialogImpl::SelectFileImpl(Type type, - owning_window->GetJavaObject()); +@@ -196,6 +196,12 @@ void SelectFileDialogImpl::SelectFileImpl(Type type, + suggested_name.value(), owning_window->GetJavaObject()); } +void SelectFileDialogImpl::ShowToast(const std::string& message) { @@ -1623,7 +1623,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_linux.h b/ui/shell_dialogs/sele diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc --- a/ui/shell_dialogs/select_file_dialog_win.cc +++ b/ui/shell_dialogs/select_file_dialog_win.cc -@@ -193,6 +193,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog, +@@ -192,6 +192,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog, int index); bool HasMultipleFileTypeChoicesImpl() override; @@ -1631,7 +1631,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/selec // Returns the filter to be used while displaying the open/save file dialog. // This is computed from the extensions for the file types being opened. -@@ -270,6 +271,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() { +@@ -269,6 +270,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() { return has_multiple_file_type_choices_; } diff --git a/build/patches/Add-cromite-flags-support.patch b/build/patches/Add-cromite-flags-support.patch index 91b11060..e9357a6f 100644 --- a/build/patches/Add-cromite-flags-support.patch +++ b/build/patches/Add-cromite-flags-support.patch @@ -24,7 +24,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../homepage/settings/HomepageSettings.java | 2 +- .../privacy/settings/PrivacySettings.java | 2 +- .../settings/FragmentDependencyProvider.java | 10 +- - .../browser/settings/SettingsActivity.java | 42 ++++- + .../browser/settings/SettingsActivity.java | 41 ++++- .../tracing/settings/DeveloperSettings.java | 5 +- chrome/browser/about_flags.cc | 11 ++ chrome/browser/browser_features.cc | 1 + @@ -106,7 +106,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html third_party/blink/public/common/features.h | 1 + ui/base/ui_base_features.cc | 1 + ui/base/ui_base_features.h | 1 + - 93 files changed, 847 insertions(+), 32 deletions(-) + 93 files changed, 846 insertions(+), 32 deletions(-) create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp @@ -152,7 +152,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn sources = [ "allocator/allocator_check.cc", "allocator/allocator_check.h", -@@ -1057,7 +1059,7 @@ component("base") { +@@ -1061,7 +1063,7 @@ component("base") { "//build/config/compiler:wglobal_constructors", ] @@ -191,7 +191,7 @@ diff --git a/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned diff --git a/base/feature_list.cc b/base/feature_list.cc --- a/base/feature_list.cc +++ b/base/feature_list.cc -@@ -42,6 +42,31 @@ +@@ -43,6 +43,31 @@ namespace base { @@ -223,7 +223,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc namespace { // Pointer to the FeatureList instance singleton that was set via -@@ -471,6 +496,46 @@ bool FeatureList::IsEnabled(const Feature& feature) { +@@ -472,6 +497,46 @@ bool FeatureList::IsEnabled(const Feature& feature) { return g_feature_list_instance->IsFeatureEnabled(feature); } @@ -270,7 +270,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc // static bool FeatureList::IsValidFeatureOrFieldTrialName(std::string_view name) { return IsStringASCII(name) && name.find_first_of(",<*") == std::string::npos; -@@ -738,6 +803,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor, +@@ -739,6 +804,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor, void FeatureList::FinalizeInitialization() { DCHECK(!initialized_); @@ -463,7 +463,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -44,6 +44,10 @@ found in the LICENSE file. +@@ -38,6 +38,10 @@ found in the LICENSE file. android:key="do_not_track" android:title="@string/do_not_track_title" android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" /> @@ -477,7 +477,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java -@@ -40,7 +40,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment { +@@ -41,7 +41,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment { private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); @Override @@ -489,7 +489,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -132,7 +132,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -127,7 +127,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment } @Override @@ -509,7 +509,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.build.annotations.NullMarked; -@@ -71,24 +72,31 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl +@@ -68,24 +69,31 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl private final OneshotSupplier mSnackbarManagerSupplier; private final OneshotSupplier mBottomSheetControllerSupplier; private final ObservableSupplier<@Nullable ModalDialogManager> mModalDialogManagerSupplier; @@ -551,19 +551,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin +import android.app.Activity; import android.annotation.SuppressLint; + import android.app.ActivityManager; import android.content.Context; - import android.content.Intent; -@@ -35,7 +36,9 @@ import org.chromium.base.CallbackUtils; - import org.chromium.base.DeviceInfo; - import org.chromium.base.Log; +@@ -43,6 +44,7 @@ import org.chromium.base.Log; import org.chromium.base.metrics.RecordHistogram; -+import java.util.function.Supplier; + import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.OneshotSupplierImpl; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; -@@ -45,6 +48,7 @@ import org.chromium.chrome.browser.back_press.BackPressHelper; +@@ -54,6 +56,7 @@ import org.chromium.chrome.browser.back_press.BackPressHelper.OnKeyDownHandler; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.init.ChromeBrowserInitializer; @@ -571,7 +569,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.profiles.ProfileManagerUtils; -@@ -52,6 +56,7 @@ import org.chromium.chrome.browser.settings.search.SettingsSearchCoordinator; +@@ -61,6 +64,7 @@ import org.chromium.chrome.browser.settings.search.SettingsSearchCoordinator; import org.chromium.chrome.browser.ui.device_lock.MissingDeviceLockLauncher; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; @@ -579,7 +577,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory; import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController; -@@ -106,6 +111,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -115,6 +119,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity PreferenceUpdateObserver { private static final String TAG = "SettingsActivity"; @@ -620,7 +618,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) public static final String EXTRA_SHOW_FRAGMENT = "show_fragment"; -@@ -187,7 +226,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -205,7 +243,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity mProfile, mSnackbarManagerSupplier, mBottomSheetControllerSupplier, @@ -629,7 +627,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin + () -> new RequestRestartDelegate(mSnackbarManagerSupplier, this)), /* recursive= */ true); fragmentManager.registerFragmentLifecycleCallbacks( - new WideDisplayPaddingApplier(), /* recursive= */ false); + new WideDisplayPaddingApplier(), /* recursive= */ true); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java @@ -655,7 +653,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -385,6 +385,10 @@ using flags_ui::kOsLinux; +@@ -389,6 +389,10 @@ using flags_ui::kOsLinux; using flags_ui::kOsMac; using flags_ui::kOsWin; @@ -666,9 +664,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc namespace about_flags { namespace { -@@ -5198,6 +5202,10 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = { +@@ -5242,6 +5246,10 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = { }; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #endif // !BUILDFLAG(IS_ANDROID) +#define FEATURE_PARAM_SECTION +#include "cromite_flags/chrome_browser_about_flags_cc.inc" @@ -677,7 +675,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // RECORDING USER METRICS FOR FLAGS: // ----------------------------------------------------------------------------- // The first line of the entry is the internal name. -@@ -5224,6 +5232,9 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = { +@@ -5268,6 +5276,9 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = { const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and // //tools/flags/generate_unexpire_flags.py. @@ -690,7 +688,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_features.cc --- a/chrome/browser/browser_features.cc +++ b/chrome/browser/browser_features.cc -@@ -302,4 +302,5 @@ BASE_FEATURE(kReportPakFileIntegrity, +@@ -284,4 +284,5 @@ BASE_FEATURE(kReportPakFileIntegrity, // show both in Chrome Tabs and Windows. BASE_FEATURE(kRemovalOfIWAsFromTabCapture, base::FEATURE_ENABLED_BY_DEFAULT); @@ -699,7 +697,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features.h --- a/chrome/browser/browser_features.h +++ b/chrome/browser/browser_features.h -@@ -122,6 +122,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture); +@@ -118,6 +118,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture); // module, e.g. // //chrome/browser//features.h // @@ -749,19 +747,20 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -835,5 +835,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString, base::FEATURE_DISABLED_BY_DEFAULT); +@@ -840,6 +840,7 @@ BASE_FEATURE(kXplatSyncedSetup, base::FEATURE_DISABLED_BY_DEFAULT); // clang-format on +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_cc.inc" } // namespace android } // namespace chrome + diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -370,6 +370,7 @@ constexpr base::FeatureParam kTouchToSearchCalloutSnippetAsSubtitle( - "snippet_as_subtitle", - /*default_value=*/false); +@@ -375,6 +375,7 @@ inline constexpr base::FeatureParam + "snippet_as_subtitle", + /*default_value=*/false); +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_h.inc" } // namespace chrome::android @@ -781,7 +780,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f import java.util.List; import java.util.Map; -@@ -1110,7 +1114,7 @@ public abstract class ChromeFeatureList { +@@ -1118,7 +1122,7 @@ public abstract class ChromeFeatureList { newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true); // keep-sorted end @@ -790,7 +789,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f List.of( // keep-sorted start sAccountForSuppressedKeyboardInsets, -@@ -1271,6 +1275,13 @@ public abstract class ChromeFeatureList { +@@ -1282,6 +1286,13 @@ public abstract class ChromeFeatureList { // keep-sorted end ); @@ -970,24 +969,24 @@ new file mode 100644 diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc --- a/chrome/browser/ui/ui_features.cc +++ b/chrome/browser/ui/ui_features.cc -@@ -712,4 +712,5 @@ bool IsAndroidAnimatedProgressBarInBrowserEnabled() { +@@ -788,4 +788,5 @@ BASE_FEATURE(kWhatsNewDesktopRefresh, base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kWhatsNewDesktopRefresh, base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kTabGroupsFocusing, base::FEATURE_DISABLED_BY_DEFAULT); +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc" } // namespace features diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc --- a/chrome/browser/unexpire_flags.cc +++ b/chrome/browser/unexpire_flags.cc -@@ -8,6 +8,7 @@ - #include "base/containers/contains.h" +@@ -11,6 +11,7 @@ #include "base/containers/flat_map.h" + #include "base/feature_list.h" #include "base/no_destructor.h" +#include "chrome/browser/about_flags.h" #include "chrome/browser/expired_flags_list.h" #include "chrome/browser/unexpire_flags_gen.h" #include "chrome/common/chrome_version.h" -@@ -114,7 +115,19 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage, +@@ -117,7 +118,19 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage, // Otherwise, the flag is expired if its expiration mstone is less than the // mstone of this copy of Chromium. @@ -1011,7 +1010,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -1913,5 +1913,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT); +@@ -1901,5 +1901,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT); // happen silently without prompting an updating dialog. BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating, base::FEATURE_DISABLED_BY_DEFAULT); @@ -1021,7 +1020,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc diff --git a/components/browser_ui/accessibility/android/BUILD.gn b/components/browser_ui/accessibility/android/BUILD.gn --- a/components/browser_ui/accessibility/android/BUILD.gn +++ b/components/browser_ui/accessibility/android/BUILD.gn -@@ -65,6 +65,7 @@ android_library("lib_java") { +@@ -73,6 +73,7 @@ android_library("lib_java") { ":page_zoom_utils_java", "//base:base_java", "//build/android:build_java", @@ -1045,9 +1044,9 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java -@@ -28,9 +28,11 @@ import org.chromium.components.omnibox.OmniboxFeatures; - import org.chromium.content_public.browser.ContentFeatureList; +@@ -30,9 +30,11 @@ import org.chromium.content_public.browser.ContentFeatureList; import org.chromium.content_public.browser.ContentFeatureMap; + import org.chromium.ui.base.UiAndroidFeatureList; +import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment; + @@ -1055,10 +1054,10 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c @NullMarked -public class AccessibilitySettings extends PreferenceFragmentCompat +public class AccessibilitySettings extends ChromeBaseSettingsFragment - implements EmbeddableSettingsPage, Preference.OnPreferenceChangeListener { - public static final String PREF_PAGE_ZOOM_DEFAULT_ZOOM = "page_zoom_default_zoom"; - public static final String PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT = -@@ -71,7 +73,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat + implements EmbeddableSettingsPage, + Preference.OnPreferenceChangeListener, + CustomDividerFragment { +@@ -78,7 +80,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat } @Override @@ -1200,17 +1199,17 @@ diff --git a/components/password_manager/core/browser/features/password_features --- a/components/password_manager/core/browser/features/password_features.cc +++ b/components/password_manager/core/browser/features/password_features.cc @@ -201,4 +201,5 @@ BASE_FEATURE(kRetrieveTrustedVaultKeyKeyboardAccessoryAction, - base::FEATURE_ENABLED_BY_DEFAULT); - #endif // BUILDFLAG(IS_ANDROID) + BASE_FEATURE(kUseActionablesForImprovedPasswordChange, + base::FEATURE_DISABLED_BY_DEFAULT); +#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc" } // namespace password_manager::features diff --git a/components/permissions/features.cc b/components/permissions/features.cc --- a/components/permissions/features.cc +++ b/components/permissions/features.cc -@@ -121,6 +121,7 @@ BASE_FEATURE(kReturnDeniedForNotificationsWhenNoAppLevelSettings, +@@ -120,6 +120,7 @@ BASE_FEATURE(kReturnDeniedForNotificationsWhenNoAppLevelSettings, + BASE_FEATURE(kPermissionPredictionsGeolocationAccuracy, base::FEATURE_DISABLED_BY_DEFAULT); - #endif +#include "cromite_flags/components_permissions_features_cc.inc" } // namespace features @@ -1640,7 +1639,7 @@ diff --git a/components/webui/version/version_handler_helper.cc b/components/web diff --git a/content/common/features.cc b/content/common/features.cc --- a/content/common/features.cc +++ b/content/common/features.cc -@@ -701,4 +701,5 @@ bool IsEnforceSameDocumentOriginInvariantsEnabled() { +@@ -750,4 +750,5 @@ bool IsEnforceSameDocumentOriginInvariantsEnabled() { blink::features::kTreatMhtmlInitialDocumentLoadsAsCrossDocument); } @@ -1649,7 +1648,7 @@ diff --git a/content/common/features.cc b/content/common/features.cc diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -1428,4 +1428,5 @@ bool IsPushSubscriptionChangeEventEnabled() { +@@ -1438,4 +1438,5 @@ bool IsPushSubscriptionChangeEventEnabled() { features::kPushSubscriptionChangeEventOnResubscribe); } @@ -1658,7 +1657,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -416,6 +416,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess(); +@@ -420,6 +420,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess(); CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess(); CONTENT_EXPORT bool IsPushSubscriptionChangeEventEnabled(); @@ -2004,7 +2003,7 @@ new file mode 100755 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -1710,5 +1710,5 @@ uint32_t GetPassthroughAudioFormats() { +@@ -1750,5 +1750,5 @@ uint32_t GetPassthroughAudioFormats() { return 0; #endif // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) } @@ -2014,7 +2013,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h -@@ -590,5 +590,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled(); +@@ -556,5 +556,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled(); MEDIA_EXPORT uint32_t GetPassthroughAudioFormats(); } // namespace media @@ -2024,18 +2023,18 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -904,4 +904,5 @@ BASE_FEATURE_PARAM(std::string, - BASE_FEATURE(kDnsResponseDiscardPartialQuestions, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -846,4 +846,5 @@ BASE_FEATURE(kAddAutomaticWithDohFallbackMode, + BASE_FEATURE(kUseQuicProxiesWithoutWaitingForConnectResponse, + base::FEATURE_DISABLED_BY_DEFAULT); +#include "cromite_flags/net_base_features_cc.inc" } // namespace net::features diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h -@@ -986,6 +986,7 @@ NET_EXPORT BASE_DECLARE_FEATURE_PARAM(std::string, kQuicOptions); - - NET_EXPORT BASE_DECLARE_FEATURE(kDnsResponseDiscardPartialQuestions); +@@ -911,6 +911,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kAddAutomaticWithDohFallbackMode); + NET_EXPORT BASE_DECLARE_FEATURE( + kUseQuicProxiesWithoutWaitingForConnectResponse); +#include "cromite_flags/net_base_features_h.inc" } // namespace net::features @@ -2064,7 +2063,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -2693,4 +2693,5 @@ bool IsXrDevice() { +@@ -2647,4 +2647,5 @@ bool IsXrDevice() { // // DO NOT ADD NEW FEATURES HERE. @@ -2073,7 +2072,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h -@@ -1955,6 +1955,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice(); +@@ -1960,6 +1960,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice(); // // DO NOT ADD NEW FEATURES HERE. @@ -2084,7 +2083,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc --- a/ui/base/ui_base_features.cc +++ b/ui/base/ui_base_features.cc -@@ -434,4 +434,5 @@ BASE_FEATURE(kUseSystemDefaultAccentColors, base::FEATURE_ENABLED_BY_DEFAULT); +@@ -449,4 +449,5 @@ BASE_FEATURE(kUseSystemDefaultAccentColors, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kStringWidthCache, base::FEATURE_DISABLED_BY_DEFAULT); @@ -2093,7 +2092,7 @@ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h --- a/ui/base/ui_base_features.h +++ b/ui/base/ui_base_features.h -@@ -267,6 +267,7 @@ BASE_DECLARE_FEATURE(kUseSystemDefaultAccentColors); +@@ -270,6 +270,7 @@ BASE_DECLARE_FEATURE(kUseSystemDefaultAccentColors); COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kStringWidthCache); diff --git a/build/patches/Add-cromite-test-support.patch b/build/patches/Add-cromite-test-support.patch index 863b5c3f..097aa2f4 100644 --- a/build/patches/Add-cromite-test-support.patch +++ b/build/patches/Add-cromite-test-support.patch @@ -73,7 +73,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java -@@ -148,6 +148,7 @@ import org.chromium.ui.base.SelectFileDialog; +@@ -149,6 +149,7 @@ import org.chromium.ui.base.SelectFileDialog; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider; import org.chromium.url.GURL; @@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni import java.io.File; import java.nio.charset.StandardCharsets; -@@ -724,7 +725,10 @@ public class ProcessInitializationHandler { +@@ -729,7 +730,10 @@ public class ProcessInitializationHandler { tasks.add( () -> { @@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -183,6 +183,11 @@ source_set("shell_integration") { +@@ -190,6 +190,11 @@ source_set("shell_integration") { # require many files from it. This makes linking more efficient. static_library("browser") { sources = [ @@ -179,7 +179,7 @@ diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b #include "chrome/browser/chrome_browser_interface_binders_webui.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_content_browser_client_parts.h" -@@ -495,6 +496,15 @@ void ChromeContentBrowserClient:: +@@ -492,6 +493,15 @@ void ChromeContentBrowserClient:: render_frame_host); }, &render_frame_host)); @@ -412,7 +412,7 @@ new file mode 100644 diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java --- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java +++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java -@@ -182,6 +182,7 @@ public class NotificationPermissionController implements UnownedUserData { +@@ -181,6 +181,7 @@ public class NotificationPermissionController { * @return True if any UI was shown (either rationale dialog or OS prompt), false otherwise. */ public boolean requestPermissionIfNeeded(boolean contextual) { @@ -423,7 +423,7 @@ diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/b diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -226,6 +226,7 @@ static const std::variant +@@ -220,6 +220,7 @@ static const std::variant #if BUILDFLAG(IS_ANDROID) &chrome::android::kCommandLineOnNonRooted, @@ -434,7 +434,7 @@ diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/s diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -669,6 +669,7 @@ mojom("mojo_bindings") { +@@ -666,6 +666,7 @@ mojom("mojo_bindings") { sources = [ "chrome_render_frame.mojom", "google_accounts_private_api_extension.mojom", @@ -477,7 +477,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #include "chrome/renderer/google_accounts_private_api_extension.h" #include "chrome/renderer/loadtimes_extension_bindings.h" #include "chrome/renderer/media/flash_embed_rewrite.h" -@@ -661,6 +662,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -650,6 +651,7 @@ void ChromeContentRendererClient::RenderFrameCreated( TrustedVaultEncryptionKeysExtension::Create(render_frame); GoogleAccountsPrivateApiExtension::Create(render_frame); @@ -785,15 +785,15 @@ diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" -@@ -46,6 +47,7 @@ - #include "content/public/browser/devtools_manager_delegate.h" +@@ -47,6 +48,7 @@ #include "content/public/browser/devtools_socket_factory.h" #include "content/public/common/content_client.h" + #include "content/public/common/content_constants.h" +#include "content/public/common/content_features.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "net/base/io_buffer.h" -@@ -588,9 +590,12 @@ void DevToolsHttpHandler::OnJsonRequest( +@@ -602,9 +604,12 @@ void DevToolsHttpHandler::OnJsonRequest( if (command == "version") { base::Value::Dict version; @@ -851,7 +851,7 @@ diff --git a/content/browser/log_console_message.h b/content/browser/log_console diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -319,6 +319,8 @@ +@@ -316,6 +316,8 @@ #include "url/origin.h" #include "url/url_constants.h" @@ -860,7 +860,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b #if BUILDFLAG(IS_ANDROID) #include "content/browser/accessibility/browser_accessibility_manager_android.h" #include "content/browser/android/content_url_loader_factory.h" -@@ -4799,7 +4801,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole( +@@ -4786,7 +4788,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole( if (delegate_->DidAddMessageToConsole(this, log_level, message, line_no, updated_source_id, untrusted_stack_trace)) { @@ -870,7 +870,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b } // Pass through log severity only on builtin components pages to limit console -@@ -4816,8 +4819,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole( +@@ -4803,8 +4806,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole( const bool is_off_the_record = GetSiteInstance()->GetBrowserContext()->IsOffTheRecord(); diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index fcbbcaeb..14c10c56 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -52,6 +52,21 @@ found in the LICENSE file. +@@ -46,6 +46,21 @@ found in the LICENSE file. android:key="cromite_flags" android:title="@string/cromite_flags_title" app:url="@string/cromite_flags_url" /> @@ -57,7 +57,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -66,6 +66,9 @@ import java.lang.annotation.Retention; +@@ -65,6 +65,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Set; @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis /** * Dispatches incoming intents to the appropriate activity based on the current configuration and * Intent fired. -@@ -269,6 +272,9 @@ public class LaunchIntentDispatcher { +@@ -262,6 +265,9 @@ public class LaunchIntentDispatcher { */ public static boolean isCustomTabIntent(Intent intent) { if (intent == null) return false; @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis Log.w( TAG, "CustomTabsIntent#shouldAlwaysUseBrowserUI() = " -@@ -297,6 +303,10 @@ public class LaunchIntentDispatcher { +@@ -290,6 +296,10 @@ public class LaunchIntentDispatcher { // Make sure the result of the CustomTabActivity is forwarded to the client. newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); @@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis // Since configureIntentForResizableCustomTab() might change the componenet/class // associated with the passed intent, it needs to be called after #setClassName(context, // CustomTabActivity.class.getName()); -@@ -493,6 +503,17 @@ public class LaunchIntentDispatcher { +@@ -486,6 +496,17 @@ public class LaunchIntentDispatcher { if (Intent.ACTION_VIEW.equals(newIntent.getAction()) && !IntentHandler.wasIntentSenderChrome(newIntent)) { @@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java -@@ -238,16 +238,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -239,16 +239,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid // Extra whose value is an array of ints that is supplied to // SyntheticTrialRegistry::RegisterExternalExperiments(). @@ -132,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust /** * Extra that, if set, makes the Custom Tab Activity's height to be x pixels, the Custom Tab -@@ -690,7 +690,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -697,7 +697,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid TrustedWebActivityIntentBuilder.EXTRA_SCREEN_ORIENTATION, ScreenOrientation.DEFAULT)); @@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust mBreakPointDp = getActivityBreakPointFromIntent(intent); mInitialActivityHeight = getInitialActivityHeightFromIntent(intent); -@@ -703,8 +703,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -710,8 +710,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid intent, EXTRA_ACTIVITY_HEIGHT_RESIZE_BEHAVIOR, ACTIVITY_HEIGHT_DEFAULT); mIsPartialCustomTabFixedHeight = activityHeightResizeBehavior == ACTIVITY_HEIGHT_FIXED; @@ -152,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust @BackgroundInteractBehavior int backgroundInteractBehavior = IntentUtils.safeGetIntExtra( -@@ -1335,7 +1335,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -1369,7 +1369,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid public @CustomTabProfileType int getCustomTabMode() { return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito() ? CustomTabProfileType.INCOGNITO @@ -166,7 +166,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java -@@ -782,7 +782,7 @@ public class CustomTabsConnection { +@@ -786,7 +786,7 @@ public class CustomTabsConnection { ThreadUtils.assertOnUiThread(); if (extras == null) return; int[] experimentIds = @@ -175,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust if (experimentIds == null) return; // When ids are set through cct, they should not override existing ids. boolean override = false; -@@ -999,6 +999,7 @@ public class CustomTabsConnection { +@@ -1003,6 +1003,7 @@ public class CustomTabsConnection { PostTask.postTask( TaskTraits.UI_DEFAULT, () -> { @@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java -@@ -43,6 +43,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable; +@@ -44,6 +44,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable; import java.util.ArrayList; import java.util.List; @@ -196,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco /** * A model class that parses the incoming intent for incognito Custom Tabs specific customization * data. -@@ -125,6 +128,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD +@@ -133,6 +136,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD } private static boolean isIntentFromThirdPartyAllowed() { @@ -206,7 +206,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco return ChromeFeatureList.sCctIncognitoAvailableToThirdParty.isEnabled(); } -@@ -222,6 +228,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD +@@ -230,6 +236,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD } public static boolean isValidIncognitoIntent(Intent intent, boolean recordMetrics) { @@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco if (!isIncognitoRequested(intent)) return false; var session = SessionHolder.getSessionHolderFromIntent(intent); if (isIntentFromThirdPartyAllowed() -@@ -332,6 +342,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD +@@ -340,6 +350,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD @Override public @CustomTabProfileType int getCustomTabMode() { @@ -239,7 +239,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import android.os.Bundle; import android.text.SpannableString; import android.text.style.ClickableSpan; -@@ -79,6 +80,15 @@ import org.chromium.ui.text.SpanApplier; +@@ -80,6 +81,15 @@ import org.chromium.ui.text.SpanApplier; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; @@ -255,7 +255,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import androidx.preference.PreferenceCategory; import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager; import org.chromium.base.shared_preferences.SharedPreferencesManager; -@@ -153,6 +163,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -148,6 +158,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment startTag, endTag, new ChromeClickableSpan(context, onClickCallback)); } @@ -265,7 +265,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) { mPageTitle.set(getString(R.string.prefs_privacy_security)); -@@ -384,6 +397,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -376,6 +389,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment new SpanApplier.SpanInfo("", "", servicesLink)); } @@ -275,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); -@@ -404,6 +420,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -396,6 +412,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { UserPrefs.get(getProfile()) .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); @@ -307,7 +307,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -436,6 +477,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -428,6 +469,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -327,7 +327,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -708,7 +708,9 @@ BASE_FEATURE(kMagicStackAndroid, base::FEATURE_ENABLED_BY_DEFAULT); +@@ -713,7 +713,9 @@ BASE_FEATURE(kMagicStackAndroid, base::FEATURE_ENABLED_BY_DEFAULT); // Enables an experimental feature which forces mayLaunchUrl to use a different // storage partition. This may reduce performance. This should not be enabled by // default. @@ -337,22 +337,22 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse + base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kMediaIndicatorsAndroid, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kMiniOriginBar, base::FEATURE_ENABLED_BY_DEFAULT); - BASE_FEATURE(kMostVisitedTilesCustomization, base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kMostVisitedTilesCustomization, base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -980,6 +980,8 @@ public abstract class ChromeFeatureList { +@@ -989,6 +989,8 @@ public abstract class ChromeFeatureList { MOST_VISITED_TILES_CUSTOMIZATION, - /* defaultValue= */ false, + /* defaultValue= */ true, /* defaultValueInTests= */ true); + public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition = + newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false); public static final CachedFlag sMostVisitedTilesReselect = newCachedFlag(MOST_VISITED_TILES_RESELECT, false); public static final CachedFlag sMultiInstanceApplicationStatusCleanup = -@@ -1223,6 +1225,7 @@ public abstract class ChromeFeatureList { +@@ -1236,6 +1238,7 @@ public abstract class ChromeFeatureList { + sMaliciousApkDownloadCheck, sMiniOriginBar, - sMitigateLegacySearchEnginePromoOverlap, sMostVisitedTilesCustomization, + sMayLaunchurlUsesSeparateStoragePartition, sMostVisitedTilesReselect, diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 47523ef7..1468a606 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -357,6 +357,8 @@ import java.util.Set; +@@ -363,6 +363,8 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; @@ -37,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct /** * This is the main activity for ChromeMobile when not running in document mode. All the tabs are * accessible via a chrome specific tab switching UI. -@@ -3858,6 +3860,8 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -3901,6 +3903,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt .closeTabs( TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true); RecordUserAction.record("MobileTabClosed"); @@ -49,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -64,6 +64,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; +@@ -68,6 +68,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityUtils; @@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.chrome.browser.ChromeActivitySessionTracker; import org.chromium.chrome.browser.ChromeApplicationImpl; import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate; -@@ -2588,6 +2589,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2633,6 +2634,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity return true; } @@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java -@@ -412,6 +412,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm +@@ -422,6 +422,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm maybeAddDividerLine(modelList, R.id.menu_item_content_filter_divider_line_id); modelList.add(buildContentFilterHelpCenterMenuItem(currentTab)); } @@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4380,6 +4380,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4437,6 +4437,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Dark theme diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index f0215fe3..81c19bad 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -557,6 +558,15 @@ AutocompleteController::AutocompleteController( +@@ -553,6 +554,15 @@ AutocompleteController::AutocompleteController( steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION), config_(config) { @@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/ #include "base/functional/callback.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" -@@ -637,6 +638,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -659,6 +660,9 @@ void SearchProvider::Run(bool query_is_private) { } void SearchProvider::DoHistoryQuery(bool minimal_changes) { @@ -88,7 +88,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/i18n/char_iterator.h" -@@ -644,6 +646,8 @@ GURL FixupURLInternal(const std::string& text, +@@ -640,6 +642,8 @@ GURL FixupURLInternal(const std::string& text, FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url); if (chrome_url && !parts.host.is_valid()) { diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index d2593638..0699c6db 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -8,40 +8,13 @@ with limited CPU/memory resources and it is disabled by default. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../common/network_features.cc | 3 +++ - .../common/network_features.h | 4 ++++ .../common/network_switch_list.h | 4 ++++ .../spoof_checks/top_domains/BUILD.gn | 1 + ...o-configure-maximum-connections-per-host.inc | 17 +++++++++++++++++ net/socket/client_socket_pool_manager.cc | 17 +++++++++++++++++ - 6 files changed, 46 insertions(+) + 4 files changed, 39 insertions(+) create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-flag-to-configure-maximum-connections-per-host.inc -diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc ---- a/components/network_session_configurator/common/network_features.cc -+++ b/components/network_session_configurator/common/network_features.cc -@@ -8,4 +8,7 @@ - - namespace features { - -+const char kMaxConnectionsPerHostChoiceDefault[] = "6", -+ kMaxConnectionsPerHostChoice15[] = "15"; -+ - } // namespace features -diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h ---- a/components/network_session_configurator/common/network_features.h -+++ b/components/network_session_configurator/common/network_features.h -@@ -10,6 +10,10 @@ - - namespace features { - -+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kMaxConnectionsPerHostChoiceDefault[], -+ kMaxConnectionsPerHostChoice6[], -+ kMaxConnectionsPerHostChoice15[]; -+ - } // namespace features - - #endif // COMPONENTS_NETWORK_SESSION_CONFIGURATOR_COMMON_NETWORK_FEATURES_H_ diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h --- a/components/network_session_configurator/common/network_switch_list.h +++ b/components/network_session_configurator/common/network_switch_list.h @@ -54,8 +27,8 @@ diff --git a/components/network_session_configurator/common/network_switch_list. +NETWORK_SWITCH(kMaxConnectionsPerHost, "max-connections-per-host") + // Ignores certificate-related errors. - NETWORK_SWITCH(kIgnoreCertificateErrors, "ignore-certificate-errors") - + // Note: In tests using net::EmbeddedTestServer with a custom hostname not + // covered by the default test certs, using this switch is usually incorrect. diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn --- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn +++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn @@ -75,8 +48,8 @@ new file mode 100644 +#ifdef FEATURE_PARAM_SECTION + +const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = { -+ {features::kMaxConnectionsPerHostChoiceDefault, "", ""}, -+ {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"}, ++ {/*features::kMaxConnectionsPerHostChoiceDefault*/ "6", "", ""}, ++ {/*features::kMaxConnectionsPerHostChoice15*/ "15", switches::kMaxConnectionsPerHost, "15"}, +}; + +#endif @@ -103,8 +76,8 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket #include "net/ssl/ssl_config.h" #include "url/gurl.h" #include "url/scheme_host_port.h" -@@ -165,6 +169,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( - int ClientSocketPoolManager::max_sockets_per_group( +@@ -165,6 +169,19 @@ void ClientSocketPoolManager::set_socket_soft_cap_per_pool_for_test( + size_t ClientSocketPoolManager::max_sockets_per_group( HttpNetworkSession::SocketPoolType pool_type) { DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES); + diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index eaa6de58..267ffcd9 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -45,7 +45,7 @@ new file mode 100644 diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1177,6 +1177,7 @@ component("net") { +@@ -1182,6 +1182,7 @@ component("net") { ":net_deps", "//components/network_time/time_tracker", "//components/unexportable_keys", diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch index 50d66a2b..79f5d4a0 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -15,14 +15,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ExternalNavigationDelegateImpl.java | 4 ++- .../cromite/sAllowExternalIntentRequests.java | 33 +++++++++++++++++++ ...g-to-disable-external-intent-requests.grdp | 9 +++++ - .../android/external_intents_features.cc | 7 +++- + .../android/external_intents_features.cc | 6 ++++ .../android/external_intents_features.h | 1 + .../ExternalIntentsFeatures.java | 6 ++++ .../ExternalNavigationHandler.java | 21 ++++++++++++ ...ag-to-disable-external-intent-requests.inc | 13 ++++++++ ...t-Delete-block-external-form-redirects.inc | 15 +++++++++ ...ag-to-disable-external-intent-requests.inc | 3 ++ - 12 files changed, 118 insertions(+), 3 deletions(-) + 12 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc @@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -77,7 +77,12 @@ found in the LICENSE file. +@@ -71,7 +71,12 @@ found in the LICENSE file. android:title="@string/settings_incognito_tab_lock_title" android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off" android:persistent="false" /> @@ -49,7 +49,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java -@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator; +@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl; import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import org.chromium.chrome.browser.fullscreen.BrowserControlsManager; import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.init.ChromeActivityNativeDelegate; -@@ -158,6 +159,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory { +@@ -155,6 +156,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory { @Override public boolean shouldDisableAllExternalIntents() { @@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.document.ChromeLauncherActivity; -@@ -131,7 +132,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat +@@ -134,7 +135,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat @Override public boolean shouldDisableExternalIntentRequestsForUrl( ExternalNavigationParams params, Intent intent) { @@ -141,17 +141,9 @@ new file mode 100644 diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc --- a/components/external_intents/android/external_intents_features.cc +++ b/components/external_intents/android/external_intents_features.cc -@@ -29,7 +29,6 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kNavigationCaptureRefactorAndroid, &kAuxiliaryNavigationStaysInBrowser, - &kReparentTopLevelNavigationFromPWA, &kReparentAuxiliaryNavigationFromPWA, - &kAuxiliaryNavigationStaysInPWA}; -- - } // namespace - - // Alphabetical: -@@ -52,7 +51,13 @@ BASE_FEATURE(kReparentAuxiliaryNavigationFromPWA, - - BASE_FEATURE(kAuxiliaryNavigationStaysInPWA, base::FEATURE_DISABLED_BY_DEFAULT); +@@ -35,7 +35,13 @@ BASE_FEATURE(kExternalNavigationDebugLogs, base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kNavigationCaptureRefactorAndroid, + base::FEATURE_DISABLED_BY_DEFAULT); +CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture, + "IntentBlockExternalFormRedirectsNoGesture", @@ -173,7 +165,7 @@ diff --git a/components/external_intents/android/external_intents_features.h b/c +BASE_DECLARE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture); BASE_DECLARE_FEATURE(kExternalNavigationDebugLogs); BASE_DECLARE_FEATURE(kBlockFrameRenavigations); - BASE_DECLARE_FEATURE(kBlockIntentsToSelf); + BASE_DECLARE_FEATURE(kNavigationCaptureRefactorAndroid); diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java @@ -188,12 +180,12 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component + new ExternalIntentsFeature(-1, INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME); + public static final String EXTERNAL_NAVIGATION_DEBUG_LOGS_NAME = "ExternalNavigationDebugLogs"; - public static final String BLOCK_INTENTS_TO_SELF_NAME = "BlockIntentsToSelf"; public static final String NAVIGATION_CAPTURE_REFACTOR_ANDROID_NAME = + "NavigationCaptureRefactorAndroid"; diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java -@@ -1760,6 +1760,12 @@ public class ExternalNavigationHandler { +@@ -1726,6 +1726,12 @@ public class ExternalNavigationHandler { return false; } @@ -206,7 +198,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal( ExternalNavigationParams params, Intent targetIntent, -@@ -1851,6 +1857,21 @@ public class ExternalNavigationHandler { +@@ -1811,6 +1817,21 @@ public class ExternalNavigationHandler { return OverrideUrlLoadingResult.forNoOverride(); } diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index 27a882ad..e791b8c0 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -78,7 +78,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c // Maximum number of entries in a vibration pattern. const unsigned kVibrationPatternLengthMax = 99; -@@ -108,6 +109,8 @@ bool VibrationController::vibrate(Navigator& navigator, +@@ -105,6 +106,8 @@ bool VibrationController::vibrate(Navigator& navigator, // reference to |window| or |navigator| was retained in another window. if (!navigator.DomWindow()) return false; @@ -104,7 +104,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1137,6 +1137,10 @@ +@@ -1138,6 +1138,10 @@ { name: "CompositingDecisionAtAnimationPhaseBoundaries" }, diff --git a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch index a4f6491f..732ce518 100644 --- a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch +++ b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch @@ -8,13 +8,13 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- build/config/compiler/BUILD.gn | 17 ++++++++++++++--- - build_overrides/build.gni | 3 +++ - 2 files changed, 17 insertions(+), 3 deletions(-) + build_overrides/build.gni | 5 +++++ + 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -727,7 +727,7 @@ config("compiler") { +@@ -734,7 +734,7 @@ config("compiler") { # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds. # It also causes segfault on Linux s390x: # https://github.com/llvm/llvm-project/issues/149511 @@ -23,7 +23,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn cflags += [ "-Wa,--crel,--allow-experimental-crel" ] } } -@@ -1836,7 +1836,7 @@ config("clang_revision") { +@@ -1830,7 +1830,7 @@ config("clang_revision") { # e.g. by setting in the the project's .gn file. config("clang_warning_suppression") { # Some build configs use older versions of clang that don't support WSMs @@ -32,7 +32,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn from_build_root = rebase_path(clang_warning_suppression_file, root_build_dir) inputs = [ clang_warning_suppression_file ] -@@ -2197,7 +2197,9 @@ config("default_warnings") { +@@ -2192,7 +2192,9 @@ config("default_warnings") { # TODO(crbug.com/432275627): Fix and re-enable. "-Wno-uninitialized-const-pointer", ] @@ -43,7 +43,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn cflags_cc += [ # TODO(crbug.com/328490295): Fix and re-enable for C flags. "-Wenum-compare-conditional", -@@ -2251,6 +2253,15 @@ config("default_warnings") { +@@ -2246,6 +2248,15 @@ config("default_warnings") { ldflags += [ "-Wno-version-check" ] } @@ -62,14 +62,16 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn diff --git a/build_overrides/build.gni b/build_overrides/build.gni --- a/build_overrides/build.gni +++ b/build_overrides/build.gni -@@ -53,6 +53,9 @@ declare_args() { - # Allows googletest to pretty-print various absl types. +@@ -54,6 +54,11 @@ declare_args() { gtest_enable_absl_printers = true + } ++declare_args() { + # Allows clangd builds by suppressing unsupported parameters + skip_clangd_unsupported_options = false ++} + - # Allow projects that wish to stay on C++17 to override Chromium's default. - # TODO(anglebug.com/330910097): evaluate removing this 2026-04-01 - use_cxx17 = false + # Features used by //base/trace_event. + declare_args() { + # Use Perfetto's trace processor for converting protobuf-encoded traces to -- diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index f6385163..b5ec9ffe 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -3922,6 +3922,8 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -3965,6 +3965,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER); } RecordUserAction.record("MobileMenuDownloadManager"); @@ -39,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2756,6 +2756,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2797,6 +2797,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity return doOpenWebApk(currentTab); } @@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -988,6 +988,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties +@@ -1024,6 +1024,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties return false; } @@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -411,6 +411,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -406,6 +406,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat modelList.add(buildAddToHomescreenListItem(currentTab, false)); } @@ -101,7 +101,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java -@@ -360,6 +360,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm +@@ -370,6 +370,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm modelList.add(buildAddToHomescreenListItem(currentTab, shouldShowIconBeforeItem())); } @@ -114,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -327,6 +327,10 @@ CHAR_LIMIT guidelines: +@@ -339,6 +339,10 @@ CHAR_LIMIT guidelines: Chrome Tips diff --git a/build/patches/Add-option-to-disable-snapshots.patch b/build/patches/Add-option-to-disable-snapshots.patch index 36673650..cd6a4d18 100644 --- a/build/patches/Add-option-to-disable-snapshots.patch +++ b/build/patches/Add-option-to-disable-snapshots.patch @@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java -@@ -504,7 +504,12 @@ class TabGridViewBinder { +@@ -512,7 +512,12 @@ class TabGridViewBinder { if (result != null) { TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize); } else { @@ -29,7 +29,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } }; if (sThumbnailFetcherForTesting != null) { -@@ -542,6 +547,7 @@ class TabGridViewBinder { +@@ -550,6 +555,7 @@ class TabGridViewBinder { */ private static void setFavicon( ImageView faviconView, PropertyModel model, @Nullable TabFavicon favicon) { @@ -69,7 +69,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -73,6 +73,11 @@ found in the LICENSE file. +@@ -67,6 +67,11 @@ found in the LICENSE file. android:title="@string/open_external_links_incognito_title" android:summary="@string/open_external_links_incognito_summary" android:defaultValue="false" /> @@ -84,7 +84,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -153,6 +153,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; +@@ -158,6 +158,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory; import org.chromium.chrome.browser.printing.TabPrinter; @@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.profiles.ProfileManagerUtils; -@@ -667,7 +668,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -679,7 +680,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity new TabContentManager( this, mBrowserControlsManagerSupplier.get(), @@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.build.annotations.NullMarked; -@@ -98,13 +99,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; +@@ -99,13 +100,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate; @@ -142,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; -@@ -216,6 +231,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -201,6 +216,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment } } @@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE); // Record the launch of PG from the S&P link-row entry point privacyGuidePreference.setOnPreferenceClickListener( -@@ -441,6 +471,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -433,6 +463,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents"; public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito"; @@ -172,7 +172,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public boolean onPreferenceChange(Preference preference, Object newValue) { -@@ -487,6 +518,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -479,6 +510,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit(); sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue); sharedPreferencesEditor.apply(); @@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -537,6 +575,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -529,6 +567,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment : R.string.text_off); } @@ -200,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -6416,6 +6416,14 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -6506,6 +6506,14 @@ To change this setting, BEGIN_LINKdelete the Chrome d Your %1$swww.amazon.com timer ran out. It'll start again tomorrow. diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index 02dfc47a..ad0512e7 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -95,6 +95,11 @@ found in the LICENSE file. +@@ -89,6 +89,11 @@ found in the LICENSE file. android:title="@string/incognito_settings_title" android:summary="@string/incognito_settings_summary" android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/> @@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -46,6 +46,7 @@ import org.chromium.base.ApplicationStatus; +@@ -47,6 +47,7 @@ import org.chromium.base.ApplicationStatus; import org.chromium.base.Callback; import org.chromium.base.CallbackController; import org.chromium.base.CallbackUtils; @@ -37,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.base.CommandLine; import org.chromium.base.DeviceInfo; import org.chromium.base.IntentUtils; -@@ -2173,8 +2174,10 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -2175,8 +2176,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt boolean hadCipherData = CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState()); @@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.base.IntentUtils; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordUserAction; -@@ -114,6 +116,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -113,6 +115,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private final SharedPreferencesManager mSharedPreferencesManager = ChromeSharedPreferences.getInstance(); @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private ManagedPreferenceDelegate mManagedPreferenceDelegate; @VisibleForTesting static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies"; @VisibleForTesting static final String PREF_TRACKING_PROTECTION = "tracking_protection"; -@@ -382,7 +386,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -374,7 +378,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); @@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting UserPrefs.get(getProfile()) .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); } else if (PREF_HTTPS_FIRST_MODE_LEGACY.equals(key)) { -@@ -442,6 +450,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -434,6 +442,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment getContext(), getProfile())); } @@ -128,7 +128,7 @@ diff --git a/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -2883,6 +2883,12 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -2898,6 +2898,12 @@ To change this setting, BEGIN_LINKdelete the Chrome d All tabs diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch index fce95375..e900082e 100644 --- a/build/patches/Add-option-to-use-home-page-as-NTP.patch +++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch @@ -105,7 +105,7 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java -@@ -87,6 +87,9 @@ import java.util.List; +@@ -89,6 +89,9 @@ import java.util.List; import java.util.function.BiConsumer; import java.util.function.Supplier; @@ -115,7 +115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over /** * A coordinator for the context menu on the tab strip by long-pressing on the group titles. It is * responsible for creating a list of menu items, setting up the menu and displaying the menu. -@@ -235,9 +238,15 @@ public class TabGroupContextMenuCoordinator extends TabStripReorderingHelper mPageTitle = new ObservableSupplierImpl<>(); -@@ -102,6 +105,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment { +@@ -103,6 +106,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment { mRadioButtons.setOnHomepagePreferenceChangeListener(this::onRadioButtonGroupChanged); mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup()); @@ -197,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java --- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java -@@ -117,7 +117,6 @@ public class LaunchMetrics { +@@ -136,7 +136,6 @@ public class LaunchMetrics { public static void recordHomePageLaunchMetrics( boolean showHomeButton, boolean homepageIsNtp, GURL homepageGurl) { if (homepageGurl.isEmpty()) { @@ -208,15 +208,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchM diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java -@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask; +@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFact + import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask; import org.chromium.chrome.browser.compositor.CompositorViewHolder; import org.chromium.chrome.browser.flags.ChromeFeatureList; - import org.chromium.chrome.browser.multiwindow.MultiInstanceManager; +import org.chromium.chrome.browser.homepage.HomepageManager; + import org.chromium.chrome.browser.multiwindow.MultiInstanceManager; + import org.chromium.chrome.browser.multiwindow.MultiInstanceManager.NewWindowAppSource; import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge; - import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState; - import org.chromium.chrome.browser.profiles.Profile; -@@ -579,6 +580,13 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode +@@ -583,6 +584,13 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode */ public @Nullable Tab launchUrl( String url, @TabLaunchType int type, @Nullable Intent intent, long intentTimestamp) { @@ -233,7 +233,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -361,6 +361,7 @@ public final class ChromePreferenceKeys { +@@ -371,6 +371,7 @@ public final class ChromePreferenceKeys { public static final String HOMEPAGE_USE_CHROME_NTP = "Chrome.Homepage.UseNTP"; public static final String HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled"; @@ -255,7 +255,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1339,6 +1339,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1348,6 +1348,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour @@ -268,8 +268,8 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -122,6 +122,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { - +@@ -123,6 +123,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { + pref_registration_flags); registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false, pref_registration_flags); + registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false, @@ -280,7 +280,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1336,6 +1336,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] = +@@ -1347,6 +1347,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] = // by enterprise policy. inline constexpr char kGeminiSettings[] = "browser.gemini_settings"; diff --git a/build/patches/Add-search-engine.patch b/build/patches/Add-search-engine.patch index a10f8d78..250dab00 100644 --- a/build/patches/Add-search-engine.patch +++ b/build/patches/Add-search-engine.patch @@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html components/search_engines/BUILD.gn | 3 ++ components/search_engines/cromite/BUILD.gn | 12 ++++++ .../cromite/cromite_prepopulated_engines.json | 37 ++++++++++++++++++ - .../search_engine_choice_utils.cc | 5 +-- + .../search_engine_choice_utils.cc | 9 +---- .../search_engines/search_engine_type.h | 5 +++ .../template_url_prepopulate_data.cc | 21 +++++++++- .../template_url_prepopulate_data.h | 9 ----- @@ -20,7 +20,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html tools/json_to_struct/json_to_struct.py | 26 ++++++++---- tools/json_to_struct/struct_generator.py | 10 +++-- tools/variations/fieldtrial_to_struct.py | 4 +- - 12 files changed, 113 insertions(+), 28 deletions(-) + 12 files changed, 113 insertions(+), 32 deletions(-) create mode 100644 components/resources/default_100_percent/search_engine_choice/default_favicon.png create mode 100644 components/search_engines/cromite/BUILD.gn create mode 100644 components/search_engines/cromite/cromite_prepopulated_engines.json @@ -63,7 +63,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL ] deps = [ -@@ -164,6 +165,7 @@ source_set("search_engine_utils") { +@@ -161,6 +162,7 @@ source_set("search_engine_utils") { ":search_engine_type", "//components/google/core/common", "//third_party/search_engines_data:prepopulated_engines", @@ -71,7 +71,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL ] deps = [ "//url" ] -@@ -259,6 +261,7 @@ source_set("unit_tests") { +@@ -256,6 +258,7 @@ source_set("unit_tests") { "//testing/gmock", "//testing/gtest", "//third_party/search_engines_data:prepopulated_engines", @@ -141,7 +141,7 @@ new file mode 100644 diff --git a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc --- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc +++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc -@@ -193,10 +193,7 @@ void RecordChoiceScreenDefaultSearchProviderType( +@@ -209,14 +209,7 @@ void RecordChoiceScreenDefaultSearchProviderType( } void RecordChoiceScreenSelectedIndex(int selected_engine_index) { @@ -149,6 +149,10 @@ diff --git a/components/search_engines/search_engine_choice/search_engine_choice - kSearchEngineChoiceScreenSelectedEngineIndexHistogram, - selected_engine_index, - TemplateURLPrepopulateData::kMaxEeaPrepopulatedEngines); +- base::PumaHistogramExactLinear( +- base::PumaType::kRc, kPumaSearchChoiceScreenSelectedEngineIndexHistogram, +- selected_engine_index, +- TemplateURLPrepopulateData::kMaxEeaPrepopulatedEngines); + // do nothing in Cromite } diff --git a/build/patches/Add-setting-to-clear-data-on-exit.patch b/build/patches/Add-setting-to-clear-data-on-exit.patch index 8fd4c410..d122936e 100644 --- a/build/patches/Add-setting-to-clear-data-on-exit.patch +++ b/build/patches/Add-setting-to-clear-data-on-exit.patch @@ -48,7 +48,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -268,6 +268,7 @@ chrome_java_sources = [ +@@ -270,6 +270,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java", @@ -74,7 +74,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -203,6 +203,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider; +@@ -208,6 +208,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider; import org.chromium.chrome.browser.quick_delete.QuickDeleteController; import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl; import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate; @@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler; import org.chromium.chrome.browser.recent_tabs.CrossDevicePaneFactory; import org.chromium.chrome.browser.reengagement.ReengagementNotificationController; -@@ -2179,7 +2180,11 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -2181,7 +2182,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt Intent intent = getIntent(); boolean hadCipherData = @@ -98,7 +98,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java -@@ -224,8 +224,8 @@ public final class BrowsingDataBridge implements Destroyable { +@@ -205,8 +205,8 @@ public final class BrowsingDataBridge { * BrowsingDataType}). * @return The state of the corresponding deletion preference. */ @@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B } /** -@@ -235,8 +235,8 @@ public final class BrowsingDataBridge implements Destroyable { +@@ -216,8 +216,8 @@ public final class BrowsingDataBridge { * BrowsingDataType}). * @param value The state to be set. */ @@ -120,7 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B } /** -@@ -340,10 +340,10 @@ public final class BrowsingDataBridge implements Destroyable { +@@ -278,10 +278,10 @@ public final class BrowsingDataBridge { @JniType("Profile*") Profile profile, @JniType("std::string") String origin); boolean getBrowsingDataDeletionPreference( @@ -165,9 +165,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C - private void onClearBrowsingData() { + protected void onClearBrowsingData() { RecordUserAction.record("ClearBrowsingData_AdvancedTab"); + } - if (ChromeFeatureList.sClearBrowsingDataAndroidSurvey.isEnabled()) { -@@ -442,6 +448,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -437,6 +443,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment BrowsingDataBridge.getForProfile(getProfile()) .setBrowsingDataDeletionPreference( ClearBrowsingDataFragment.getDataType(item.getOption()), @@ -175,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C item.isSelected()); } -@@ -449,8 +456,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -444,8 +451,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment .setBrowsingDataDeletionTimePeriod(mLastSelectedTimePeriod); } @@ -189,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C String referrer = fragmentArgs.getString( ClearBrowsingDataFragment.CLEAR_BROWSING_DATA_REFERRER, null); -@@ -476,6 +487,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -471,6 +482,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment DialogOption.CLEAR_SITE_SETTINGS); } @@ -200,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C /** * Decides whether a given dialog option should be selected when the dialog is initialized. * -@@ -484,7 +499,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -479,7 +494,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment */ private boolean isOptionSelectedByDefault(@DialogOption int option) { return BrowsingDataBridge.getForProfile(getProfile()) @@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C } /** -@@ -552,6 +567,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -547,6 +562,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment * options. */ private void onClearButtonClicked() { @@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C if (shouldShowImportantSitesDialog()) { showImportantDialogThenClear(); return; -@@ -581,6 +597,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -576,6 +592,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment Button clearButton = (Button) assumeNonNull(getView()).findViewById(R.id.clear_button); boolean isEnabled = !getSelectedOptions().isEmpty(); clearButton.setEnabled(isEnabled); @@ -225,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C } private int getSpinnerIndex( -@@ -658,7 +675,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -653,7 +670,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment .getBoolean(Pref.ALLOW_DELETING_BROWSER_HISTORY)) { enabled = false; browsingDataBridge.setBrowsingDataDeletionPreference( @@ -234,7 +234,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C } // Disable tabs closure if the user is in multi-window mode. -@@ -688,8 +705,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -683,8 +700,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment mSigninManager.addSignInStateObserver(this); setHasOptionsMenu(true); @@ -334,7 +334,7 @@ new file mode 100644 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -2097,6 +2097,16 @@ +@@ -2148,6 +2148,16 @@ Delete browsing data @@ -354,7 +354,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -108,6 +108,7 @@ +@@ -109,6 +109,7 @@ #include "components/enterprise/client_certificates/core/features.h" #include "components/enterprise/data_controls/core/browser/features.h" #include "components/error_page/common/error_page_switches.h" @@ -365,7 +365,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -@@ -70,6 +70,15 @@ PrefService* GetPrefService(Profile* profile) { +@@ -67,6 +67,15 @@ PrefService* GetPrefService(Profile* profile) { return profile->GetOriginalProfile()->GetPrefs(); } @@ -381,7 +381,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro void OnBrowsingDataModelBuilt(JNIEnv* env, const ScopedJavaGlobalRef& java_callback, std::unique_ptr model) { -@@ -222,7 +231,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting( +@@ -219,7 +228,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting( static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference( JNIEnv* env, Profile* profile, @@ -391,7 +391,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro DCHECK_GE(data_type, 0); DCHECK_LE(data_type, static_cast(browsing_data::BrowsingDataType::MAX_VALUE)); -@@ -234,7 +244,7 @@ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference( +@@ -231,7 +241,7 @@ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference( std::string pref; if (!browsing_data::GetDeletionPreferenceFromDataType( static_cast(data_type), @@ -400,7 +400,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro return false; } -@@ -245,6 +255,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference( +@@ -242,6 +252,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference( JNIEnv* env, Profile* profile, jint data_type, @@ -408,7 +408,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro jboolean value) { DCHECK_GE(data_type, 0); DCHECK_LE(data_type, -@@ -253,7 +264,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference( +@@ -250,7 +261,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference( std::string pref; if (!browsing_data::GetDeletionPreferenceFromDataType( static_cast(data_type), @@ -420,7 +420,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc -@@ -324,8 +324,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() { +@@ -327,8 +327,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() { void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy( bool keep_browser_alive) { @@ -448,7 +448,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager. if (!data_types.empty() && IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref( -@@ -434,6 +451,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() { +@@ -437,6 +454,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() { bool ChromeBrowsingDataLifetimeManager:: IsConditionSatisfiedForBrowsingDataRemoval( const syncer::UserSelectableTypeSet sync_types) { @@ -459,7 +459,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager. diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -351,6 +351,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -352,6 +352,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( uint64_t origin_type_mask, base::OnceCallback callback) { CHECK(((remove_mask & @@ -467,7 +467,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. ~content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS & ~constants::FILTERABLE_DATA_TYPES) == 0) || filter_builder->MatchesAllOriginsAndDomains()); -@@ -454,6 +455,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -455,6 +456,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( CreateTaskCompletionClosure(TracingDataType::kHistory), &history_task_tracker_); } @@ -477,7 +477,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. if (ClipboardRecentContent::GetInstance()) ClipboardRecentContent::GetInstance()->SuppressClipboardContent(); -@@ -562,6 +566,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -563,6 +567,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( // and SSL host state are scoped to hosts and represent them as std::string. // Rename the method to indicate its more general usage. if (profile_->GetSSLHostStateDelegate()) { @@ -489,7 +489,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. profile_->GetSSLHostStateDelegate()->Clear( filter_builder->MatchesAllOriginsAndDomains() ? base::RepeatingCallback() -@@ -590,9 +599,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -591,9 +600,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( } device_event_log::Clear(delete_begin_, delete_end_); @@ -503,7 +503,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange( delete_begin_, delete_end_); -@@ -1318,6 +1331,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -1320,6 +1333,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( if (should_clear_zero_suggest_and_session_token && template_url_service) template_url_service->ClearSessionToken(); @@ -515,7 +515,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -560,6 +560,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -564,6 +564,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] = settings_api::PrefType::kNumber; @@ -562,19 +562,20 @@ diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/browser/profiles/android/profile_manager_utils.cc --- a/chrome/browser/profiles/android/profile_manager_utils.cc +++ b/chrome/browser/profiles/android/profile_manager_utils.cc -@@ -64,3 +64,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles( - g_browser_process->profile_manager()->GetLoadedProfiles(), +@@ -65,4 +65,9 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles( RemoveSessionCookiesForProfile); } -+ + +static void JNI_ProfileManagerUtils_RemoveBrowsingDataAtStart( + JNIEnv* env) { + g_browser_process->profile_manager()->RemoveBrowsingDataAtStart(); +} ++ + DEFINE_JNI(ProfileManagerUtils) diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1448,6 +1448,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, +@@ -1516,6 +1516,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, } } @@ -594,7 +595,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile void ProfileManager::DoFinalInitForServices(Profile* profile, bool go_off_the_record) { if (!do_final_services_init_ || -@@ -2117,9 +2130,9 @@ void ProfileManager::OnBrowserClosed(Browser* browser) { +@@ -2185,9 +2198,9 @@ void ProfileManager::OnBrowserClosed(Browser* browser) { // Do nothing if the closed window is not the last window of the same profile. bool has_other_window = false; ForEachCurrentBrowserWindowInterfaceOrderedByActivation( @@ -609,7 +610,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -215,6 +215,8 @@ class ProfileManager : public Profile::Delegate { +@@ -231,6 +231,8 @@ class ProfileManager : public Profile::Delegate { // profiles. std::vector GetLoadedProfiles() const; @@ -675,7 +676,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts -@@ -214,6 +214,7 @@ export class SettingsClearBrowsingDataDialogElement extends +@@ -216,6 +216,7 @@ export class SettingsClearBrowsingDataDialogElement extends value: () => [loadTimeData.getString('basicPageTitle'), loadTimeData.getString('advancedPageTitle'), @@ -683,7 +684,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ ], }, -@@ -336,6 +337,7 @@ export class SettingsClearBrowsingDataDialogElement extends +@@ -344,6 +345,7 @@ export class SettingsClearBrowsingDataDialogElement extends } this.clearButtonDisabled_ = this.getSelectedDataTypes_(page as HTMLElement).length === 0; @@ -694,7 +695,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1434,6 +1434,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1443,6 +1443,9 @@ Your Google account may have other forms of browsing history like searches and a Some of your history might not show up here. To see all your Chrome history, open full Chrome history. Also, your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. @@ -721,7 +722,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2192,6 +2192,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -2218,6 +2218,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"clearedData", IDS_SETTINGS_CLEARED_DATA}, {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, @@ -979,7 +980,7 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_service_impl.cc --- a/content/browser/btm/btm_service_impl.cc +++ b/content/browser/btm/btm_service_impl.cc -@@ -262,7 +262,7 @@ class StateClearer : public BrowsingDataRemover::Observer { +@@ -261,7 +261,7 @@ class StateClearer : public BrowsingDataRemover::Observer { remove_mask &= ~BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX; remover->RemoveWithFilterAndReply( base::Time::Min(), base::Time::Max(), @@ -991,7 +992,7 @@ diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_s diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc -@@ -1551,6 +1551,7 @@ void StoragePartitionImpl::Initialize( +@@ -1557,6 +1557,7 @@ void StoragePartitionImpl::Initialize( .AppendASCII("Code Cache"); } DCHECK_GE(settings.size_in_bytes(), 0); diff --git a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch index 1aef8152..1c7a3c69 100644 --- a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch @@ -98,7 +98,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java -@@ -134,8 +134,9 @@ class ChromeContextMenuItem { +@@ -135,8 +135,9 @@ class ChromeContextMenuItem { // Developer Group int VIEW_PAGE_SOURCE = 41; int INSPECT_ELEMENT = 42; @@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr } /** Mapping from {@link Item} to the ID found in the ids.xml. */ -@@ -183,6 +184,7 @@ class ChromeContextMenuItem { +@@ -184,6 +185,7 @@ class ChromeContextMenuItem { R.id.contextmenu_print_page, // Item.PRINT_PAGE R.id.contextmenu_view_page_source, // Item.VIEW_PAGE_SOURCE R.id.contextmenu_inspect_element, // Item.INSPECT_ELEMENT @@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr }; /** Mapping from {@link Item} to the ID of the string that describes the action of the item. */ -@@ -230,6 +232,7 @@ class ChromeContextMenuItem { +@@ -231,6 +233,7 @@ class ChromeContextMenuItem { R.string.contextmenu_print_page, // Item.PRINT_PAGE R.string.contextmenu_view_page_source, // Item.VIEW_PAGE_SOURCE R.string.contextmenu_inspect_element, // Item.INSPECT_ELEMENT @@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -459,6 +459,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -474,6 +474,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } if (mParams.isAnchor()) { ModelList linkGroup = new ModelList(); @@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr if (FirstRunStatus.getFirstRunFlowComplete() && !isEmptyUrl(mParams.getUrl()) && UrlUtilities.isAcceptedScheme(mParams.getUrl())) { -@@ -1068,6 +1071,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -1083,6 +1086,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { getProfile(), false); }); @@ -150,7 +150,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java -@@ -401,6 +401,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { +@@ -414,6 +414,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { mTab.loadUrl(loadUrlParams); } @@ -168,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -444,6 +444,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -446,6 +446,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kTabGroupParityBottomSheetAndroid, &kTabModelInitFixes, &kTabStorageSqlitePrototype, @@ -179,7 +179,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -511,6 +511,8 @@ public abstract class ChromeFeatureList { +@@ -517,6 +517,8 @@ public abstract class ChromeFeatureList { "DisableToolbarSwipeUp"; public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM = "MoveTopToolbarToBottom"; @@ -188,7 +188,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON = "NewTabPageCustomizationToolbarButton"; public static final String NEW_TAB_PAGE_CUSTOMIZATION_V2 = "NewTabPageCustomizationV2"; -@@ -1024,6 +1026,8 @@ public abstract class ChromeFeatureList { +@@ -1031,6 +1033,8 @@ public abstract class ChromeFeatureList { newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false); public static final CachedFlag sMoveTopToolbarToBottom = newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false); @@ -197,7 +197,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false); public static final CachedFlag sPostGetMyMemoryStateToBackground = newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true); -@@ -1292,6 +1296,7 @@ public abstract class ChromeFeatureList { +@@ -1303,6 +1307,7 @@ public abstract class ChromeFeatureList { sTopControlsRefactor, sTopControlsRefactorV2, sTouchToSearchCallout, @@ -208,7 +208,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1563,6 +1563,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1572,6 +1572,12 @@ Your Google account may have other forms of browsing history like searches and a Disable toolbar swipe up @@ -221,15 +221,15 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -3222,6 +3228,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -3237,6 +3243,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Open in new Chrome tab + + Open in current tab + - - Open in Incognito tab + + Open in Chrome window diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml @@ -249,7 +249,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java -@@ -54,6 +54,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -60,6 +60,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate; private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate; @@ -259,7 +259,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c private PageZoomPreference mPageZoomDefaultZoomPref; private ChromeSwitchPreference mPageZoomIncludeOSAdjustment; private ChromeSwitchPreference mPageZoomAlwaysShowPref; -@@ -150,6 +153,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -157,6 +160,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.getValue()); mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this); @@ -272,7 +272,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c Preference captions = findPreference(PREF_CAPTIONS); captions.setOnPreferenceClickListener( preference -> { -@@ -244,6 +253,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -265,6 +274,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) { mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue); mDelegate.requestRestart(getActivity()); @@ -467,7 +467,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_ #include "third_party/blink/renderer/core/paint/timing/paint_timing.h" #include "third_party/blink/renderer/core/probe/core_probes.h" #include "third_party/blink/renderer/core/resize_observer/resize_observer_entry.h" -@@ -796,6 +798,21 @@ void HTMLImageElement::DidFinishLayout() { +@@ -782,6 +784,21 @@ void HTMLImageElement::DidFinishLayout() { } } @@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h --- a/third_party/blink/renderer/core/html/html_image_element.h +++ b/third_party/blink/renderer/core/html/html_image_element.h -@@ -216,6 +216,8 @@ class CORE_EXPORT HTMLImageElement +@@ -211,6 +211,8 @@ class CORE_EXPORT HTMLImageElement void DidAddUserAgentShadowRoot(ShadowRoot&) override; void AdjustStyle(ComputedStyleBuilder&) override; @@ -525,7 +525,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t mouse_event->SetDefaultHandled(); } -@@ -434,7 +436,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch( +@@ -440,7 +442,8 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, bool ContextMenuController::ShowContextMenu(LocalFrame* frame, const PhysicalOffset& point, WebMenuSourceType source_type, @@ -535,7 +535,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t // Displaying the context menu in this function is a big hack as we don't // have context, i.e. whether this is being invoked via a script or in // response to user input (Mouse event WM_RBUTTONDOWN, -@@ -457,6 +460,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, +@@ -463,6 +466,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, if (!result.InnerNodeOrImageMapImage()) return false; @@ -552,7 +552,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t // Clear any previously set cached results if we are resetting the hit test // result. image_selection_cached_result_ = nullptr; -@@ -838,7 +851,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, +@@ -844,7 +857,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, SetAutofillData(result.InnerNode(), data); @@ -564,7 +564,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/third_party/blink/renderer/core/page/context_menu_controller.h --- a/third_party/blink/renderer/core/page/context_menu_controller.h +++ b/third_party/blink/renderer/core/page/context_menu_controller.h -@@ -57,7 +57,7 @@ class CORE_EXPORT ContextMenuController final +@@ -58,7 +58,7 @@ class CORE_EXPORT ContextMenuController void DocumentDetached(Document*); @@ -573,13 +573,13 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/th void ShowContextMenuAtPoint(LocalFrame*, float x, float y, -@@ -124,7 +124,8 @@ class CORE_EXPORT ContextMenuController final - bool ShowContextMenu(LocalFrame*, - const PhysicalOffset&, - WebMenuSourceType, -- const MouseEvent* mouse_event = nullptr); -+ const MouseEvent* mouse_event = nullptr, -+ bool do_not_show_context_menu = false); +@@ -127,7 +127,8 @@ class CORE_EXPORT ContextMenuController + virtual bool ShowContextMenu(LocalFrame*, + const PhysicalOffset&, + WebMenuSourceType, +- const MouseEvent* mouse_event); ++ const MouseEvent* mouse_event, ++ bool do_not_show_context_menu = false); bool ShouldShowContextMenuFromTouch(const ContextMenuData&); diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index 6bf6bb0b..c96eb500 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -27,8 +27,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -169,6 +169,7 @@ - #include "components/sensitive_content/features.h" #include "components/services/heap_profiling/public/cpp/switches.h" + #include "components/services/on_device_translation/buildflags/buildflags.h" #include "components/services/storage/public/cpp/buckets/bucket_info.h" +#include "components/site_engagement/core/features.h" #include "components/shared_highlighting/core/common/shared_highlighting_features.h" @@ -131,7 +131,7 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co #include "components/feature_engagement/public/configuration.h" #include "components/feature_engagement/public/event_constants.h" #include "components/feature_engagement/public/feature_constants.h" -@@ -113,6 +114,12 @@ std::optional GetClientSideFeatureConfig( +@@ -121,6 +122,12 @@ std::optional GetClientSideFeatureConfig( } #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index c3bba809..a2f0eca4 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java -@@ -60,6 +60,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; +@@ -68,6 +68,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory; import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController; @@ -20,10 +20,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage; import org.chromium.components.browser_ui.settings.PreferenceUpdateObserver; -@@ -797,8 +798,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity - finishCurrentSettings(mainFragment); +@@ -922,8 +923,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity return true; } else if (item.getItemId() == R.id.menu_id_general_help) { + RecordUserAction.record("Settings.MobileHelpAndFeedback"); - HelpAndFeedbackLauncherImpl.getForProfile(mProfile) - .show(this, getString(R.string.help_context_settings), null); + if (mainFragment instanceof SettingsUtils.ISupportHelpAndFeedback) { diff --git a/build/patches/Add-support-for-writing-URIs.patch b/build/patches/Add-support-for-writing-URIs.patch index 49836eb4..77514647 100644 --- a/build/patches/Add-support-for-writing-URIs.patch +++ b/build/patches/Add-support-for-writing-URIs.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc --- a/base/android/content_uri_utils.cc +++ b/base/android/content_uri_utils.cc -@@ -137,6 +137,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env, +@@ -137,6 +137,16 @@ static void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env, Time::FromMillisecondsSinceUnixEpoch(last_modified)); } diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 3d9de760..4a2f54d1 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -189,7 +189,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -86,6 +86,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor( +@@ -93,6 +93,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor( return settings; } @@ -206,7 +206,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -114,6 +114,8 @@ enum ReasonForCallingCanExecuteScripts { +@@ -148,6 +148,8 @@ enum ReasonForCallingCanExecuteScripts { enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag }; @@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -346,6 +346,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( +@@ -341,6 +341,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( } } @@ -232,7 +232,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() { base::AutoLock locker(WebGLContextLimitLock()); DCHECK(webgl_context_limits_initialized_); -@@ -616,25 +623,6 @@ static String ExtractWebGLContextCreationError( +@@ -611,25 +618,6 @@ static String ExtractWebGLContextCreationError( const Platform::WebGLContextInfo& info) { StringBuilder builder; builder.Append("Could not create a WebGL context"); @@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(), builder); builder.Append('.'); -@@ -695,6 +683,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( +@@ -690,6 +678,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( const CanvasContextCreationAttributesCore& attributes, Platform::WebGLContextType context_type, Platform::WebGLContextInfo* context_info) { @@ -274,7 +274,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h -@@ -1958,6 +1958,8 @@ class MODULES_EXPORT WebGLRenderingContextBase +@@ -1965,6 +1965,8 @@ class MODULES_EXPORT WebGLRenderingContextBase DOMArrayBufferView* pixels, int64_t offset); diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index 7fd3e4a3..348bb5c6 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -187,7 +187,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc -@@ -49,6 +49,7 @@ +@@ -47,6 +47,7 @@ #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/task_type.h" @@ -195,7 +195,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d #include "third_party/blink/public/platform/web_url.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h" #include "third_party/blink/public/web/web_document.h" -@@ -1053,6 +1054,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -1041,6 +1042,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( // |request_multiple_routes|. Whether local IP addresses could be // collected depends on if mic/camera permission is granted for this // origin. @@ -210,9 +210,9 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc -@@ -16,6 +16,9 @@ - #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h" - #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h" +@@ -12,6 +12,9 @@ + #include "base/synchronization/lock.h" + #include "base/task/single_thread_task_runner.h" #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" +#include "third_party/blink/public/platform/web_content_settings_client.h" +#include "third_party/blink/public/web/web_local_frame.h" @@ -220,7 +220,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver. #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_rtcp_parameters.h" -@@ -279,6 +282,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state, +@@ -277,6 +280,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state, if (kind != "audio" && kind != "video") return nullptr; @@ -238,9 +238,9 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver. diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc -@@ -21,6 +21,9 @@ - #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h" - #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h" +@@ -17,6 +17,9 @@ + #include "base/strings/to_string.h" + #include "base/task/single_thread_task_runner.h" #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" +#include "third_party/blink/public/platform/web_content_settings_client.h" +#include "third_party/blink/public/web/web_local_frame.h" @@ -248,7 +248,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h" -@@ -1031,6 +1034,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, +@@ -1019,6 +1022,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, if (kind != "audio" && kind != "video") return nullptr; diff --git a/build/patches/Allow-DocumentPiP-if-PopupsAndRedirects-are-active.patch b/build/patches/Allow-DocumentPiP-if-PopupsAndRedirects-are-active.patch index ab1fc973..1a4542a9 100644 --- a/build/patches/Allow-DocumentPiP-if-PopupsAndRedirects-are-active.patch +++ b/build/patches/Allow-DocumentPiP-if-PopupsAndRedirects-are-active.patch @@ -34,7 +34,7 @@ diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/pict #include "third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_event.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" -@@ -386,6 +387,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow( +@@ -388,6 +389,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow( return; } diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 070155dd..00652838 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc --- a/chrome/browser/net/chrome_report_sender.cc +++ b/chrome/browser/net/chrome_report_sender.cc -@@ -85,6 +85,7 @@ void SendReport( +@@ -88,6 +88,7 @@ void SendReport( const std::string& report, base::OnceClosure success_callback, ErrorCallback error_callback) { @@ -43,7 +43,7 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc --- a/content/browser/devtools/protocol/network_handler.cc +++ b/content/browser/devtools/protocol/network_handler.cc -@@ -1511,6 +1511,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { +@@ -1517,6 +1517,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { } } @@ -51,7 +51,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { std::vector urls; frame_host->ForEachRenderFrameHostImplWithAction( -@@ -1524,6 +1525,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { +@@ -1530,6 +1531,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { }); return urls; } @@ -106,9 +106,9 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse #include "base/values.h" +#include "net/base/features.h" #include "content/browser/service_worker/service_worker_host.h" + #include "content/browser/shared_storage/shared_storage_worklet_host.h" #include "content/browser/worker_host/dedicated_worker_host.h" - #include "content/browser/worker_host/shared_worker_host.h" -@@ -240,12 +241,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { +@@ -241,12 +242,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { const std::string& group, const std::string& type, base::Value::Dict body) { @@ -126,7 +126,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -16439,12 +16439,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -16347,12 +16347,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( } } } @@ -308,7 +308,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic diff --git a/services/network/network_context.h b/services/network/network_context.h --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -508,14 +508,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -499,14 +499,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const GURL& url, const std::optional& reporting_source, const net::NetworkAnonymizationKey& network_anonymization_key, @@ -340,7 +340,7 @@ diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/pu diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn --- a/services/network/public/mojom/BUILD.gn +++ b/services/network/public/mojom/BUILD.gn -@@ -1826,7 +1826,6 @@ mojom("mojom") { +@@ -1833,7 +1833,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -351,7 +351,7 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom -@@ -1305,6 +1305,7 @@ interface NetworkContext { +@@ -1245,6 +1245,7 @@ interface NetworkContext { // provided `network_anonymization_key`. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -359,7 +359,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1312,6 +1313,7 @@ interface NetworkContext { +@@ -1252,6 +1253,7 @@ interface NetworkContext { NetworkAnonymizationKey network_anonymization_key, mojo_base.mojom.DictionaryValue body); @@ -367,7 +367,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueEnterpriseReport(string type, string group, url.mojom.Url url, -@@ -1322,6 +1324,7 @@ interface NetworkContext { +@@ -1262,6 +1264,7 @@ interface NetworkContext { // Note that this queued report will never be delivered if no reporting // endpoint matching is registered for with the provided // `network_anonymization_key`. @@ -413,7 +413,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h" #include "services/network/public/mojom/source_location.mojom-blink.h" -@@ -2854,9 +2855,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() { +@@ -2871,9 +2872,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() { return CHECK_DEREF(GetDocument()).GetResourceCoordinator(); } @@ -428,15 +428,15 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -37,6 +37,7 @@ - #include "base/time/time.h" +@@ -38,6 +38,7 @@ #include "base/unguessable_token.h" #include "build/build_config.h" -+#include "net/net_buildflags.h" - #include "mojo/public/cpp/bindings/pending_associated_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h" ++#include "net/net_buildflags.h" #include "net/storage_access_api/status.h" -@@ -668,7 +669,9 @@ class CORE_EXPORT LocalFrame final + #include "services/metrics/public/cpp/ukm_source_id.h" + #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" +@@ -670,7 +671,9 @@ class CORE_EXPORT LocalFrame final return client_hints_preferences_; } @@ -457,17 +457,17 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ #include "third_party/blink/public/platform/browser_interface_broker_proxy.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/task_type.h" -@@ -59,7 +60,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext"; +@@ -55,7 +56,9 @@ bool ShouldReportBeVisibleToObservers(Report* report) { + ReportingContext::ReportingContext(ExecutionContext& context) - : Supplement(context), - execution_context_(context), + : execution_context_(context), +#if BUILDFLAG(ENABLE_REPORTING) reporting_service_(&context), +#endif receivers_(this, &context) {} // static -@@ -126,7 +129,9 @@ void ReportingContext::Trace(Visitor* visitor) const { +@@ -121,7 +124,9 @@ void ReportingContext::Trace(Visitor* visitor) const { visitor->Trace(observers_); visitor->Trace(report_buffer_); visitor->Trace(execution_context_); @@ -475,9 +475,9 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ visitor->Trace(reporting_service_); +#endif visitor->Trace(receivers_); - Supplement::Trace(visitor); } -@@ -149,6 +154,7 @@ void ReportingContext::CountReport(Report* report) { + +@@ -143,6 +148,7 @@ void ReportingContext::CountReport(Report* report) { UseCounter::Count(execution_context_, feature); } @@ -485,7 +485,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ const HeapMojoRemote& ReportingContext::GetReportingService() const { if (!reporting_service_.is_bound()) { -@@ -158,6 +164,7 @@ ReportingContext::GetReportingService() const { +@@ -152,6 +158,7 @@ ReportingContext::GetReportingService() const { } return reporting_service_; } @@ -493,7 +493,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ void ReportingContext::NotifyInternal(Report* report) { if (!ShouldReportBeVisibleToObservers(report)) { -@@ -184,6 +191,7 @@ void ReportingContext::NotifyInternal(Report* report) { +@@ -178,6 +185,7 @@ void ReportingContext::NotifyInternal(Report* report) { void ReportingContext::SendToReportingAPI(Report* report, const String& endpoint) const { @@ -501,7 +501,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ const String& type = report->type(); if (!(type == ReportType::kCSPViolation || type == ReportType::kCSPHash || type == ReportType::kDeprecation || -@@ -268,6 +276,7 @@ void ReportingContext::SendToReportingAPI(Report* report, +@@ -262,6 +270,7 @@ void ReportingContext::SendToReportingAPI(Report* report, url, endpoint, body->featureId(), body->disposition(), body->message(), body->sourceFile(), line_number, column_number); } @@ -520,7 +520,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h" #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h" #include "third_party/blink/renderer/core/core_export.h" -@@ -56,10 +57,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected, +@@ -52,10 +53,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected, private: // Counts the use of a report type via UseCounter. void CountReport(Report*); @@ -533,7 +533,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p void NotifyInternal(Report* report); // Send |report| via the Reporting API to |endpoint|. void SendToReportingAPI(Report* report, const String& endpoint) const; -@@ -71,8 +72,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected, +@@ -67,8 +68,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected, // This is declared mutable so that the service endpoint can be cached by // const methods. diff --git a/build/patches/Allow-building-without-supervised-users.patch b/build/patches/Allow-building-without-supervised-users.patch index 7de62873..0973808e 100644 --- a/build/patches/Allow-building-without-supervised-users.patch +++ b/build/patches/Allow-building-without-supervised-users.patch @@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -828,7 +828,6 @@ if (_is_default_toolchain) { +@@ -815,7 +815,6 @@ if (_is_default_toolchain) { "//components/offline_pages/core:offline_page_model_enums_java", "//components/sharing_message:sharing_dialog_type_generated_enum", "//components/sharing_message:sharing_send_message_result_generated_enum", @@ -65,7 +65,7 @@ diff --git a/chrome/browser/feedback/android/BUILD.gn b/chrome/browser/feedback/ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc -@@ -327,7 +327,7 @@ void PrepareFactory( +@@ -332,7 +332,7 @@ void PrepareFactory( policy::BrowserPolicyConnector* policy_connector) { factory->SetManagedPolicies(policy_service, policy_connector); factory->SetRecommendedPolicies(policy_service, policy_connector); @@ -89,7 +89,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -680,10 +680,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) { +@@ -679,10 +679,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) { prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_); pref_change_registrar_.Init(prefs); @@ -100,7 +100,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p // Changes in the profile avatar. pref_change_registrar_.Add( -@@ -1627,6 +1623,7 @@ GURL ProfileImpl::GetHomePage() { +@@ -1603,6 +1599,7 @@ GURL ProfileImpl::GetHomePage() { } void ProfileImpl::UpdateSupervisedUserIdInStorage() { @@ -111,7 +111,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1194,10 +1194,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) { +@@ -1262,10 +1262,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) { profile->GetPrefs()->SetString(prefs::kProfileName, profile_name); } @@ -122,7 +122,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile } void ProfileManager::RegisterTestingProfile(std::unique_ptr profile, -@@ -1976,9 +1972,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) { +@@ -2044,9 +2040,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) { init_params.icon_index = profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex); @@ -208,7 +208,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences diff --git a/components/supervised_user/core/browser/supervised_user_service.cc b/components/supervised_user/core/browser/supervised_user_service.cc --- a/components/supervised_user/core/browser/supervised_user_service.cc +++ b/components/supervised_user/core/browser/supervised_user_service.cc -@@ -248,6 +248,7 @@ SupervisedUserService::SupervisedUserService( +@@ -244,6 +244,7 @@ SupervisedUserService::SupervisedUserService( } void SupervisedUserService::SetSettingsServiceActive(bool active) { diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 08b2f2be..4f1dd80c 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -23,7 +23,7 @@ diff --git a/content/public/renderer/render_frame_media_playback_options.cc b/co diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc -@@ -1311,6 +1311,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1287,6 +1287,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -36,7 +36,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc void WebMediaPlayerImpl::EnabledAudioTracksChanged( std::optional enabled_track_id) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3678,7 +3684,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3654,7 +3660,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { const bool preserve_audio = HasUnmutedAudio() || audio_source_provider_->IsAudioBeingCaptured(); // Audio only stream is allowed to play when in background. diff --git a/build/patches/Always-open-browser-controls-in-new-tab.patch b/build/patches/Always-open-browser-controls-in-new-tab.patch index f9b66b88..a0094c90 100644 --- a/build/patches/Always-open-browser-controls-in-new-tab.patch +++ b/build/patches/Always-open-browser-controls-in-new-tab.patch @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM import org.chromium.chrome.browser.DefaultBrowserInfo; import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpenerImpl; -@@ -43,6 +44,7 @@ import org.chromium.chrome.browser.preferences.Pref; +@@ -45,6 +46,7 @@ import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory; import org.chromium.chrome.browser.printing.TabPrinter; import org.chromium.chrome.browser.profiles.Profile; @@ -26,7 +26,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; -@@ -335,6 +337,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { +@@ -348,6 +350,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { @Nullable Referrer referrer, boolean navigateToTab, @Nullable AdditionalNavigationParams additionalNavigationParams) { @@ -34,7 +34,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM RecordUserAction.record("MobileNewTabOpened"); RecordUserAction.record("LinkOpenedInNewTab"); LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec()); -@@ -355,6 +358,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { +@@ -368,6 +371,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { * @param url The URL to open. */ public void onOpenInNewTabInGroup(GURL url, @Nullable Referrer referrer) { diff --git a/build/patches/Android-Pixel-Perfect-Mode.patch b/build/patches/Android-Pixel-Perfect-Mode.patch index 2b70ab27..222f76bf 100644 --- a/build/patches/Android-Pixel-Perfect-Mode.patch +++ b/build/patches/Android-Pixel-Perfect-Mode.patch @@ -35,7 +35,6 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../browser/flags/cromite/sPixelPerfect.java | 33 +++++++++++++ .../settings/ChromeBaseSettingsFragment.java | 4 ++ .../Pixel-perfect-mode.grdp | 9 ++++ - .../common/interventions_features.cc | 1 + components/input/BUILD.gn | 2 + components/input/android_input_helper.cc | 2 +- components/input/child_frame_input_helper.cc | 2 +- @@ -78,7 +77,6 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../widget/visual_properties_mojom_traits.h | 11 +++++ .../mojom/widget/visual_properties.mojom | 4 ++ third_party/blink/public/web/web_view.h | 1 + - .../canvas_interventions_helper.cc | 1 + .../blink/renderer/core/css/media_values.cc | 4 +- .../renderer/core/exported/web_view_impl.cc | 41 ++++++++++++---- .../renderer/core/exported/web_view_impl.h | 5 ++ @@ -109,7 +107,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html ui/display/mojom/screen_info_mojom_traits.h | 4 ++ ui/display/screen_info.h | 1 + ui/events/blink/blink_event_util.cc | 2 +- - 99 files changed, 533 insertions(+), 139 deletions(-) + 97 files changed, 531 insertions(+), 139 deletions(-) create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sPixelPerfect.java create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Pixel-perfect-mode.grdp create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Pixel-perfect-mode.inc @@ -119,7 +117,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc --- a/android_webview/browser/aw_contents.cc +++ b/android_webview/browser/aw_contents.cc -@@ -1039,7 +1039,7 @@ void AwContents::OnSizeChanged(JNIEnv* env, int w, int h, int ow, int oh) { +@@ -955,7 +955,7 @@ void AwContents::OnSizeChanged(JNIEnv* env, int w, int h, int ow, int oh) { DCHECK_CURRENTLY_ON(BrowserThread::UI); gfx::Size size(w, h); web_contents_->GetNativeView()->OnPhysicalBackingSizeChanged(size); @@ -131,7 +129,7 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw diff --git a/cc/input/input_handler.cc b/cc/input/input_handler.cc --- a/cc/input/input_handler.cc +++ b/cc/input/input_handler.cc -@@ -695,7 +695,7 @@ InputHandlerPointerResult InputHandler::MouseMoveAt( +@@ -720,7 +720,7 @@ InputHandlerPointerResult InputHandler::MouseMoveAt( return result; } @@ -176,7 +174,7 @@ diff --git a/cc/layers/viewport.cc b/cc/layers/viewport.cc diff --git a/cc/mojo_embedder/viz_layer_context.cc b/cc/mojo_embedder/viz_layer_context.cc --- a/cc/mojo_embedder/viz_layer_context.cc +++ b/cc/mojo_embedder/viz_layer_context.cc -@@ -1301,7 +1301,7 @@ void VizLayerContext::SetVisible(bool visible) { +@@ -1311,7 +1311,7 @@ void VizLayerContext::SetVisible(bool visible) { service_->SetVisible(visible); } @@ -210,7 +208,7 @@ diff --git a/cc/trees/commit_state.h b/cc/trees/commit_state.h diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc --- a/cc/trees/layer_tree_host.cc +++ b/cc/trees/layer_tree_host.cc -@@ -1389,7 +1389,7 @@ void LayerTreeHost::SetEventListenerProperties( +@@ -1391,7 +1391,7 @@ void LayerTreeHost::SetEventListenerProperties( SetNeedsCommit(); } @@ -219,7 +217,7 @@ diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc const gfx::Rect& device_viewport_rect, float device_scale_factor, const viz::LocalSurfaceId& local_surface_id_from_parent) { -@@ -1509,9 +1509,11 @@ void LayerTreeHost::SetOverscrollBehavior(const OverscrollBehavior& behavior) { +@@ -1511,9 +1511,11 @@ void LayerTreeHost::SetOverscrollBehavior(const OverscrollBehavior& behavior) { void LayerTreeHost::SetPageScaleFactorAndLimits(float page_scale_factor, float min_page_scale_factor, @@ -231,7 +229,7 @@ diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc pending_commit_state()->max_page_scale_factor == max_page_scale_factor) return; DCHECK_GE(page_scale_factor, min_page_scale_factor); -@@ -1527,6 +1529,7 @@ void LayerTreeHost::SetPageScaleFactorAndLimits(float page_scale_factor, +@@ -1529,6 +1531,7 @@ void LayerTreeHost::SetPageScaleFactorAndLimits(float page_scale_factor, pending_commit_state()->page_scale_factor = page_scale_factor; pending_commit_state()->min_page_scale_factor = min_page_scale_factor; @@ -263,7 +261,7 @@ diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -2585,7 +2585,7 @@ viz::RegionCaptureBounds LayerTreeHostImpl::CollectRegionCaptureBounds() { +@@ -2587,7 +2587,7 @@ viz::RegionCaptureBounds LayerTreeHostImpl::CollectRegionCaptureBounds() { return bounds; } @@ -272,7 +270,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc viz::CompositorFrameMetadata metadata; if (settings().trees_in_viz_in_viz_process) { // In TreesInViz mode, this function is called in client process already, -@@ -2752,7 +2752,7 @@ viz::CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() { +@@ -2754,7 +2754,7 @@ viz::CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() { return metadata; } @@ -284,7 +282,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc --- a/cc/trees/layer_tree_impl.cc +++ b/cc/trees/layer_tree_impl.cc -@@ -162,6 +162,7 @@ LayerTreeImpl::LayerTreeImpl( +@@ -163,6 +163,7 @@ LayerTreeImpl::LayerTreeImpl( background_color_(SkColors::kTransparent), page_scale_factor_(page_scale_factor), min_page_scale_factor_(0), @@ -292,7 +290,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc max_page_scale_factor_(0), external_page_scale_factor_(1.f), device_scale_factor_(1.f), -@@ -449,7 +450,7 @@ void LayerTreeImpl::InvalidateRasterInducingScrolls( +@@ -450,7 +451,7 @@ void LayerTreeImpl::InvalidateRasterInducingScrolls( } } @@ -301,7 +299,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc if (!InnerViewportScrollNode()) return; -@@ -519,8 +520,13 @@ void LayerTreeImpl::UpdateViewportContainerSizes() { +@@ -520,8 +521,13 @@ void LayerTreeImpl::UpdateViewportContainerSizes() { // Adjust the outer viewport container as well, since adjusting only the // inner may cause its bounds to exceed those of the outer, causing scroll // clamping. @@ -317,7 +315,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc property_trees->SetOuterViewportContainerBoundsDelta(scaled_bounds_delta); // outer_viewport_container_bounds_delta and -@@ -818,6 +824,7 @@ void LayerTreeImpl::PullLayerTreePropertiesFrom(CommitState& commit_state) { +@@ -843,6 +849,7 @@ void LayerTreeImpl::PullLayerTreePropertiesFrom(CommitState& commit_state) { PushPageScaleFromMainThread(commit_state.page_scale_factor, commit_state.min_page_scale_factor, @@ -325,7 +323,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc commit_state.max_page_scale_factor); SetBrowserControlsParams(commit_state.browser_controls_params); -@@ -927,6 +934,7 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) { +@@ -967,6 +974,7 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) { // Active tree already shares the page_scale_factor object with pending // tree so only the limits need to be provided. target_tree->PushPageScaleFactorAndLimits(nullptr, min_page_scale_factor(), @@ -333,7 +331,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc max_page_scale_factor()); target_tree->SetExternalPageScaleFactor(external_page_scale_factor_); -@@ -1343,19 +1351,21 @@ void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) { +@@ -1402,19 +1410,21 @@ void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) { void LayerTreeImpl::PushPageScaleFromMainThread(float page_scale_factor, float min_page_scale_factor, @@ -357,7 +355,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc if (changed_page_scale) { DidUpdatePageScale(); -@@ -1364,12 +1374,13 @@ void LayerTreeImpl::SetPageScaleFactorAndLimitsForDisplayTree( +@@ -1423,12 +1433,13 @@ void LayerTreeImpl::SetPageScaleFactorAndLimitsForDisplayTree( void LayerTreeImpl::PushPageScaleFactorAndLimits(const float* page_scale_factor, float min_page_scale_factor, @@ -372,7 +370,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc if (page_scale_factor) { DCHECK(!IsActiveTree() || !host_impl_->pending_tree()); -@@ -1486,12 +1497,15 @@ void LayerTreeImpl::PushBrowserControls( +@@ -1545,12 +1556,15 @@ void LayerTreeImpl::PushBrowserControls( } bool LayerTreeImpl::SetPageScaleFactorLimits(float min_page_scale_factor, @@ -388,7 +386,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc max_page_scale_factor_ = max_page_scale_factor; return true; -@@ -2392,7 +2406,7 @@ ScrollbarSet LayerTreeImpl::ScrollbarsFor(ElementId scroll_element_id) const { +@@ -2451,7 +2465,7 @@ ScrollbarSet LayerTreeImpl::ScrollbarsFor(ElementId scroll_element_id) const { return scrollbars; } @@ -397,7 +395,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc const gfx::PointF& screen_space_point, const gfx::Transform& local_space_to_screen_space_transform, const gfx::Rect& local_space_rect, -@@ -3003,7 +3017,7 @@ static gfx::SelectionBound ComputeViewportSelectionBound( +@@ -3062,7 +3076,7 @@ static gfx::SelectionBound ComputeViewportSelectionBound( return viewport_bound; } @@ -409,7 +407,7 @@ diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h --- a/cc/trees/layer_tree_impl.h +++ b/cc/trees/layer_tree_impl.h -@@ -383,6 +383,7 @@ class CC_EXPORT LayerTreeImpl { +@@ -385,6 +385,7 @@ class CC_EXPORT LayerTreeImpl { void SetPageScaleOnActiveTree(float active_page_scale); void PushPageScaleFromMainThread(float page_scale_factor, float min_page_scale_factor, @@ -417,7 +415,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h float max_page_scale_factor); const LayerSelection& selection() const { return selection_; } float current_page_scale_factor() const { -@@ -390,7 +391,7 @@ class CC_EXPORT LayerTreeImpl { +@@ -392,7 +393,7 @@ class CC_EXPORT LayerTreeImpl { } float min_page_scale_factor() const { return min_page_scale_factor_; } float max_page_scale_factor() const { return max_page_scale_factor_; } @@ -426,7 +424,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h float page_scale_delta() const { return page_scale_factor()->Delta(); } SyncedScale* page_scale_factor(); -@@ -845,6 +846,7 @@ class CC_EXPORT LayerTreeImpl { +@@ -847,6 +848,7 @@ class CC_EXPORT LayerTreeImpl { void SetPageScaleFactorAndLimitsForDisplayTree(float page_scale_factor, float min_page_scale_factor, @@ -434,7 +432,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h float max_page_scale_factor); LayerTreeHostImpl* host_impl() { return host_impl_; } -@@ -869,8 +871,10 @@ class CC_EXPORT LayerTreeImpl { +@@ -871,8 +873,10 @@ class CC_EXPORT LayerTreeImpl { float ClampPageScaleFactorToLimits(float page_scale_factor) const; void PushPageScaleFactorAndLimits(const float* page_scale_factor, float min_page_scale_factor, @@ -445,7 +443,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h float max_page_scale_factor); void DidUpdatePageScale(); void PushBrowserControls(const float* top_controls_shown_ratio, -@@ -909,6 +913,7 @@ class CC_EXPORT LayerTreeImpl { +@@ -911,6 +915,7 @@ class CC_EXPORT LayerTreeImpl { scoped_refptr page_scale_factor_; float min_page_scale_factor_; @@ -456,7 +454,7 @@ diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc --- a/cc/trees/property_tree.cc +++ b/cc/trees/property_tree.cc -@@ -1602,7 +1602,7 @@ void ScrollTree::clear() { +@@ -1690,7 +1690,7 @@ void ScrollTree::clear() { #endif } @@ -465,7 +463,7 @@ diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc const ScrollNode* scroll_node = Node(scroll_node_id); gfx::SizeF scroll_bounds = this->scroll_bounds(scroll_node_id); -@@ -2121,7 +2121,7 @@ gfx::Vector2dF ScrollTree::ScrollBy(const ScrollNode& scroll_node, +@@ -2239,7 +2239,7 @@ gfx::Vector2dF ScrollTree::ScrollBy(const ScrollNode& scroll_node, return old_offset + scroll - new_offset; } @@ -501,7 +499,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -41,6 +41,9 @@ import androidx.annotation.NonNull; +@@ -44,6 +44,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; @@ -511,7 +509,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.base.ActivityState; import org.chromium.base.ApplicationStatus; import org.chromium.base.Callback; -@@ -540,7 +543,25 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -552,7 +555,25 @@ public abstract class ChromeActivity extends AsyncInitializationActivity // Ensure that mConfig is initialized before tablet mode changes. mConfig = getResources().getConfiguration(); @@ -562,7 +560,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java -@@ -618,7 +618,7 @@ public class OverlayPanelContent { +@@ -619,7 +619,7 @@ public class OverlayPanelContent { OverlayPanelContentJni.get() .onPhysicalBackingSizeChanged( mNativeOverlayPanelContentPtr, webContents, mContentViewWidth, viewHeight); @@ -574,7 +572,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bott diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java -@@ -2370,7 +2370,7 @@ class TabImpl implements Tab { +@@ -2394,7 +2394,7 @@ class TabImpl implements Tab { Supplier compositorViewHolderSupplier = assumeNonNull(getActivity()).getCompositorViewHolderSupplier(); View compositorView = compositorViewHolderSupplier.get(); @@ -717,21 +715,10 @@ new file mode 100644 + Eliminate conversions between dpi and pixels in Blink + + -diff --git a/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc b/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc ---- a/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc -+++ b/components/fingerprinting_protection_filter/interventions/common/interventions_features.cc -@@ -27,6 +27,7 @@ BASE_FEATURE_PARAM(bool, - &kBlockCanvasReadback, - "enable_in_regular_mode", - false); -+SET_CROMITE_FEATURE_DISABLED(kCanvasNoise); - - bool IsCanvasInterventionsEnabledForIncognitoState(bool is_incognito) { - if (is_incognito) { diff --git a/components/input/BUILD.gn b/components/input/BUILD.gn --- a/components/input/BUILD.gn +++ b/components/input/BUILD.gn -@@ -97,6 +97,8 @@ component("input") { +@@ -98,6 +98,8 @@ component("input") { "//ui/events:gesture_detection", "//ui/events/blink", "//ui/events/gestures/blink", @@ -767,7 +754,7 @@ diff --git a/components/input/child_frame_input_helper.cc b/components/input/chi diff --git a/components/input/input_router_impl.cc b/components/input/input_router_impl.cc --- a/components/input/input_router_impl.cc +++ b/components/input/input_router_impl.cc -@@ -618,7 +618,7 @@ bool InputRouterImpl::IsAutoscrollInProgress() { +@@ -619,7 +619,7 @@ bool InputRouterImpl::IsAutoscrollInProgress() { return client_->IsAutoscrollInProgress(); } @@ -849,7 +836,7 @@ diff --git a/components/input/render_widget_targeter.cc b/components/input/rende diff --git a/components/thin_webview/internal/thin_webview.cc b/components/thin_webview/internal/thin_webview.cc --- a/components/thin_webview/internal/thin_webview.cc +++ b/components/thin_webview/internal/thin_webview.cc -@@ -105,7 +105,7 @@ void ThinWebView::ResizeWebContents(const gfx::Size& size) { +@@ -106,7 +106,7 @@ void ThinWebView::ResizeWebContents(const gfx::Size& size) { return; web_contents_->GetNativeView()->OnPhysicalBackingSizeChanged(size); @@ -897,7 +884,7 @@ diff --git a/components/viz/service/input/render_input_router_support_child_fram diff --git a/components/viz/service/layers/layer_context_impl.cc b/components/viz/service/layers/layer_context_impl.cc --- a/components/viz/service/layers/layer_context_impl.cc +++ b/components/viz/service/layers/layer_context_impl.cc -@@ -1841,7 +1841,7 @@ base::expected LayerContextImpl::DoUpdateDisplayTree( +@@ -1883,7 +1883,7 @@ base::expected LayerContextImpl::DoUpdateDisplayTree( return base::unexpected("Invalid page scale factors"); } layers.SetPageScaleFactorAndLimitsForDisplayTree( @@ -998,7 +985,7 @@ diff --git a/content/browser/renderer_host/input/touch_selection_controller_clie diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -9396,7 +9396,7 @@ void RenderFrameHostImpl::ShowPopupMenu( +@@ -9315,7 +9315,7 @@ void RenderFrameHostImpl::ShowPopupMenu( #endif } @@ -1010,7 +997,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -1049,7 +1049,20 @@ blink::VisualProperties RenderWidgetHostImpl::GetVisualProperties() { +@@ -1055,7 +1055,20 @@ blink::VisualProperties RenderWidgetHostImpl::GetVisualProperties() { blink::VisualProperties visual_properties; visual_properties.screen_infos = GetScreenInfos(); auto& current_screen_info = visual_properties.screen_infos.mutable_current(); @@ -1032,7 +1019,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/ // For testing, override the raster color profile. // Note: this needs to be done here and not earlier in the pipeline because // Mac uses the display color space to update an NSSurface and this setting -@@ -1154,6 +1167,13 @@ blink::VisualProperties RenderWidgetHostImpl::GetVisualProperties() { +@@ -1160,6 +1173,13 @@ blink::VisualProperties RenderWidgetHostImpl::GetVisualProperties() { visual_properties.compositing_scale_factor = properties_from_parent_local_root_.compositing_scale_factor; @@ -1046,7 +1033,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/ #if BUILDFLAG(IS_MAC) // Only macOS cursor scaling affects CSS custom cursor images for now. visual_properties.cursor_accessibility_scale_factor = -@@ -1334,8 +1354,10 @@ bool RenderWidgetHostImpl::SynchronizeVisualProperties( +@@ -1340,8 +1360,10 @@ bool RenderWidgetHostImpl::SynchronizeVisualProperties( } } @@ -1059,7 +1046,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/ // If we do not have a valid viz::LocalSurfaceId then we are a child frame // waiting on the id to be propagated from our parent. We cannot create a hash -@@ -3990,7 +4012,7 @@ void RenderWidgetHostImpl::IntrinsicSizingInfoChanged( +@@ -4010,7 +4032,7 @@ void RenderWidgetHostImpl::IntrinsicSizingInfoChanged( // porting drag-and-drop calls to Mojo, so that RenderWidgetHostImpl bypasses // RenderWidget to talk the the WebFrameWidget and needs to perform the scale // operation itself. @@ -1071,7 +1058,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc -@@ -89,6 +89,7 @@ +@@ -90,6 +90,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/content_features.h" #include "content/public/common/content_switches.h" @@ -1079,7 +1066,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ #include "third_party/blink/public/mojom/input/input_handler.mojom.h" #include "third_party/perfetto/include/perfetto/tracing/track.h" #include "third_party/skia/include/core/SkBitmap.h" -@@ -989,7 +990,7 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( +@@ -990,7 +991,7 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( ? SK_ColorTRANSPARENT : metadata.root_background_color.toSkColor()); @@ -1088,7 +1075,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ overscroll_controller_->OnFrameMetadataUpdated( metadata.page_scale_factor, metadata.device_scale_factor, metadata.scrollable_viewport_size, metadata.root_layer_size, -@@ -1292,6 +1293,12 @@ gfx::Size RenderWidgetHostViewAndroid::GetRequestedRendererSizeDevicePx() { +@@ -1293,6 +1294,12 @@ gfx::Size RenderWidgetHostViewAndroid::GetRequestedRendererSizeDevicePx() { default_bounds_dip_.height() * scale_factor); } @@ -1101,7 +1088,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ const float scale_factor = GetDeviceScaleFactor() / view_.GetDipScale(); return gfx::ScaleToCeiledSize(view_.GetSizeDevicePx(), scale_factor); } -@@ -1317,6 +1324,10 @@ void RenderWidgetHostViewAndroid::SetInsets(const gfx::Insets& insets) { +@@ -1318,6 +1325,10 @@ void RenderWidgetHostViewAndroid::SetInsets(const gfx::Insets& insets) { NOTREACHED(); } @@ -1112,7 +1099,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ gfx::Size RenderWidgetHostViewAndroid::GetCompositorViewportPixelSize() { if (!view_.parent()) { if (default_bounds_dip_.IsEmpty()) { -@@ -1452,7 +1463,7 @@ viz::SurfaceId RenderWidgetHostViewAndroid::GetCurrentSurfaceId() const { +@@ -1462,7 +1473,7 @@ viz::SurfaceId RenderWidgetHostViewAndroid::GetCurrentSurfaceId() const { : viz::SurfaceId(); } @@ -1121,7 +1108,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ const gfx::PointF& point, RenderWidgetHostViewInput* target_view, gfx::PointF* transformed_point) { -@@ -1868,7 +1879,7 @@ bool RenderWidgetHostViewAndroid::HasFallbackSurface() const { +@@ -1879,7 +1890,7 @@ bool RenderWidgetHostViewAndroid::HasFallbackSurface() const { return delegated_frame_host_->HasFallbackSurface(); } @@ -1144,7 +1131,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/c diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc -@@ -113,6 +113,10 @@ gfx::Size RenderWidgetHostViewBase::GetCompositorViewportPixelSize() { +@@ -116,6 +116,10 @@ gfx::Size RenderWidgetHostViewBase::GetCompositorViewportPixelSize() { GetDeviceScaleFactor()); } @@ -1155,7 +1142,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/con void RenderWidgetHostViewBase::SelectionBoundsChanged( const gfx::Rect& anchor_rect, base::i18n::TextDirection anchor_dir, -@@ -605,7 +609,7 @@ display::ScreenInfos RenderWidgetHostViewBase::GetScreenInfos() const { +@@ -614,7 +618,7 @@ display::ScreenInfos RenderWidgetHostViewBase::GetScreenInfos() const { void RenderWidgetHostViewBase::ResetGestureDetection() {} @@ -1167,7 +1154,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/con diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h -@@ -286,6 +286,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -294,6 +294,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase // The size of the view's backing surface in non-DPI-adjusted pixels. virtual gfx::Size GetCompositorViewportPixelSize(); @@ -1249,7 +1236,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java -@@ -533,7 +533,8 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper +@@ -526,7 +526,8 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper boolean shouldSuggest, int sourceType, RenderFrameHost renderFrameHost, @@ -1259,7 +1246,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select mMenuModelBridge = menuModelBridge; RecordHistogram.recordEnumeratedHistogram( "Android.ShowSelectionMenuSourceType", sourceType, MenuSourceType.MAX_VALUE); -@@ -543,6 +544,8 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper +@@ -536,6 +537,8 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper mXDip = xDip; mYDip = yDip; mSelectionRect.set(left, top, right, offsetBottom); @@ -1283,7 +1270,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon } @Override -@@ -1469,7 +1469,7 @@ public class WebContentsImpl +@@ -1475,7 +1475,7 @@ public class WebContentsImpl Rect getFullscreenVideoSize(long nativeWebContentsAndroid); @@ -1317,7 +1304,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c + // All features in alphabetical order. - // Kill switch to guard additional security checks performed by the browser + // Marks navigations as aborted when the NavigationHandle is destroyed mid diff --git a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java --- a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java +++ b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java @@ -1451,7 +1438,7 @@ diff --git a/third_party/blink/public/mojom/widget/visual_properties.mojom b/thi diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h --- a/third_party/blink/public/web/web_view.h +++ b/third_party/blink/public/web/web_view.h -@@ -249,6 +249,7 @@ class BLINK_EXPORT WebView { +@@ -238,6 +238,7 @@ class BLINK_EXPORT WebView { // Minimum and Maximum as computed as a combination of default, page defined, // UA, etc. constraints. virtual float MinimumPageScaleFactor() const = 0; @@ -1459,17 +1446,6 @@ diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/ virtual float MaximumPageScaleFactor() const = 0; // Sets the offset of the visual viewport within the main frame, in -diff --git a/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc b/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc ---- a/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc -+++ b/third_party/blink/renderer/core/canvas_interventions/canvas_interventions_helper.cc -@@ -69,6 +69,7 @@ std::string_view GetContextTypeForMetrics(ExecutionContext* execution_context) { - // 2) the CanvasInterventions RuntimeEnabledFeature is enabled - bool ShouldApplyNoise(HighEntropyCanvasOpType canvas_operations, - ExecutionContext* execution_context) { -+ if (RuntimeEnabledFeatures::PixelPerfectEnabled()) return false; - CanvasNoiseReason noise_reason = CanvasNoiseReason::kAllConditionsMet; - if (canvas_operations == HighEntropyCanvasOpType::kNone) { - noise_reason |= CanvasNoiseReason::kNoTrigger; diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/blink/renderer/core/css/media_values.cc --- a/third_party/blink/renderer/core/css/media_values.cc +++ b/third_party/blink/renderer/core/css/media_values.cc @@ -1494,7 +1470,7 @@ diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/b diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -1265,8 +1265,19 @@ void WebViewImpl::UpdateICBAndResizeViewport( +@@ -1255,8 +1255,19 @@ void WebViewImpl::UpdateICBAndResizeViewport( if (GetBrowserControls().PermittedState() == cc::BrowserControlsState::kBoth && !GetBrowserControls().ShrinkViewport()) { @@ -1516,7 +1492,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p } GetPageScaleConstraintsSet().DidChangeInitialContainingBlockSize(icb_size); -@@ -1346,7 +1357,8 @@ void WebViewImpl::DidUpdateBrowserControls() { +@@ -1336,7 +1347,8 @@ void WebViewImpl::DidUpdateBrowserControls() { ResizeViewportAnchor::ResizeScope resize_scope(*resize_viewport_anchor_); visual_viewport.SetBrowserControlsAdjustment( @@ -1526,7 +1502,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p } } -@@ -1420,7 +1432,7 @@ void WebViewImpl::ResizeWithBrowserControls( +@@ -1410,7 +1422,7 @@ void WebViewImpl::ResizeWithBrowserControls( float bottom_controls_height, bool browser_controls_shrink_layout) { ResizeWithBrowserControls( @@ -1535,7 +1511,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p {top_controls_height, GetBrowserControls().TopMinHeight(), bottom_controls_height, GetBrowserControls().BottomMinHeight(), GetBrowserControls().AnimateHeightChanges(), -@@ -1430,6 +1442,8 @@ void WebViewImpl::ResizeWithBrowserControls( +@@ -1420,6 +1432,8 @@ void WebViewImpl::ResizeWithBrowserControls( void WebViewImpl::ResizeWithBrowserControls( const gfx::Size& main_frame_widget_size, const gfx::Size& visible_viewport_size, @@ -1544,7 +1520,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p cc::BrowserControlsParams browser_controls_params) { if (should_auto_resize_) { // When auto-resizing only the viewport size comes from the browser, while -@@ -1438,6 +1452,11 @@ void WebViewImpl::ResizeWithBrowserControls( +@@ -1428,6 +1442,11 @@ void WebViewImpl::ResizeWithBrowserControls( return; } @@ -1556,7 +1532,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p if (size_ == main_frame_widget_size && GetPage()->GetVisualViewport().Size() == visible_viewport_size && GetBrowserControls().Params() == browser_controls_params) -@@ -2118,7 +2137,7 @@ void WebViewImpl::DidAttachLocalMainFrame() { +@@ -2112,7 +2131,7 @@ void WebViewImpl::DidAttachLocalMainFrame() { web_preferences_.prefers_reduced_motion); MainFrameImpl()->FrameWidgetImpl()->SetPageScaleStateAndLimits( viewport.Scale(), viewport.IsPinchGestureActive(), @@ -1565,7 +1541,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p // Prevent main frame updates while the main frame is loading until enough // progress is made and BeginMainFrames are explicitly asked for. scoped_defer_main_frame_update_ = -@@ -2934,7 +2953,7 @@ void WebViewImpl::RefreshPageScaleFactor() { +@@ -2928,7 +2947,7 @@ void WebViewImpl::RefreshPageScaleFactor() { auto& viewport = GetPage()->GetVisualViewport(); MainFrameImpl()->FrameWidgetImpl()->SetPageScaleStateAndLimits( viewport.Scale(), viewport.IsPinchGestureActive(), @@ -1574,7 +1550,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p } } -@@ -3011,7 +3030,7 @@ void WebViewImpl::UpdatePageDefinedViewportConstraints( +@@ -3005,7 +3024,7 @@ void WebViewImpl::UpdatePageDefinedViewportConstraints( TextAutosizer::UpdatePageInfoInAllFrames(GetPage()->MainFrame()); } @@ -1583,7 +1559,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p if (should_auto_resize_ || !MainFrameImpl()) return; -@@ -3245,6 +3264,10 @@ float WebViewImpl::MinimumPageScaleFactor() const { +@@ -3239,6 +3258,10 @@ float WebViewImpl::MinimumPageScaleFactor() const { return GetPageScaleConstraintsSet().FinalConstraints().minimum_scale; } @@ -1594,7 +1570,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p float WebViewImpl::MaximumPageScaleFactor() const { return GetPageScaleConstraintsSet().FinalConstraints().maximum_scale; } -@@ -3295,7 +3318,7 @@ void WebViewImpl::SendResizeEventForMainFrame() { +@@ -3289,7 +3312,7 @@ void WebViewImpl::SendResizeEventForMainFrame() { auto& viewport = GetPage()->GetVisualViewport(); MainFrameImpl()->FrameWidgetImpl()->SetPageScaleStateAndLimits( viewport.Scale(), viewport.IsPinchGestureActive(), @@ -1603,7 +1579,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p } } -@@ -3844,7 +3867,7 @@ void WebViewImpl::PageScaleFactorChanged() { +@@ -3834,7 +3857,7 @@ void WebViewImpl::PageScaleFactorChanged() { DCHECK(viewport.IsActiveViewport()); MainFrameImpl()->FrameWidgetImpl()->SetPageScaleStateAndLimits( viewport.Scale(), viewport.IsPinchGestureActive(), @@ -1615,7 +1591,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h --- a/third_party/blink/renderer/core/exported/web_view_impl.h +++ b/third_party/blink/renderer/core/exported/web_view_impl.h -@@ -171,6 +171,7 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -168,6 +168,7 @@ class CORE_EXPORT WebViewImpl final : public WebView, void AdvanceFocus(bool reverse) override; float PageScaleFactor() const override; float MinimumPageScaleFactor() const override; @@ -1623,7 +1599,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_pa float MaximumPageScaleFactor() const override; void SetDefaultPageScaleLimits(float min_scale, float max_scale) override; void SetInitialPageScaleOverride(float) override; -@@ -284,6 +285,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -281,6 +282,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, // includes all browser controls params such as the min heights. void ResizeWithBrowserControls(const gfx::Size& main_frame_widget_size, const gfx::Size& visible_viewport_size, @@ -1632,7 +1608,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_pa cc::BrowserControlsParams); // Requests a page-scale animation based on the specified point/rect. -@@ -834,6 +837,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -827,6 +830,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, // The upper bound on the size when auto-resizing. gfx::Size max_auto_size_; @@ -1644,7 +1620,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_pa diff --git a/third_party/blink/renderer/core/frame/local_frame_view.cc b/third_party/blink/renderer/core/frame/local_frame_view.cc --- a/third_party/blink/renderer/core/frame/local_frame_view.cc +++ b/third_party/blink/renderer/core/frame/local_frame_view.cc -@@ -1740,8 +1740,11 @@ void LocalFrameView::PerformPostLayoutTasks(bool visual_viewport_size_changed) { +@@ -1791,8 +1791,11 @@ void LocalFrameView::PerformPostLayoutTasks(bool visual_viewport_size_changed) { } float LocalFrameView::InputEventsScaleFactor() const { @@ -1785,7 +1761,7 @@ diff --git a/third_party/blink/renderer/core/frame/visual_viewport.h b/third_par diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc -@@ -1873,6 +1873,9 @@ void WebFrameWidgetImpl::UpdateVisualProperties( +@@ -1872,6 +1872,9 @@ void WebFrameWidgetImpl::UpdateVisualProperties( // All non-top-level Widgets (child local-root frames, GuestViews, // etc.) propagate and consume the page scale factor as "external", meaning // that it comes from the top level widget's page scale. @@ -1795,7 +1771,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th if (!ForTopMostMainFrame()) { // The main frame controls the page scale factor, from blink. For other // frame widgets, the page scale from pinch zoom and compositing scale is -@@ -1880,7 +1883,7 @@ void WebFrameWidgetImpl::UpdateVisualProperties( +@@ -1879,7 +1882,7 @@ void WebFrameWidgetImpl::UpdateVisualProperties( // blink doesn't need to know this page scale factor outside the main frame, // the compositor does in order to produce its output at the correct scale. float combined_scale_factor = visual_properties.page_scale_factor * @@ -1804,7 +1780,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th widget_base_->LayerTreeHost()->SetExternalPageScaleFactor( combined_scale_factor, visual_properties.is_pinch_gesture_active); -@@ -1893,7 +1896,7 @@ void WebFrameWidgetImpl::UpdateVisualProperties( +@@ -1892,7 +1895,7 @@ void WebFrameWidgetImpl::UpdateVisualProperties( // Ensure the external scale factor in top-level widgets is reset as it may // be leftover from when a widget was nested and was promoted to top level. widget_base_->LayerTreeHost()->SetExternalPageScaleFactor( @@ -1813,7 +1789,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th /*is_pinch_gesture_active=*/false); } -@@ -1937,6 +1940,18 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( +@@ -1936,6 +1939,18 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( new_compositor_viewport_pixel_rect, device_scale_factor_for_testing_ / non_testing_device_scale_factor_); } @@ -1832,7 +1808,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th if (ForMainFrame()) { if (size_ != new_size) { -@@ -1954,6 +1969,8 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( +@@ -1953,6 +1968,8 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( size_.value(), widget_base_->DIPsToCeiledBlinkSpace( widget_base_->VisibleViewportSize()), @@ -1841,7 +1817,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th visual_properties.browser_controls_params); return; } -@@ -1987,6 +2004,8 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( +@@ -1986,6 +2003,8 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( View()->ResizeWithBrowserControls( size_.value(), widget_base_->VisibleViewportSize(), @@ -1850,7 +1826,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th visual_properties.browser_controls_params); } -@@ -2375,6 +2394,8 @@ void WebFrameWidgetImpl::SetZoomInternal(double zoom_level, +@@ -2374,6 +2393,8 @@ void WebFrameWidgetImpl::SetZoomInternal(double zoom_level, View()->ZoomFactorForViewportLayout() * static_cast(View()->ZoomLevelToZoomFactor(zoom_level)) * static_cast(css_zoom_factor); @@ -1859,7 +1835,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th if (zoom_changed) { // Set the layout shift exclusion window for the zoom level change. if (LocalFrameView* view = document->View()) { -@@ -3421,6 +3442,7 @@ void WebFrameWidgetImpl::SetRootLayer(scoped_refptr layer) { +@@ -3425,6 +3446,7 @@ void WebFrameWidgetImpl::SetRootLayer(scoped_refptr layer) { // be needed in setting the raster scale. SetPageScaleStateAndLimits(1.f, false /* is_pinch_gesture_active */, View()->MinimumPageScaleFactor(), @@ -1867,7 +1843,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th View()->MaximumPageScaleFactor()); } -@@ -4796,9 +4818,10 @@ void WebFrameWidgetImpl::SetPageScaleStateAndLimits( +@@ -4810,9 +4832,10 @@ void WebFrameWidgetImpl::SetPageScaleStateAndLimits( float page_scale_factor, bool is_pinch_gesture_active, float minimum, @@ -1879,7 +1855,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th // Only propagate page scale from the main frame. if (ForMainFrame()) { -@@ -4922,7 +4945,10 @@ void WebFrameWidgetImpl::OrientationChanged() { +@@ -4936,7 +4959,10 @@ void WebFrameWidgetImpl::OrientationChanged() { void WebFrameWidgetImpl::DidUpdateSurfaceAndScreen( const display::ScreenInfos& previous_original_screen_infos) { display::ScreenInfo screen_info = widget_base_->GetScreenInfo(); @@ -1891,7 +1867,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th if (ShouldAutoDetermineCompositingToLCDTextSetting()) { // This causes compositing state to be modified which dirties the -@@ -5121,7 +5147,7 @@ void WebFrameWidgetImpl::SetDeviceScaleFactorForTesting(float factor) { +@@ -5135,7 +5161,7 @@ void WebFrameWidgetImpl::SetDeviceScaleFactorForTesting(float factor) { if (!device_scale_factor_for_testing_) { non_testing_device_scale_factor_ = @@ -1903,7 +1879,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h -@@ -659,6 +659,7 @@ class CORE_EXPORT WebFrameWidgetImpl +@@ -660,6 +660,7 @@ class CORE_EXPORT WebFrameWidgetImpl void SetPageScaleStateAndLimits(float page_scale_factor, bool is_pinch_gesture_active, float minimum, @@ -1935,7 +1911,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/thi diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -1506,6 +1506,7 @@ bool HTMLCanvasElement::PushFrame(scoped_refptr&& image, +@@ -1515,6 +1515,7 @@ bool HTMLCanvasElement::PushFrame(scoped_refptr&& image, } bool HTMLCanvasElement::ShouldAccelerate() const { @@ -1946,7 +1922,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc diff --git a/third_party/blink/renderer/core/input/event_handler.cc b/third_party/blink/renderer/core/input/event_handler.cc --- a/third_party/blink/renderer/core/input/event_handler.cc +++ b/third_party/blink/renderer/core/input/event_handler.cc -@@ -2090,7 +2090,7 @@ GestureEventWithHitTestResults EventHandler::HitTestResultForGestureEvent( +@@ -2103,7 +2103,7 @@ GestureEventWithHitTestResults EventHandler::HitTestResultForGestureEvent( hit_test_result); } @@ -1958,7 +1934,7 @@ diff --git a/third_party/blink/renderer/core/input/event_handler.cc b/third_part diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc --- a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc +++ b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc -@@ -1071,7 +1071,8 @@ InspectorEmulationAgent::setSmallViewportHeightDifferenceOverride( +@@ -1075,7 +1075,8 @@ InspectorEmulationAgent::setSmallViewportHeightDifferenceOverride( // Ensure the override is applied immediately without having to wait for // `WebFrameWidgetImpl::UpdateVisualProperties()` to be called. GetWebViewImpl()->ResizeWithBrowserControls( @@ -1971,7 +1947,7 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc --- a/third_party/blink/renderer/core/page/page.cc +++ b/third_party/blink/renderer/core/page/page.cc -@@ -1332,6 +1332,10 @@ void Page::CalculateEmulatedScreenSetting(LocalFrame* frame, bool force) { +@@ -1289,6 +1289,10 @@ void Page::CalculateEmulatedScreenSetting(LocalFrame* frame, bool force) { || disable_screen_emulated_) { isEnabled = false; } @@ -1997,7 +1973,7 @@ diff --git a/third_party/blink/renderer/core/page/viewport_description.cc b/thir diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -470,16 +470,17 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -462,16 +462,17 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( } } @@ -2020,7 +1996,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -6000,6 +6000,10 @@ +@@ -6164,6 +6164,10 @@ // If enabled, the `getDisplayMedia()` family of APIs will ask for NV12 // frames, which should trigger a zero-copy path in the tab capture code. name: "ZeroCopyTabCapture", @@ -2075,7 +2051,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox scroll_state_data.delta_x_hint = -event.data.scroll_begin.delta_x_hint; scroll_state_data.delta_y_hint = -event.data.scroll_begin.delta_y_hint; scroll_state_data.is_beginning = true; -@@ -877,7 +892,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( +@@ -897,7 +912,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( const WebGestureEvent& gesture_event = static_cast(event); input_handler_->PinchGestureBegin( @@ -2084,7 +2060,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox GestureScrollInputType(gesture_event.SourceDevice())); gesture_pinch_in_progress_ = true; return DID_HANDLE; -@@ -889,7 +904,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( +@@ -909,7 +924,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( const WebGestureEvent& gesture_event = static_cast(event); input_handler_->PinchGestureEnd( @@ -2093,7 +2069,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox return DID_HANDLE; } -@@ -899,7 +914,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( +@@ -919,7 +934,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( static_cast(event); input_handler_->PinchGestureUpdate( gesture_event.data.pinch_update.scale, @@ -2102,7 +2078,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox return DID_HANDLE; } -@@ -922,7 +937,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( +@@ -942,7 +957,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( // TODO(arakeri): Pass in the modifier instead of a bool once the // refactor (crbug.com/1022097) is done. For details, see // crbug.com/1016955. @@ -2111,7 +2087,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox } return DID_NOT_HANDLE; -@@ -933,7 +948,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( +@@ -953,7 +968,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( static_cast(event); CHECK(input_handler_); if (mouse_event.button == WebMouseEvent::Button::kLeft) @@ -2120,7 +2096,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox return DID_NOT_HANDLE; } case WebInputEvent::Type::kMouseMove: { -@@ -948,7 +963,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( +@@ -968,7 +983,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler( (mouse_event.button == WebPointerProperties::Button::kNoButton && !(mouse_event.GetModifiers() & WebInputEvent::Modifiers::kRelativeMotionEvent)); @@ -2129,7 +2105,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox should_cancel_scrollbar_drag); return DID_NOT_HANDLE; } -@@ -987,12 +1002,14 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution( +@@ -1007,12 +1022,14 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution( // to check pointer lock state gfx::PointF point = static_cast(event).PositionInWidget(); @@ -2144,7 +2120,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox return WebInputEventAttribution( WebInputEventAttribution::kTargetedFrame, input_handler_->FindFrameElementIdAtPoint(point)); -@@ -1007,6 +1024,7 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution( +@@ -1027,6 +1044,7 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution( // how the renderer host performs touch event dispatch. // https://cs.chromium.org/chromium/src/content/browser/renderer_host/render_widget_host_input_event_router.cc?l=808&rcl=10fe9d0a725d4ed7b69266a5936c525f0a5b26d3 gfx::PointF point = touch_event.touches[0].PositionInWidget(); @@ -2152,7 +2128,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox const cc::ElementId targeted_element = input_handler_->FindFrameElementIdAtPoint(point); -@@ -1108,7 +1126,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel( +@@ -1128,7 +1146,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel( } } @@ -2161,7 +2137,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox if (input_handler_->HasBlockingWheelEventHandlerAt( gfx::Point(position_in_widget.x(), position_in_widget.y()))) { result = DID_NOT_HANDLE; -@@ -1280,7 +1298,7 @@ InputHandlerProxy::HandleGestureScrollUpdate( +@@ -1310,7 +1328,7 @@ InputHandlerProxy::HandleGestureScrollUpdate( scroll_data->set_unused_delta_y(scroll_result.unused_scroll_delta.y()); }); @@ -2169,8 +2145,8 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox + HandleOverscroll(ScalePoint(gesture_event.PositionInWidget()), scroll_result, gesture_event.SourceDevice()); - if (elastic_overscroll_controller_) -@@ -1367,8 +1385,8 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HitTestTouchEvent( + if (elastic_overscroll_controller_) { +@@ -1403,8 +1421,8 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HitTestTouchEvent( } cc::TouchAction touch_action = cc::TouchAction::kAuto; @@ -2181,7 +2157,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox // TODO(crbug.com/355578906): This is just some rough math for now. The main // thread counterpart is AdjustPointerEvent. The buffer math on the main and // cc thread(s) need to match. -@@ -1483,7 +1501,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart( +@@ -1519,7 +1537,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart( touch_event.touches_length == 1) { DCHECK(touch_event.touches[0].state == WebTouchPoint::State::kStatePressed); cc::InputHandlerPointerResult pointer_result = HandlePointerDown( @@ -2190,7 +2166,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox if (pointer_result.type == cc::PointerResultType::kScrollbarScroll) { client_->SetAllowedTouchAction(allowed_touch_action); return DID_HANDLE; -@@ -1546,7 +1564,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchMove( +@@ -1582,7 +1600,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchMove( touch_event.touch_start_or_first_touch_move); if (touch_event.touches_length == 1) { cc::InputHandlerPointerResult pointer_result = HandlePointerMove( @@ -2199,7 +2175,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox false /* should_cancel_scrollbar_drag */); if (pointer_result.type == cc::PointerResultType::kScrollbarScroll) { return DID_HANDLE; -@@ -1589,7 +1607,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchEnd( +@@ -1625,7 +1643,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchEnd( touch_event.touches_length); if (touch_event.touches_length == 1) { cc::InputHandlerPointerResult pointer_result = HandlePointerUp( @@ -2301,7 +2277,7 @@ diff --git a/third_party/blink/renderer/platform/widget/widget_base.cc b/third_p diff --git a/third_party/blink/renderer/platform/widget/widget_base.h b/third_party/blink/renderer/platform/widget/widget_base.h --- a/third_party/blink/renderer/platform/widget/widget_base.h +++ b/third_party/blink/renderer/platform/widget/widget_base.h -@@ -404,7 +404,7 @@ class PLATFORM_EXPORT WidgetBase : public mojom::blink::Widget, +@@ -405,7 +405,7 @@ class PLATFORM_EXPORT WidgetBase : public mojom::blink::Widget, void OnDevToolsSessionConnectionChanged(bool attached); // Helper to get the non-emulated device scale factor. @@ -2391,9 +2367,9 @@ diff --git a/ui/android/event_forwarder.cc b/ui/android/event_forwarder.cc diff --git a/ui/android/java/src/org/chromium/ui/base/UiAndroidFeatureList.java b/ui/android/java/src/org/chromium/ui/base/UiAndroidFeatureList.java --- a/ui/android/java/src/org/chromium/ui/base/UiAndroidFeatureList.java +++ b/ui/android/java/src/org/chromium/ui/base/UiAndroidFeatureList.java -@@ -59,6 +59,12 @@ public class UiAndroidFeatureList { - /* defaultValue= */ true, - /* defaultValueInTests= */ true); +@@ -66,6 +66,12 @@ public class UiAndroidFeatureList { + UiAndroidFeatures.ANDROID_TOUCHPAD_OVERSCROLL_HISTORY_NAVIGATION, + /* defaultValue= */ true); + public static final CachedFlag sPixelPerfect = + newCachedFlag( @@ -2574,8 +2550,8 @@ diff --git a/ui/display/mojom/screen_info_mojom_traits.cc b/ui/display/mojom/scr out->device_scale_factor = data.device_scale_factor(); + out->device_scale_factor_original = data.device_scale_factor_original(); out->depth = data.depth(); + out->handwriting_radius = data.handwriting_radius(); out->depth_per_component = data.depth_per_component(); - out->is_monochrome = data.is_monochrome(); diff --git a/ui/display/mojom/screen_info_mojom_traits.h b/ui/display/mojom/screen_info_mojom_traits.h --- a/ui/display/mojom/screen_info_mojom_traits.h +++ b/ui/display/mojom/screen_info_mojom_traits.h diff --git a/build/patches/Android-Toolbar-Scroll-Ablation-setting.patch b/build/patches/Android-Toolbar-Scroll-Ablation-setting.patch index c96d03bb..dc5f2e51 100644 --- a/build/patches/Android-Toolbar-Scroll-Ablation-setting.patch +++ b/build/patches/Android-Toolbar-Scroll-Ablation-setting.patch @@ -53,7 +53,7 @@ new file mode 100644 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml -@@ -79,6 +79,12 @@ found in the LICENSE file. +@@ -84,6 +84,12 @@ found in the LICENSE file. android:key="disable_toolbar_swipeup" android:title="@string/disable_toolbar_swipe_up" /> diff --git a/build/patches/Android-fonts-fingerprinting-mitigation.patch b/build/patches/Android-fonts-fingerprinting-mitigation.patch index 646c79ff..c84c6fb7 100644 --- a/build/patches/Android-fonts-fingerprinting-mitigation.patch +++ b/build/patches/Android-fonts-fingerprinting-mitigation.patch @@ -54,7 +54,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java --- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java +++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java -@@ -970,6 +970,9 @@ public final class ProductionSupportedFlagList { +@@ -933,6 +933,9 @@ public final class ProductionSupportedFlagList { "Hides user preference on the system keyboard by setting the standard " + "eng layout and removing the layout information from the " + "javascript keyboard events."), @@ -106,7 +106,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -8015,6 +8015,13 @@ static_library("browser") { +@@ -8010,6 +8010,13 @@ static_library("browser") { ] } @@ -123,7 +123,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc --- a/chrome/browser/component_updater/registration.cc +++ b/chrome/browser/component_updater/registration.cc -@@ -116,10 +116,20 @@ +@@ -115,10 +115,20 @@ #include "chrome/browser/component_updater/file_type_policies_component_installer.h" #endif @@ -161,7 +161,7 @@ new file mode 100644 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -269,6 +269,10 @@ static_library("renderer") { +@@ -266,6 +266,10 @@ static_library("renderer") { deps += [ "//components/strings" ] } @@ -175,7 +175,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn --- a/components/component_updater/installer_policies/BUILD.gn +++ b/components/component_updater/installer_policies/BUILD.gn -@@ -36,6 +36,13 @@ static_library("installer_policies_no_content_deps") { +@@ -32,6 +32,13 @@ static_library("installer_policies_no_content_deps") { "trust_token_key_commitments_component_installer_policy.h", ] @@ -625,7 +625,7 @@ diff --git a/components/services/font/public/mojom/font_service.mojom b/componen diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -2613,6 +2613,17 @@ source_set("browser") { +@@ -2608,6 +2608,17 @@ source_set("browser") { ] } @@ -643,8 +643,8 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn if (is_linux || is_chromeos) { sources -= [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ] -@@ -2658,6 +2669,13 @@ source_set("browser") { - ] +@@ -2654,6 +2665,13 @@ source_set("browser") { + deps += [ "//components/services/font_data:lib" ] } + if (is_android) { @@ -672,7 +672,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bin #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck -@@ -348,6 +353,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver( +@@ -351,6 +356,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver( } #endif @@ -706,7 +706,7 @@ diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn -@@ -349,6 +349,10 @@ target(link_target_type, "renderer") { +@@ -350,6 +350,10 @@ target(link_target_type, "renderer") { deps += [ "//services/screen_ai/public/mojom" ] } @@ -720,7 +720,7 @@ diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -138,6 +138,23 @@ +@@ -142,6 +142,23 @@ #include "content/common/android/sync_compositor_statics.h" #endif @@ -744,7 +744,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer using blink::Platform; using blink::WebAudioDevice; using blink::WebAudioLatencyHint; -@@ -188,6 +205,37 @@ viz::command_buffer_metrics::ContextType ToVizContextType( +@@ -192,6 +209,37 @@ viz::command_buffer_metrics::ContextType ToVizContextType( NOTREACHED(); } @@ -782,7 +782,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer } // namespace //------------------------------------------------------------------------------ -@@ -201,18 +249,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -205,18 +253,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits::max()} + 1) { @@ -805,7 +805,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer +#endif #endif - #if BUILDFLAG(IS_WIN) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) diff --git a/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc b/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc new file mode 100644 --- /dev/null @@ -848,7 +848,7 @@ new file mode 100644 diff --git a/skia/BUILD.gn b/skia/BUILD.gn --- a/skia/BUILD.gn +++ b/skia/BUILD.gn -@@ -460,6 +460,18 @@ component("skia") { +@@ -449,6 +449,18 @@ component("skia") { sources += skia_ports_fci_sources } diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index 2ccd3c1b..02c35542 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -88,7 +88,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc -@@ -17,6 +17,7 @@ +@@ -20,6 +20,7 @@ #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/mediastream/media_devices.h" #include "third_party/blink/public/platform/browser_interface_broker_proxy.h" @@ -96,7 +96,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" #include "third_party/blink/public/platform/web_audio_latency_hint.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" -@@ -863,7 +864,9 @@ double AudioContext::baseLatency() const { +@@ -921,7 +922,9 @@ double AudioContext::baseLatency() const { DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_); DCHECK(destination()); @@ -110,15 +110,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc --- a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc +++ b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc -@@ -29,6 +29,7 @@ - +@@ -30,6 +30,7 @@ #include "base/metrics/histogram_functions.h" #include "build/build_config.h" + #include "media/base/audio_bus.h" +#include "third_party/blink/public/common/features.h" #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h" #include "third_party/blink/public/platform/platform.h" -@@ -776,6 +777,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const { +@@ -777,6 +778,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const { return To(GetExecutionContext()); } @@ -162,15 +162,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.c diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc --- a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc +++ b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc -@@ -32,6 +32,7 @@ - #include +@@ -33,6 +33,7 @@ #include "base/compiler_specific.h" + #include "media/base/audio_bus.h" +#include "third_party/blink/renderer/modules/webaudio/base_audio_context.h" #include "third_party/blink/renderer/platform/audio/audio_bus.h" #include "third_party/blink/renderer/platform/audio/audio_utilities.h" #include "third_party/blink/renderer/platform/audio/vector_math.h" -@@ -117,7 +118,8 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array, +@@ -118,7 +119,8 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array, for (unsigned i = 0; i < len; ++i) { const float linear_value = UNSAFE_TODO(source[i]); const double db_mag = audio_utilities::LinearToDecibels(linear_value); @@ -180,7 +180,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/ } } } -@@ -155,9 +157,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array, +@@ -156,9 +158,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array, // The range m_minDecibels to m_maxDecibels will be scaled to byte values // from 0 to UCHAR_MAX. @@ -193,7 +193,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/ // Clip to valid range. UNSAFE_TODO(destination[i]) = static_cast(ClampTo(scaled_value, 0, UCHAR_MAX)); -@@ -188,6 +192,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData( +@@ -189,6 +193,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData( input_buffer[(i + write_index - fft_size + kInputBufferSize) % kInputBufferSize]); @@ -201,7 +201,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/ UNSAFE_TODO(destination[i]) = value; } } -@@ -211,10 +216,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) { +@@ -212,10 +217,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) { for (unsigned i = 0; i < len; ++i) { // Buffer access is protected due to modulo operation. @@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -631,9 +631,8 @@ +@@ -639,9 +639,8 @@ { // AudioContext.playoutStats interface. // https://chromestatus.com/feature/5172818344148992 diff --git a/build/patches/Battery-API-return-nothing.patch b/build/patches/Battery-API-return-nothing.patch index 9e074294..04930f62 100644 --- a/build/patches/Battery-API-return-nothing.patch +++ b/build/patches/Battery-API-return-nothing.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc --- a/third_party/blink/renderer/modules/battery/battery_manager.cc +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc -@@ -80,46 +80,28 @@ ScriptPromise BatteryManager::StartRequest( +@@ -77,46 +77,28 @@ ScriptPromise BatteryManager::StartRequest( } bool BatteryManager::charging() { diff --git a/build/patches/Block-gateway-attacks-via-websockets.patch b/build/patches/Block-gateway-attacks-via-websockets.patch index ff90f965..532be148 100644 --- a/build/patches/Block-gateway-attacks-via-websockets.patch +++ b/build/patches/Block-gateway-attacks-via-websockets.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -391,6 +391,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable, +@@ -424,6 +424,7 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext, void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space); HeapObserverList& ContextLifecycleObserverSet(); @@ -93,8 +93,8 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th +#include "third_party/blink/renderer/platform/network/network_utils.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/scheduler/public/virtual_time_controller.h" - #include "third_party/blink/renderer/platform/supplementable.h" -@@ -90,6 +91,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const { + #include "third_party/blink/renderer/platform/weborigin/security_policy.h" +@@ -89,6 +90,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const { return should_block_request; } diff --git a/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch b/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch index 3b7f2296..955560d4 100644 --- a/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch +++ b/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch @@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -5180,7 +5180,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin( +@@ -5158,7 +5158,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin( } void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) { @@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p return referrer_; } -@@ -2903,6 +2908,13 @@ void DocumentLoader::CommitNavigation() { +@@ -2913,6 +2918,13 @@ void DocumentLoader::CommitNavigation() { response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly)); } @@ -135,7 +135,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h --- a/third_party/blink/renderer/core/loader/document_loader.h +++ b/third_party/blink/renderer/core/loader/document_loader.h -@@ -773,7 +773,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected, +@@ -768,7 +768,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected, // |archive_|, but won't have |loading_main_document_from_mhtml_archive_| set. bool loading_main_document_from_mhtml_archive_ = false; const bool loading_srcdoc_ = false; diff --git a/build/patches/Bookmarks-select-all-menu-entry.patch b/build/patches/Bookmarks-select-all-menu-entry.patch index f3c564d3..ed2ec5a5 100644 --- a/build/patches/Bookmarks-select-all-menu-entry.patch +++ b/build/patches/Bookmarks-select-all-menu-entry.patch @@ -80,7 +80,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -252,6 +252,9 @@ CHAR_LIMIT guidelines: +@@ -264,6 +264,9 @@ CHAR_LIMIT guidelines: Sites diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index 04b688ba..2e637275 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -92,7 +92,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -858,6 +858,8 @@ chrome_java_sources = [ +@@ -871,6 +871,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omaha/OmahaBase.java", "java/src/org/chromium/chrome/browser/omaha/OmahaDelegate.java", "java/src/org/chromium/chrome/browser/omaha/OmahaDelegateBase.java", @@ -119,7 +119,7 @@ diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/a diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java -@@ -29,13 +29,19 @@ import org.chromium.ui.widget.Toast; +@@ -31,10 +31,15 @@ import org.chromium.ui.widget.Toast; import java.util.Calendar; @@ -133,6 +133,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/ - implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener { + implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener, + Preference.OnPreferenceChangeListener { + static { + CalendarFactory.warmUp(); + } +@@ -42,6 +47,7 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment private static final int TAPS_FOR_DEVELOPER_SETTINGS = 7; private static final String PREF_APPLICATION_VERSION = "application_version"; @@ -140,9 +144,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/ private static final String PREF_OS_VERSION = "os_version"; private static final String PREF_LEGAL_INFORMATION = "legal_information"; -@@ -72,6 +78,13 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment +@@ -78,6 +84,13 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment assumeNonNull(p); - int currentYear = Calendar.getInstance().get(Calendar.YEAR); + int currentYear = CalendarFactory.get().get(Calendar.YEAR); p.setSummary(getString(R.string.legal_information_summary, currentYear)); + + ChromeSwitchPreference allowInlineUpdate = @@ -154,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/ } @Override -@@ -142,6 +155,19 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment +@@ -148,6 +161,19 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment return true; } @@ -686,7 +690,7 @@ new file mode 100644 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2660,6 +2660,12 @@ static_library("browser") { +@@ -2652,6 +2652,12 @@ static_library("browser") { } if (is_android) { @@ -1004,18 +1008,18 @@ new file mode 100644 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -386,6 +386,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -387,6 +387,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kProtectedTabsAndroid, &kPwaRestoreUi, &kPwaRestoreUiAtStartup, + &kInlineUpdateFlow, - &kQuickDeleteAndroidSurvey, &kReadAloud, &kReadAloudAudioOverviews, + &kReadAloudAudioOverviewsFeedback, diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -469,6 +469,7 @@ public abstract class ChromeFeatureList { +@@ -477,6 +477,7 @@ public abstract class ChromeFeatureList { public static final String INCOGNITO_NTP_SMALL_ICON = "IncognitoNtpSmallIcon"; public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot"; public static final String INCOGNITO_THEME_OVERLAY_TESTING = "IncognitoThemeOverlayTesting"; @@ -1026,7 +1030,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc --- a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc +++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc -@@ -266,7 +266,7 @@ AccessCodeCastDiscoveryInterface::CreateEndpointFetcher( +@@ -264,7 +264,7 @@ AccessCodeCastDiscoveryInterface::CreateEndpointFetcher( .SetTimeout(kTimeout) .SetUrl(GURL(base::StrCat({GetDiscoveryUrl(), "/", access_code}))) .SetPostData(kEmptyPostData) @@ -1617,7 +1621,7 @@ diff --git a/chrome/browser/save_to_drive/drive_uploader.cc b/chrome/browser/sav diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -2306,6 +2306,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2315,6 +2315,12 @@ Your Google account may have other forms of browsing history like searches and a Chrome updates are no longer supported for this version of Android @@ -1630,7 +1634,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -4315,7 +4321,10 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4366,7 +4372,10 @@ To change this setting, BEGIN_LINKdelete the Chrome d @@ -1642,7 +1646,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Newer version is available -@@ -4326,6 +4335,18 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4377,6 +4386,18 @@ To change this setting, BEGIN_LINKdelete the Chrome d Android version is unsupported @@ -1664,7 +1668,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc --- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc +++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc -@@ -742,7 +742,7 @@ LensOverlayQueryController::CreateEndpointFetcher( +@@ -765,7 +765,7 @@ LensOverlayQueryController::CreateEndpointFetcher( .SetTimeout(timeout) .SetUrl(fetch_url) .SetUploadProgressCallback(std::move(upload_progress_callback)) @@ -1724,7 +1728,7 @@ diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.c diff --git a/components/contextual_search/internal/composebox_query_controller.cc b/components/contextual_search/internal/composebox_query_controller.cc --- a/components/contextual_search/internal/composebox_query_controller.cc +++ b/components/contextual_search/internal/composebox_query_controller.cc -@@ -525,7 +525,7 @@ ComposeboxQueryController::CreateEndpointFetcher( +@@ -772,7 +772,7 @@ ComposeboxQueryController::CreateEndpointFetcher( .SetTimeout(timeout) .SetUploadProgressCallback(std::move(upload_progress_callback)) .SetUrl(fetch_url) @@ -1760,7 +1764,7 @@ diff --git a/components/data_sharing/internal/preview_server_proxy.cc b/componen diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc --- a/components/endpoint_fetcher/endpoint_fetcher.cc +++ b/components/endpoint_fetcher/endpoint_fetcher.cc -@@ -25,6 +25,11 @@ +@@ -29,6 +29,11 @@ #include "services/network/public/mojom/referrer_policy.mojom-shared.h" #include "services/network/public/mojom/url_response_head.mojom.h" @@ -1772,7 +1776,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi namespace endpoint_fetcher { namespace { -@@ -43,6 +48,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) { +@@ -47,6 +52,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) { return "DELETE"; case HttpMethod::kPut: return "PUT"; @@ -1781,7 +1785,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi default: DCHECK(0) << base::StringPrintf("Unknown HttpMethod %d\n", static_cast(http_method)); -@@ -50,6 +57,13 @@ std::string GetHttpMethodString(const HttpMethod& http_method) { +@@ -54,6 +61,13 @@ std::string GetHttpMethodString(const HttpMethod& http_method) { return ""; } @@ -1795,7 +1799,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi } // namespace EndpointResponse::EndpointResponse() = default; -@@ -105,9 +119,11 @@ EndpointFetcher::RequestParams::Builder::Build() { +@@ -109,9 +123,11 @@ EndpointFetcher::RequestParams::Builder::Build() { EndpointFetcher::EndpointFetcher( const scoped_refptr& url_loader_factory, signin::IdentityManager* identity_manager, @@ -1808,7 +1812,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi request_params_(std::move(request_params)) { if (request_params_.auth_type() == OAUTH) { DCHECK(identity_manager_) -@@ -120,12 +136,32 @@ EndpointFetcher::EndpointFetcher( +@@ -124,12 +140,32 @@ EndpointFetcher::EndpointFetcher( EndpointFetcher::EndpointFetcher( const net::NetworkTrafficAnnotationTag& annotation_tag) : identity_manager_(nullptr), @@ -1841,7 +1845,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi EndpointFetcher::~EndpointFetcher() = default; void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) { -@@ -208,13 +244,10 @@ void EndpointFetcher::PerformHttpRequest( +@@ -212,13 +248,10 @@ void EndpointFetcher::PerformHttpRequest( auto resource_request = std::make_unique(); resource_request->method = GetHttpMethodString(request_params_.http_method()); resource_request->url = request_params_.url(); @@ -1858,7 +1862,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi // Add Content-Type header if post data is present. bool has_body_content = (request_params_.http_method() == HttpMethod::kPost || request_params_.http_method() == HttpMethod::kPut) && -@@ -255,8 +288,23 @@ void EndpointFetcher::PerformHttpRequest( +@@ -259,8 +292,23 @@ void EndpointFetcher::PerformHttpRequest( break; } @@ -1882,7 +1886,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi if (has_body_content) { simple_url_loader_->AttachStringForUpload( -@@ -269,9 +317,18 @@ void EndpointFetcher::PerformHttpRequest( +@@ -273,9 +321,18 @@ void EndpointFetcher::PerformHttpRequest( simple_url_loader_->SetRetryOptions(GetMaxRetries(), network::SimpleURLLoader::RETRY_ON_5XX); @@ -1901,10 +1905,10 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi + base::Unretained(this))); + return; + } - network::SimpleURLLoader::BodyAsStringCallbackDeprecated - body_as_string_callback = base::BindOnce( - &EndpointFetcher::OnResponseFetched, weak_ptr_factory_.GetWeakPtr(), -@@ -330,21 +387,6 @@ void EndpointFetcher::OnResponseFetched( + network::SimpleURLLoader::BodyAsStringCallback body_as_string_callback = + base::BindOnce(&EndpointFetcher::OnResponseFetched, + weak_ptr_factory_.GetWeakPtr(), +@@ -334,21 +391,6 @@ void EndpointFetcher::OnResponseFetched( std::move(endpoint_fetcher_callback).Run(std::move(response)); } @@ -1926,7 +1930,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi int EndpointFetcher::GetMaxRetries() const { return request_params_.max_retries.value_or(kNumRetries); } -@@ -362,4 +404,39 @@ std::string EndpointFetcher::GetUrlForTesting() { +@@ -366,4 +408,39 @@ std::string EndpointFetcher::GetUrlForTesting() { return request_params_.url().spec(); } @@ -2017,7 +2021,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin @@ -334,11 +349,17 @@ class EndpointFetcher { void OnResponseFetched(EndpointFetcherCallback callback, - std::unique_ptr response_body); + std::optional response_body); + void OnURLLoadComplete(scoped_refptr headers); + void OnSimpleLoaderRedirect(const GURL& url_before_redirect, + const net::RedirectInfo& redirect_info, @@ -2032,16 +2036,16 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin // Members set in constructor const scoped_refptr url_loader_factory_; -@@ -346,6 +367,8 @@ class EndpointFetcher { - // this case, callers should invoke `PerformRequest` directly). - const raw_ptr identity_manager_; +@@ -349,6 +370,8 @@ class EndpointFetcher { + // SingleClientSharedTabGroupVersioningSyncTest.ShouldShowVersioningMessagesAfterRestart/kSyncTransportOnly + const raw_ptr identity_manager_; + const bool intercept_redirect_; + // The complete definition of the specific network request to be performed. // Contains authentication details and response handling preferences. const RequestParams request_params_; -@@ -355,6 +378,9 @@ class EndpointFetcher { +@@ -358,6 +381,9 @@ class EndpointFetcher { access_token_fetcher_; std::unique_ptr simple_url_loader_; diff --git a/build/patches/Bromite-subresource-adblocker.patch b/build/patches/Bromite-subresource-adblocker.patch index 45a1aefe..a79c6589 100644 --- a/build/patches/Bromite-subresource-adblocker.patch +++ b/build/patches/Bromite-subresource-adblocker.patch @@ -65,7 +65,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -325,6 +325,7 @@ if (_is_default_toolchain) { +@@ -302,6 +302,7 @@ if (_is_default_toolchain) { "//chrome/android/features/tab_ui/public:ui_java_resources", "//chrome/android/modules/stack_unwinder/provider:java", "//chrome/android/webapk/libs/client:client_java", @@ -76,15 +76,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -439,6 +439,7 @@ chrome_java_resources = [ - "java/res/layout/account_divider_preference.xml", +@@ -453,6 +453,7 @@ chrome_java_resources = [ "java/res/layout/account_management_account_row.xml", "java/res/layout/app_history_filter.xml", + "java/res/layout/auto_pip_permission_dialog.xml", + "java/res/layout/adblock_editor.xml", "java/res/layout/auto_sign_in_first_run_dialog.xml", "java/res/layout/autofill_billing_address_dropdown.xml", "java/res/layout/autofill_card_name_and_number.xml", -@@ -639,6 +640,7 @@ chrome_java_resources = [ +@@ -658,6 +659,7 @@ chrome_java_resources = [ "java/res/xml/account_management_preferences.xml", "java/res/xml/ad_services_config.xml", "java/res/xml/appearance_preferences.xml", @@ -95,7 +95,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -929,6 +929,8 @@ chrome_java_sources = [ +@@ -942,6 +942,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/permissions/PermissionBlockedDialog.java", "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java", @@ -179,7 +179,7 @@ new file mode 100644 diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml --- a/chrome/android/java/res/values/styles.xml +++ b/chrome/android/java/res/values/styles.xml -@@ -317,6 +317,24 @@ found in the LICENSE file. +@@ -331,6 +331,24 @@ found in the LICENSE file. @@ -441,7 +441,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java -@@ -87,6 +87,8 @@ import java.util.HashMap; +@@ -95,6 +95,8 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -450,8 +450,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin /** * The Chrome settings activity. * -@@ -1016,6 +1018,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity - if (!MAIN_FRAGMENT_TAG.equals(fragment.getTag())) { +@@ -1175,6 +1177,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity + && !MAIN_FRAGMENT_TAG.equals(fragment.getTag())) { return; } + if (fragment instanceof AdBlockEditor) return; @@ -461,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -17255,6 +17255,16 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -17395,6 +17395,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Never show this again. @@ -521,7 +521,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h namespace gcm { class GCMDriver; } -@@ -271,6 +276,7 @@ class BrowserProcess { +@@ -276,6 +281,7 @@ class BrowserProcess { #endif virtual component_updater::ComponentUpdateService* component_updater() = 0; @@ -532,7 +532,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1285,6 +1285,34 @@ BrowserProcessImpl::component_updater() { +@@ -1284,6 +1284,34 @@ BrowserProcessImpl::component_updater() { return component_updater_.get(); } @@ -570,7 +570,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -211,6 +211,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -213,6 +213,7 @@ class BrowserProcessImpl : public BrowserProcess, #endif component_updater::ComponentUpdateService* component_updater() override; @@ -578,7 +578,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc MediaFileSystemRegistry* media_file_system_registry() override; WebRtcLogUploader* webrtc_log_uploader() override; network_time::NetworkTimeTracker* network_time_tracker() override; -@@ -428,6 +429,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -426,6 +427,7 @@ class BrowserProcessImpl : public BrowserProcess, // to concerns over integrity of data shared between profiles, // but some users of component updater only install per-user. std::unique_ptr component_updater_; @@ -589,7 +589,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -429,6 +429,9 @@ StartupProfileInfo CreateInitialProfile( +@@ -430,6 +430,9 @@ StartupProfileInfo CreateInitialProfile( // missing code in the above test. CHECK(profile_info.profile) << "Cannot get default profile."; @@ -700,7 +700,7 @@ new file mode 100755 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -715,6 +715,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -716,6 +716,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry); NetworkProcessLaunchWatcher::RegisterPrefs(registry); @@ -714,8 +714,8 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -224,6 +224,20 @@ CHAR_LIMIT guidelines: - Search settings +@@ -236,6 +236,20 @@ CHAR_LIMIT guidelines: + Try searching the help center + @@ -738,7 +738,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -2942,6 +2942,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; +@@ -2979,6 +2979,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; inline constexpr char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; @@ -753,7 +753,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp --- a/components/browser_ui/strings/android/site_settings.grdp +++ b/components/browser_ui/strings/android/site_settings.grdp -@@ -421,6 +421,9 @@ +@@ -424,6 +424,9 @@ This site shows intrusive or misleading ads @@ -1595,7 +1595,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f web_contents_helper_(web_contents_helper) {} ContentSubresourceFilterThrottleManager:: -@@ -628,6 +632,17 @@ ContentSubresourceFilterThrottleManager:: +@@ -661,6 +665,17 @@ ContentSubresourceFilterThrottleManager:: throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(), ad_tagging_state); } @@ -1616,7 +1616,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h -@@ -403,6 +403,8 @@ class ContentSubresourceFilterThrottleManager +@@ -410,6 +410,8 @@ class ContentSubresourceFilterThrottleManager std::unique_ptr profile_interaction_manager_; @@ -1998,15 +1998,15 @@ diff --git a/components/subresource_filter/core/browser/verified_ruleset_dealer. diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/components/subresource_filter/core/common/indexed_ruleset.cc --- a/components/subresource_filter/core/common/indexed_ruleset.cc +++ b/components/subresource_filter/core/common/indexed_ruleset.cc -@@ -6,6 +6,7 @@ - +@@ -7,6 +7,7 @@ #include "base/check.h" + #include "base/functional/callback.h" #include "base/hash/hash.h" +#include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" #include "base/trace_event/trace_event.h" -@@ -37,7 +38,9 @@ VerifyStatus GetVerifyStatus(base::span buffer, +@@ -38,7 +39,9 @@ VerifyStatus GetVerifyStatus(base::span buffer, // least once. The verifier detects a subset of the errors detected by the // checksum, and is unneeded once expected_checksum is consistently nonzero. flatbuffers::Verifier verifier(buffer.data(), buffer.size()); diff --git a/build/patches/Bubble-Locking-on-UI-DevTools.patch b/build/patches/Bubble-Locking-on-UI-DevTools.patch index a91e5acf..2d018268 100644 --- a/build/patches/Bubble-Locking-on-UI-DevTools.patch +++ b/build/patches/Bubble-Locking-on-UI-DevTools.patch @@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc --- a/chrome/browser/ui/views/toolbar/reload_button.cc +++ b/chrome/browser/ui/views/toolbar/reload_button.cc -@@ -274,6 +274,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) { +@@ -276,6 +276,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) { command = IDC_RELOAD; } diff --git a/build/patches/Change-popup-site-setting.patch b/build/patches/Change-popup-site-setting.patch index d054733b..1a53b17a 100644 --- a/build/patches/Change-popup-site-setting.patch +++ b/build/patches/Change-popup-site-setting.patch @@ -24,7 +24,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/resources/settings/site_settings/popups_page.html b/chrome/browser/resources/settings/site_settings/popups_page.html --- a/chrome/browser/resources/settings/site_settings/popups_page.html +++ b/chrome/browser/resources/settings/site_settings/popups_page.html -@@ -9,6 +9,8 @@ +@@ -10,6 +10,8 @@ category="[[contentSettingsTypesEnum_.POPUPS]]" allow-option-label="$i18n{siteSettingsPopupsAllowed}" allow-option-icon="cr:open-in-new" diff --git a/build/patches/Chrome-web-store-protection.patch b/build/patches/Chrome-web-store-protection.patch index afdd837f..57c52243 100644 --- a/build/patches/Chrome-web-store-protection.patch +++ b/build/patches/Chrome-web-store-protection.patch @@ -181,7 +181,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/profile_info_genera diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -67,6 +67,7 @@ +@@ -68,6 +68,7 @@ #include "extensions/browser/scoped_active_install.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" @@ -189,7 +189,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/permissions_parser.h" -@@ -245,6 +246,8 @@ Profile* GetProfileInIncognito(Profile* profile) { +@@ -242,6 +243,8 @@ Profile* GetProfileInIncognito(Profile* profile) { // there was previously stored data, or an empty string otherwise. The Set will // overwrite any previous login. std::string GetWebstoreLogin(Profile* profile) { @@ -198,7 +198,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) { return profile->GetPrefs()->GetString(kWebstoreLogin); } -@@ -252,11 +255,15 @@ std::string GetWebstoreLogin(Profile* profile) { +@@ -249,11 +252,15 @@ std::string GetWebstoreLogin(Profile* profile) { } void SetWebstoreLogin(Profile* profile, const std::string& login) { @@ -214,7 +214,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api switch (status) { case kCanRequest: return api::webstore_private::ExtensionInstallStatus::kCanRequest; -@@ -1194,7 +1201,8 @@ ExtensionFunction::ResponseAction +@@ -1177,7 +1184,8 @@ ExtensionFunction::ResponseAction WebstorePrivateIsInIncognitoModeFunction::Run() { Profile* profile = Profile::FromBrowserContext(browser_context()); return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create( @@ -224,7 +224,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api } WebstorePrivateIsPendingCustodianApprovalFunction:: -@@ -1291,11 +1299,14 @@ WebstorePrivateGetReferrerChainFunction::Run() { +@@ -1274,11 +1282,14 @@ WebstorePrivateGetReferrerChainFunction::Run() { request.mutable_referrer_chain_options()->set_recent_navigations_to_collect( recent_navigations_to_collect); @@ -291,7 +291,7 @@ diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -248,8 +248,6 @@ ExtensionService::ExtensionService( +@@ -247,8 +247,6 @@ ExtensionService::ExtensionService( UpgradeDetector::GetInstance()->AddObserver(this); #endif @@ -300,7 +300,7 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this); if (autoupdate_enabled) { -@@ -764,7 +762,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() { +@@ -763,7 +761,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() { // unpublished extensions should not be enabled. This update allows // unpublished extensions to be disabled sooner rather than waiting till the // next regularly scheduled fetch. @@ -1201,9 +1201,9 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/bro diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc --- a/extensions/common/extension_features.cc +++ b/extensions/common/extension_features.cc -@@ -182,4 +182,11 @@ BASE_FEATURE(kEnableShouldShowPromotion, base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kEnableWebRequestCollapsedListeners, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -183,4 +183,11 @@ BASE_FEATURE(kEnableShouldShowPromotion, base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kWebRequestPersistFilteredEvents, + base::FEATURE_ENABLED_BY_DEFAULT); +CROMITE_FEATURE(kEnableExtensionAutoupdate, + "EnableExtensionAutoupdate", @@ -1216,9 +1216,9 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h --- a/extensions/common/extension_features.h +++ b/extensions/common/extension_features.h -@@ -300,6 +300,16 @@ BASE_DECLARE_FEATURE(kEnableShouldShowPromotion); - // Enables the "collapsed listeners" strategy for webRequest lazy listeners. - BASE_DECLARE_FEATURE(kEnableWebRequestCollapsedListeners); +@@ -307,6 +307,16 @@ BASE_DECLARE_FEATURE(kWebRequestSecurityInfo); + // browser startup). + BASE_DECLARE_FEATURE(kWebRequestPersistFilteredEvents); +// Activates the auto update of extensions. +// the only data provided by default is the list of extensions. diff --git a/build/patches/Clear-CORS-Preflight-Cache-on-clearing-data.patch b/build/patches/Clear-CORS-Preflight-Cache-on-clearing-data.patch index 84514312..bf7b288f 100644 --- a/build/patches/Clear-CORS-Preflight-Cache-on-clearing-data.patch +++ b/build/patches/Clear-CORS-Preflight-Cache-on-clearing-data.patch @@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/preflight_cache.cc --- a/services/network/cors/preflight_cache.cc +++ b/services/network/cors/preflight_cache.cc -@@ -204,6 +204,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) { +@@ -197,6 +197,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) { MayPurge(max_entries, purge_unit); } @@ -29,7 +29,7 @@ diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/pr diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/preflight_cache.h --- a/services/network/cors/preflight_cache.h +++ b/services/network/cors/preflight_cache.h -@@ -78,6 +78,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightCache final { +@@ -75,6 +75,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightCache final { // `max_entries` for testing. void MayPurgeForTesting(size_t max_entries, size_t purge_unit); @@ -41,7 +41,7 @@ diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/pre diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc --- a/services/network/cors/preflight_controller.cc +++ b/services/network/cors/preflight_controller.cc -@@ -755,6 +755,10 @@ void PreflightController::ClearCorsPreflightCache( +@@ -631,6 +631,10 @@ void PreflightController::ClearCorsPreflightCache( cache_.ClearCache(std::move(url_filter)); } @@ -55,9 +55,9 @@ diff --git a/services/network/cors/preflight_controller.cc b/services/network/co diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h --- a/services/network/cors/preflight_controller.h +++ b/services/network/cors/preflight_controller.h -@@ -152,6 +152,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final { - url_loader_network_service_observer, - const PreflightMode& preflight_mode); +@@ -117,6 +117,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final { + mojo::PendingRemote + url_loader_network_service_observer); + void ClearCache(); + @@ -79,7 +79,7 @@ diff --git a/services/network/cors/preflight_result.cc b/services/network/cors/p diff --git a/services/network/network_context.cc b/services/network/network_context.cc --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -1373,6 +1373,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time, +@@ -1368,6 +1368,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time, base::Time end_time, mojom::ClearDataFilterPtr filter, ClearHttpCacheCallback callback) { diff --git a/build/patches/Client-hints-overrides.patch b/build/patches/Client-hints-overrides.patch index adf1724f..5a8184a3 100644 --- a/build/patches/Client-hints-overrides.patch +++ b/build/patches/Client-hints-overrides.patch @@ -76,7 +76,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd std::string brand_version = output_version_type == blink::UserAgentBrandVersionType::kFullVersion -@@ -693,6 +691,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(bool only_low_entropy_ch) { +@@ -695,6 +693,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(bool only_low_entropy_ch) { } // High entropy client hints. @@ -236,7 +236,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc -@@ -186,6 +186,7 @@ const String& NavigatorUAData::platform() const { +@@ -114,6 +114,7 @@ const String& NavigatorUAData::platform() const { } bool AllowedToCollectHighEntropyValues(ExecutionContext* execution_context) { @@ -256,9 +256,9 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third + RuntimeEnabled=UserAgentClientHint, + Exposed=(Window,Worker) +] interface NavigatorUAData { - [HighEntropy, MeasureAs=NavigatorUAData_Brands] readonly attribute FrozenArray brands; - [HighEntropy=Direct, MeasureAs=NavigatorUAData_Mobile] readonly attribute boolean mobile; - [HighEntropy=Direct, MeasureAs=NavigatorUAData_Platform] readonly attribute DOMString platform; + [MeasureAs=NavigatorUAData_Brands] readonly attribute FrozenArray brands; + [MeasureAs=NavigatorUAData_Mobile] readonly attribute boolean mobile; + [MeasureAs=NavigatorUAData_Platform] readonly attribute DOMString platform; diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc @@ -283,7 +283,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -592,6 +592,11 @@ +@@ -610,6 +610,11 @@ name: "AriaNotifyV2", status: {"Android": "test", "Win": "test", "Mac": "test", "Linux": "test"}, }, @@ -295,12 +295,12 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 { name: "AriaRowColIndexText", status: "stable", -@@ -1019,8 +1024,7 @@ +@@ -1016,8 +1021,7 @@ // Allows top-level sites to restrict collection of high-entropy UA client // hints (from 3Ps, or itself) via the getHighEntropyValues API. // crbug.com/385161047 - name: "ClientHintUAHighEntropyValuesPermissionPolicy", -- status: "test", +- status: "stable", + name: "ClientHintUAHighEntropyValuesPermissionPolicy", // disabled by default }, { diff --git a/build/patches/Close-Sessions-On-Ip-Change.patch b/build/patches/Close-Sessions-On-Ip-Change.patch index 256bbe55..6344d2fa 100644 --- a/build/patches/Close-Sessions-On-Ip-Change.patch +++ b/build/patches/Close-Sessions-On-Ip-Change.patch @@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/components/network_session_configurator/browser/network_session_configurator.cc b/components/network_session_configurator/browser/network_session_configurator.cc --- a/components/network_session_configurator/browser/network_session_configurator.cc +++ b/components/network_session_configurator/browser/network_session_configurator.cc -@@ -222,9 +222,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions( +@@ -221,9 +221,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions( bool ShouldQuicCloseSessionsOnIpChange( const VariationParameters& quic_trial_params) { @@ -34,7 +34,7 @@ diff --git a/components/network_session_configurator/browser/network_session_con } bool ShouldQuicGoAwaySessionsOnIpChange( -@@ -305,11 +304,8 @@ bool ShouldQuicEstimateInitialRtt( +@@ -304,11 +303,8 @@ bool ShouldQuicEstimateInitialRtt( bool ShouldQuicMigrateSessionsOnNetworkChangeV2( const VariationParameters& quic_trial_params) { @@ -88,7 +88,7 @@ new file mode 100644 diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -511,7 +511,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT); +@@ -443,7 +443,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT); // NetworkChangeNotifier::AreNetworkHandlesSupported). #if BUILDFLAG(IS_ANDROID) inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default = diff --git a/build/patches/Cromite-Branding--improve-settings-ui.patch b/build/patches/Cromite-Branding--improve-settings-ui.patch index c1472052..8422cac8 100644 --- a/build/patches/Cromite-Branding--improve-settings-ui.patch +++ b/build/patches/Cromite-Branding--improve-settings-ui.patch @@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -664,7 +664,7 @@ chrome_java_resources = [ +@@ -683,7 +683,7 @@ chrome_java_resources = [ "java/res/xml/manage_sync_preferences.xml", "java/res/xml/personalize_google_services_preferences.xml", "java/res/xml/incognito_preferences.xml", @@ -253,16 +253,16 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -194,7 +194,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -189,7 +189,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) { mPageTitle.set(getString(R.string.prefs_privacy_security)); - SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences); + SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences_cromite); - Preference incognitoTrackingProtectionsPreference = - findPreference(PREF_INCOGNITO_TRACKING_PROTECTIONS); -@@ -290,7 +290,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment + Preference sandboxPreference = findPreference(PREF_PRIVACY_SANDBOX); + // Overwrite the click listener to pass a correct referrer to the fragment. +@@ -282,7 +282,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment ChromeSwitchPreference passwordLeakTogglePref = (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION); diff --git a/build/patches/Cromite-Branding.patch b/build/patches/Cromite-Branding.patch index 78493d59..64c1d0c2 100644 --- a/build/patches/Cromite-Branding.patch +++ b/build/patches/Cromite-Branding.patch @@ -91,7 +91,7 @@ diff --git a/build/BUILD.gn b/build/BUILD.gn diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -186,6 +186,10 @@ declare_args() { +@@ -184,6 +184,10 @@ declare_args() { clang_warning_suppression_file = "" } @@ -9146,7 +9146,7 @@ diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -466,8 +466,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -481,8 +481,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { && !isEmptyUrl(mParams.getUrl()) && UrlUtilities.isAcceptedScheme(mParams.getUrl())) { if (mMode == ContextMenuMode.NORMAL) { @@ -9214,7 +9214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -873,7 +873,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -914,7 +914,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { } return mBackButtonShouldCloseTabFn.apply(tab) ? ActionType.CLOSE_TAB @@ -13201,7 +13201,7 @@ e)fqMZZ`3a)Ds&5H CreateProfilePrefStoreManager( +@@ -294,10 +295,7 @@ std::unique_ptr CreateProfilePrefStoreManager( const base::FilePath& profile_path) { std::string seed; CHECK(ui::ResourceBundle::HasSharedInstance()); @@ -13371,7 +13371,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc -@@ -78,7 +78,7 @@ const int kMaxProfileShortcutFileNameLength = 64; +@@ -79,7 +79,7 @@ const int kMaxProfileShortcutFileNameLength = 64; // Incrementing this number will cause profile icons to be regenerated on // profile startup (it should be incremented whenever the product/avatar icons // change, etc). @@ -13402,7 +13402,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html #menu { color: var(--google-grey-700); display: flex; -@@ -176,7 +188,7 @@ +@@ -177,7 +189,7 @@ @@ -13439,7 +13439,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -2371,7 +2371,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2380,7 +2380,7 @@ Your Google account may have other forms of browsing history like searches and a About Chrome @@ -13448,7 +13448,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Application version -@@ -5752,7 +5752,7 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -5845,7 +5845,7 @@ To change this setting, BEGIN_LINKdelete the Chrome d @@ -18412,7 +18412,7 @@ i?Ib$(ofrX17!1R|`h|N%TnD<%35@j2bgPM^i2nno*_EOI diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -1109,6 +1109,7 @@ bool AutocompleteController::ShouldRunProvider( +@@ -1106,6 +1106,7 @@ bool AutocompleteController::ShouldRunProvider( #if BUILDFLAG(IS_ANDROID) if (omnibox::IsAndroidHub(input_.current_page_classification())) { diff --git a/build/patches/Customize-selection-popup.patch b/build/patches/Customize-selection-popup.patch index 7545ad8f..fab4fb31 100644 --- a/build/patches/Customize-selection-popup.patch +++ b/build/patches/Customize-selection-popup.patch @@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionMod diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -903,10 +903,17 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -897,10 +897,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt @TabLaunchType int type, @TabCreationState int creationState, boolean markedForSelection) { @@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java -@@ -249,6 +249,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat +@@ -250,6 +250,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat // Skip opening a new Tab if it doesn't make sense. if (mTab.isClosing()) return false; @@ -121,7 +121,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit WindowAndroid window = mTab.getWindowAndroid(); boolean openingPopup = window != null -@@ -279,7 +287,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat +@@ -294,7 +302,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat mTab, /* shouldPin= */ false, webContents, @@ -158,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java -@@ -417,8 +417,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { +@@ -430,8 +430,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { public void onOpenImageInNewTab(GURL url, @Nullable Referrer referrer) { LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec()); loadUrlParams.setReferrer(referrer); @@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.base.TraceEvent; import org.chromium.base.lifetime.Destroyable; import org.chromium.base.metrics.RecordUserAction; -@@ -979,11 +980,16 @@ public class RootUiCoordinator +@@ -1021,11 +1022,16 @@ public class RootUiCoordinator TrackerFactory.getTrackerForProfile(tab.getProfile()) .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED); @@ -265,7 +265,7 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml -@@ -79,4 +79,28 @@ found in the LICENSE file. +@@ -84,4 +84,28 @@ found in the LICENSE file. android:key="disable_toolbar_swipeup" android:title="@string/disable_toolbar_swipe_up" /> @@ -390,7 +390,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java -@@ -1113,7 +1113,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper +@@ -1114,7 +1114,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper private boolean handleAssistMenuItemClick(int order) { // Primary assist action is always the first action in the list so offset by 1. diff --git a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch index 49f498b7..48a0f74c 100644 --- a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch +++ b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch @@ -24,11 +24,11 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re + android:inputType="textUri" android:hint="@string/omnibox_empty_hint" android:textAlignment="viewStart" - app:layout_constraintStart_toEndOf="@id/location_bar_status" + android:importantForAutofill="no" diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -378,8 +378,17 @@ class LocationBarMediator +@@ -409,8 +409,17 @@ class LocationBarMediator if (!mUrlFocusedWithPastedText && !shouldRetainOmniboxOnFocus && mLocationBarLayout.shouldClearTextOnFocus()) { @@ -48,7 +48,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } else if (shouldRetainOmniboxOnFocus) { mUrlCoordinator.setSelectAllOnFocus(true); } -@@ -1798,7 +1807,6 @@ class LocationBarMediator +@@ -1898,7 +1907,6 @@ class LocationBarMediator mUrlCoordinator.setKeyboardVisibility(true, false); } @@ -67,7 +67,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import android.os.SystemClock; import android.text.Editable; import android.text.InputType; -@@ -114,6 +115,7 @@ public class UrlBar extends AutocompleteEditText { +@@ -116,6 +117,7 @@ public class UrlBar extends AutocompleteEditText { private boolean mAllowFocus = true; private boolean mShouldSendTypingStartedEvent; @@ -75,7 +75,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow private boolean mPendingScroll; private boolean mIsInCct; -@@ -353,6 +355,28 @@ public class UrlBar extends AutocompleteEditText { +@@ -369,6 +371,28 @@ public class UrlBar extends AutocompleteEditText { fixupTextDirection(); mShouldSendTypingStartedEvent = focused; diff --git a/build/patches/Disable-Accessibility-service-by-default.patch b/build/patches/Disable-Accessibility-service-by-default.patch index 12a92816..e76581b1 100644 --- a/build/patches/Disable-Accessibility-service-by-default.patch +++ b/build/patches/Disable-Accessibility-service-by-default.patch @@ -42,7 +42,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java -@@ -1134,6 +1134,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa +@@ -1142,6 +1142,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa structure.setChildCount(0); return; } diff --git a/build/patches/Disable-Android-Tab-Declutter.patch b/build/patches/Disable-Android-Tab-Declutter.patch index f894a5ab..b00b7f22 100644 --- a/build/patches/Disable-Android-Tab-Declutter.patch +++ b/build/patches/Disable-Android-Tab-Declutter.patch @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java -@@ -104,11 +104,12 @@ public class TabArchiveSettings { +@@ -105,11 +105,12 @@ public class TabArchiveSettings { // are created, and tabs disappearing from tests is very unexpected. For archive tests, // this will need to be turned on manually. return mPrefsManager.readBoolean( diff --git a/build/patches/Disable-CSSDynamicRangeLimit.patch b/build/patches/Disable-CSSDynamicRangeLimit.patch index 9ff8e6e5..daa4fc80 100644 --- a/build/patches/Disable-CSSDynamicRangeLimit.patch +++ b/build/patches/Disable-CSSDynamicRangeLimit.patch @@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1398,7 +1398,7 @@ +@@ -1419,7 +1419,7 @@ }, { name: "CSSDynamicRangeLimit", diff --git a/build/patches/Disable-Compose-feature.patch b/build/patches/Disable-Compose-feature.patch index 15c13177..6a2e72cb 100644 --- a/build/patches/Disable-Compose-feature.patch +++ b/build/patches/Disable-Compose-feature.patch @@ -23,7 +23,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui #include "chrome/browser/history_embeddings/history_embeddings_utils.h" #include "chrome/browser/optimization_guide/optimization_guide_keyed_service.h" #include "chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.h" -@@ -354,7 +356,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) +@@ -359,7 +361,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) base::FeatureList::IsEnabled(permissions::features::kKeyboardLockPrompt)); #if BUILDFLAG(ENABLE_COMPOSE) diff --git a/build/patches/Disable-Compression-Dictionary-Transport.patch b/build/patches/Disable-Compression-Dictionary-Transport.patch index 3a1999d2..21aff747 100644 --- a/build/patches/Disable-Compression-Dictionary-Transport.patch +++ b/build/patches/Disable-Compression-Dictionary-Transport.patch @@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1447,8 +1447,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( +@@ -1452,8 +1452,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( registry->RegisterBooleanPref(prefs::kSandboxExternalProtocolBlocked, true); registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true); registry->RegisterListPref(prefs::kSSLErrorOverrideAllowedForOrigins); diff --git a/build/patches/Disable-Device-Attributes-API.patch b/build/patches/Disable-Device-Attributes-API.patch index a9353d30..55c56795 100644 --- a/build/patches/Disable-Device-Attributes-API.patch +++ b/build/patches/Disable-Device-Attributes-API.patch @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/device_api/device_service_impl.cc --- a/chrome/browser/device_api/device_service_impl.cc +++ b/chrome/browser/device_api/device_service_impl.cc -@@ -154,6 +154,7 @@ bool IsPermissionsPolicyFeatureEnabled() { +@@ -155,6 +155,7 @@ bool IsPermissionsPolicyFeatureEnabled() { bool IsTrustedContext(content::RenderFrameHost& host, const url::Origin& origin) { @@ -18,7 +18,7 @@ diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/d // Do not create the service for the incognito mode. if (GetProfile(host)->IsIncognitoProfile()) { return false; -@@ -349,6 +350,10 @@ void DeviceServiceImpl::GetAnnotatedLocation( +@@ -350,6 +351,10 @@ void DeviceServiceImpl::GetAnnotatedLocation( void DeviceServiceImpl::GetDeviceAttribute( void (DeviceAttributeApi::*method)(DeviceAttributeCallback callback), DeviceAttributeCallback callback) { diff --git a/build/patches/Disable-FedCm.patch b/build/patches/Disable-FedCm.patch index 8e6b7889..a494ace5 100644 --- a/build/patches/Disable-FedCm.patch +++ b/build/patches/Disable-FedCm.patch @@ -6,16 +6,18 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- .../content_settings/core/browser/content_settings_registry.cc | 2 +- .../content/public/common/content_features_cc/Disable-FedCm.inc | 1 + + .../services/network/public/cpp/features_cc/Disable-FedCm.inc | 1 + .../third_party/blink/common/features_cc/Disable-FedCm.inc | 1 + .../blink/renderer/platform/runtime_enabled_features.json5 | 2 +- - 4 files changed, 4 insertions(+), 2 deletions(-) + 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc + create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -650,7 +650,7 @@ void ContentSettingsRegistry::Init() { +@@ -640,7 +640,7 @@ void ContentSettingsRegistry::Init() { PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); Register(ContentSettingsType::FEDERATED_IDENTITY_AUTO_REAUTHN_PERMISSION, @@ -30,6 +32,12 @@ new file mode 100644 +++ b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kFedCm); +diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kSendSameSiteLaxForFedCM); diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc new file mode 100644 --- /dev/null @@ -39,7 +47,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2222,7 +2222,7 @@ +@@ -2286,7 +2286,7 @@ { name: "FedCm", public: true, diff --git a/build/patches/Disable-GetInstalledRelatedApps-API.patch b/build/patches/Disable-GetInstalledRelatedApps-API.patch index 2a1ccdc1..17394e94 100644 --- a/build/patches/Disable-GetInstalledRelatedApps-API.patch +++ b/build/patches/Disable-GetInstalledRelatedApps-API.patch @@ -58,7 +58,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2952,9 +2952,8 @@ +@@ -3037,9 +3037,8 @@ status: "stable", }, { diff --git a/build/patches/Disable-PrivacyGuide.patch b/build/patches/Disable-PrivacyGuide.patch index 17f68d94..1b350f05 100644 --- a/build/patches/Disable-PrivacyGuide.patch +++ b/build/patches/Disable-PrivacyGuide.patch @@ -22,7 +22,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -328,8 +328,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) +@@ -336,8 +336,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) #endif // BUILDFLAG(IS_CHROMEOS) bool show_privacy_guide = diff --git a/build/patches/Disable-Real-Box.patch b/build/patches/Disable-Real-Box.patch index 538472e4..67e1ad3c 100644 --- a/build/patches/Disable-Real-Box.patch +++ b/build/patches/Disable-Real-Box.patch @@ -4,16 +4,16 @@ Subject: Disable Real Box Real-box is search box in ntp --- - chrome/browser/prefs/browser_prefs.cc | 2 +- - chrome/browser/resources/new_tab_page/app.html | 17 ----------------- - .../ui/webui/searchbox/searchbox_handler.cc | 1 + - components/search/ntp_features.cc | 4 ++-- - 4 files changed, 4 insertions(+), 20 deletions(-) + chrome/browser/prefs/browser_prefs.cc | 2 +- + .../browser/resources/new_tab_page/app.html | 19 ------------------- + .../searchbox/searchbox_handler.cc | 1 + + components/search/ntp_features.cc | 4 ++-- + 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -2235,7 +2235,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1987,7 +1987,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, registry->RegisterBooleanPref( prefs::kLensRegionSearchEnabled, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); @@ -25,7 +25,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html --- a/chrome/browser/resources/new_tab_page/app.html +++ b/chrome/browser/resources/new_tab_page/app.html -@@ -40,23 +40,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js'; +@@ -40,25 +40,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js'; ?hidden="${!this.showScrim_}"> ` : ''}
@@ -37,6 +37,7 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res - @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}" - ?had-secondary-side="${this.realboxHadSecondarySide}" - @had-secondary-side-changed="${this.onRealboxHadSecondarySideChanged_}" +- @context-menu-entrypoint-click="${this.onContextMenuEntrypointClick_}" - ?can-show-secondary-side="${this.realboxCanShowSecondarySide}" - ?compose-button-enabled="${this.composeButtonEnabled}" - ?composebox-enabled="${this.composeboxEnabled}" @@ -44,15 +45,16 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res - ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}" - ?cycling-placeholders="${this.searchboxCyclingPlaceholders_}" - @searchbox-input-focus-changed="${this.onInputFocusChanged_}" -- context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}"> +- context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}" +- ?multi-line-enabled="${this.multiLineEnabled_}"> - ${this.showComposebox_ ? html` -
+diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc +--- a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc ++++ b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc +@@ -299,6 +299,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source, Profile* profile, bool enable_voice_search, bool enable_lens_search) { @@ -63,7 +65,7 @@ diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/bro diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc --- a/components/search/ntp_features.cc +++ b/components/search/ntp_features.cc -@@ -109,7 +109,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT); +@@ -114,7 +114,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT); // If enabled, logo will be shown. // This is a kill switch. Keep indefinitely. @@ -72,7 +74,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features. // If enabled, middle slot promo will be shown. // This is a kill switch. Keep indefinitely. -@@ -151,7 +151,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT); +@@ -156,7 +156,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT); // If enabled, OneGoogleBar will be shown. // This is a kill switch. Keep indefinitely. diff --git a/build/patches/Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch b/build/patches/Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch index 6d844b38..d6a30c23 100644 --- a/build/patches/Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch +++ b/build/patches/Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch @@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -4830,8 +4830,8 @@ +@@ -4951,8 +4951,8 @@ { // Preserves the sticky user activation state after a page navigates to // another same-origin page. https://crbug.com/433729626 diff --git a/build/patches/Disable-TLS-resumption.patch b/build/patches/Disable-TLS-resumption.patch index 265b2f8e..02f6d79f 100644 --- a/build/patches/Disable-TLS-resumption.patch +++ b/build/patches/Disable-TLS-resumption.patch @@ -129,7 +129,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {} QuicSessionRequest::~QuicSessionRequest() { -@@ -2415,7 +2447,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) { +@@ -2422,7 +2454,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) { cert_verifier_, transport_security_state_, sct_auditing_delegate_, std::move(hostnames_to_allow_unknown_roots), key.network_anonymization_key), diff --git a/build/patches/Disable-UA-full-version.patch b/build/patches/Disable-UA-full-version.patch index bb366b64..89fa33f9 100644 --- a/build/patches/Disable-UA-full-version.patch +++ b/build/patches/Disable-UA-full-version.patch @@ -7,8 +7,8 @@ getHighEntropyValues will return only the major version Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../renderer/core/frame/navigator_ua_data.cc | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) + .../renderer/core/frame/navigator_ua_data.cc | 21 +++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc @@ -20,13 +20,15 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ +#include "base/version.h" +#include "base/strings/strcat.h" +#include "base/strings/string_number_conversions.h" - #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h" - #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h" - #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h" -@@ -65,6 +68,16 @@ void MaybeRecordMetric(bool record_identifiability, - execution_context); - } + #include "third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom-blink.h" + #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" + #include "third_party/blink/renderer/bindings/core/v8/v8_ua_data_values.h" +@@ -17,6 +20,20 @@ + namespace blink { + ++namespace { ++ +const String GetReducedVersionNumber(const std::string& fullVersion) { + base::Version version(fullVersion); + std::string version_str; @@ -37,10 +39,12 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ + return String::FromUTF8(version_str); +} + - } // namespace - ++} ++ NavigatorUAData::NavigatorUAData(ExecutionContext* context) -@@ -103,7 +116,7 @@ void NavigatorUAData::SetFullVersionList( + : ExecutionContextClient(context) { + NavigatorUABrandVersion* dict = NavigatorUABrandVersion::Create(); +@@ -53,7 +70,7 @@ void NavigatorUAData::SetFullVersionList( const UserAgentBrandList& full_version_list) { for (const auto& brand_version : full_version_list) { AddBrandFullVersion(String::FromUTF8(brand_version.brand), @@ -49,7 +53,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ } } -@@ -125,7 +138,7 @@ void NavigatorUAData::SetModel(const String& model) { +@@ -75,7 +92,7 @@ void NavigatorUAData::SetModel(const String& model) { } void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) { diff --git a/build/patches/Disable-Viewport-Segments.patch b/build/patches/Disable-Viewport-Segments.patch index 84d3a9a1..b78b4ee3 100644 --- a/build/patches/Disable-Viewport-Segments.patch +++ b/build/patches/Disable-Viewport-Segments.patch @@ -21,7 +21,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -5458,8 +5458,7 @@ +@@ -5592,8 +5592,7 @@ status: "stable", }, { diff --git a/build/patches/Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch b/build/patches/Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch index cbb3f147..d76537a9 100644 --- a/build/patches/Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch +++ b/build/patches/Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch @@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -357,8 +357,13 @@ void ContentSettingsRegistry::Init() { +@@ -347,8 +347,13 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); diff --git a/build/patches/Disable-WebGPU.patch b/build/patches/Disable-WebGPU.patch index 8164255e..34ecf660 100644 --- a/build/patches/Disable-WebGPU.patch +++ b/build/patches/Disable-WebGPU.patch @@ -24,10 +24,10 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc --- a/gpu/config/gpu_finch_features.cc +++ b/gpu/config/gpu_finch_features.cc -@@ -182,7 +182,7 @@ BASE_FEATURE(kEnableDrDc, +@@ -196,7 +196,7 @@ BASE_FEATURE(kEnableDrDc, // enabled by default on supported platforms. #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(USE_WEBGPU_ON_VULKAN_VIA_GL_INTEROP) -#define WEBGPU_ENABLED base::FEATURE_ENABLED_BY_DEFAULT +#define WEBGPU_ENABLED base::FEATURE_DISABLED_BY_DEFAULT #else @@ -36,7 +36,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc --- a/third_party/blink/renderer/modules/webgpu/gpu.cc +++ b/third_party/blink/renderer/modules/webgpu/gpu.cc -@@ -161,6 +161,8 @@ GPU::GPU(NavigatorBase& navigator) +@@ -153,6 +153,8 @@ GPU::GPU(NavigatorBase& navigator) GPU::~GPU() = default; WGSLLanguageFeatures* GPU::wgslLanguageFeatures() const { @@ -45,7 +45,7 @@ diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blin return wgsl_language_features_.Get(); } -@@ -444,6 +446,7 @@ ScriptPromise> GPU::requestAdapter( +@@ -404,6 +406,7 @@ ScriptPromise> GPU::requestAdapter( "WebGPU is experimental on this platform. See " "https://github.com/gpuweb/gpuweb/wiki/" "Implementation-Status#implementation-status")); diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch index 5d032b53..bd78da8d 100644 --- a/build/patches/Disable-all-predictors-code.patch +++ b/build/patches/Disable-all-predictors-code.patch @@ -5,82 +5,82 @@ Subject: Disable all predictors code Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/BUILD.gn | 3 - - .../background_download_service_factory.cc | 2 +- - .../preloading_model_keyed_service.cc | 3 + - .../preloading_model_keyed_service_factory.cc | 4 +- - .../chrome_hints_manager.cc | 1 + - .../model_validator_keyed_service.cc | 6 +- - .../optimization_guide_keyed_service.cc | 1 - - .../password_change_delegate_impl.cc | 2 + - chrome/browser/permissions/BUILD.gn | 2 - - .../permissions/chrome_permissions_client.cc | 2 - - .../passage_embedder_delegate.cc | 2 + - .../permissions_ai_ui_selector.cc | 5 ++ - .../permissions_ai_ui_selector.h | 5 +- - .../prediction_model_handler_provider.cc | 12 +++- - .../prediction_model_handler_provider.h | 2 + - .../quiet_notification_permission_ui_state.cc | 4 +- - .../autocomplete_action_predictor.cc | 2 + - .../predictors/loading_predictor_config.cc | 4 +- - .../browser/predictors/predictors_features.cc | 3 +- - .../search_prefetch/field_trial_settings.cc | 4 ++ - .../search_prefetch_url_loader_interceptor.cc | 1 + - ...hrome_browser_main_extra_parts_profiles.cc | 1 - - chrome/browser/safe_browsing/BUILD.gn | 1 - - ...ation_content_detection_service_factory.cc | 6 ++ - .../preloading/AndroidPrerenderManager.java | 1 + - .../ui/autofill/chrome_autofill_client.cc | 15 ----- - chrome/browser/ui/tab_helpers.cc | 1 - - .../autofill_ml_internals_page_handler.cc | 2 + - .../autofill_ml_internals_page_handler.h | 3 + - .../autofill_ml_internals_ui.cc | 3 + - .../read_anything/read_aloud_app_model.cc | 16 +++++- - .../read_anything/read_aloud_app_model.h | 9 ++- - .../read_anything_app_controller.cc | 10 ++++ - .../read_anything_app_controller.h | 4 ++ - chrome/test/BUILD.gn | 2 - - chrome/utility/BUILD.gn | 2 +- - chrome/utility/services.cc | 8 --- - components/BUILD.gn | 2 +- - .../browser/foundations/autofill_manager.cc | 6 ++ - .../browser/foundations/autofill_manager.h | 3 + - .../autofill_optimization_guide_decider.cc | 5 +- - .../field_classification_model_handler.cc | 12 ++-- - .../field_classification_model_handler.h | 10 +++- - .../aim_eligibility_service_features.cc | 1 + - .../browser/autocomplete_controller.cc | 4 ++ - .../omnibox/browser/base_search_provider.cc | 4 +- - .../prediction_model_download_manager.cc | 6 +- - .../delivery/prediction_model_fetcher_impl.cc | 1 + - .../core/hints/hints_fetcher.cc | 1 + - .../core/hints/hints_manager.cc | 2 + - .../core/optimization_guide_features.cc | 12 ++-- - components/optimization_guide/features.gni | 3 +- - .../core/page_content_annotations_features.cc | 4 ++ - .../page_content_annotations_model_manager.cc | 1 + - .../notification_content_detection/BUILD.gn | 4 -- - .../service_worker_main_resource_loader.cc | 1 + - .../Disable-all-predictors-code.inc | 2 + - .../Disable-all-predictors-code.inc | 1 + - .../Disable-all-predictors-code.inc | 1 + - .../Disable-all-predictors-code.inc | 1 + - .../Disable-all-predictors-code.inc | 5 ++ - .../Disable-all-predictors-code.inc | 1 + - .../Disable-all-predictors-code.inc | 1 + - .../Disable-all-predictors-code.inc | 2 + - media/webrtc/BUILD.gn | 5 ++ - media/webrtc/helpers.cc | 3 +- - services/on_device_model/ml/BUILD.gn | 2 +- - services/on_device_model/ml/ts_model.cc | 4 +- - services/on_device_model/safety/BUILD.gn | 2 +- - services/webnn/BUILD.gn | 2 +- - services/webnn/features.gni | 2 +- - services/webnn/webnn_context_provider_impl.cc | 57 +------------------ - .../core/html/parser/html_document_parser.cc | 1 + - .../document_speculation_rules.cc | 1 + - .../platform/runtime_enabled_features.json5 | 2 +- - 75 files changed, 187 insertions(+), 144 deletions(-) + chrome/browser/BUILD.gn | 3 --- + .../background_download_service_factory.cc | 2 +- + .../preloading_model_keyed_service.cc | 3 +++ + .../preloading_model_keyed_service_factory.cc | 4 +--- + .../optimization_guide/chrome_hints_manager.cc | 1 + + .../model_validator_keyed_service.cc | 6 +++++- + .../optimization_guide_keyed_service.cc | 1 - + .../password_change_delegate_impl.cc | 2 ++ + chrome/browser/permissions/BUILD.gn | 2 -- + .../permissions/chrome_permissions_client.cc | 2 -- + .../passage_embedder_delegate.cc | 2 ++ + .../permissions_ai_ui_selector.cc | 5 +++++ + .../permissions_ai_ui_selector.h | 5 ++++- + .../prediction_model_handler_provider.cc | 12 +++++++++--- + .../prediction_model_handler_provider.h | 2 ++ + .../quiet_notification_permission_ui_state.cc | 4 ++-- + .../predictors/autocomplete_action_predictor.cc | 2 ++ + .../predictors/loading_predictor_config.cc | 4 ++-- + chrome/browser/predictors/predictors_features.cc | 3 +-- + .../search_prefetch/field_trial_settings.cc | 4 ++++ + .../search_prefetch_url_loader_interceptor.cc | 1 + + .../chrome_browser_main_extra_parts_profiles.cc | 1 - + chrome/browser/safe_browsing/BUILD.gn | 1 - + ...fication_content_detection_service_factory.cc | 6 ++++++ + .../preloading/AndroidPrerenderManager.java | 1 + + .../ui/autofill/chrome_autofill_client.cc | 13 +------------ + chrome/browser/ui/tab_helpers.cc | 1 - + .../autofill_ml_internals_page_handler.cc | 2 ++ + .../autofill_ml_internals_page_handler.h | 3 +++ + .../autofill_ml_internals_ui.cc | 3 +++ + .../read_anything/read_aloud_app_model.cc | 16 ++++++++++++++-- + .../read_anything/read_aloud_app_model.h | 9 ++++++++- + .../read_anything_app_controller.cc | 10 ++++++++++ + .../read_anything/read_anything_app_controller.h | 4 ++++ + chrome/test/BUILD.gn | 2 -- + chrome/utility/BUILD.gn | 2 +- + chrome/utility/services.cc | 8 -------- + components/BUILD.gn | 2 +- + .../core/browser/foundations/autofill_manager.cc | 6 ++++++ + .../core/browser/foundations/autofill_manager.h | 3 +++ + .../autofill_optimization_guide_decider.cc | 5 +++-- + .../field_classification_model_handler.cc | 12 ++++++++---- + .../field_classification_model_handler.h | 10 ++++++++-- + .../browser/aim_eligibility_service_features.cc | 1 + + .../omnibox/browser/autocomplete_controller.cc | 4 ++++ + .../omnibox/browser/base_search_provider.cc | 4 ++-- + .../prediction_model_download_manager.cc | 6 ++++-- + .../delivery/prediction_model_fetcher_impl.cc | 1 + + .../core/hints/hints_fetcher.cc | 1 + + .../core/hints/hints_manager.cc | 2 ++ + .../core/optimization_guide_features.cc | 12 ++++++------ + components/optimization_guide/features.gni | 3 +-- + .../core/page_content_annotations_features.cc | 4 ++++ + .../page_content_annotations_model_manager.cc | 1 + + .../notification_content_detection/BUILD.gn | 4 ---- + .../service_worker_main_resource_loader.cc | 1 + + .../Disable-all-predictors-code.inc | 2 ++ + .../Disable-all-predictors-code.inc | 1 + + .../Disable-all-predictors-code.inc | 1 + + .../Disable-all-predictors-code.inc | 1 + + .../features_cc/Disable-all-predictors-code.inc | 5 +++++ + .../features_cc/Disable-all-predictors-code.inc | 1 + + .../features_cc/Disable-all-predictors-code.inc | 1 + + .../features_cc/Disable-all-predictors-code.inc | 2 ++ + media/webrtc/BUILD.gn | 5 +++++ + media/webrtc/helpers.cc | 3 ++- + services/on_device_model/ml/BUILD.gn | 2 +- + services/on_device_model/ml/ts_model.cc | 4 ++-- + services/on_device_model/safety/BUILD.gn | 2 +- + services/webnn/BUILD.gn | 2 +- + services/webnn/features.gni | 2 +- + services/webnn/webnn_context_provider_impl.cc | 13 +------------ + .../core/html/parser/html_document_parser.cc | 1 + + .../document_speculation_rules.cc | 1 + + .../platform/runtime_enabled_features.json5 | 2 +- + 75 files changed, 188 insertions(+), 97 deletions(-) create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc @@ -93,7 +93,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -728,8 +728,6 @@ static_library("browser") { +@@ -731,8 +731,6 @@ static_library("browser") { "navigation_predictor/navigation_predictor_keyed_service_factory.h", "navigation_predictor/navigation_predictor_metrics_document_data.cc", "navigation_predictor/navigation_predictor_metrics_document_data.h", @@ -102,7 +102,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "navigation_predictor/preloading_model_keyed_service.cc", "navigation_predictor/preloading_model_keyed_service.h", "navigation_predictor/preloading_model_keyed_service_factory.cc", -@@ -2376,7 +2374,6 @@ static_library("browser") { +@@ -2364,7 +2362,6 @@ static_library("browser") { "//components/resources", "//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser:safe_browsing_service", @@ -175,7 +175,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc b/chrome/browser/optimization_guide/model_validator_keyed_service.cc --- a/chrome/browser/optimization_guide/model_validator_keyed_service.cc +++ b/chrome/browser/optimization_guide/model_validator_keyed_service.cc -@@ -67,13 +67,13 @@ namespace optimization_guide { +@@ -69,13 +69,13 @@ namespace optimization_guide { ModelValidatorKeyedService::ModelValidatorKeyedService(Profile* profile) : profile_(profile) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -190,7 +190,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc if (switches::ShouldValidateModel()) { // Create the validator object which will get destroyed when the model // load is complete. -@@ -134,6 +134,7 @@ void ModelValidatorKeyedService::OnPrimaryAccountChanged( +@@ -136,6 +136,7 @@ void ModelValidatorKeyedService::OnPrimaryAccountChanged( void ModelValidatorKeyedService::StartModelExecutionValidation() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -198,15 +198,15 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc auto* opt_guide_service = OptimizationGuideKeyedServiceFactory::GetForProfile(profile_); if (!opt_guide_service) { -@@ -152,6 +153,7 @@ void ModelValidatorKeyedService::StartModelExecutionValidation() { - /*execution_timeout=*/std::nullopt, +@@ -154,6 +155,7 @@ void ModelValidatorKeyedService::StartModelExecutionValidation() { + /*options=*/{}, base::BindOnce(&ModelValidatorKeyedService::OnModelExecuteResponse, weak_ptr_factory_.GetWeakPtr())); +#endif } void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation( -@@ -169,6 +171,7 @@ void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation( +@@ -171,6 +173,7 @@ void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation( void ModelValidatorKeyedService::PerformOnDeviceModelExecutionValidation( std::unique_ptr input) { @@ -214,7 +214,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); auto* opt_guide_service = OptimizationGuideKeyedServiceFactory::GetForProfile(profile_); -@@ -216,6 +219,7 @@ void ModelValidatorKeyedService::ExecuteModel( +@@ -218,6 +221,7 @@ void ModelValidatorKeyedService::ExecuteModel( *metadata, base::BindRepeating( &ModelValidatorKeyedService::OnDeviceModelExecuteResponse, weak_ptr_factory_.GetWeakPtr(), std::move(request))); @@ -225,7 +225,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc -@@ -383,7 +383,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( +@@ -420,7 +420,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( void OptimizationGuideKeyedService::RegisterOptimizationTypes( const std::vector& optimization_types) { @@ -236,7 +236,7 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service. diff --git a/chrome/browser/password_manager/password_change_delegate_impl.cc b/chrome/browser/password_manager/password_change_delegate_impl.cc --- a/chrome/browser/password_manager/password_change_delegate_impl.cc +++ b/chrome/browser/password_manager/password_change_delegate_impl.cc -@@ -397,11 +397,13 @@ void PasswordChangeDelegateImpl::StartPasswordChangeFlow() { +@@ -353,11 +353,13 @@ void PasswordChangeDelegateImpl::StartPasswordChangeFlow() { // a local ML model for field classification. // TODO(452883239): Clean this up when model is downloaded on start-up for // everybody. @@ -249,7 +249,7 @@ diff --git a/chrome/browser/password_manager/password_change_delegate_impl.cc b/ +#endif } - void PasswordChangeDelegateImpl::OnLoginStateCheckResult(bool is_logged_in) { + void PasswordChangeDelegateImpl::OnLoginStateCheckResult( diff --git a/chrome/browser/permissions/BUILD.gn b/chrome/browser/permissions/BUILD.gn --- a/chrome/browser/permissions/BUILD.gn +++ b/chrome/browser/permissions/BUILD.gn @@ -265,7 +265,7 @@ diff --git a/chrome/browser/permissions/BUILD.gn b/chrome/browser/permissions/BU diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc -@@ -481,8 +481,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors( +@@ -482,8 +482,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors( #endif selectors.emplace_back(std::make_unique( Profile::FromBrowserContext(browser_context))); @@ -296,7 +296,7 @@ diff --git a/chrome/browser/permissions/prediction_service/passage_embedder_dele diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc --- a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc +++ b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc -@@ -412,6 +412,7 @@ void PermissionsAiUiSelector::SelectUiToUse( +@@ -434,6 +434,7 @@ void PermissionsAiUiSelector::SelectUiToUse( } } @@ -304,7 +304,7 @@ diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_sel void PermissionsAiUiSelector::OnGetInnerTextForOnDeviceModel( ModelExecutionData model_data, ModelExecutionCallback model_execution_callback, -@@ -459,6 +460,7 @@ void PermissionsAiUiSelector::OnGetInnerTextForOnDeviceModel( +@@ -481,6 +482,7 @@ void PermissionsAiUiSelector::OnGetInnerTextForOnDeviceModel( InquireServerModel(model_data.features, std::move(model_data.request_metadata)); } @@ -312,7 +312,7 @@ diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_sel void PermissionsAiUiSelector::OnTimeout() { VLOG(1) << "[CPSS] Overall timeout for prediction reached."; -@@ -673,6 +675,7 @@ bool PermissionsAiUiSelector::ShouldHoldBack( +@@ -697,6 +699,7 @@ bool PermissionsAiUiSelector::ShouldHoldBack( PredictionSource PermissionsAiUiSelector::GetPredictionTypeToUse( permissions::RequestType request_type) { @@ -320,7 +320,7 @@ diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_sel const bool is_msbb_enabled = profile_->GetPrefs()->GetBoolean( unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled); -@@ -749,6 +752,7 @@ PredictionSource PermissionsAiUiSelector::GetPredictionTypeToUse( +@@ -773,6 +776,7 @@ PredictionSource PermissionsAiUiSelector::GetPredictionTypeToUse( return PredictionSource::kNoCpssModel; } @@ -328,7 +328,7 @@ diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_sel void PermissionsAiUiSelector::set_language_detection_observer_for_testing( std::unique_ptr language_detection_observer) { -@@ -761,6 +765,7 @@ void PermissionsAiUiSelector::set_inner_text_for_testing( +@@ -785,6 +789,7 @@ void PermissionsAiUiSelector::set_inner_text_for_testing( CHECK_IS_TEST(); inner_text_for_testing_ = std::move(inner_text_); } @@ -512,7 +512,7 @@ diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -1221,7 +1221,6 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1217,7 +1217,6 @@ void ChromeBrowserMainExtraPartsProfiles:: #else policy::UserPolicySigninServiceFactory::GetInstance(); #endif @@ -523,7 +523,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn -@@ -53,7 +53,6 @@ static_library("safe_browsing") { +@@ -54,7 +54,6 @@ static_library("safe_browsing") { "//components/resources:components_resources_grit", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -582,19 +582,16 @@ diff --git a/chrome/browser/ui/android/preloading/java/src/org/chromium/chrome/b diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc --- a/chrome/browser/ui/autofill/chrome_autofill_client.cc +++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc -@@ -565,11 +565,7 @@ void ChromeAutofillClient::GetAiPageContent(GetAiPageContentCallback callback) { +@@ -564,7 +564,7 @@ void ChromeAutofillClient::GetAiPageContent(GetAiPageContentCallback callback) { } AutofillAiManager* ChromeAutofillClient::GetAutofillAiManager() { --#if !BUILDFLAG(IS_ANDROID) -- return &autofill_ai_manager_; --#else - return nullptr; --#endif +- return autofill_ai_manager_.get(); ++ return nullptr; } AutofillAiModelCache* ChromeAutofillClient::GetAutofillAiModelCache() { -@@ -1401,18 +1397,7 @@ void ChromeAutofillClient::TriggerPlusAddressUserPerceptionSurvey( +@@ -1384,18 +1384,7 @@ void ChromeAutofillClient::TriggerPlusAddressUserPerceptionSurvey( optimization_guide::ModelQualityLogsUploaderService* ChromeAutofillClient::GetMqlsUploadService() { @@ -820,7 +817,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h" #include "chrome/renderer/accessibility/read_anything/read_anything_app_model.h" #include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h" -@@ -1798,6 +1800,7 @@ void ReadAnythingAppController::OnConnected() { +@@ -1810,6 +1812,7 @@ void ReadAnythingAppController::OnConnected() { render_frame()->GetBrowserInterfaceBroker().GetInterface( std::move(page_handler_factory_receiver)); @@ -828,7 +825,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr // Get the dependency parser model used by phrase-based highlighting. if (read_aloud_model_.GetDependencyParserModel().IsAvailable()) { return; -@@ -1806,6 +1809,7 @@ void ReadAnythingAppController::OnConnected() { +@@ -1818,6 +1821,7 @@ void ReadAnythingAppController::OnConnected() { page_handler_->GetDependencyParserModel( base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel, weak_ptr_factory_.GetWeakPtr())); @@ -836,7 +833,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr } void ReadAnythingAppController::OnCopy() const { -@@ -2046,8 +2050,10 @@ std::u16string ReadAnythingAppController::GetCurrentTextContent() { +@@ -2062,8 +2066,10 @@ std::u16string ReadAnythingAppController::GetCurrentTextContent() { } void ReadAnythingAppController::PreprocessTextForSpeech() { @@ -847,7 +844,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr } void ReadAnythingAppController::MovePositionToNextGranularity() { -@@ -2301,14 +2307,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const { +@@ -2320,14 +2326,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const { void ReadAnythingAppController::UpdateDependencyParserModel( base::File model_file) { @@ -879,7 +876,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr class ReadAnythingAppControllerTest; class ReadAnythingAppControllerScreen2xDataCollectionModeTest; -@@ -311,7 +313,9 @@ class ReadAnythingAppController +@@ -313,7 +315,9 @@ class ReadAnythingAppController // available. void UpdateDependencyParserModel(base::File model_file); @@ -892,7 +889,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -5798,8 +5798,6 @@ if (!is_android) { +@@ -5812,8 +5812,6 @@ if (!is_android) { "//chrome/browser/ui/exclusive_access:test_support", "//chrome/browser/ui/hats", "//components/safe_browsing/content/browser:safe_browsing_blocking_page", @@ -916,9 +913,9 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc --- a/chrome/utility/services.cc +++ b/chrome/utility/services.cc -@@ -243,13 +243,6 @@ auto RunMirroringService( - std::move(receiver), content::UtilityThread::Get()->GetIOTaskRunner()); - } +@@ -245,13 +245,6 @@ auto RunMirroringService( + + #endif // !BUILDFLAG(IS_ANDROID) -auto RunPassageEmbeddingsService( - mojo::PendingReceiver @@ -927,24 +924,24 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc - std::move(receiver)); -} - - #endif // !BUILDFLAG(IS_ANDROID) - #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE) -@@ -444,7 +437,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { + auto RunSpeechRecognitionService( + mojo::PendingReceiver receiver) { +@@ -440,7 +433,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { + services.Add(RunWebAppOriginAssociationParser); + services.Add(RunCSVPasswordParser); + services.Add(ContentBookmarkParser); +- services.Add(RunPassageEmbeddingsService); + #if !BUILDFLAG(IS_ANDROID) services.Add(RunProfileImporter); - services.Add(RunMirroringService); -- services.Add(RunPassageEmbeddingsService); - services.Add(RunScreenAIServiceFactory); - #endif // !BUILDFLAG(IS_ANDROID) - diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -625,7 +625,7 @@ test("components_unittests") { +@@ -629,7 +629,7 @@ test("components_unittests") { + "//components/media_router/common/providers/cast/channel:unit_tests", "//components/one_time_tokens/core/browser:unit_tests", "//components/page_info:unit_tests", - "//components/permissions:unit_tests", - "//components/permissions/prediction_service:unit_tests", + # "//components/permissions/prediction_service:unit_tests", "//components/privacy_sandbox/privacy_sandbox_attestations:unit_tests", @@ -953,7 +950,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/components/autofill/core/browser/foundations/autofill_manager.cc --- a/components/autofill/core/browser/foundations/autofill_manager.cc +++ b/components/autofill/core/browser/foundations/autofill_manager.cc -@@ -137,8 +137,10 @@ struct AutofillManager::AsyncContext { +@@ -135,8 +135,10 @@ struct AutofillManager::AsyncContext { std::vector forms; std::vector regex_predictions; @@ -964,23 +961,22 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/ GeoIpCountryCode country_code; LanguageCode current_page_language; std::unique_ptr log_manager; -@@ -710,6 +712,7 @@ void AutofillManager::ParseFormsAsyncCommon( - } - } +@@ -894,12 +896,14 @@ void AutofillManager::UpdateFormCache( + auto apply_predictions = [](FormStructure& form_structure, + const AsyncContext& context, size_t i) { +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB) - if (!context.autofill_predictions.empty()) { - context.autofill_predictions[i].ApplyTo(form_structure->fields()); - } -@@ -717,6 +720,7 @@ void AutofillManager::ParseFormsAsyncCommon( - context.password_manager_predictions[i].ApplyTo( - form_structure->fields()); - } + if (!context.autofill_predictions.empty()) { + context.autofill_predictions[i].ApplyTo(form_structure.fields()); + } + if (!context.password_manager_predictions.empty()) { + context.password_manager_predictions[i].ApplyTo(form_structure.fields()); + } +#endif - if (!context.regex_predictions.empty()) { - context.regex_predictions[i].ApplyTo(form_structure->fields()); - } -@@ -979,6 +983,7 @@ void AutofillManager::LogCurrentFieldTypes( + if (!context.regex_predictions.empty()) { + context.regex_predictions[i].ApplyTo(form_structure.fields()); + } +@@ -990,6 +994,7 @@ void AutofillManager::LogCurrentFieldTypes( } } @@ -988,7 +984,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/ void AutofillManager::SubscribeToMlModelChanges( FieldClassificationModelHandler& handler) { switch (handler.optimization_target()) { -@@ -1002,5 +1007,6 @@ void AutofillManager::SubscribeToMlModelChanges( +@@ -1013,5 +1018,6 @@ void AutofillManager::SubscribeToMlModelChanges( NOTREACHED(); } } @@ -1006,7 +1002,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.h b/c #include "components/translate/core/browser/translate_driver.h" namespace autofill { -@@ -368,10 +369,12 @@ class AutofillManager +@@ -374,10 +375,12 @@ class AutofillManager // Reparses all known forms. void ReparseKnownForms(); @@ -1022,7 +1018,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.h b/c diff --git a/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc b/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc --- a/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc +++ b/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc -@@ -264,6 +264,7 @@ void AutofillOptimizationGuideDecider::OnPaymentsDataLoaded( +@@ -273,6 +273,7 @@ void AutofillOptimizationGuideDecider::OnPaymentsDataLoaded( // If we do not have any optimization types to register, do not do anything. if (!optimization_types.empty()) { @@ -1030,7 +1026,7 @@ diff --git a/components/autofill/core/browser/integrators/optimization_guide/aut decider_->RegisterOptimizationTypes( std::vector( std::move(optimization_types).extract())); -@@ -371,7 +372,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockSingleFieldSuggestions( +@@ -380,7 +381,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockSingleFieldSuggestions( const AutofillField* field) const { // If the field's storable type is `IBAN_VALUE`, check whether IBAN // suggestions should be blocked based on `url`. @@ -1039,7 +1035,7 @@ diff --git a/components/autofill/core/browser/integrators/optimization_guide/aut optimization_guide::OptimizationGuideDecision decision = decider_->CanApplyOptimization( url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED, -@@ -397,7 +398,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockFormFieldSuggestion( +@@ -406,7 +407,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockFormFieldSuggestion( const CreditCard& card) const { if (auto optimization_type = GetVcnMerchantOptOutOptimizationTypeForCard(card); @@ -1168,7 +1164,7 @@ diff --git a/components/omnibox/browser/aim_eligibility_service_features.cc b/co BASE_FEATURE(kAimEnabled, base::FEATURE_ENABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_DISABLED(kAimEnabled); // Disable AI Mode starter pack - BASE_FEATURE(kAimServerEligibilityEnabled, base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kAimServerEligibilityEnabled, base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc --- a/components/omnibox/browser/autocomplete_controller.cc @@ -1183,7 +1179,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ #include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h" #include "components/omnibox/browser/bookmark_provider.h" #include "components/omnibox/browser/bookmark_scoring_signals_annotator.h" -@@ -132,6 +134,7 @@ using ProviderType = AutocompleteProvider::Type; +@@ -128,6 +130,7 @@ using ProviderType = AutocompleteProvider::Type; constexpr bool is_android = !!BUILDFLAG(IS_ANDROID); @@ -1191,7 +1187,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ void RecordMlScoreCoverage(size_t matches_with_non_null_scores, size_t total_scored_matches) { int percent_score_coverage = -@@ -240,6 +243,7 @@ void RecordTotalMatchesScored(size_t num_scored) { +@@ -236,6 +239,7 @@ void RecordTotalMatchesScored(size_t num_scored) { base::UmaHistogramCounts1000("Omnibox.URLScoringModelExecuted.Matches", num_scored); } @@ -1202,7 +1198,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc --- a/components/omnibox/browser/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc -@@ -100,14 +100,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type, +@@ -102,14 +102,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type, bool BaseSearchProvider::ShouldPrefetch(const AutocompleteMatch& match) { // TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for // non-debugging purposes. @@ -1259,7 +1255,7 @@ diff --git a/components/optimization_guide/core/delivery/prediction_model_downlo diff --git a/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc b/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc --- a/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc +++ b/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc -@@ -51,6 +51,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels( +@@ -52,6 +52,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels( proto::RequestContext request_context, const std::string& locale, ModelsFetchedCallback models_fetched_callback) { @@ -1270,7 +1266,7 @@ diff --git a/components/optimization_guide/core/delivery/prediction_model_fetche diff --git a/components/optimization_guide/core/hints/hints_fetcher.cc b/components/optimization_guide/core/hints/hints_fetcher.cc --- a/components/optimization_guide/core/hints/hints_fetcher.cc +++ b/components/optimization_guide/core/hints/hints_fetcher.cc -@@ -202,6 +202,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints( +@@ -204,6 +204,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints( bool skip_cache, HintsFetchedCallback hints_fetched_callback, std::optional request_context_metadata) { @@ -1298,7 +1294,7 @@ diff --git a/components/optimization_guide/core/hints/hints_manager.cc b/compone diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc --- a/components/optimization_guide/core/optimization_guide_features.cc +++ b/components/optimization_guide/core/optimization_guide_features.cc -@@ -39,11 +39,7 @@ namespace features { +@@ -41,11 +41,7 @@ namespace features { namespace { constexpr auto enabled_by_default_mobile_only = @@ -1310,7 +1306,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b } // namespace -@@ -244,8 +240,7 @@ size_t MaxHostKeyedHintCacheSize() { +@@ -254,8 +250,7 @@ size_t MaxHostKeyedHintCacheSize() { } bool ShouldPersistHintsToDisk() { @@ -1320,8 +1316,8 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b } RequestContextSet GetAllowedContextsForPersonalizedMetadata() { -@@ -579,5 +574,10 @@ bool ShouldEnableOptimizationGuideIconView() { - return base::FeatureList::IsEnabled(kOptimizationGuideIconView); +@@ -603,5 +598,10 @@ std::optional GetMainFrameGetAIPageContentTimeout() { + return kGetAIPageContentMainFrameTimeoutParam.Get(); } +SET_CROMITE_FEATURE_DISABLED(kOptimizationHints); @@ -1347,8 +1343,8 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc --- a/components/page_content_annotations/core/page_content_annotations_features.cc +++ b/components/page_content_annotations/core/page_content_annotations_features.cc -@@ -323,4 +323,8 @@ PageContentExtractionTriggeringMode GetPageContentExtractionTriggeringMode() { - return PageContentExtractionTriggeringMode::kOnLoad; +@@ -326,4 +326,8 @@ bool IsSupportedCountryForFeature(const std::string& country_code, + return IsSupportedCountry(country_code, value); } +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations); @@ -1491,11 +1487,11 @@ diff --git a/media/webrtc/helpers.cc b/media/webrtc/helpers.cc diff --git a/services/on_device_model/ml/BUILD.gn b/services/on_device_model/ml/BUILD.gn --- a/services/on_device_model/ml/BUILD.gn +++ b/services/on_device_model/ml/BUILD.gn -@@ -79,7 +79,7 @@ if (use_blink || (is_ios && build_with_internal_optimization_guide)) { +@@ -83,7 +83,7 @@ if (use_blink || (is_ios && build_with_internal_optimization_guide)) { if (use_blink) { deps += [ "//gpu/config" ] } -- if (!is_fuchsia) { +- if (!is_fuchsia && build_with_tflite_lib) { + if (build_with_tflite_lib && !is_fuchsia) { deps += [ "//services/on_device_model/safety:bert_safety_model" ] } @@ -1503,21 +1499,21 @@ diff --git a/services/on_device_model/ml/BUILD.gn b/services/on_device_model/ml/ diff --git a/services/on_device_model/ml/ts_model.cc b/services/on_device_model/ml/ts_model.cc --- a/services/on_device_model/ml/ts_model.cc +++ b/services/on_device_model/ml/ts_model.cc -@@ -25,7 +25,7 @@ +@@ -27,7 +27,7 @@ #include "services/on_device_model/public/mojom/on_device_model_service.mojom.h" #include "services/on_device_model/safety/safety_util.h" --#if !BUILDFLAG(IS_FUCHSIA) -+#if false && !BUILDFLAG(IS_FUCHSIA) +-#if !BUILDFLAG(IS_FUCHSIA) && BUILDFLAG(BUILD_WITH_TFLITE_LIB) ++#if false && !BUILDFLAG(IS_FUCHSIA) && BUILDFLAG(BUILD_WITH_TFLITE_LIB) #include "services/on_device_model/safety/bert_safety_model.h" #endif -@@ -189,7 +189,7 @@ void TsHolder::Reset(mojom::TextSafetyModelParamsPtr params, +@@ -207,7 +207,7 @@ void TsHolder::Reset(mojom::TextSafetyModelParamsPtr params, mojo::PendingReceiver model) { model_.Clear(); --#if !BUILDFLAG(IS_FUCHSIA) -+#if false && !BUILDFLAG(IS_FUCHSIA) +-#if !BUILDFLAG(IS_FUCHSIA) && BUILDFLAG(BUILD_WITH_TFLITE_LIB) ++#if false && !BUILDFLAG(IS_FUCHSIA) && BUILDFLAG(BUILD_WITH_TFLITE_LIB) if (!params->safety_assets || params->safety_assets->which() == mojom::SafetyModelAssets::Tag::kTsAssets) { auto impl = TsModel::Create(*chrome_ml_, std::move(params)); @@ -1528,7 +1524,7 @@ diff --git a/services/on_device_model/safety/BUILD.gn b/services/on_device_model import("//components/optimization_guide/features.gni") --if (!is_fuchsia) { +-if (!is_fuchsia && build_with_tflite_lib) { +if (build_with_tflite_lib && !is_fuchsia) { source_set("bert_safety_op_resolver") { sources = [ @@ -1536,15 +1532,15 @@ diff --git a/services/on_device_model/safety/BUILD.gn b/services/on_device_model diff --git a/services/webnn/BUILD.gn b/services/webnn/BUILD.gn --- a/services/webnn/BUILD.gn +++ b/services/webnn/BUILD.gn -@@ -166,7 +166,7 @@ component("webnn_service") { +@@ -169,7 +169,7 @@ component("webnn_service") { } } - if (is_win) { + if (is_win && webnn_use_tflite) { sources += [ - "ort/buffer_content_ort.cc", - "ort/buffer_content_ort.h", + "ort/context_impl_ort.cc", + "ort/context_impl_ort.h", diff --git a/services/webnn/features.gni b/services/webnn/features.gni --- a/services/webnn/features.gni +++ b/services/webnn/features.gni @@ -1560,74 +1556,30 @@ diff --git a/services/webnn/features.gni b/services/webnn/features.gni diff --git a/services/webnn/webnn_context_provider_impl.cc b/services/webnn/webnn_context_provider_impl.cc --- a/services/webnn/webnn_context_provider_impl.cc +++ b/services/webnn/webnn_context_provider_impl.cc -@@ -236,62 +236,7 @@ void WebNNContextProviderImpl::CreateWebNNContext( +@@ -244,18 +244,7 @@ void WebNNContextProviderImpl::CreateWebNNContext( } #if BUILDFLAG(IS_WIN) - if (ort::ShouldCreateOrtContext(*options)) { -- base::expected, std::string> -- env_creation_results = ort::Environment::GetInstance(gpu_info_); -- if (!env_creation_results.has_value()) { -- LOG(ERROR) << "[WebNN] Failed to create ONNX Runtime context: " -- << env_creation_results.error(); -- } else { -- mojom::Device device_type = options->device; -- // Falls back to GPU if the device type is NPU but NPU is disabled. -- if (device_type == mojom::Device::kNpu && -- gpu_feature_info_.IsWorkaroundEnabled(gpu::DISABLE_WEBNN_FOR_NPU)) { -- device_type = mojom::Device::kGpu; -- LOG(WARNING) << "[WebNN] [WARNING] NPU device is disabled to create " -- "ONNX Runtime context. Falling back to GPU."; -- } +- scoped_trace.AddStep("EnsureWebNNExecutionProvidersReady"); - -- if (!task_runner->BelongsToCurrentThread()) { -- // Re-create sequence for the new task runner. Destroying the old -- // sequence is safe since it has no scheduled tasks yet. -- sequence.reset(); -- sequence = std::make_unique(*scheduler_, task_runner, -- command_buffer_id); -- -- scoped_trace.AddStep("Create on sequence"); -- -- // Safe to use base::Unretained for shared_image_manager_ since it -- // lives on the GPU service, which is guaranteed to outlive the provider -- // and its contexts. -- task_runner->PostTaskAndReplyWithResult( -- FROM_HERE, -- base::BindOnce( -- &ort::ContextImplOrt::Create, std::move(receiver), AsWeakPtr(), -- env_creation_results.value()->GetEpWorkarounds(device_type), -- std::move(options), device_type, -- std::move(write_tensor_consumer), -- std::move(read_tensor_producer), -- std::move(env_creation_results.value()), command_buffer_id, -- std::move(sequence), std::move(memory_tracker_), task_runner, -- base::Unretained(shared_image_manager_.get()), -- main_thread_task_runner_, std::move(scoped_trace)), -- base::BindOnce(&WebNNContextProviderImpl::OnCreateWebNNContextImpl, -- AsWeakPtr(), std::move(callback), std::move(remote), -- std::move(write_tensor_producer), -- std::move(read_tensor_consumer))); -- return; -- } -- context_impl = base::MakeRefCounted( -- std::move(receiver), AsWeakPtr(), -- env_creation_results.value()->GetEpWorkarounds(device_type), -- std::move(options), device_type, std::move(write_tensor_consumer), -- std::move(read_tensor_producer), -- std::move(env_creation_results.value()), command_buffer_id, -- std::move(sequence), memory_tracker_, std::move(task_runner), -- shared_image_manager_, main_thread_task_runner_); -- } +- gpu_host_->EnsureWebNNExecutionProvidersReady(base::BindOnce( +- &WebNNContextProviderImpl::DidEnsureWebNNExecutionProvidersReady, +- AsWeakPtr(), std::move(scoped_trace), std::move(options), +- std::move(write_tensor_producer), std::move(write_tensor_consumer), +- std::move(read_tensor_producer), std::move(read_tensor_consumer), +- command_buffer_id, std::move(sequence), std::move(owning_task_runner), +- std::move(receiver), std::move(remote), std::move(callback))); +- return; - } else if (dml::ShouldCreateDmlContext(*options)) { + if (dml::ShouldCreateDmlContext(*options)) { - base::expected, mojom::ErrorPtr> + base::expected context_creation_results = dml::CreateContextFromOptions( std::move(options), std::move(write_tensor_consumer), diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc b/third_party/blink/renderer/core/html/parser/html_document_parser.cc --- a/third_party/blink/renderer/core/html/parser/html_document_parser.cc +++ b/third_party/blink/renderer/core/html/parser/html_document_parser.cc -@@ -1867,6 +1867,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget( +@@ -1846,6 +1846,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget( } bool HTMLDocumentParser::ShouldSkipPreloadScan() { @@ -1638,7 +1590,7 @@ diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc --- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc +++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc -@@ -664,6 +664,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() { +@@ -659,6 +659,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() { return; } @@ -1649,7 +1601,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -3898,7 +3898,7 @@ +@@ -3989,7 +3989,7 @@ // // It also has some feature params defined throughout the codebase. name: "Prerender2", diff --git a/build/patches/Disable-all-promo-dialogs.patch b/build/patches/Disable-all-promo-dialogs.patch index 2c8a0bae..7ba2f9ff 100644 --- a/build/patches/Disable-all-promo-dialogs.patch +++ b/build/patches/Disable-all-promo-dialogs.patch @@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -1772,6 +1772,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1858,6 +1858,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { } private boolean maybeShowPromo(Profile profile) { @@ -29,7 +29,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -183,7 +183,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -187,7 +187,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled, false); diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index 465bfda3..b4ec7e8d 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -13,6 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../browser/aw_content_browser_client.cc | 3 + .../chromium/android_webview/AwSettings.java | 4 +- + .../apk/AndroidManifest.xml | 3 - chrome/android/java/AndroidManifest.xml | 4 - .../ChromeSiteSettingsDelegate.java | 2 + .../k_anonymity_trust_token_getter.cc | 2 +- @@ -46,7 +47,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html third_party/blink/renderer/core/page/page.cc | 2 +- .../platform/runtime_enabled_features.json5 | 20 +- ui/events/android/motion_event_android.cc | 8 +- - 35 files changed, 103 insertions(+), 434 deletions(-) + 36 files changed, 103 insertions(+), 437 deletions(-) create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc @@ -82,7 +83,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja @SpeculativeLoadingAllowedFlags private int mSpeculativeLoadingAllowedFlags = -@@ -1788,7 +1788,7 @@ public class AwSettings { +@@ -1795,7 +1795,7 @@ public class AwSettings { public void setAttributionBehavior(@AttributionBehavior int behavior) { synchronized (mAwSettingsLock) { if (mAttributionBehavior != behavior) { @@ -91,6 +92,19 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja mEventHandler.updateWebkitPreferencesLocked(); } } +diff --git a/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml +--- a/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml ++++ b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml +@@ -178,9 +178,6 @@ + android:exported="true"> + + +- +- + diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -102,9 +116,9 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -- -- -- -- -- -- - - @@ -340,23 +305,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1047,15 +1012,6 @@ by a child template that "extends" this file. - android:exported="false" - android:permission="android.permission.BIND_JOB_SERVICE"/> - -- -- -- -- -- -- -- - -@@ -1364,12 +1320,6 @@ by a child template that "extends" this file. +@@ -1369,12 +1342,6 @@ by a child template that "extends" this file. {% endif %} @@ -369,27 +318,6 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro ()); map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); @@ -1209,7 +1137,7 @@ diff --git a/chrome/browser/webid/android/java/src/org/chromium/chrome/browser/w diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn --- a/chrome/test/android/BUILD.gn +++ b/chrome/test/android/BUILD.gn -@@ -373,8 +373,6 @@ android_library("chrome_java_integration_test_support") { +@@ -379,8 +379,6 @@ android_library("chrome_java_integration_test_support") { deps = [ ":chrome_java_test_support_common", @@ -1221,7 +1149,7 @@ diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java -@@ -2858,14 +2858,6 @@ public class ExternalNavigationHandler { +@@ -2818,14 +2818,6 @@ public class ExternalNavigationHandler { * @return Whether the given intent is going to open an Instant App. */ private static boolean isIntentToInstantApp(Intent intent) { @@ -3154,7 +3082,7 @@ diff --git a/components/omnibox/common/android/java/src/org/chromium/components/ import org.chromium.base.BaseSwitches; import org.chromium.base.CommandLine; import org.chromium.base.ContextUtils; -@@ -177,12 +175,6 @@ public class OmniboxFeatures { +@@ -192,12 +190,6 @@ public class OmniboxFeatures { "geolocation_request_min_update_interval_millis", (int) (9 * DateUtils.MINUTE_IN_MILLIS)); @@ -3282,7 +3210,7 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi "//base:base_java", "//base:service_loader_java", "//build/android:build_java", -@@ -201,7 +199,6 @@ robolectric_library("junit") { +@@ -205,7 +203,6 @@ robolectric_library("junit") { deps = [ ":java", ":signin_java_test_support", @@ -3318,7 +3246,7 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ "//base:base_java", "//base:service_loader_java", "//base/version_info/android:version_constants_java", -@@ -225,8 +223,6 @@ robolectric_library("junit") { +@@ -223,8 +221,6 @@ robolectric_library("junit") { deps = [ ":java", ":test_support_java", @@ -3350,7 +3278,7 @@ new file mode 100644 diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2CredentialRequest.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2CredentialRequest.java --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2CredentialRequest.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2CredentialRequest.java -@@ -26,8 +26,6 @@ import android.util.Pair; +@@ -27,8 +27,6 @@ import androidx.annotation.IntDef; import androidx.annotation.RequiresApi; import androidx.annotation.VisibleForTesting; @@ -3359,7 +3287,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut import org.jni_zero.JNINamespace; import org.jni_zero.NativeMethods; -@@ -49,7 +47,6 @@ import org.chromium.blink.mojom.ResidentKeyRequirement; +@@ -50,7 +48,6 @@ import org.chromium.blink.mojom.ResidentKeyRequirement; import org.chromium.blink_public.common.BlinkFeatures; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; @@ -3367,7 +3295,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut import org.chromium.components.webauthn.cred_man.CredManHelper; import org.chromium.components.webauthn.cred_man.CredManSupportProvider; import org.chromium.content_public.browser.ClientDataJson; -@@ -133,12 +130,7 @@ public class Fido2CredentialRequest +@@ -146,12 +143,7 @@ public class Fido2CredentialRequest */ public Fido2CredentialRequest(AuthenticationContextProvider authenticationContextProvider) { mAuthenticationContextProvider = authenticationContextProvider; @@ -3381,7 +3309,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut mPlayServicesAvailable = playServicesAvailable; mCredManHelper = new CredManHelper(mAuthenticationContextProvider, this, mPlayServicesAvailable); -@@ -335,22 +327,6 @@ public class Fido2CredentialRequest +@@ -348,22 +340,6 @@ public class Fido2CredentialRequest returnErrorAndResetCallback(AuthenticatorStatus.UNKNOWN_ERROR); return; } @@ -3404,7 +3332,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut return; } int result = -@@ -398,23 +374,6 @@ public class Fido2CredentialRequest +@@ -411,23 +387,6 @@ public class Fido2CredentialRequest returnErrorAndResetCallback(AuthenticatorStatus.UNKNOWN_ERROR); return; } @@ -3428,7 +3356,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } /** -@@ -784,32 +743,6 @@ public class Fido2CredentialRequest +@@ -796,32 +755,6 @@ public class Fido2CredentialRequest callback.onIsUserVerifyingPlatformAuthenticatorAvailableResponse(false); return; } @@ -3461,7 +3389,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } public void handleReportRequest( -@@ -1166,16 +1099,6 @@ public class Fido2CredentialRequest +@@ -1178,16 +1111,6 @@ public class Fido2CredentialRequest if (options.mediation == Mediation.CONDITIONAL) { mCancellableUiState = CancellableUiState.REQUEST_SENT_TO_PLATFORM; } @@ -3478,7 +3406,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } private void handleNonCredentialReturn(GetCredentialOptions options, Integer reason) { -@@ -1219,34 +1142,6 @@ public class Fido2CredentialRequest +@@ -1231,34 +1154,6 @@ public class Fido2CredentialRequest return; } mCancellableUiState = CancellableUiState.REQUEST_SENT_TO_PLATFORM; @@ -3927,11 +3855,10 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut /** * This class is responsible for emitting histograms regarding CredMan usage in -@@ -104,20 +103,6 @@ public class CredManMetricsHelper { - } +@@ -105,19 +104,5 @@ public class CredManMetricsHelper { public void reportGetCredentialMetrics( -- @CredManGetRequestEnum int value, CancellableUiState cancellableUiState) { + @CredManGetRequestEnum int value, @CancellableUiState int cancellableUiState) { - assert !(cancellableUiState == CancellableUiState.NONE) - || !(value == CredManGetRequestEnum.SUCCESS_PASSWORD) - : "Passwords cannot be received from modal requests!"; @@ -3946,7 +3873,6 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut - "WebAuthentication.Android.CredManConditionalRequest", - value, - CredManGetRequestEnum.NUM_ENTRIES); -+ @CredManGetRequestEnum int value, Object cancellableUiState) { } } diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/browser/push_messaging/push_messaging_manager.cc @@ -3978,7 +3904,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -3802,10 +3802,6 @@ if (is_android) { +@@ -3803,10 +3803,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ @@ -4083,7 +4009,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. diff --git a/third_party/android_deps/autorolled/BUILD.gn b/third_party/android_deps/autorolled/BUILD.gn --- a/third_party/android_deps/autorolled/BUILD.gn +++ b/third_party/android_deps/autorolled/BUILD.gn -@@ -133,311 +133,6 @@ template("define_autorolled_targets") { +@@ -70,325 +70,6 @@ template("define_autorolled_targets") { ] } @@ -4352,6 +4278,20 @@ diff --git a/third_party/android_deps/autorolled/BUILD.gn b/third_party/android_ - - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - if (google_play_services_package == "//third_party/android_deps") { +- android_aar_prebuilt("google_play_services_time_java") { +- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_time/play-services-time.aar" +- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_time/com_google_android_gms_play_services_time.info" +- enable_bytecode_checks = false +- deps = [ +- "$google_play_services_package:google_play_services_base_java", +- "$google_play_services_package:google_play_services_basement_java", +- "$google_play_services_package:google_play_services_tasks_java", +- ] +- } +- } +- +- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. +- if (google_play_services_package == "//third_party/android_deps") { - android_aar_prebuilt("google_play_services_vision_java") { - aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_vision/play-services-vision.aar" - info_path = "autorolled/committed/libs/com_google_android_gms_play_services_vision/com_google_android_gms_play_services_vision.info" @@ -4395,7 +4335,7 @@ diff --git a/third_party/android_deps/autorolled/BUILD.gn b/third_party/android_ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. if (!defined(material_design_target)) { android_aar_prebuilt("com_google_android_material_material_java") { -@@ -487,24 +182,6 @@ template("define_autorolled_targets") { +@@ -438,24 +119,6 @@ template("define_autorolled_targets") { } } @@ -4420,8 +4360,8 @@ diff --git a/third_party/android_deps/autorolled/BUILD.gn b/third_party/android_ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. android_aar_prebuilt("com_google_ar_impress_java") { aar_path = "autorolled/cipd/libs/com_google_ar_impress/impress.aar" -@@ -551,38 +228,6 @@ template("define_autorolled_targets") { - deps = [ "//third_party/android_deps:com_google_errorprone_error_prone_annotations_java" ] +@@ -509,38 +172,6 @@ template("define_autorolled_targets") { + preferred_dep = true } - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. @@ -4457,9 +4397,9 @@ diff --git a/third_party/android_deps/autorolled/BUILD.gn b/third_party/android_ - } - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - if (!defined(android_proto_runtime)) { - java_prebuilt("com_google_protobuf_protobuf_javalite_java") { -@@ -928,190 +573,6 @@ template("define_autorolled_targets") { + if (!defined(guava_android_target)) { + java_prebuilt("com_google_guava_guava_java") { +@@ -965,190 +596,6 @@ template("define_autorolled_targets") { ] } @@ -4650,7 +4590,7 @@ diff --git a/third_party/android_deps/autorolled/BUILD.gn b/third_party/android_ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. java_prebuilt("com_google_auto_value_auto_value_annotations_java") { jar_path = "autorolled/cipd/libs/com_google_auto_value_auto_value_annotations/auto-value-annotations.jar" -@@ -1128,242 +589,6 @@ template("define_autorolled_targets") { +@@ -1165,242 +612,6 @@ template("define_autorolled_targets") { testonly = true } @@ -4891,9 +4831,9 @@ diff --git a/third_party/android_deps/autorolled/BUILD.gn b/third_party/android_ - } - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - java_prebuilt( - "com_google_testparameterinjector_test_parameter_injector_java") { -@@ -1940,28 +1165,6 @@ template("define_autorolled_targets") { + java_prebuilt("com_google_guava_failureaccess_java") { + jar_path = "autorolled/cipd/libs/com_google_guava_failureaccess/failureaccess.jar" +@@ -1923,28 +1134,6 @@ template("define_autorolled_targets") { deps = [ "//third_party/android_deps:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_java" ] } @@ -4975,7 +4915,7 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices diff --git a/third_party/androidx/customizations.gni b/third_party/androidx/customizations.gni --- a/third_party/androidx/customizations.gni +++ b/third_party/androidx/customizations.gni -@@ -155,7 +155,7 @@ template("androidx_java_prebuilt") { +@@ -160,7 +160,7 @@ template("androidx_java_prebuilt") { } } @@ -4984,7 +4924,7 @@ diff --git a/third_party/androidx/customizations.gni b/third_party/androidx/cust _androidx_prebuilt(target_name) { forward_variables_from(invoker, "*") target_type = "android_aar_prebuilt" -@@ -172,6 +172,18 @@ template("androidx_android_aar_prebuilt") { +@@ -177,6 +177,18 @@ template("androidx_android_aar_prebuilt") { } } diff --git a/build/patches/Remove-detection-of-captive-portals.patch b/build/patches/Remove-detection-of-captive-portals.patch index 4a6b5683..a09473fc 100644 --- a/build/patches/Remove-detection-of-captive-portals.patch +++ b/build/patches/Remove-detection-of-captive-portals.patch @@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -619,7 +619,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams( +@@ -600,7 +600,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams( void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, @@ -24,7 +24,7 @@ diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/brow diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc --- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc +++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc -@@ -79,20 +79,6 @@ EnterpriseManaged g_is_enterprise_managed_for_testing = +@@ -80,20 +80,6 @@ EnterpriseManaged g_is_enterprise_managed_for_testing = // CaptivePortalBlockingPage to be invoked when the user has pressed the // connect button. void OpenLoginPage(content::WebContents* web_contents) { diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index a40db13a..27ffaf0e 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -26,7 +26,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java -@@ -1172,9 +1172,6 @@ public class KeyboardShortcuts { +@@ -1175,9 +1175,6 @@ public class KeyboardShortcuts { return true; } return false; @@ -39,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2603,15 +2603,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2648,15 +2648,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity final Tab currentTab = getActivityTab(); @@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java -@@ -905,6 +905,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -900,6 +900,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getActivity().getTheme())); help.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); @@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java -@@ -1173,7 +1173,6 @@ public abstract class BaseCustomTabActivity extends ChromeActivity { +@@ -1242,7 +1242,6 @@ public abstract class BaseCustomTabActivity extends ChromeActivity { // Disable creating new tabs, bookmark, print, help, focus_url, etc. if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id @@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -592,6 +592,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -579,6 +579,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment help.setIcon( TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getActivity().getTheme())); @@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java -@@ -765,6 +765,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -881,6 +881,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity help.setIcon( TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getTheme())); @@ -135,7 +135,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/G diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -@@ -311,6 +311,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment +@@ -312,6 +312,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(R.drawable.ic_help_and_feedback); @@ -146,7 +146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/M diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java -@@ -401,7 +401,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm +@@ -411,7 +411,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm } // Help @@ -169,7 +169,7 @@ diff --git a/chrome/browser/autofill/android/java/res/menu/prefeditor_editor_men diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/AutofillOptionsFragment.java b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/AutofillOptionsFragment.java --- a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/AutofillOptionsFragment.java +++ b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/AutofillOptionsFragment.java -@@ -121,6 +121,7 @@ public class AutofillOptionsFragment extends ChromeBaseSettingsFragment { +@@ -122,6 +122,7 @@ public class AutofillOptionsFragment extends ChromeBaseSettingsFragment { MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(R.drawable.ic_help_and_feedback); @@ -191,7 +191,7 @@ diff --git a/chrome/browser/prefetch/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/PrivacySandboxSettingsBaseFragment.java b/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/PrivacySandboxSettingsBaseFragment.java --- a/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/PrivacySandboxSettingsBaseFragment.java +++ b/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/PrivacySandboxSettingsBaseFragment.java -@@ -69,6 +69,7 @@ public abstract class PrivacySandboxSettingsBaseFragment extends ChromeBaseSetti +@@ -74,6 +74,7 @@ public abstract class PrivacySandboxSettingsBaseFragment extends ChromeBaseSetti help.setIcon( TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getActivity().getTheme())); @@ -213,7 +213,7 @@ diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/b diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -145,6 +145,15 @@ void LaunchReleaseNotesImpl(Profile* profile, apps::LaunchSource source) { +@@ -146,6 +146,15 @@ void LaunchReleaseNotesImpl(Profile* profile, apps::LaunchSource source) { // shown in the last active browser. If there is no such browser, a new browser // is created. void ShowHelpImpl(Browser* browser, Profile* profile, HelpSource source) { diff --git a/build/patches/Remove-navigator.connection-info.patch b/build/patches/Remove-navigator.connection-info.patch index 1055dcda..c102a700 100644 --- a/build/patches/Remove-navigator.connection-info.patch +++ b/build/patches/Remove-navigator.connection-info.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b/third_party/blink/renderer/modules/netinfo/network_information.cc --- a/third_party/blink/renderer/modules/netinfo/network_information.cc +++ b/third_party/blink/renderer/modules/netinfo/network_information.cc -@@ -80,7 +80,7 @@ NetworkInformation::~NetworkInformation() { +@@ -79,7 +79,7 @@ NetworkInformation::~NetworkInformation() { } bool NetworkInformation::IsObserving() const { @@ -25,7 +25,7 @@ diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b } V8ConnectionType NetworkInformation::type() const { -@@ -181,6 +181,7 @@ void NetworkInformation::ConnectionChange( +@@ -180,6 +180,7 @@ void NetworkInformation::ConnectionChange( const std::optional& transport_rtt, const std::optional& downlink_mbps, bool save_data) { @@ -33,7 +33,7 @@ diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b DCHECK(GetExecutionContext()->IsContextThread()); const String host = Host(); -@@ -262,6 +263,7 @@ void NetworkInformation::RemoveAllEventListeners() { +@@ -261,6 +262,7 @@ void NetworkInformation::RemoveAllEventListeners() { } bool NetworkInformation::HasPendingActivity() const { @@ -41,7 +41,7 @@ diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b DCHECK(context_stopped_ || IsObserving() == HasEventListeners()); // Prevent collection of this object when there are active listeners. -@@ -274,6 +276,7 @@ void NetworkInformation::ContextDestroyed() { +@@ -273,6 +275,7 @@ void NetworkInformation::ContextDestroyed() { } void NetworkInformation::StartObserving() { @@ -49,7 +49,7 @@ diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b if (!IsObserving() && !context_stopped_) { type_ = GetNetworkStateNotifier().ConnectionType(); DCHECK(!connection_observer_handle_); -@@ -284,6 +287,7 @@ void NetworkInformation::StartObserving() { +@@ -283,6 +286,7 @@ void NetworkInformation::StartObserving() { } void NetworkInformation::StopObserving() { diff --git a/build/patches/Remove-segmentation-platform.patch b/build/patches/Remove-segmentation-platform.patch index 0a955948..f97717c3 100644 --- a/build/patches/Remove-segmentation-platform.patch +++ b/build/patches/Remove-segmentation-platform.patch @@ -47,9 +47,9 @@ diff --git a/chrome/browser/segmentation_platform/chrome_browser_main_extra_part diff --git a/components/segmentation_platform/public/features.cc b/components/segmentation_platform/public/features.cc --- a/components/segmentation_platform/public/features.cc +++ b/components/segmentation_platform/public/features.cc -@@ -291,4 +291,7 @@ constexpr base::FeatureParam kNewFeatures{&kAndroidTipsNotifications, - "new_features", - /*default_value=*/false}; +@@ -272,4 +272,7 @@ constexpr base::FeatureParam kWindowTimeMinutes{&kAndroidTipsNotifications, + "window_time_minutes", + /*default_value=*/120}; +SET_CROMITE_FEATURE_DISABLED(kSegmentationPlatformFeature); +SET_CROMITE_FEATURE_DISABLED(kSegmentationPlatformFeedSegmentFeature); diff --git a/build/patches/Remove-support-for-device-memory-and-cpu-recovery.patch b/build/patches/Remove-support-for-device-memory-and-cpu-recovery.patch index 0f9a6d7d..fb801b34 100644 --- a/build/patches/Remove-support-for-device-memory-and-cpu-recovery.patch +++ b/build/patches/Remove-support-for-device-memory-and-cpu-recovery.patch @@ -59,7 +59,7 @@ new file mode 100644 diff --git a/storage/browser/blob/blob_memory_controller.cc b/storage/browser/blob/blob_memory_controller.cc --- a/storage/browser/blob/blob_memory_controller.cc +++ b/storage/browser/blob/blob_memory_controller.cc -@@ -55,6 +55,15 @@ using MemoryAllocation = BlobMemoryController::MemoryAllocation; +@@ -51,6 +51,15 @@ using MemoryAllocation = BlobMemoryController::MemoryAllocation; using QuotaAllocationTask = BlobMemoryController::QuotaAllocationTask; using DiskSpaceFuncPtr = BlobMemoryController::DiskSpaceFuncPtr; @@ -75,7 +75,7 @@ diff --git a/storage/browser/blob/blob_memory_controller.cc b/storage/browser/bl File::Error CreateBlobDirectory(const FilePath& blob_storage_dir) { File::Error error = File::FILE_OK; base::CreateDirectoryAndGetError(blob_storage_dir, &error); -@@ -85,22 +94,15 @@ BlobStorageLimits CalculateBlobStorageLimitsImpl( +@@ -81,22 +90,15 @@ BlobStorageLimits CalculateBlobStorageLimitsImpl( uint64_t memory_size = optional_memory_size_for_testing ? optional_memory_size_for_testing.value() @@ -244,7 +244,7 @@ diff --git a/third_party/blink/renderer/core/timing/memory_info.cc b/third_party diff --git a/third_party/blink/renderer/core/timing/window_performance.cc b/third_party/blink/renderer/core/timing/window_performance.cc --- a/third_party/blink/renderer/core/timing/window_performance.cc +++ b/third_party/blink/renderer/core/timing/window_performance.cc -@@ -326,7 +326,7 @@ MemoryInfo* WindowPerformance::memory(ScriptState* script_state) const { +@@ -325,7 +325,7 @@ MemoryInfo* WindowPerformance::memory(ScriptState* script_state) const { const bool is_locked_to_site = Platform::Current()->IsLockedToSite(); auto* memory_info = MakeGarbageCollected( is_locked_to_site ? MemoryInfo::Precision::kPrecise diff --git a/build/patches/Remove-voice-recognition-integration.patch b/build/patches/Remove-voice-recognition-integration.patch index feaa38dc..55f92491 100644 --- a/build/patches/Remove-voice-recognition-integration.patch +++ b/build/patches/Remove-voice-recognition-integration.patch @@ -5,7 +5,7 @@ Subject: Remove voice recognition integration License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../BaseCustomTabRootUiCoordinator.java | 2 +- - .../chrome/browser/ntp/NewTabPage.java | 38 +---------- + .../chrome/browser/ntp/NewTabPage.java | 29 +-------- .../browser/ntp/search/SearchBoxMediator.java | 1 - .../browser/searchwidget/SearchActivity.java | 3 +- .../SearchActivityLocationBarLayout.java | 8 --- @@ -25,12 +25,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../omnibox/voice/VoiceRecognitionUtil.java | 1 + chrome/browser/ui/android/toolbar/BUILD.gn | 1 - .../toolbar/VoiceToolbarButtonController.java | 1 + - 21 files changed, 11 insertions(+), 260 deletions(-) + 21 files changed, 12 insertions(+), 250 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java -@@ -492,7 +492,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { +@@ -505,7 +505,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { mIntentDataProvider.get(), AppCompatResources.getDrawable(mActivity, R.drawable.ic_open_in_new_white_24dp), mOpenInBrowserRunnable, @@ -42,15 +42,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -@@ -79,7 +79,6 @@ import org.chromium.chrome.browser.ntp_customization.edge_to_edge.TopInsetCoordi - import org.chromium.chrome.browser.ntp_customization.theme.BackgroundImageInfo; +@@ -81,7 +81,6 @@ import org.chromium.chrome.browser.ntp_customization.theme.chrome_colors.NtpThem + import org.chromium.chrome.browser.ntp_customization.theme.upload_image.BackgroundImageInfo; import org.chromium.chrome.browser.omnibox.OmniboxFocusReason; import org.chromium.chrome.browser.omnibox.OmniboxStub; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.readaloud.ReadAloudController; -@@ -142,7 +141,6 @@ public class NewTabPage +@@ -145,7 +144,6 @@ public class NewTabPage TemplateUrlServiceObserver, BrowserControlsStateProvider.Observer, FeedSurfaceDelegate, @@ -58,7 +58,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. ModuleDelegateHost { private static final String TAG = "NewTabPage"; -@@ -176,7 +174,6 @@ public class NewTabPage +@@ -179,7 +177,6 @@ public class NewTabPage protected boolean mIsDefaultSearchEngineGoogle; protected @Nullable OmniboxStub mOmniboxStub; @@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. // The timestamp at which the constructor was called. protected final long mConstructedTimeNs; -@@ -390,8 +387,7 @@ public class NewTabPage +@@ -395,8 +392,7 @@ public class NewTabPage @Override public boolean isVoiceSearchEnabled() { @@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } @Override -@@ -399,24 +395,6 @@ public class NewTabPage +@@ -407,14 +403,7 @@ public class NewTabPage if (mIsDestroyed) return; FeedReliabilityLogger feedReliabilityLogger = mFeedSurfaceProvider.getReliabilityLogger(); @@ -88,20 +88,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. - VoiceRecognitionHandler.VoiceInteractionSource.NTP); - mTracker.notifyEvent(EventConstants.NTP_VOICE_SEARCH_BUTTON_CLICKED); - } else if (mOmniboxStub != null) { -- if (feedReliabilityLogger != null) { -- feedReliabilityLogger.onOmniboxFocused(); -- } -- mOmniboxStub.setUrlBarFocus( -- true, -- pastedText, -- pastedText == null -- ? OmniboxFocusReason.FAKE_BOX_TAP -- : OmniboxFocusReason.FAKE_BOX_LONG_PRESS); -- } - } - - @Override -@@ -1055,12 +1033,6 @@ public class NewTabPage ++ if (mOmniboxStub != null) { + if (feedReliabilityLogger != null) { + feedReliabilityLogger.onOmniboxFocused(); + } +@@ -1087,12 +1076,6 @@ public class NewTabPage mOmniboxStub.addUrlFocusChangeListener(feedReliabilityLogger); } } @@ -114,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } /** -@@ -1079,11 +1051,6 @@ public class NewTabPage +@@ -1111,11 +1094,6 @@ public class NewTabPage } } @@ -126,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. /** Adds an observer to be notified on most visited tile clicks. */ public void addMostVisitedTileClickObserver(MostVisitedTileClickObserver observer) { mMostVisitedTileClickObservers.addObserver(observer); -@@ -1169,9 +1136,6 @@ public class NewTabPage +@@ -1200,9 +1178,6 @@ public class NewTabPage mOmniboxStub.removeUrlFocusChangeListener(feedReliabilityLogger); } mFeedSurfaceProvider.destroy(); @@ -150,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/Sear diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java -@@ -70,7 +70,6 @@ import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; +@@ -71,7 +71,6 @@ import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; import org.chromium.chrome.browser.tab.TabFavicon; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabwindow.TabWindowInfo; @@ -178,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se import org.chromium.chrome.browser.toolbar.top.ToolbarPhone; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.SearchType; -@@ -214,13 +213,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { +@@ -213,13 +212,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { return false; } @@ -195,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -980,7 +980,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1021,7 +1021,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mTabBookmarkerSupplier, mBookmarkModelSupplier, mActivityTabProvider, @@ -207,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -119,7 +119,6 @@ import org.chromium.chrome.browser.omnibox.OmniboxStub; +@@ -117,7 +117,6 @@ import org.chromium.chrome.browser.omnibox.OmniboxStub; import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegateImpl; import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener; @@ -215,7 +206,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar import org.chromium.chrome.browser.page_info.ChromePageInfo; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; -@@ -3266,10 +3265,6 @@ public class ToolbarManager +@@ -3282,10 +3281,6 @@ public class ToolbarManager return mLocationBar.getOmniboxStub(); } @@ -323,7 +314,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; -@@ -325,7 +324,6 @@ public class RootUiCoordinator +@@ -337,7 +336,6 @@ public class RootUiCoordinator private LayoutManagerImpl mLayoutManager; protected OneshotSupplier mIntentMetadataOneshotSupplier; protected OneshotSupplierImpl mPromoShownOneshotSupplier = new OneshotSupplierImpl<>(); @@ -331,7 +322,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi private MediaCaptureOverlayController mCaptureController; private @Nullable ScrollCaptureManager mScrollCaptureManager; protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher; -@@ -778,9 +776,6 @@ public class RootUiCoordinator +@@ -810,9 +808,6 @@ public class RootUiCoordinator } if (mToolbarManager != null) { @@ -341,7 +332,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi mToolbarManager.destroy(); mToolbarManager = null; } -@@ -1746,23 +1741,10 @@ public class RootUiCoordinator +@@ -1801,23 +1796,10 @@ public class RootUiCoordinator if (!mSupportsAppMenuSupplier.getAsBoolean()) { mToolbarManager.getToolbar().disableMenuButton(); } @@ -368,7 +359,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn --- a/chrome/browser/ui/android/omnibox/BUILD.gn +++ b/chrome/browser/ui/android/omnibox/BUILD.gn -@@ -162,7 +162,6 @@ android_library("java") { +@@ -164,7 +164,6 @@ android_library("java") { "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionView.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewProperties.java", @@ -402,7 +393,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java -@@ -50,7 +50,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxLoadUrlParams; +@@ -60,7 +60,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxLoadUrlParams; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsVisualState; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; @@ -410,7 +401,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; import org.chromium.chrome.browser.share.ShareDelegate; -@@ -560,12 +559,6 @@ public class LocationBarCoordinator +@@ -630,12 +629,6 @@ public class LocationBarCoordinator return mLocationBarLayout.getSecurityIconView(); } @@ -423,7 +414,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Override public @Nullable OmniboxStub getOmniboxStub() { return mLocationBarMediator; -@@ -729,7 +722,7 @@ public class LocationBarCoordinator +@@ -799,7 +792,7 @@ public class LocationBarCoordinator public void startAutocompletePrefetch() { if (!mNativeInitialized) return; mAutocompleteCoordinator.prefetchZeroSuggestResults( @@ -432,7 +423,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } /** -@@ -895,11 +888,6 @@ public class LocationBarCoordinator +@@ -1000,11 +993,6 @@ public class LocationBarCoordinator // End tablet-specific methods. @@ -447,7 +438,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java -@@ -30,7 +30,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; +@@ -29,7 +29,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.status.StatusView; import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; @@ -455,7 +446,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.components.browser_ui.widget.CompositeTouchDelegate; import org.chromium.components.embedder_support.util.UrlUtilities; import org.chromium.ui.base.DeviceFormFactor; -@@ -458,11 +457,6 @@ public class LocationBarLayout extends ConstraintLayout { +@@ -493,11 +492,6 @@ public class LocationBarLayout extends ConstraintLayout { mSearchEngineUtils = searchEngineUtils; } @@ -470,7 +461,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -67,7 +67,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; +@@ -73,7 +73,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxLoadUrlParams; @@ -478,7 +469,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge; import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState; import org.chromium.chrome.browser.profiles.Profile; -@@ -117,8 +116,6 @@ import java.util.function.Supplier; +@@ -124,8 +123,6 @@ import java.util.function.Supplier; class LocationBarMediator implements LocationBarDataProvider.Observer, OmniboxStub, @@ -486,8 +477,8 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow - VoiceRecognitionHandler.Observer, UrlBarDelegate, OnKeyListener, - ComponentCallbacks, -@@ -177,7 +174,6 @@ class LocationBarMediator + FuseboxAttachmentChangeListener, +@@ -185,7 +182,6 @@ class LocationBarMediator }; private final LocationBarLayout mLocationBarLayout; @@ -495,7 +486,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow private final LocationBarDataProvider mLocationBarDataProvider; private final @Nullable BrowserControlsStateProvider mBrowserControlsStateProvider; private final LocationBarEmbedderUiOverrides mEmbedderUiOverrides; -@@ -266,8 +262,6 @@ class LocationBarMediator +@@ -283,8 +279,6 @@ class LocationBarMediator mEmbedderUiOverrides = embedderUiOverrides; mOverrideUrlLoadingDelegate = overrideUrlLoadingDelegate; mLocaleManager = localeManager; @@ -504,7 +495,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow mProfileSupplier = profileSupplier; mProfileSupplier.addObserver(mCallbackController.makeCancelable(this::setProfile)); mTemplateUrlServiceSupplier = templateUrlServiceSupplier; -@@ -356,9 +350,6 @@ class LocationBarMediator +@@ -387,9 +381,6 @@ class LocationBarMediator mStatusCoordinator = null; mAutocompleteCoordinator = null; mUrlCoordinator = null; @@ -514,7 +505,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow mLocationBarDataProvider.removeObserver(this); mDeferredNativeRunnables.clear(); mUrlFocusChangeListeners.clear(); -@@ -500,11 +491,6 @@ class LocationBarMediator +@@ -531,11 +522,6 @@ class LocationBarMediator mLocationBarLayout.setUnfocusedWidth(unfocusedWidth); } @@ -526,7 +517,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /* package */ void setLensControllerForTesting(LensController lensController) { mLensController = lensController; } -@@ -811,10 +797,6 @@ class LocationBarMediator +@@ -858,10 +844,6 @@ class LocationBarMediator // Hide keyboard before launch voice search to avoid keyboard action announcement in // TalkBack to be picked up by voice search. mUrlCoordinator.setKeyboardVisibility(false, false); @@ -537,10 +528,10 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } /** package */ -@@ -1459,10 +1441,7 @@ class LocationBarMediator +@@ -1548,10 +1530,7 @@ class LocationBarMediator } - if (shouldShowDeleteButton()) return false; + if (isUrlBarFocusedWithUserInput()) return false; - if (!mNativeInitialized - || mVoiceRecognitionHandler == null - || !mVoiceRecognitionHandler.isVoiceSearchEnabled() @@ -549,7 +540,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow return false; } boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean(); -@@ -1480,6 +1459,7 @@ class LocationBarMediator +@@ -1569,6 +1548,7 @@ class LocationBarMediator @VisibleForTesting boolean shouldShowLensButton() { @@ -557,7 +548,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow if (mAutocompleteRequestTypeSupplier.get() != AutocompleteRequestType.SEARCH) { return false; } -@@ -1788,11 +1768,6 @@ class LocationBarMediator +@@ -1884,11 +1864,6 @@ class LocationBarMediator } } @@ -569,7 +560,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Override public void addUrlFocusChangeListener(UrlFocusChangeListener listener) { mUrlFocusChangeListeners.addObserver(listener); -@@ -1808,31 +1783,13 @@ class LocationBarMediator +@@ -1904,7 +1879,7 @@ class LocationBarMediator return mUrlHasFocus; } @@ -577,7 +568,9 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow + // @Override public void clearOmniboxFocus() { setUrlBarFocus( - /* shouldBeFocused= */ false, /* pastedText= */ null, OmniboxFocusReason.UNFOCUS); + /* shouldBeFocused= */ false, +@@ -1913,25 +1888,7 @@ class LocationBarMediator + AutocompleteRequestType.SEARCH); } - @Override @@ -603,7 +596,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow public void setSearchQuery(String query) { if (TextUtils.isEmpty(query)) return; -@@ -1855,20 +1812,6 @@ class LocationBarMediator +@@ -1955,20 +1912,6 @@ class LocationBarMediator mUrlCoordinator.setKeyboardVisibility(true, false); } @@ -632,10 +625,10 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.lens.LensEntryPoint; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; + import org.chromium.components.omnibox.AutocompleteRequestType; import java.util.List; - -@@ -43,13 +42,6 @@ public interface OmniboxStub { +@@ -47,13 +46,6 @@ public interface OmniboxStub { */ boolean isUrlBarFocused(); @@ -652,16 +645,16 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java -@@ -14,7 +14,6 @@ import org.jni_zero.NativeMethods; - import org.chromium.build.annotations.NullMarked; +@@ -15,7 +15,6 @@ import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.omnibox.OmniboxMetrics; + import org.chromium.chrome.browser.omnibox.fusebox.ComposeBoxQueryControllerBridge; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceResult; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.omnibox.AutocompleteInput; import org.chromium.components.omnibox.AutocompleteMatch; -@@ -331,25 +330,6 @@ public class AutocompleteController { - mNativeController, match.getNativeObjectRef(), matchIndex, webContents); +@@ -341,25 +340,6 @@ public class AutocompleteController { + mNativeController, bridge == null ? 0L : bridge.getNativeInstance()); } - /** @@ -686,9 +679,9 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** * Updates searchbox stats parameters on the selected match that we will navigate to and * returns the updated URL. -@@ -453,11 +433,6 @@ public class AutocompleteController { - long nativeAutocompleteMatch, - long elapsedTimeSinceInputChange); +@@ -469,11 +449,6 @@ public class AutocompleteController { + long nativeAutocompleteControllerAndroid, + long nativeComposeboxQueryControllerBridge); - void setVoiceMatches( - long nativeAutocompleteControllerAndroid, @@ -701,7 +694,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java -@@ -35,7 +35,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController.On +@@ -34,7 +34,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController.On import org.chromium.chrome.browser.omnibox.suggestions.SuggestionListViewBinder.SuggestionListViewHolder; import org.chromium.chrome.browser.omnibox.suggestions.base.BaseSuggestionViewBinder; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; @@ -709,7 +702,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; -@@ -305,13 +304,6 @@ public class AutocompleteCoordinator +@@ -301,13 +300,6 @@ public class AutocompleteCoordinator implements OmniboxSuggestionsVisualState { } } @@ -726,7 +719,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java -@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate.Auto +@@ -46,7 +46,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate.Auto import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionFactoryImpl; import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionInSuggest; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; @@ -734,7 +727,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; -@@ -519,15 +518,6 @@ class AutocompleteMediator +@@ -541,15 +540,6 @@ class AutocompleteMediator mShouldPreventOmniboxAutocomplete = prevent; } @@ -764,7 +757,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -38,7 +38,6 @@ android_library("java") { +@@ -39,7 +39,6 @@ android_library("java") { "java/src/org/chromium/chrome/browser/toolbar/ToolbarResourceUtils.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabController.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabControllerImpl.java", diff --git a/build/patches/Remove-window-name-on-cross-origin-navigation.patch b/build/patches/Remove-window-name-on-cross-origin-navigation.patch index b62abfee..a5674667 100644 --- a/build/patches/Remove-window-name-on-cross-origin-navigation.patch +++ b/build/patches/Remove-window-name-on-cross-origin-navigation.patch @@ -34,7 +34,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc --- a/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc -@@ -2976,7 +2976,8 @@ void DocumentLoader::CommitNavigation() { +@@ -2986,7 +2986,8 @@ void DocumentLoader::CommitNavigation() { // that the name would be nulled and if the name is accessed after we will // fire a UseCounter. If we decide to move forward with this change, we'd // actually clean the name here. @@ -44,7 +44,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p frame_->Tree().ExperimentalSetNulledName(); } -@@ -2987,6 +2988,7 @@ void DocumentLoader::CommitNavigation() { +@@ -2997,6 +2998,7 @@ void DocumentLoader::CommitNavigation() { // TODO(shuuran): CrossSiteCrossBrowsingContextGroupSetNulledName will just // record the fact that the name would be nulled and if the name is accessed // after we will fire a UseCounter. diff --git a/build/patches/Restore-BookmarkToolbar-setCurrentFolder.patch b/build/patches/Restore-BookmarkToolbar-setCurrentFolder.patch index 58666d05..6e1f685f 100644 --- a/build/patches/Restore-BookmarkToolbar-setCurrentFolder.patch +++ b/build/patches/Restore-BookmarkToolbar-setCurrentFolder.patch @@ -69,7 +69,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java -@@ -300,6 +300,7 @@ class BookmarkToolbarMediator +@@ -299,6 +299,7 @@ class BookmarkToolbarMediator @Override public void onFolderStateSet(@Nullable BookmarkId folder) { mCurrentFolder = folder; diff --git a/build/patches/Restore-LastTabStandingTracker.patch b/build/patches/Restore-LastTabStandingTracker.patch index 4416526b..cd60e0a7 100644 --- a/build/patches/Restore-LastTabStandingTracker.patch +++ b/build/patches/Restore-LastTabStandingTracker.patch @@ -27,7 +27,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1588,6 +1588,16 @@ static_library("browser") { +@@ -1573,6 +1573,16 @@ static_library("browser") { "webdata_services/web_data_service_factory.cc", ] @@ -383,15 +383,15 @@ new file mode 100644 diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -145,6 +145,7 @@ - #include "chrome/browser/password_manager/password_manager_settings_service_factory.h" +@@ -142,6 +142,7 @@ #include "chrome/browser/password_manager/profile_password_store_factory.h" + #include "chrome/browser/payments/browser_binding/browser_bound_key_deleter_service_factory.h" #include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h" +#include "chrome/browser/permissions/last_tab_standing_tracker_factory.h" #include "chrome/browser/permissions/notifications_engagement_service_factory.h" #include "chrome/browser/permissions/one_time_permissions_tracker_factory.h" #include "chrome/browser/permissions/origin_keyed_permission_action_service_factory.h" -@@ -1132,6 +1133,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1126,6 +1127,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(BUILD_WITH_TFLITE_LIB) OnDeviceTailModelServiceFactory::GetInstance(); #endif @@ -402,7 +402,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -50,6 +50,7 @@ +@@ -51,6 +51,7 @@ #include "chrome/browser/page_info/page_info_features.h" #include "chrome/browser/page_load_metrics/page_load_metrics_initialize.h" #include "chrome/browser/password_manager/chrome_password_manager_client.h" diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 873e128c..6d5c416c 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -23,8 +23,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -399,6 +399,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kReadAloudTapToSeek, +@@ -401,6 +401,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &kRecordIncognitoNtpTimeToFirstNavigationMetric, &kRecordSuppressionMetrics, &kReengagementNotification, + &kSearchReadyOmniboxFeature, @@ -34,9 +34,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -495,6 +495,7 @@ public abstract class ChromeFeatureList { - public static final String MITIGATE_LEGACY_SEARCH_ENGINE_PROMO_OVERLAP = - "MitigateLegacySearchEnginePromoOverlap"; +@@ -501,6 +501,7 @@ public abstract class ChromeFeatureList { + public static final String MEDIA_INDICATORS_ANDROID = "MediaIndicatorsAndroid"; + public static final String MINI_ORIGIN_BAR = "MiniOriginBar"; public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization"; + public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; public static final String MOST_VISITED_TILES_RESELECT = "MostVisitedTilesReselect"; diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index bf6d5a2b..c5791c2c 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -80,7 +80,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/drawable-hdpi/ic_phone_googblue_36dp.png", "java/res/drawable-hdpi/ic_photo_camera.png", "java/res/drawable-hdpi/ic_place_googblue_36dp.png", -@@ -547,6 +552,7 @@ chrome_java_resources = [ +@@ -563,6 +568,7 @@ chrome_java_resources = [ "java/res/layout/manage_sync_settings_bottom_bar.xml", "java/res/layout/material_tooltip.xml", "java/res/layout/multiline_spinner_item.xml", @@ -88,7 +88,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/layout/mv_tiles_layout.xml", "java/res/layout/navigation_bubble.xml", "java/res/layout/navigation_sheet.xml", -@@ -556,8 +562,10 @@ chrome_java_resources = [ +@@ -572,8 +578,10 @@ chrome_java_resources = [ "java/res/layout/new_custom_tab_toolbar.xml", "java/res/layout/new_tab_page_incognito.xml", "java/res/layout/new_tab_page_layout.xml", @@ -102,7 +102,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -623,6 +623,7 @@ chrome_java_sources = [ +@@ -630,6 +630,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/feedback/FeedFeedbackCollector.java", "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherImpl.java", "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java", @@ -110,7 +110,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/findinpage/FindToolbar.java", "java/src/org/chromium/chrome/browser/findinpage/FindToolbarManager.java", "java/src/org/chromium/chrome/browser/findinpage/FindToolbarObserver.java", -@@ -1046,6 +1047,7 @@ chrome_java_sources = [ +@@ -1059,6 +1060,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesMetadataUtils.java", "java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesCoordinator.java", "java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesLayout.java", @@ -564,7 +564,7 @@ diff --git a/chrome/android/java/res/values/attrs.xml b/chrome/android/java/res/ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml -@@ -128,6 +128,8 @@ found in the LICENSE file. +@@ -125,6 +125,8 @@ found in the LICENSE file. 62dp @@ -576,7 +576,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -3458,7 +3458,8 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -3475,7 +3475,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt getStartupMetricsTracker(), mRootUiCoordinator.getExclusiveAccessManager(), mBackPressManager, @@ -700,7 +700,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java --- a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java -@@ -151,7 +151,10 @@ public class IdentityDiscController +@@ -150,7 +150,10 @@ public class IdentityDiscController mButtonData.setButtonSpec( buttonSpecWithDrawableAndDescription(mButtonData.getButtonSpec(), email)); @@ -721,17 +721,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat import androidx.annotation.VisibleForTesting; +import androidx.annotation.NonNull; + import org.chromium.base.lifetime.Destroyable; import org.chromium.base.metrics.RecordUserAction; - import org.chromium.base.supplier.DestroyableObservableSupplier; -@@ -30,6 +31,7 @@ import org.chromium.chrome.browser.app.ChromeActivity; +@@ -31,6 +32,7 @@ import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.bookmarks.BookmarkPage; +import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpener; - import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier; + import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginAdapter; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.flags.ChromeFeatureList; -@@ -96,6 +98,7 @@ public class NativePageFactory { +@@ -98,6 +100,7 @@ public class NativePageFactory { private final ObservableSupplier mEdgeToEdgeControllerSupplier; private final ObservableSupplier mTopInsetCoordinatorSupplier; private final StartupMetricsTracker mStartupMetricsTracker; @@ -739,7 +739,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private @Nullable NewTabPageCreationTracker mNewTabPageCreationTracker; private @Nullable NativePageBuilder mNativePageBuilder; -@@ -122,7 +125,8 @@ public class NativePageFactory { +@@ -124,7 +127,8 @@ public class NativePageFactory { ObservableSupplier topInsetCoordinatorSupplier, StartupMetricsTracker startupMetricsTracker, BackPressManager backPressManager, @@ -749,7 +749,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat mActivity = activity; mBottomSheetController = sheetController; mBrowserControlsManager = browserControlsManager; -@@ -142,6 +146,7 @@ public class NativePageFactory { +@@ -144,6 +148,7 @@ public class NativePageFactory { mStartupMetricsTracker = startupMetricsTracker; mBackPressManager = backPressManager; mMultiInstanceManager = multiInstanceManager; @@ -757,7 +757,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat } private NativePageBuilder getBuilder() { -@@ -167,7 +172,8 @@ public class NativePageFactory { +@@ -169,7 +174,8 @@ public class NativePageFactory { mTopInsetCoordinatorSupplier, mStartupMetricsTracker, mBackPressManager, @@ -767,7 +767,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat } return mNativePageBuilder; } -@@ -202,9 +208,10 @@ public class NativePageFactory { +@@ -204,9 +210,10 @@ public class NativePageFactory { private final StartupMetricsTracker mStartupMetricsTracker; private final BackPressManager mBackPressManager; private final MultiInstanceManager mMultiInstanceManager; @@ -779,7 +779,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat Supplier newTabPageCreationTracker, BottomSheetController sheetController, BrowserControlsManager browserControlsManager, -@@ -223,7 +230,8 @@ public class NativePageFactory { +@@ -225,7 +232,8 @@ public class NativePageFactory { ObservableSupplier topInsetCoordinatorSupplier, StartupMetricsTracker startupMetricsTracker, BackPressManager backPressManager, @@ -789,7 +789,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat mActivity = activity; mNewTabPageCreationTracker = newTabPageCreationTracker; mBottomSheetController = sheetController; -@@ -244,6 +252,7 @@ public class NativePageFactory { +@@ -246,6 +254,7 @@ public class NativePageFactory { mStartupMetricsTracker = startupMetricsTracker; mBackPressManager = backPressManager; mMultiInstanceManager = multiInstanceManager; @@ -797,7 +797,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat } protected NativePage buildNewTabPage(Tab tab, String url) { -@@ -282,7 +291,8 @@ public class NativePageFactory { +@@ -288,7 +297,8 @@ public class NativePageFactory { mEdgeToEdgeControllerSupplier, mTopInsetCoordinatorSupplier, mStartupMetricsTracker, @@ -810,7 +810,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegateImpl.java -@@ -29,7 +29,7 @@ import org.chromium.ui.mojom.WindowOpenDisposition; +@@ -31,7 +31,7 @@ import org.chromium.ui.mojom.WindowOpenDisposition; /** {@link NativePageNavigationDelegate} implementation. */ @NullMarked public class NativePageNavigationDelegateImpl implements NativePageNavigationDelegate { @@ -822,7 +822,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -@@ -130,6 +130,9 @@ import org.chromium.ui.base.DeviceFormFactor; +@@ -133,6 +133,9 @@ import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.WindowAndroid; import org.chromium.url.GURL; @@ -832,7 +832,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. import java.util.List; import java.util.function.Supplier; -@@ -510,7 +513,8 @@ public class NewTabPage +@@ -534,7 +537,8 @@ public class NewTabPage ObservableSupplier edgeToEdgeControllerSupplier, ObservableSupplier topInsetCoordinatorSupplier, StartupMetricsTracker startupMetricsTracker, @@ -842,7 +842,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. mConstructedTimeNs = System.nanoTime(); TraceEvent.begin(TAG); -@@ -539,7 +543,7 @@ public class NewTabPage +@@ -563,7 +567,7 @@ public class NewTabPage nativePageHost, tabModelSelector, mTab, @@ -913,7 +913,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL initializeSearchBoxTextView(); initializeVoiceSearchButton(); initializeLensButton(); -@@ -730,8 +736,8 @@ public class NewTabPageLayout extends LinearLayout +@@ -737,8 +743,8 @@ public class NewTabPageLayout extends LinearLayout private void calculateTabletMvtWidth(int totalWidth) { if (mMvTilesContainerLayout.getVisibility() == GONE) return; @@ -924,7 +924,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL updateMvtOnTablet(); } -@@ -781,7 +787,7 @@ public class NewTabPageLayout extends LinearLayout +@@ -788,7 +794,7 @@ public class NewTabPageLayout extends LinearLayout && mInitialized) { return; } @@ -933,7 +933,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL mSearchProviderIsGoogle = isGoogle; if (!mSearchProviderIsGoogle) { -@@ -830,6 +836,7 @@ public class NewTabPageLayout extends LinearLayout +@@ -837,6 +843,7 @@ public class NewTabPageLayout extends LinearLayout * @param disable Whether to disable the animations. */ void setUrlFocusAnimationsDisabled(boolean disable) { @@ -941,7 +941,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL if (disable == mDisableUrlFocusChangeAnimations) return; mDisableUrlFocusChangeAnimations = disable; if (!disable) onUrlFocusAnimationChanged(); -@@ -1232,6 +1239,22 @@ public class NewTabPageLayout extends LinearLayout +@@ -1241,6 +1248,22 @@ public class NewTabPageLayout extends LinearLayout return mMostVisitedTilesCoordinator; } @@ -1517,26 +1517,26 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -352,6 +352,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -354,6 +354,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kInstanceSwitcherV2, &kKeyboardEscBackNavigation, - &kLegacyTabStateDeprecation, -+ &kSimplifiedNTP, &kLensOnQuickActionSearchWidget, ++ &kSimplifiedNTP, + &kLinkHoverStatusBar, &kLoadAllTabsAtStartup, &kLoadNativeEarly, diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -496,6 +496,7 @@ public abstract class ChromeFeatureList { - public static final String MITIGATE_LEGACY_SEARCH_ENGINE_PROMO_OVERLAP = - "MitigateLegacySearchEnginePromoOverlap"; +@@ -502,6 +502,7 @@ public abstract class ChromeFeatureList { + public static final String MEDIA_INDICATORS_ANDROID = "MediaIndicatorsAndroid"; + public static final String MINI_ORIGIN_BAR = "MiniOriginBar"; public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization"; + public static final String SIMPLIFIED_NTP = "SimplifiedNTP"; public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; public static final String MOST_VISITED_TILES_RESELECT = "MostVisitedTilesReselect"; public static final String MULTI_INSTANCE_APPLICATION_STATUS_CLEANUP = -@@ -969,7 +970,7 @@ public abstract class ChromeFeatureList { +@@ -980,7 +981,7 @@ public abstract class ChromeFeatureList { newCachedFlag(LOCK_BACK_PRESS_HANDLER_AT_START, true); public static final CachedFlag sLockTopControlsOnLargeTabletsV2 = newCachedFlag(LOCK_TOP_CONTROLS_ON_LARGE_TABLETS_V2, false); @@ -1572,7 +1572,7 @@ diff --git a/chrome/browser/segmentation_platform/android/java/src/org/chromium/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -3965,6 +3965,12 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4013,6 +4013,12 @@ To change this setting, BEGIN_LINKdelete the Chrome d Recent tabs @@ -1612,7 +1612,7 @@ diff --git a/components/ntp_tiles/custom_links_store.cc b/components/ntp_tiles/c diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc --- a/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc -@@ -207,6 +207,7 @@ BASE_FEATURE(kRemoveSearchReadyOmnibox, DISABLED); +@@ -196,6 +196,7 @@ BASE_FEATURE(kRemoveSearchReadyOmnibox, DISABLED); BASE_FEATURE(kDefaultTypedNavigationsToHttps, "OmniboxDefaultTypedNavigationsToHttps", enable_if(IS_IOS)); @@ -1620,7 +1620,7 @@ diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/ // Override the delay to create a spare renderer when the omnibox is focused // on Android. -@@ -293,6 +294,7 @@ BASE_FEATURE(kOmniboxMobileParityUpdate, ENABLED); +@@ -282,6 +283,7 @@ BASE_FEATURE(kOmniboxMobileParityUpdate, ENABLED); // Updates various NTP/Omnibox assets and descriptions for visual alignment on // Android and iOS, V2. BASE_FEATURE(kOmniboxMobileParityUpdateV2, ENABLED); diff --git a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch index 376b1ee2..145a4cee 100644 --- a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch +++ b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch @@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/segmentation_pl diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -@@ -290,14 +290,7 @@ public class MainSettings extends ChromeBaseSettingsFragment +@@ -350,14 +350,7 @@ public class MainSettings extends ChromeBaseSettingsFragment getContext(), getProfile(), /* androidPermissionDelegate= */ null, @@ -87,7 +87,7 @@ diff --git a/chrome/browser/segmentation_platform/segmentation_platform_config.c diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -5028,6 +5028,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -5085,6 +5085,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d View @@ -119,7 +119,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/radio_button_grou diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java -@@ -356,7 +356,7 @@ public class AdaptiveToolbarButtonController +@@ -361,7 +361,7 @@ public class AdaptiveToolbarButtonController } private boolean isScreenWideEnoughForButton() { @@ -157,7 +157,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java -@@ -180,12 +180,12 @@ public class AdaptiveToolbarStatePredictor { +@@ -200,12 +200,12 @@ public class AdaptiveToolbarStatePredictor { case AdaptiveToolbarButtonVariant.READ_ALOUD: case AdaptiveToolbarButtonVariant.PAGE_SUMMARY: case AdaptiveToolbarButtonVariant.OPEN_IN_BROWSER: @@ -171,7 +171,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow case AdaptiveToolbarButtonVariant.PRICE_INSIGHTS: case AdaptiveToolbarButtonVariant.TAB_GROUPING: return false; -@@ -214,6 +214,10 @@ public class AdaptiveToolbarStatePredictor { +@@ -234,6 +234,10 @@ public class AdaptiveToolbarStatePredictor { * @param callback A callback for results. */ public void readFromSegmentationPlatform(Callback> callback) { @@ -197,7 +197,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/settings/RadioButtonGroupAdaptiveToolbarPreference.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/settings/RadioButtonGroupAdaptiveToolbarPreference.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/settings/RadioButtonGroupAdaptiveToolbarPreference.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/settings/RadioButtonGroupAdaptiveToolbarPreference.java -@@ -41,6 +41,7 @@ public class RadioButtonGroupAdaptiveToolbarPreference extends ContainedRadioBut +@@ -43,6 +43,7 @@ public class RadioButtonGroupAdaptiveToolbarPreference extends ContainedRadioBut private @Nullable RadioButtonWithDescription mAddToBookmarksButton; private @Nullable RadioButtonWithDescription mReadAloudButton; private @Nullable RadioButtonWithDescription mPageSummaryButton; @@ -205,7 +205,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow private @AdaptiveToolbarButtonVariant int mSelected; private @AdaptiveToolbarButtonVariant int mAutoButtonCaption; private @Nullable AdaptiveToolbarStatePredictor mStatePredictor; -@@ -66,6 +67,7 @@ public class RadioButtonGroupAdaptiveToolbarPreference extends ContainedRadioBut +@@ -68,6 +69,7 @@ public class RadioButtonGroupAdaptiveToolbarPreference extends ContainedRadioBut mAutoButton = (RadioButtonWithDescription) holder.findViewById(R.id.adaptive_option_based_on_usage); @@ -213,7 +213,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow mNewTabButton = (RadioButtonWithDescription) holder.findViewById(R.id.adaptive_option_new_tab); mShareButton = (RadioButtonWithDescription) holder.findViewById(R.id.adaptive_option_share); -@@ -73,6 +75,7 @@ public class RadioButtonGroupAdaptiveToolbarPreference extends ContainedRadioBut +@@ -75,6 +77,7 @@ public class RadioButtonGroupAdaptiveToolbarPreference extends ContainedRadioBut (RadioButtonWithDescription) holder.findViewById(R.id.adaptive_option_voice_search); mTranslateButton = (RadioButtonWithDescription) holder.findViewById(R.id.adaptive_option_translate); @@ -221,7 +221,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow mAddToBookmarksButton = (RadioButtonWithDescription) holder.findViewById(R.id.adaptive_option_add_to_bookmarks); -@@ -80,6 +83,8 @@ public class RadioButtonGroupAdaptiveToolbarPreference extends ContainedRadioBut +@@ -82,6 +85,8 @@ public class RadioButtonGroupAdaptiveToolbarPreference extends ContainedRadioBut (RadioButtonWithDescription) holder.findViewById(R.id.adaptive_option_read_aloud); mPageSummaryButton = (RadioButtonWithDescription) holder.findViewById(R.id.adaptive_option_page_summary); diff --git a/build/patches/Restore-chrome-password-store.patch b/build/patches/Restore-chrome-password-store.patch index 872e76a6..a0dee635 100644 --- a/build/patches/Restore-chrome-password-store.patch +++ b/build/patches/Restore-chrome-password-store.patch @@ -21,7 +21,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../settings/AutofillProfilesFragment.java | 1 + .../settings/PasswordSettings.java | 697 ++++++++++++++++++ .../settings/FragmentDependencyProvider.java | 5 + - .../chrome/browser/settings/MainSettings.java | 12 - + .../chrome/browser/settings/MainSettings.java | 13 - .../settings/SettingsNavigationImpl.java | 4 + chrome/browser/BUILD.gn | 7 + .../autofill/AutofillClientProviderUtils.java | 1 + @@ -87,7 +87,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../core/common/password_manager_pref_names.h | 2 - components/sync/service/sync_prefs.cc | 2 +- .../Restore-chrome-password-store.inc | 1 + - 79 files changed, 5539 insertions(+), 75 deletions(-) + 79 files changed, 5539 insertions(+), 76 deletions(-) create mode 100644 chrome/android/java/res/layout/password_no_result.xml create mode 100644 chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java @@ -133,7 +133,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -806,6 +806,10 @@ if (_is_default_toolchain) { +@@ -793,6 +793,10 @@ if (_is_default_toolchain) { "//url/mojom:url_mojom_origin_java", ] @@ -144,7 +144,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn deps += feed_deps srcjar_deps = [ -@@ -948,6 +952,10 @@ if (_is_default_toolchain) { +@@ -935,6 +939,10 @@ if (_is_default_toolchain) { "//components/visited_url_ranking/internal:internal_java", ] @@ -158,7 +158,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -655,3 +655,8 @@ chrome_java_resources = [ +@@ -674,3 +674,8 @@ chrome_java_resources = [ "java/res/xml/tracing_preferences.xml", "java/res/xml/unified_account_settings_preferences.xml", ] @@ -170,7 +170,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -886,6 +886,7 @@ chrome_java_sources = [ +@@ -898,6 +898,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogViewBinder.java", "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java", "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java", @@ -181,7 +181,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java --- a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java +++ b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java -@@ -580,10 +580,7 @@ class ManualFillingMediator +@@ -587,10 +587,7 @@ class ManualFillingMediator // suggestions for non credential fields. The check for feature flag needs to happen before // `IS_CREDENTIAL_FIELD_OR_HAS_AUTOFILL_SUGGESTIONS` check to ensure we get the unbiased // metrics. @@ -196,7 +196,7 @@ diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/ch diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -466,10 +466,9 @@ by a child template that "extends" this file. +@@ -477,10 +477,9 @@ by a child template that "extends" this file. @@ -322,7 +322,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java -@@ -839,6 +839,7 @@ public class AutofillPaymentMethodsFragment extends ChromeBaseSettingsFragment +@@ -841,6 +841,7 @@ public class AutofillPaymentMethodsFragment extends ChromeBaseSettingsFragment } private boolean disabledSettingsInThirdPartyMode() { @@ -333,7 +333,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java -@@ -442,6 +442,7 @@ public class AutofillProfilesFragment extends ChromeBaseSettingsFragment +@@ -447,6 +447,7 @@ public class AutofillProfilesFragment extends ChromeBaseSettingsFragment } private boolean disabledSettingsInThirdPartyMode() { @@ -1055,7 +1055,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme import org.chromium.chrome.browser.password_manager.PasswordManagerHelper; import org.chromium.chrome.browser.password_manager.PasswordStoreBridge; import org.chromium.chrome.browser.privacy_guide.PrivacyGuideFragment; -@@ -134,6 +136,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl +@@ -131,6 +133,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl PasswordManagerHelper.getForProfile(mProfile), new SettingsCustomTabLauncherImpl()); } @@ -1068,14 +1068,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -@@ -489,18 +489,6 @@ public class MainSettings extends ChromeBaseSettingsFragment - preference -> - SettingsNavigationHelper.showAutofillProfileSettings( - getActivity())); +@@ -608,19 +608,6 @@ public class MainSettings extends ChromeBaseSettingsFragment + return SettingsNavigationHelper.showAutofillProfileSettings( + getActivity()); + }); - PasswordsPreference passwordsPreference = findPreference(PREF_PASSWORDS); - passwordsPreference.setProfile(getProfile()); - passwordsPreference.setOnPreferenceClickListener( - preference -> { +- onPreferenceSelected(preference); - PasswordManagerLauncher.showPasswordSettings( - getActivity(), - getProfile(), @@ -1098,7 +1099,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings; import org.chromium.chrome.browser.sync.settings.ManageSyncSettings; import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; -@@ -50,6 +51,7 @@ public class SettingsNavigationImpl implements SettingsNavigation { +@@ -56,6 +57,7 @@ public class SettingsNavigationImpl implements SettingsNavigation { case SettingsFragment.SAFETY_CHECK: case SettingsFragment.SITE: case SettingsFragment.ACCESSIBILITY: @@ -1106,7 +1107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin case SettingsFragment.GOOGLE_SERVICES: case SettingsFragment.MANAGE_SYNC: case SettingsFragment.FINANCIAL_ACCOUNTS: -@@ -127,6 +129,8 @@ public class SettingsNavigationImpl implements SettingsNavigation { +@@ -134,6 +136,8 @@ public class SettingsNavigationImpl implements SettingsNavigation { return SiteSettings.class; case SettingsFragment.ACCESSIBILITY: return AccessibilitySettings.class; @@ -1118,7 +1119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3353,6 +3353,13 @@ static_library("browser") { +@@ -3365,6 +3365,13 @@ static_library("browser") { "touch_to_fill/password_manager/touch_to_fill_controller_webauthn_delegate.h", ] @@ -1131,7 +1132,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn + deps += [ ":delta_file_proto", - ":profile_token", + ":language_data_proto", diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java --- a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java +++ b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java @@ -6037,7 +6038,7 @@ diff --git a/chrome/browser/password_manager/password_manager_settings_service_f diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -2815,13 +2815,6 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, +@@ -2475,13 +2475,6 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, profile_prefs->ClearPref(kObsoletePasswordsUseUPMLocalAndSeparateStores); profile_prefs->ClearPref(kObsoleteEmptyProfileStoreLoginDatabase); profile_prefs->ClearPref(kObsoleteUpmAutoExportCsvNeedsDeletion); @@ -6054,7 +6055,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -691,7 +691,7 @@ For more settings that use data to improve your Chrome experience, go to @@ -6063,7 +6064,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Password saving is turned on by your administrator -@@ -791,6 +791,127 @@ For more settings that use data to improve your Chrome experience, go to @@ -6208,14 +6209,14 @@ new file mode 100644 diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc --- a/components/autofill/core/common/autofill_features.cc +++ b/components/autofill/core/common/autofill_features.cc -@@ -860,6 +860,7 @@ BASE_FEATURE(kAutofillEnableKeyboardAccessoryChipRedesign, - // TODO: crbug.com/385172647 - Clean up after the feature is launched. - BASE_FEATURE(kAutofillEnableKeyboardAccessoryChipWidthAdjustment, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -572,6 +572,7 @@ BASE_FEATURE(kAutofillEnableLoyaltyCardsFilling, + IS_WALLET_PASSES_SUPPORTED_PLATFORM + ? base::FEATURE_ENABLED_BY_DEFAULT + : base::FEATURE_DISABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_DISABLED(kAutofillDeepLinkAutofillOptions); + #if BUILDFLAG(IS_ANDROID) // Controls if Chrome Autofill UI surfaces ignore touch events if something is - // fully or partially obscuring the Chrome window. diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsNavigation.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsNavigation.java --- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsNavigation.java +++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsNavigation.java @@ -6250,7 +6251,7 @@ diff --git a/components/password_manager/core/browser/features/password_manager_ diff --git a/components/password_manager/core/browser/import/password_importer.cc b/components/password_manager/core/browser/import/password_importer.cc --- a/components/password_manager/core/browser/import/password_importer.cc +++ b/components/password_manager/core/browser/import/password_importer.cc -@@ -76,6 +76,17 @@ const int32_t kMaxFileSizeBytes = 1000 * 1024; +@@ -75,6 +75,17 @@ const int32_t kMaxFileSizeBytes = 1000 * 1024; // optional string. The string will be present if the status is SUCCESS. base::expected ReadFileToString( const base::FilePath& path) { @@ -6271,7 +6272,7 @@ diff --git a/components/password_manager/core/browser/import/password_importer.c diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -615,9 +615,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -624,9 +624,7 @@ void PasswordManager::RegisterProfilePrefs( registry->RegisterIntegerPref(prefs::kTotalPasswordsAvailableForProfile, 0); registry->RegisterIntegerPref(prefs::kPasswordRemovalReasonForAccount, 0); registry->RegisterIntegerPref(prefs::kPasswordRemovalReasonForProfile, 0); @@ -6319,7 +6320,7 @@ diff --git a/components/password_manager/core/browser/password_manager_constants diff --git a/components/password_manager/core/browser/password_store/BUILD.gn b/components/password_manager/core/browser/password_store/BUILD.gn --- a/components/password_manager/core/browser/password_store/BUILD.gn +++ b/components/password_manager/core/browser/password_store/BUILD.gn -@@ -72,6 +72,19 @@ source_set("password_store_impl") { +@@ -73,6 +73,19 @@ source_set("password_store_impl") { "android_backend_error.h", "password_data_type_controller_delegate_android.cc", "password_data_type_controller_delegate_android.h", @@ -6363,7 +6364,7 @@ diff --git a/components/password_manager/core/browser/password_store/login_datab diff --git a/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc b/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc --- a/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc +++ b/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc -@@ -150,6 +150,7 @@ void PasswordStoreBuiltInBackend::InitBackend( +@@ -152,6 +152,7 @@ void PasswordStoreBuiltInBackend::InitBackend( DCHECK(helper_); affiliated_match_helper_ = affiliated_match_helper; @@ -6371,7 +6372,7 @@ diff --git a/components/password_manager/core/browser/password_store/password_st // To ensure that groups of the kClearUndecryptablePasswords will stay // balanced, after the cleanup is done an additional flag check is needed. // Users won't reach the flag the normal way since the LoginDB is working -@@ -158,6 +159,7 @@ void PasswordStoreBuiltInBackend::InitBackend( +@@ -160,6 +161,7 @@ void PasswordStoreBuiltInBackend::InitBackend( if (pref_service_->GetBoolean(prefs::kClearingUndecryptablePasswords)) { base::FeatureList::IsEnabled(features::kClearUndecryptablePasswords); } @@ -6379,7 +6380,7 @@ diff --git a/components/password_manager/core/browser/password_store/password_st background_task_runner_->PostTask( FROM_HERE, base::BindOnce(&LoginDatabaseAsyncHelper::CreateSyncBackend, -@@ -434,11 +436,15 @@ void PasswordStoreBuiltInBackend::OnEncryptorReceived( +@@ -436,11 +438,15 @@ void PasswordStoreBuiltInBackend::OnEncryptorReceived( weak_ptr_factory_.GetWeakPtr())) .Then(std::move(remote_form_changes_received)); diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index 5ba4bcac..011704d4 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -1372,7 +1372,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1456,7 +1456,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { private void initStatusIndicatorCoordinator(LayoutManagerImpl layoutManager) { // TODO(crbug.com/40112282): Disable on tablets for now as we need to do one or two extra // things for tablets. @@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab return; } -@@ -1406,6 +1407,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1490,6 +1491,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { hubManager.setStatusIndicatorHeight(mStatusIndicatorHeight); }); @@ -117,18 +117,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -377,6 +377,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -379,6 +379,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kNotificationPermissionBottomSheet, &kNotificationPermissionVariant, &kNotificationTrampoline, + &kOfflineIndicatorV2, &kOmahaMinSdkVersionAndroid, - &kOmniboxAutofocusOnIncognitoNtp, &kPCCTMinimumHeight, + &kPageAnnotationsService, diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -514,6 +514,7 @@ public abstract class ChromeFeatureList { +@@ -520,6 +520,7 @@ public abstract class ChromeFeatureList { "NotificationPermissionBottomSheet"; public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String NOTIFICATION_TRAMPOLINE = "NotificationTrampoline"; diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 8bf70c86..383e5dd9 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2528,6 +2528,10 @@ +@@ -2616,6 +2616,10 @@ "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ], "expiry_milestone": 150 }, @@ -49,9 +49,9 @@ new file mode 100644 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml -@@ -50,4 +50,10 @@ found in the LICENSE file. - android:key="image_descriptions" - android:title="@string/image_descriptions_settings_title" /> +@@ -55,4 +55,10 @@ found in the LICENSE file. + android:summary="@string/touchpad_overscroll_history_navigation_summary" + android:title="@string/touchpad_overscroll_history_navigation_title" /> + 0) { - type = OverscrollAction::kPullToRefresh; + if (!disable_pull_to_refresh_) type = OverscrollAction::kPullToRefresh; @@ -134,7 +134,7 @@ diff --git a/ui/android/overscroll_refresh.h b/ui/android/overscroll_refresh.h OverscrollRefresh(const OverscrollRefresh&) = delete; OverscrollRefresh& operator=(const OverscrollRefresh&) = delete; -@@ -107,6 +107,7 @@ class UI_ANDROID_EXPORT OverscrollRefresh { +@@ -109,6 +109,7 @@ class UI_ANDROID_EXPORT OverscrollRefresh { bool scrolled_to_top_; bool scrolled_to_bottom_; diff --git a/build/patches/Revert-removal-of-execution-context-address-space.patch b/build/patches/Revert-removal-of-execution-context-address-space.patch index 0eb9d9ce..e55eef73 100644 --- a/build/patches/Revert-removal-of-execution-context-address-space.patch +++ b/build/patches/Revert-removal-of-execution-context-address-space.patch @@ -65,7 +65,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -515,6 +515,15 @@ void ExecutionContext::SetReferrerPolicy( +@@ -522,6 +522,15 @@ void ExecutionContext::SetReferrerPolicy( policy_container_->UpdateReferrerPolicy(referrer_policy); } @@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context #include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h" #include "third_party/blink/public/common/fingerprinting_protection/noise_token.h" #include "third_party/blink/public/common/tokens/tokens.h" -@@ -386,6 +387,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable, +@@ -419,6 +420,9 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext, const String& message = g_empty_string, const String& source_file = g_empty_string) const {} @@ -142,15 +142,15 @@ diff --git a/third_party/blink/renderer/core/frame/policy_container.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/policy_container.h b/third_party/blink/renderer/core/frame/policy_container.h --- a/third_party/blink/renderer/core/frame/policy_container.h +++ b/third_party/blink/renderer/core/frame/policy_container.h -@@ -8,6 +8,7 @@ +@@ -7,6 +7,7 @@ + #include "mojo/public/cpp/bindings/associated_remote.h" - #include "mojo/public/cpp/bindings/pending_remote.h" #include "services/network/public/mojom/content_security_policy.mojom-blink-forward.h" +#include "services/network/public/mojom/ip_address_space.mojom-shared.h" #include "services/network/public/mojom/referrer_policy.mojom-shared.h" #include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h" #include "third_party/blink/public/mojom/frame/policy_container.mojom-blink.h" -@@ -44,6 +45,16 @@ class CORE_EXPORT PolicyContainer { +@@ -43,6 +44,16 @@ class CORE_EXPORT PolicyContainer { void UpdateReferrerPolicy(network::mojom::blink::ReferrerPolicy policy); network::mojom::blink::ReferrerPolicy GetReferrerPolicy() const; @@ -391,7 +391,7 @@ diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_param const Vector* inherited_trial_features, const base::UnguessableToken& parent_devtools_token, std::unique_ptr worker_settings, -@@ -80,6 +81,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams( +@@ -77,6 +78,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams( starter_https_state(starter_https_state), worker_clients(worker_clients), content_settings_client(std::move(content_settings_client)), @@ -410,7 +410,7 @@ diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_param #include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h" #include "third_party/blink/public/common/tokens/tokens.h" #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" -@@ -65,6 +66,7 @@ struct CORE_EXPORT GlobalScopeCreationParams final { +@@ -63,6 +64,7 @@ struct CORE_EXPORT GlobalScopeCreationParams final { HttpsState starter_https_state, WorkerClients*, std::unique_ptr, @@ -418,7 +418,7 @@ diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_param const Vector* inherited_trial_features, const base::UnguessableToken& parent_devtools_token, std::unique_ptr, -@@ -190,6 +192,11 @@ struct CORE_EXPORT GlobalScopeCreationParams final { +@@ -185,6 +187,11 @@ struct CORE_EXPORT GlobalScopeCreationParams final { std::unique_ptr content_settings_client; @@ -655,7 +655,7 @@ diff --git a/third_party/blink/renderer/core/workers/worker_global_scope.h b/thi #include "third_party/blink/public/common/tokens/tokens.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom-blink-forward.h" #include "third_party/blink/public/mojom/script/script_type.mojom-blink-forward.h" -@@ -177,6 +178,7 @@ class CORE_EXPORT WorkerGlobalScope +@@ -187,6 +188,7 @@ class CORE_EXPORT WorkerGlobalScope virtual void Initialize( const KURL& response_url, network::mojom::ReferrerPolicy response_referrer_policy, @@ -685,15 +685,15 @@ diff --git a/third_party/blink/renderer/core/workers/worker_thread_test.cc b/thi diff --git a/third_party/blink/renderer/core/workers/worker_thread_test_helper.h b/third_party/blink/renderer/core/workers/worker_thread_test_helper.h --- a/third_party/blink/renderer/core/workers/worker_thread_test_helper.h +++ b/third_party/blink/renderer/core/workers/worker_thread_test_helper.h -@@ -9,6 +9,7 @@ - +@@ -10,6 +10,7 @@ #include "base/synchronization/waitable_event.h" + #include "mojo/public/cpp/bindings/receiver_set.h" #include "services/metrics/public/cpp/ukm_source_id.h" +#include "services/network/public/mojom/ip_address_space.mojom-blink.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/blink/public/common/loader/worker_main_script_load_parameters.h" #include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h" -@@ -81,11 +82,15 @@ class FakeWorkerGlobalScope : public WorkerGlobalScope { +@@ -78,11 +79,15 @@ class FakeWorkerGlobalScope : public WorkerGlobalScope { void Initialize( const KURL& response_url, network::mojom::ReferrerPolicy response_referrer_policy, @@ -709,7 +709,7 @@ diff --git a/third_party/blink/renderer/core/workers/worker_thread_test_helper.h InitContentSecurityPolicyFromVector(std::move(response_csp)); BindContentSecurityPolicyToExecutionContext(); -@@ -161,6 +166,7 @@ class WorkerThreadForTest : public WorkerThread { +@@ -158,6 +163,7 @@ class WorkerThreadForTest : public WorkerThread { false /* starter_secure_context */, CalculateHttpsState(security_origin), worker_clients, nullptr /* content_settings_client */, @@ -732,7 +732,7 @@ diff --git a/third_party/blink/renderer/modules/csspaint/paint_worklet_global_sc diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc --- a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc +++ b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc -@@ -220,7 +220,9 @@ void WebEmbeddedWorkerImpl::StartWorkerThread( +@@ -214,7 +214,9 @@ void WebEmbeddedWorkerImpl::StartWorkerThread( Vector(), network::mojom::ReferrerPolicy::kDefault, starter_origin.get(), starter_secure_context, starter_https_state, nullptr /* worker_clients */, @@ -840,7 +840,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl diff --git a/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc b/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc --- a/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc -@@ -87,6 +87,7 @@ class AudioWorkletGlobalScopeTest : public PageTestBase, public ModuleTestBase { +@@ -88,6 +88,7 @@ class AudioWorkletGlobalScopeTest : public PageTestBase, public ModuleTestBase { window->GetReferrerPolicy(), window->GetSecurityOrigin(), window->IsSecureContext(), window->GetHttpsState(), nullptr /* worker_clients */, nullptr /* content_settings_client */, diff --git a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch index 43358795..8df30857 100644 --- a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch +++ b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch @@ -196,7 +196,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p #include "third_party/blink/renderer/bindings/core/v8/binding_security.h" #include "third_party/blink/renderer/bindings/core/v8/capture_source_location.h" #include "third_party/blink/renderer/bindings/core/v8/isolated_world_csp.h" -@@ -501,7 +502,10 @@ bool LocalDOMWindow::CanExecuteScripts( +@@ -510,7 +511,10 @@ bool LocalDOMWindow::CanExecuteScripts( } return false; } @@ -211,7 +211,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -4146,19 +4146,6 @@ bool LocalFrame::IsSameOrigin() { +@@ -4157,19 +4157,6 @@ bool LocalFrame::IsSameOrigin() { return security_origin->IsSameOriginWith(top_security_origin); } @@ -234,7 +234,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -930,12 +930,6 @@ class CORE_EXPORT LocalFrame final +@@ -932,12 +932,6 @@ class CORE_EXPORT LocalFrame final return *v8_local_compile_hints_producer_; } @@ -264,7 +264,7 @@ diff --git a/third_party/blink/renderer/core/html/html_meta_element.cc b/third_p diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.cc b/third_party/blink/renderer/core/loader/base_fetch_context.cc --- a/third_party/blink/renderer/core/loader/base_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/base_fetch_context.cc -@@ -274,7 +274,7 @@ BaseFetchContext::CanRequestInternal( +@@ -273,7 +273,7 @@ BaseFetchContext::CanRequestInternal( } if (type == ResourceType::kScript) { @@ -366,7 +366,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/thir diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/third_party/blink/renderer/core/loader/worker_fetch_context.cc --- a/third_party/blink/renderer/core/loader/worker_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/worker_fetch_context.cc -@@ -79,10 +79,14 @@ SubresourceFilter* WorkerFetchContext::GetSubresourceFilter() const { +@@ -78,10 +78,14 @@ SubresourceFilter* WorkerFetchContext::GetSubresourceFilter() const { return subresource_filter_.Get(); } diff --git a/build/patches/Set-caret-blink-interval-to-default.patch b/build/patches/Set-caret-blink-interval-to-default.patch index 75acbd50..b213a9c1 100644 --- a/build/patches/Set-caret-blink-interval-to-default.patch +++ b/build/patches/Set-caret-blink-interval-to-default.patch @@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -3617,9 +3617,7 @@ void WebViewImpl::UpdateRendererPreferences( +@@ -3602,9 +3602,7 @@ void WebViewImpl::UpdateRendererPreferences( UpdateFontRenderingFromRendererPrefs(); blink::SetCaretBlinkInterval( diff --git a/build/patches/Set-the-screen-frame-rate-to-60-Hz.patch b/build/patches/Set-the-screen-frame-rate-to-60-Hz.patch index 0a252cb1..441ada5b 100644 --- a/build/patches/Set-the-screen-frame-rate-to-60-Hz.patch +++ b/build/patches/Set-the-screen-frame-rate-to-60-Hz.patch @@ -85,7 +85,7 @@ diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_st diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -104,6 +104,12 @@ found in the LICENSE file. +@@ -98,6 +98,12 @@ found in the LICENSE file. android:summary="@string/tab_switcher_list_mode_summary" app:featureName="TabSwitcherListMode" app:needRestart="true" /> @@ -101,7 +101,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -12141,9 +12141,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11998,9 +11998,9 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(::features::kBlockRootWindowAccessibleNameChangeEvent)}, #endif // BUILDFLAG(IS_MAC) @@ -125,7 +125,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/ai/ai_manager.h" #include "chrome/browser/app_mode/app_mode_utils.h" -@@ -303,6 +304,7 @@ +@@ -305,6 +306,7 @@ #include "components/variations/variations_associated_data.h" #include "components/variations/variations_switches.h" #include "components/version_info/version_info.h" @@ -133,7 +133,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "components/webapps/common/web_app_id.h" #include "components/webui/chrome_urls/pref_names.h" #include "content/public/browser/attribution_data_model.h" -@@ -2720,6 +2722,15 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2718,6 +2720,15 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( command_line->AppendSwitchASCII(ash::switches::kHomedir, homedir.value()); #endif @@ -166,7 +166,7 @@ new file mode 100644 diff --git a/components/viz/common/features.cc b/components/viz/common/features.cc --- a/components/viz/common/features.cc +++ b/components/viz/common/features.cc -@@ -92,6 +92,7 @@ const char kMaxOverlaysParam[] = "max_overlays"; +@@ -97,6 +97,7 @@ const char kMaxOverlaysParam[] = "max_overlays"; BASE_FEATURE(kDelegatedCompositing, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kAvoidDuplicateDelayBeginFrame, base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/build/patches/Show-NTP-at-startup.patch b/build/patches/Show-NTP-at-startup.patch index 9c4411da..b0288017 100644 --- a/build/patches/Show-NTP-at-startup.patch +++ b/build/patches/Show-NTP-at-startup.patch @@ -70,7 +70,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BrowserRestartA diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java -@@ -15,8 +15,10 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; +@@ -16,8 +16,10 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.lifecycle.DestroyObserver; import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver; import org.chromium.chrome.browser.lifecycle.StartStopWithNativeObserver; @@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivit /** * Manages pref that can track the delay since the last stop of the tracked activity. -@@ -59,6 +61,18 @@ public class ChromeInactivityTracker +@@ -73,6 +75,18 @@ public class ChromeInactivityTracker mLifecycleDispatcher.register(this); } @@ -103,10 +103,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivit diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -3083,6 +3083,8 @@ public class ChromeTabbedActivity extends ChromeActivity { - mInactivityTracker = +@@ -3088,6 +3088,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt + mInactivityTrackerSupplier.set( new ChromeInactivityTracker( - ChromePreferenceKeys.TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF); + ChromePreferenceKeys.TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF)); + mInactivityTracker.setIsStartup( + !CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState())); TabUsageTracker.initialize(this.getLifecycleDispatcher(), tabModelSelector); @@ -158,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToC diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -992,7 +992,7 @@ +@@ -1007,7 +1007,7 @@ Open a specific page or set of pages @@ -170,7 +170,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -423,6 +423,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -425,6 +425,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kSearchInCCTIfEnabledByEmbedder, &kSearchResumptionModuleAndroid, &kSettingsMultiColumn, @@ -238,7 +238,7 @@ diff --git a/chrome/browser/performance_manager/policies/background_tab_loading_ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -940,6 +940,8 @@ public final class ChromePreferenceKeys { +@@ -958,6 +958,8 @@ public final class ChromePreferenceKeys { public static final String TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF = "ChromeTabbedActivity.BackgroundTimeMs"; @@ -284,7 +284,7 @@ diff --git a/chrome/browser/resources/settings/on_startup_page/on_startup_page.t diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc -@@ -918,7 +918,13 @@ class SessionRestoreImpl : public BrowserListObserver { +@@ -920,7 +920,13 @@ class SessionRestoreImpl : public BrowserListObserver { // be selected as ShowBrowser() will load the selected tab. bool is_selected_tab = (initial_tab_count == 0) && (i == selected_tab_index); @@ -299,7 +299,7 @@ diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/session // Convert the last active time because WebContents needs a TimeTicks. const base::TimeDelta delta = tab.last_active_time - epoch_time; const base::TimeTicks last_active_time_ticks = epoch_time_ticks + delta; -@@ -1220,6 +1226,7 @@ class SessionRestoreImpl : public BrowserListObserver { +@@ -1240,6 +1246,7 @@ class SessionRestoreImpl : public BrowserListObserver { } if (last_normal_browser && !normal_startup_tabs.empty()) { AppendURLsToBrowser(last_normal_browser, normal_startup_tabs); @@ -477,7 +477,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc --- a/chrome/browser/ui/browser_tabrestore.cc +++ b/chrome/browser/ui/browser_tabrestore.cc -@@ -234,7 +234,7 @@ WebContents* AddRestoredTabImpl(std::unique_ptr web_contents, +@@ -239,7 +239,7 @@ WebContents* AddRestoredTabImpl(std::unique_ptr web_contents, // Immediate load if the browser activeness is true or unknown. That is, do // not do immediate load for browsers that are known to be inactive. diff --git a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch index a31b5bff..4e31ff5e 100644 --- a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch +++ b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch @@ -7,15 +7,15 @@ Avoid displaying info about intrusive ads License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../site_settings/SingleWebsiteSettings.java | 51 ++++++++++++------- - .../browser_ui/site_settings/Website.java | 14 ++++- + .../browser_ui/site_settings/Website.java | 8 ++- .../bromite_content_settings/javascript.inc | 4 ++ - 3 files changed, 50 insertions(+), 19 deletions(-) + 3 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 components/content_settings/core/browser/bromite_content_settings/javascript.inc diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java -@@ -643,6 +643,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -662,6 +662,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment setUpSoundPreference(preference); } else if (type == ContentSettingsType.JAVASCRIPT) { setUpJavascriptPreference(preference); @@ -24,7 +24,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.GEOLOCATION) { setUpLocationPreference(preference); } else if (type == ContentSettingsType.GEOLOCATION_WITH_OPTIONS) { -@@ -1172,17 +1174,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1257,17 +1259,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment private void setUpAdsInformationalBanner() { // Add the informational banner which shows at the top of the UI if ad blocking is // activated on this site. @@ -42,7 +42,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } @RequiresNonNull({"mSite"}) -@@ -1528,12 +1521,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1620,12 +1613,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment @ContentSetting @Nullable Integer currentValue = mSite.getContentSetting(browserContextHandle, ContentSettingsType.JAVASCRIPT); @@ -62,7 +62,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } // Not possible to embargo JAVASCRIPT. setupContentSettingsPreference( -@@ -1543,6 +1537,29 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1635,6 +1629,29 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment isOneTime(ContentSettingsType.JAVASCRIPT)); } @@ -92,7 +92,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c /** * Updates the ads list preference based on whether the site is a candidate for blocking. This * has some custom behavior. 1. If the site is a candidate and has activation, the permission -@@ -1560,9 +1577,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1652,9 +1669,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment } // If the ad blocker is activated, then this site will have ads blocked unless there is an // explicit permission disallowing the blocking. @@ -106,27 +106,23 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java -@@ -316,7 +316,19 @@ public final class Website implements WebsiteEntry { - new ContentSettingException( - ContentSettingsType.ADS, - getAddress().getOrigin(), -- ContentSetting.BLOCK, -+ value, -+ ProviderType.NONE, -+ /* isEmbargoed= */ false); -+ setContentSettingException(type, exception); -+ } +@@ -286,9 +286,15 @@ public final class Website implements WebsiteEntry { + return new ContentSettingException( + ContentSettingsType.ADS, + getAddress().getOrigin(), +- ContentSetting.BLOCK, ++ value, + ProviderType.NONE, + /* isEmbargoed= */ false); + } else if (type == ContentSettingsType.COOKIES) { + // It is possible to set the permission without having an existing exception -+ if (exception == null) { -+ exception = -+ new ContentSettingException( -+ ContentSettingsType.COOKIES, -+ getAddress().getOrigin(), -+ value, - ProviderType.NONE, - /* isEmbargoed= */ false); - setContentSettingException(type, exception); ++ return new ContentSettingException( ++ ContentSettingsType.COOKIES, ++ getAddress().getOrigin(), ++ value, ProviderType.NONE, /* isEmbargoed= */ false); + } else if (type == ContentSettingsType.JAVASCRIPT) { + // It is possible to set the permission without having an existing exception, + // because we show the javascript permission in Site Settings if javascript diff --git a/components/content_settings/core/browser/bromite_content_settings/javascript.inc b/components/content_settings/core/browser/bromite_content_settings/javascript.inc new file mode 100644 --- /dev/null diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch index 7bcc26d8..11e7e2a5 100644 --- a/build/patches/Site-setting-for-images.patch +++ b/build/patches/Site-setting-for-images.patch @@ -324,7 +324,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -4133,19 +4133,6 @@ bool LocalFrame::IsSameOrigin() { +@@ -4144,19 +4144,6 @@ bool LocalFrame::IsSameOrigin() { return security_origin->IsSameOriginWith(top_security_origin); } @@ -347,7 +347,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -929,12 +929,6 @@ class CORE_EXPORT LocalFrame final +@@ -931,12 +931,6 @@ class CORE_EXPORT LocalFrame final return *v8_local_compile_hints_producer_; } @@ -427,7 +427,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/thir diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc --- a/third_party/blink/renderer/core/page/page.cc +++ b/third_party/blink/renderer/core/page/page.cc -@@ -1084,9 +1084,8 @@ void Page::SettingsChanged(ChangeType change_type) { +@@ -1041,9 +1041,8 @@ void Page::SettingsChanged(ChangeType change_type) { for (Frame* frame = MainFrame(); frame; frame = frame->Tree().TraverseNext()) { if (auto* local_frame = DynamicTo(frame)) { @@ -460,9 +460,9 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c auto_load_images_(true), + images_enabled_(true), allow_stale_resources_(false), - image_fetched_(false) { - InstanceCounters::IncrementCounter(InstanceCounters::kResourceFetcherCounter); -@@ -2001,7 +2002,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused( + image_fetched_(false), + memory_pressure_listener_registration_( +@@ -2021,7 +2022,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused( return false; } @@ -471,7 +471,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c } ResourceFetcher::RevalidationPolicy -@@ -2246,8 +2247,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) { +@@ -2266,8 +2267,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) { ReloadImagesIfNotDeferred(); } @@ -496,7 +496,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h --- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h +++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h -@@ -234,6 +234,7 @@ class PLATFORM_EXPORT ResourceFetcher +@@ -235,6 +235,7 @@ class PLATFORM_EXPORT ResourceFetcher bool StartLoad(Resource*, bool is_potentially_unused_preload = false); void SetAutoLoadImages(bool); @@ -504,7 +504,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h FetchContext& Context() const; void ClearContext(); -@@ -716,6 +717,7 @@ class PLATFORM_EXPORT ResourceFetcher +@@ -717,6 +718,7 @@ class PLATFORM_EXPORT ResourceFetcher bool is_in_request_resource_ = false; bool auto_load_images_ : 1; diff --git a/build/patches/Supporting-Dangling-Ptr-Detection-via-BackupRefPtr.patch b/build/patches/Supporting-Dangling-Ptr-Detection-via-BackupRefPtr.patch index a0f429d8..62a32c95 100644 --- a/build/patches/Supporting-Dangling-Ptr-Detection-via-BackupRefPtr.patch +++ b/build/patches/Supporting-Dangling-Ptr-Detection-via-BackupRefPtr.patch @@ -53,7 +53,7 @@ diff --git a/base/allocator/partition_alloc_features.cc b/base/allocator/partiti diff --git a/base/allocator/partition_alloc_support.cc b/base/allocator/partition_alloc_support.cc --- a/base/allocator/partition_alloc_support.cc +++ b/base/allocator/partition_alloc_support.cc -@@ -280,6 +280,20 @@ void StartMemoryReclaimer(scoped_refptr task_runner) { +@@ -287,6 +287,20 @@ void StartMemoryReclaimer(scoped_refptr task_runner) { std::map ProposeSyntheticFinchTrials() { std::map trials; @@ -74,7 +74,7 @@ diff --git a/base/allocator/partition_alloc_support.cc b/base/allocator/partitio #if PA_BUILDFLAG(ENABLE_DANGLING_RAW_PTR_CHECKS) trials.emplace("DanglingPointerDetector", "Enabled"); #else -@@ -291,13 +305,18 @@ std::map ProposeSyntheticFinchTrials() { +@@ -298,13 +312,18 @@ std::map ProposeSyntheticFinchTrials() { trials.emplace("VectorRawPtrExperiment", "Disabled"); #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) @@ -96,7 +96,7 @@ diff --git a/base/allocator/partition_alloc_support.cc b/base/allocator/partitio } #if BUILDFLAG(IS_ANDROID) BootloaderOverride bootloader_override = GetBootloaderOverride(); -@@ -895,10 +914,7 @@ bool PartitionAllocSupport::ShouldEnablePartitionAllocWithAdvancedChecks( +@@ -919,10 +938,7 @@ bool PartitionAllocSupport::ShouldEnablePartitionAllocWithAdvancedChecks( base::features::kPartitionAllocWithAdvancedChecks)) { return false; } diff --git a/build/patches/Temp-disable-UseContextSnapshot.patch b/build/patches/Temp-disable-UseContextSnapshot.patch index 2805adfc..9f427b3b 100644 --- a/build/patches/Temp-disable-UseContextSnapshot.patch +++ b/build/patches/Temp-disable-UseContextSnapshot.patch @@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -1098,6 +1098,7 @@ BASE_FEATURE(kUnrestrictedSharedArrayBuffer, base::FEATURE_DISABLED_BY_DEFAULT); +@@ -1079,6 +1079,7 @@ BASE_FEATURE(kUnrestrictedSharedArrayBuffer, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) && BUILDFLAG(INCLUDE_BOTH_V8_SNAPSHOTS) // If enabled, blink's context snapshot is used rather than the v8 snapshot. BASE_FEATURE(kUseContextSnapshot, base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/build/patches/Temp-disable-experimental-web-platform-features.patch b/build/patches/Temp-disable-experimental-web-platform-features.patch index 9012217f..41650cfb 100644 --- a/build/patches/Temp-disable-experimental-web-platform-features.patch +++ b/build/patches/Temp-disable-experimental-web-platform-features.patch @@ -9,7 +9,7 @@ Subject: Temp disable experimental-web-platform-features diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -5481,10 +5481,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5532,10 +5532,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName, flag_descriptions::kGpuRasterizationDescription, kOsAll, MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)}, diff --git a/build/patches/Temp-use-PREVIEW-for-IDCompositionDevice5.patch b/build/patches/Temp-use-PREVIEW-for-IDCompositionDevice5.patch index 4871d942..d9b890bd 100644 --- a/build/patches/Temp-use-PREVIEW-for-IDCompositionDevice5.patch +++ b/build/patches/Temp-use-PREVIEW-for-IDCompositionDevice5.patch @@ -24,7 +24,7 @@ diff --git a/components/viz/service/display_embedder/skia_output_device_dcomp.cc #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkSurface.h" #include "third_party/skia/include/gpu/ganesh/GrDirectContext.h" -@@ -56,7 +57,7 @@ OutputSurface::DCSupportLevel GetDcSupportLevel() { +@@ -61,7 +62,7 @@ OutputSurface::DCSupportLevel GetDcSupportLevel() { Microsoft::WRL::ComPtr dcomp_device = gl::GetDirectCompositionDevice(); diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch index 79643342..1d77ce6e 100644 --- a/build/patches/Timezone-customization.patch +++ b/build/patches/Timezone-customization.patch @@ -565,11 +565,10 @@ new file mode 100644 diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc -@@ -1351,3 +1351,19 @@ JNI_WebsitePreferenceBridge_ToHostOnlyPattern( - ContentSettingsPattern::FromString(pattern_string)); +@@ -1352,5 +1352,21 @@ JNI_WebsitePreferenceBridge_ToHostOnlyPattern( return ConvertUTF8ToJavaString(env, host_only_pattern.ToString()); } -+ + +static void JNI_WebsitePreferenceBridge_SetCustomTimezone( + JNIEnv* env, + const JavaParamRef& jbrowser_context_handle, @@ -585,6 +584,9 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid + GetHostContentSettingsMap(jbrowser_context_handle)->GetTimezoneOverrideValue(custom_timezone); + return ConvertUTF8ToJavaString(env, custom_timezone); +} ++ + DEFINE_JNI(GeolocationSetting) + DEFINE_JNI(WebsitePreferenceBridge) diff --git a/components/browser_ui/strings/bromite_content_settings/timezone.grdp b/components/browser_ui/strings/bromite_content_settings/timezone.grdp new file mode 100644 --- /dev/null @@ -661,7 +663,7 @@ new file mode 100644 diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc -@@ -99,6 +99,8 @@ void PrefProvider::RegisterProfilePrefs( +@@ -103,6 +103,8 @@ void PrefProvider::RegisterProfilePrefs( info->GetPrefRegistrationFlags()); } @@ -670,7 +672,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov // Obsolete prefs ---------------------------------------------------------- // These prefs have been removed, but need to be registered so they can -@@ -178,6 +180,10 @@ PrefProvider::PrefProvider(PrefService* prefs, +@@ -185,6 +187,10 @@ PrefProvider::PrefProvider(PrefService* prefs, event_args->set_number_of_exceptions( num_exceptions); // PrefProvider::PrefProvider. }); @@ -681,7 +683,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov } PrefProvider::~PrefProvider() { -@@ -508,4 +514,14 @@ void PrefProvider::SetClockForTesting(const base::Clock* clock) { +@@ -517,4 +523,14 @@ void PrefProvider::SetClockForTesting(const base::Clock* clock) { } } @@ -821,7 +823,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/pref_names.h b/components/content_settings/core/common/pref_names.h --- a/components/content_settings/core/common/pref_names.h +++ b/components/content_settings/core/common/pref_names.h -@@ -267,6 +267,9 @@ inline constexpr char kDesktopSiteWindowSettingEnabled[] = +@@ -277,6 +277,9 @@ inline constexpr char kDesktopSiteWindowSettingEnabled[] = "desktop_site.window_setting"; #endif @@ -1054,7 +1056,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/timezone/timezone_controller.h b/third_party/blink/renderer/core/timezone/timezone_controller.h --- a/third_party/blink/renderer/core/timezone/timezone_controller.h +++ b/third_party/blink/renderer/core/timezone/timezone_controller.h -@@ -11,6 +11,7 @@ +@@ -12,6 +12,7 @@ #include "services/device/public/mojom/time_zone_monitor.mojom-blink.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" @@ -1062,7 +1064,7 @@ diff --git a/third_party/blink/renderer/core/timezone/timezone_controller.h b/th namespace blink { -@@ -25,6 +26,7 @@ namespace blink { +@@ -26,6 +27,7 @@ namespace blink { // current host system time zone is assumed. class CORE_EXPORT TimeZoneController final : public device::mojom::blink::TimeZoneMonitorClient { @@ -1070,7 +1072,7 @@ diff --git a/third_party/blink/renderer/core/timezone/timezone_controller.h b/th public: ~TimeZoneController() override; -@@ -39,7 +41,9 @@ class CORE_EXPORT TimeZoneController final +@@ -61,7 +63,9 @@ class CORE_EXPORT TimeZoneController final ChangeTimeZoneOverride(timezone_id); } @@ -1080,5 +1082,5 @@ diff --git a/third_party/blink/renderer/core/timezone/timezone_controller.h b/th + ~TimeZoneOverride() { if (clear_at_destruction_) ClearTimeZoneOverride(); } }; - static std::unique_ptr SetTimeZoneOverride( + struct TimeZoneOverrideResult { -- diff --git a/build/patches/Use-64-bit-WebView-processes.patch b/build/patches/Use-64-bit-WebView-processes.patch index 4076a016..81d57e9e 100644 --- a/build/patches/Use-64-bit-WebView-processes.patch +++ b/build/patches/Use-64-bit-WebView-processes.patch @@ -22,20 +22,22 @@ sandboxing. Original License: MIT - https://spdx.org/licenses/MIT.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - android_webview/nonembedded/java/AndroidManifest.xml | 3 --- - 1 file changed, 3 deletions(-) + android_webview/nonembedded/java/AndroidManifest.xml | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/android_webview/nonembedded/java/AndroidManifest.xml b/android_webview/nonembedded/java/AndroidManifest.xml --- a/android_webview/nonembedded/java/AndroidManifest.xml +++ b/android_webview/nonembedded/java/AndroidManifest.xml -@@ -40,9 +40,6 @@ by a child template that "extends" this file. +@@ -39,10 +39,7 @@ by a child template that "extends" this file. + +- {% endif %}> ++ android:multiArch="true"> {# This part is shared between stand-alone WebView and Monochrome #} {% macro common(manifest_package, webview_lib) %} + diff --git a/build/patches/Use-list-mode-for-tab-switcher.patch b/build/patches/Use-list-mode-for-tab-switcher.patch index 51fe705d..91b952aa 100644 --- a/build/patches/Use-list-mode-for-tab-switcher.patch +++ b/build/patches/Use-list-mode-for-tab-switcher.patch @@ -181,7 +181,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser activity, mBrowserControlsStateProvider, mModalDialogManager, -@@ -345,6 +347,11 @@ public class TabGridDialogCoordinator implements TabGridDialogMediator.DialogCon +@@ -347,6 +349,11 @@ public class TabGridDialogCoordinator implements TabGridDialogMediator.DialogCon : "SnackbarManager should have been created or the activity was already" + " finishing."; @@ -193,7 +193,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser ViewGroup container = mDialogView.findViewById(R.id.dialog_container_view); mTabListEditorCoordinator = new TabListEditorCoordinator( -@@ -355,7 +362,7 @@ public class TabGridDialogCoordinator implements TabGridDialogMediator.DialogCon +@@ -357,7 +364,7 @@ public class TabGridDialogCoordinator implements TabGridDialogMediator.DialogCon mCurrentTabGroupModelFilterSupplier, mTabContentManager, mTabListCoordinator::setRecyclerViewPosition, @@ -337,7 +337,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java -@@ -118,13 +118,13 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -119,13 +119,13 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO * *

NOTE: STRIP and GRID modes will have height equal to that of the container view. */ @@ -353,7 +353,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser int NUM_ENTRIES = 4; } -@@ -367,6 +367,8 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -371,6 +371,8 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO assumeNonNull(model); if (mMode == TabListMode.GRID) { TabGridViewBinder.onViewRecycled(model, viewHolder.itemView); @@ -362,7 +362,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } else if (mMode == TabListMode.STRIP) { TabStripViewBinder.onViewRecycled(model, viewHolder.itemView); } -@@ -475,6 +477,21 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -479,6 +481,21 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO .inflate(R.layout.tab_strip_item, parentView, false); }, TabStripViewBinder::bind); @@ -384,7 +384,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } else { throw new IllegalArgumentException( "Attempting to create a tab list UI with invalid mode"); -@@ -526,7 +543,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -532,7 +549,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO parentView.addView(mRecyclerView); } @@ -393,7 +393,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser boolean hasFixedSize = mMode != TabListMode.STRIP || !TabUiUtils.isDataSharingFunctionalityEnabled(); mRecyclerView.setAdapter(mAdapter); -@@ -558,9 +575,13 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -564,9 +581,13 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO Rect frame = new Rect(); mActivity.getWindow().getDecorView().getWindowVisibleDisplayFrame(frame); updateGridCardLayout(frame.width()); @@ -409,7 +409,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser @Override public void onLayoutCompleted(RecyclerView.State state) { super.onLayoutCompleted(state); -@@ -645,7 +666,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -650,7 +671,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO public void addTabListItemSizeChangedObserver(TabListItemSizeChangedObserver observer) { mTabListItemSizeChangedObserverList.addObserver(observer); Size size = mMediator.getDefaultGridCardSize(); @@ -418,7 +418,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser observer.onSizeChanged(mMediator.getCurrentSpanCount(), size); } -@@ -680,7 +701,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -685,7 +706,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO Size getThumbnailSize() { Size size = mMediator.getDefaultGridCardSize(); @@ -427,7 +427,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser return TabUtils.deriveThumbnailSize(size, mActivity); } -@@ -734,7 +755,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -739,7 +760,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO } private void configureRecyclerViewTouchHelpers() { @@ -439,8 +439,8 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListEditorCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListEditorCoordinator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListEditorCoordinator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListEditorCoordinator.java -@@ -364,7 +364,7 @@ public class TabListEditorCoordinator { - mDisplayGroups = displayGroups; +@@ -404,7 +404,7 @@ public class TabListEditorCoordinator { + mSnackbarManager = snackbarManager; mTabActionState = initialTabActionState; mTabContentManager = tabContentManager; - assert mode == TabListCoordinator.TabListMode.GRID; @@ -463,7 +463,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java -@@ -2555,8 +2555,26 @@ class TabListMediator implements TabListNotificationHandler { +@@ -2601,8 +2601,26 @@ class TabListMediator implements TabListNotificationHandler { private void updateFaviconForTab( PropertyModel model, Tab tab, @Nullable Bitmap icon, @Nullable GURL iconUrl) { if (mActionsOnAllRelatedTabs && isTabInTabGroup(tab)) { @@ -981,7 +981,7 @@ new file mode 100644 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java -@@ -333,7 +333,7 @@ public abstract class TabSwitcherPaneBase implements Pane, TabSwitcher, TabSwitc +@@ -330,7 +330,7 @@ public abstract class TabSwitcherPaneBase implements Pane, TabSwitcher, TabSwitc || isFullSpaceModeOnAndroidXr; @Nullable Tab tab = getCurrentTab(); @@ -990,7 +990,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser return FadeHubLayoutAnimationFactory.createFadeInAnimatorProvider( hubContainerView, HUB_LAYOUT_FADE_DURATION_MS, mOnToolbarAlphaChange); } else if (isFullSpaceModeOnAndroidXr && getTabListMode() == TabListMode.GRID) { -@@ -362,7 +362,7 @@ public abstract class TabSwitcherPaneBase implements Pane, TabSwitcher, TabSwitc +@@ -359,7 +359,7 @@ public abstract class TabSwitcherPaneBase implements Pane, TabSwitcher, TabSwitc HubContainerView hubContainerView) { assert !DeviceFormFactor.isNonMultiDisplayContextOnTablet(hubContainerView.getContext()); Tab tab = getCurrentTab(); @@ -1053,7 +1053,7 @@ diff --git a/chrome/android/features/tab_ui/tab_management_java_sources.gni b/ch diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -94,6 +94,12 @@ found in the LICENSE file. +@@ -88,6 +88,12 @@ found in the LICENSE file. android:summary="@string/allow_external_intent_requests_summary" app:featureName="AllowExternalIntentRequests" app:needRestart="false" /> @@ -1069,7 +1069,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -190,6 +190,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver; +@@ -194,6 +194,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver; import org.chromium.chrome.browser.tabmodel.TabModelUtils; import org.chromium.chrome.browser.task_manager.TaskManager; import org.chromium.chrome.browser.task_manager.TaskManagerFactory; @@ -1077,7 +1077,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.chrome.browser.theme.ThemeModuleUtils; import org.chromium.chrome.browser.tinker_tank.TinkerTankDelegate; import org.chromium.chrome.browser.toolbar.ControlContainer; -@@ -668,8 +669,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -680,8 +681,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity new TabContentManager( this, mBrowserControlsManagerSupplier.get(), @@ -1301,11 +1301,10 @@ diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/f void FaviconHelper::OnFaviconBitmapResultAvailable( const JavaRef& j_favicon_image_callback, const favicon_base::FaviconRawBitmapResult& result) { -@@ -162,3 +344,33 @@ void FaviconHelper::OnFaviconBitmapResultAvailable( - Java_FaviconImageCallback_onFaviconAvailable( +@@ -163,4 +345,34 @@ void FaviconHelper::OnFaviconBitmapResultAvailable( env, j_favicon_image_callback, j_favicon_bitmap, result.icon_url); } -+ + +void FaviconHelper::OnComposedFaviconBitmapResultsAvailable( + const JavaRef& j_favicon_image_callback, + const int desired_size_in_pixel, @@ -1335,6 +1334,8 @@ diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/f + Java_ComposedFaviconImageCallback_onComposedFaviconAvailable( + env, j_favicon_image_callback, j_favicon_bitmap, icon_url_vector); +} ++ + DEFINE_JNI(FaviconHelper) diff --git a/chrome/browser/android/favicon_helper.h b/chrome/browser/android/favicon_helper.h --- a/chrome/browser/android/favicon_helper.h +++ b/chrome/browser/android/favicon_helper.h @@ -1686,15 +1687,15 @@ new file mode 100644 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -@@ -60,6 +60,7 @@ import org.chromium.build.annotations.NullUnmarked; - import org.chromium.build.annotations.Nullable; +@@ -65,6 +65,7 @@ import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.flags.ChromeFeatureList; + import org.chromium.chrome.browser.ntp_customization.NtpCustomizationUtils; import org.chromium.chrome.browser.omnibox.LocationBar; +import org.chromium.chrome.browser.flags.cromite.sTabSwitcherListMode; import org.chromium.chrome.browser.omnibox.LocationBarBackgroundDrawable; import org.chromium.chrome.browser.omnibox.LocationBarBackgroundDrawable.HairlineBehavior; import org.chromium.chrome.browser.omnibox.LocationBarCoordinator; -@@ -1835,7 +1836,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2030,7 +2031,7 @@ public class ToolbarPhone extends ToolbarLayout // On entering the tab switcher, set the focusability of the url bar to be false. This will // occur at the start of the enter event, and will later be reset to true upon finishing the // exit event. @@ -1703,7 +1704,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow mLocationBar.setUrlBarFocusable(false); } -@@ -2063,7 +2064,8 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2267,7 +2268,8 @@ public class ToolbarPhone extends ToolbarLayout ToggleTabStackButtonCoordinator tabSwitcherButtonCoordinator = getTabSwitcherButtonCoordinator(); assumeNonNull(tabSwitcherButtonCoordinator); diff --git a/build/patches/Viewport-Protection-flag.patch b/build/patches/Viewport-Protection-flag.patch index 764f21d3..2e92c90e 100644 --- a/build/patches/Viewport-Protection-flag.patch +++ b/build/patches/Viewport-Protection-flag.patch @@ -211,9 +211,9 @@ new file mode 100644 diff --git a/components/guest_view/browser/guest_view_base.cc b/components/guest_view/browser/guest_view_base.cc --- a/components/guest_view/browser/guest_view_base.cc +++ b/components/guest_view/browser/guest_view_base.cc -@@ -670,6 +670,14 @@ void GuestViewBase::AttachToOuterWebContentsFrame( - if (attachment_callback) +@@ -688,6 +688,14 @@ void GuestViewBase::AttachToOuterWebContentsFrame( std::move(attachment_callback).Run(); + } + // Disable viewport protection + // I use this hack, i.e. I reuse the SetPageScale method for my own purposes, @@ -282,7 +282,7 @@ diff --git a/third_party/blink/public/common/widget/device_emulation_params.h b/ diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5 --- a/third_party/blink/renderer/core/css/css_properties.json5 +++ b/third_party/blink/renderer/core/css/css_properties.json5 -@@ -4343,6 +4343,7 @@ +@@ -4341,6 +4341,7 @@ }, { name: "opacity", @@ -290,7 +290,7 @@ diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_pa property_methods: ["ParseSingleValue", "CSSValueFromComputedStyleInternal"], interpolable: true, compositable: true, -@@ -4350,7 +4351,6 @@ +@@ -4348,7 +4349,6 @@ field_template: "primitive", default_value: "1.0", type_name: "float", @@ -313,7 +313,7 @@ diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/b diff --git a/third_party/blink/renderer/core/css/resolver/style_resolver.cc b/third_party/blink/renderer/core/css/resolver/style_resolver.cc --- a/third_party/blink/renderer/core/css/resolver/style_resolver.cc +++ b/third_party/blink/renderer/core/css/resolver/style_resolver.cc -@@ -2350,7 +2350,12 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const { +@@ -2354,7 +2354,12 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const { ComputedStyleBuilder builder = CreateComputedStyleBuilder(); builder.SetRtlOrdering(GetDocument().VisuallyOrdered() ? EOrder::kVisual : EOrder::kLogical); @@ -399,7 +399,7 @@ diff --git a/third_party/blink/renderer/core/events/pointer_event.h b/third_part diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -1120,7 +1120,7 @@ WebPagePopupImpl* WebViewImpl::OpenPagePopup(PagePopupClient* client) { +@@ -1110,7 +1110,7 @@ WebPagePopupImpl* WebViewImpl::OpenPagePopup(PagePopupClient* client) { page_popup_ = WebPagePopupImpl::Create( std::move(popup_widget_host), std::move(widget_host), std::move(widget_receiver), this, agent_group_scheduler, @@ -411,7 +411,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -1606,7 +1606,12 @@ int LocalDOMWindow::outerHeight() const { +@@ -1615,7 +1615,12 @@ int LocalDOMWindow::outerHeight() const { if (frame->IsInFencedFrameTree()) { return innerHeight(); } @@ -425,7 +425,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p Page* page = frame->GetPage(); if (!page) return 0; -@@ -1631,7 +1636,12 @@ int LocalDOMWindow::outerWidth() const { +@@ -1640,7 +1645,12 @@ int LocalDOMWindow::outerWidth() const { if (frame->IsInFencedFrameTree()) { return innerWidth(); } @@ -439,7 +439,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p Page* page = frame->GetPage(); if (!page) return 0; -@@ -1827,7 +1837,8 @@ double LocalDOMWindow::devicePixelRatio() const { +@@ -1836,7 +1846,8 @@ double LocalDOMWindow::devicePixelRatio() const { if (!GetFrame()) return 0.0; @@ -449,7 +449,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p } ScriptPromise LocalDOMWindow::scrollBy(ScriptState* script_state, -@@ -2469,6 +2480,23 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2446,6 +2457,23 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, if (!completed_url.IsEmpty() || result.new_window) result.frame->Navigate(frame_request, WebFrameLoadType::kStandard); @@ -473,7 +473,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p // TODO(japhet): window-open-noopener.html?_top and several tests in // html/browsers/windows/browsing-context-names/ appear to require that // the special case target names (_top, _parent, _self) ignore opener -@@ -2520,6 +2548,15 @@ DOMWindow* LocalDOMWindow::openPictureInPictureWindow( +@@ -2497,6 +2525,15 @@ DOMWindow* LocalDOMWindow::openPictureInPictureWindow( DCHECK(result.new_window); result.frame->Navigate(frame_request, WebFrameLoadType::kStandard); @@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -1674,6 +1674,10 @@ void LocalFrame::RestoreScrollOffsets() { +@@ -1685,6 +1685,10 @@ void LocalFrame::RestoreScrollOffsets() { saved_scroll_offsets_ = nullptr; } @@ -503,7 +503,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ void LocalFrame::SetLayoutZoomFactor(float factor) { SetZoomFactors(factor, text_zoom_factor_, css_zoom_factor_); } -@@ -1860,12 +1864,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() { +@@ -1871,12 +1875,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() { return mojo_handler_->GetDevicePosture(); } @@ -522,7 +522,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ return ratio; } -@@ -3451,6 +3459,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) { +@@ -3466,6 +3474,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) { DCHECK(!GetDocument() || !GetDocument()->Printing()); DCHECK(IsMainFrame()); @@ -537,7 +537,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -431,7 +431,8 @@ class CORE_EXPORT LocalFrame final +@@ -433,7 +433,8 @@ class CORE_EXPORT LocalFrame final void SetInViewSourceMode(bool = true); void SetLayoutZoomFactor(float); @@ -547,7 +547,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b void SetTextZoomFactor(float); float TextZoomFactor() const { return text_zoom_factor_; } void SetCssZoomFactor(float); -@@ -440,7 +441,7 @@ class CORE_EXPORT LocalFrame final +@@ -442,7 +443,7 @@ class CORE_EXPORT LocalFrame final float text_zoom_factor, float css_zoom_factor); @@ -556,7 +556,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b // Informs the local root's document and its local descendant subtree that a // media query value changed. -@@ -1091,6 +1092,7 @@ class CORE_EXPORT LocalFrame final +@@ -1140,6 +1141,7 @@ class CORE_EXPORT LocalFrame final unsigned did_run_detach_impl_ : 1 = false; float layout_zoom_factor_; @@ -662,7 +662,7 @@ diff --git a/third_party/blink/renderer/core/frame/screen_metrics_emulator.h b/t diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc -@@ -1946,6 +1946,15 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( +@@ -1945,6 +1945,15 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( if (DeviceEmulator() && widget_base_ && !widget_base_->WillBeDestroyed()) { DeviceEmulator()->UpdateVisualProperties(visual_properties); @@ -735,7 +735,7 @@ diff --git a/third_party/blink/renderer/core/input/touch.cc b/third_party/blink/ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc --- a/third_party/blink/renderer/core/page/page.cc +++ b/third_party/blink/renderer/core/page/page.cc -@@ -110,6 +110,13 @@ +@@ -108,6 +108,13 @@ #include "ui/color/color_provider_utils.h" #include "ui/gfx/geometry/insets_conversions.h" @@ -749,7 +749,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re namespace blink { namespace { -@@ -1313,7 +1320,96 @@ void Page::UpdateAcceleratedCompositingSettings() { +@@ -1268,7 +1275,96 @@ void Page::UpdateAcceleratedCompositingSettings() { } } @@ -849,9 +849,9 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/renderer/core/page/page.h --- a/third_party/blink/renderer/core/page/page.h +++ b/third_party/blink/renderer/core/page/page.h -@@ -566,6 +566,10 @@ class CORE_EXPORT Page final : public GarbageCollected, - void SetCanvasNoiseToken(std::optional canvas_noise_token); - std::optional CanvasNoiseToken() const; +@@ -597,6 +597,10 @@ class CORE_EXPORT Page final : public GarbageCollected, + + #endif + void CalculateEmulatedScreenSetting(LocalFrame* frame, bool force = false); + bool IsScreenEmulated() { return is_screen_emulated_; } @@ -860,7 +860,7 @@ diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/ren private: friend class ScopedPagePauser; class CloseTaskHandler; -@@ -736,6 +740,11 @@ class CORE_EXPORT Page final : public GarbageCollected, +@@ -767,6 +771,11 @@ class CORE_EXPORT Page final : public GarbageCollected, // browser side FrameTree has the FrameTree::Type of kFencedFrame. bool is_fenced_frame_tree_ = false; @@ -875,7 +875,7 @@ diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/ren diff --git a/third_party/blink/renderer/core/style/computed_style.h b/third_party/blink/renderer/core/style/computed_style.h --- a/third_party/blink/renderer/core/style/computed_style.h +++ b/third_party/blink/renderer/core/style/computed_style.h -@@ -2025,6 +2025,12 @@ class ComputedStyle final : public ComputedStyleBase { +@@ -2032,6 +2032,12 @@ class ComputedStyle final : public ComputedStyleBase { IsRunningBackdropFilterAnimationOnCompositor(); } diff --git a/build/patches/WIN-Add-some-prefs-to-secure-preferences.patch b/build/patches/WIN-Add-some-prefs-to-secure-preferences.patch index fc48c80d..bd7c277e 100644 --- a/build/patches/WIN-Add-some-prefs-to-secure-preferences.patch +++ b/build/patches/WIN-Add-some-prefs-to-secure-preferences.patch @@ -9,7 +9,7 @@ Subject: WIN Add some prefs to secure preferences diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc -@@ -117,6 +117,14 @@ bool g_disable_domain_check_for_testing = false; +@@ -119,6 +119,14 @@ bool g_disable_domain_check_for_testing = false; // See CleanupDeprecatedTrackedPreferences() in pref_hash_filter.cc to remove a // deprecated tracked preference. const auto kTrackedPrefs = std::to_array({ diff --git a/build/patches/WIN-Disable-first-run.patch b/build/patches/WIN-Disable-first-run.patch index 9f5ed746..689d474a 100644 --- a/build/patches/WIN-Disable-first-run.patch +++ b/build/patches/WIN-Disable-first-run.patch @@ -9,7 +9,7 @@ Subject: WIN Disable first run diff --git a/chrome/browser/ui/startup/first_run_service.cc b/chrome/browser/ui/startup/first_run_service.cc --- a/chrome/browser/ui/startup/first_run_service.cc +++ b/chrome/browser/ui/startup/first_run_service.cc -@@ -123,7 +123,7 @@ bool IsFirstRunMarkedFinishedInPrefs() { +@@ -119,7 +119,7 @@ bool IsFirstRunMarkedFinishedInPrefs() { // static void FirstRunService::RegisterLocalStatePrefs(PrefRegistrySimple* registry) { diff --git a/build/patches/WIN-Fix-log-to-file.patch b/build/patches/WIN-Fix-log-to-file.patch index a371bd61..1cd06120 100644 --- a/build/patches/WIN-Fix-log-to-file.patch +++ b/build/patches/WIN-Fix-log-to-file.patch @@ -13,7 +13,7 @@ Log rotation enabled by default. diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc -@@ -36,7 +36,7 @@ +@@ -37,7 +37,7 @@ #include "chrome/common/logging_chrome.h" #include "content/public/common/content_switches.h" @@ -22,7 +22,7 @@ diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc #include "ash/constants/ash_switches.h" #include "base/i18n/time_formatting.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -@@ -211,7 +211,7 @@ LoggingDestination DetermineLoggingDestination( +@@ -212,7 +212,7 @@ LoggingDestination DetermineLoggingDestination( return LoggingDestFromCommandLine(command_line, unused); } @@ -31,7 +31,7 @@ diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc bool RotateLogFile(const base::FilePath& target_path) { DCHECK(!target_path.empty()); // If the old log file doesn't exist, do nothing. -@@ -256,7 +256,9 @@ bool RotateLogFile(const base::FilePath& target_path) { +@@ -257,7 +257,9 @@ bool RotateLogFile(const base::FilePath& target_path) { return true; } @@ -41,7 +41,7 @@ diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc base::FilePath SetUpSymlinkIfNeeded(const base::FilePath& symlink_path, bool new_log) { DCHECK(!symlink_path.empty()); -@@ -429,6 +431,9 @@ void InitChromeLogging(const base::CommandLine& command_line, +@@ -430,6 +432,9 @@ void InitChromeLogging(const base::CommandLine& command_line, // since that will remove the newly created link instead. delete_old_log_file = APPEND_TO_OLD_LOG_FILE; #endif // BUILDFLAG(IS_CHROMEOS) @@ -51,7 +51,7 @@ diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc } } else { log_locking_state = DONT_LOCK_LOG_FILE; -@@ -593,7 +598,7 @@ bool DialogsAreSuppressed() { +@@ -594,7 +599,7 @@ bool DialogsAreSuppressed() { return dialogs_are_suppressed_; } diff --git a/build/patches/WIN-enable-pdf-plugin.patch b/build/patches/WIN-enable-pdf-plugin.patch index 163d3642..1b8193a2 100644 --- a/build/patches/WIN-enable-pdf-plugin.patch +++ b/build/patches/WIN-enable-pdf-plugin.patch @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -2377,7 +2377,9 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() +@@ -2390,7 +2390,9 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() } PluginData* LocalFrame::GetPluginData() const { diff --git a/build/patches/Warning-message-for-unsupported-hardware-aes.patch b/build/patches/Warning-message-for-unsupported-hardware-aes.patch index af6b89a5..91308644 100644 --- a/build/patches/Warning-message-for-unsupported-hardware-aes.patch +++ b/build/patches/Warning-message-for-unsupported-hardware-aes.patch @@ -59,7 +59,7 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn "//headless:headless_non_renderer", "//headless:headless_shell_browser_lib", "//net:net_resources", -@@ -1635,6 +1636,8 @@ if (is_android) { +@@ -1636,6 +1637,8 @@ if (is_android) { "//chrome/common/profiler", "//chrome/gpu", "//chrome/renderer", @@ -71,7 +71,7 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc -@@ -103,6 +103,9 @@ +@@ -98,6 +98,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/scoped_startup_resource_bundle.h" #include "ui/base/ui_base_switches.h" @@ -81,7 +81,7 @@ diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegat #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ BUILDFLAG(IS_MAC) -@@ -1101,6 +1104,12 @@ std::optional ChromeMainDelegate::BasicStartupComplete() { +@@ -1090,6 +1093,12 @@ std::optional ChromeMainDelegate::BasicStartupComplete() { } #endif @@ -97,7 +97,7 @@ diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegat diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -7263,6 +7263,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7327,6 +7327,10 @@ Keep your key file in a safe place. You will need it to create new versions of y You are using an unsupported feature flag: $1SignedHTTPExchange. Stability and security will suffer. @@ -111,7 +111,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -293,6 +293,15 @@ void ShowBadFlagsPrompt(content::WebContents* web_contents) { +@@ -287,6 +287,15 @@ void ShowBadFlagsPrompt(content::WebContents* web_contents) { return; } } @@ -130,7 +130,7 @@ diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/s diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3820,6 +3820,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3847,6 +3847,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kSchedulerBoostUrgent, #endif switches::kDesktopModeViewportMetaEnabled, diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch index c1441cb6..da9936ab 100644 --- a/build/patches/Welcome-screen.patch +++ b/build/patches/Welcome-screen.patch @@ -31,7 +31,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -526,6 +526,7 @@ chrome_java_resources = [ +@@ -542,6 +542,7 @@ chrome_java_resources = [ "java/res/layout/find_in_page.xml", "java/res/layout/find_toolbar.xml", "java/res/layout/fre_tos_privacy_disclaimer.xml", @@ -42,7 +42,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -646,6 +646,8 @@ chrome_java_sources = [ +@@ -653,6 +653,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java", "java/src/org/chromium/chrome/browser/firstrun/SkipTosDialogPolicyListener.java", "java/src/org/chromium/chrome/browser/firstrun/TosDialogBehaviorSharedPrefInvalidator.java", @@ -240,7 +240,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml --- a/chrome/android/java/res/values/styles.xml +++ b/chrome/android/java/res/values/styles.xml -@@ -342,6 +342,30 @@ found in the LICENSE file. +@@ -356,6 +356,30 @@ found in the LICENSE file. 1 diff --git a/build/patches/add-browser-policy.patch b/build/patches/add-browser-policy.patch index e72df3d9..57105a47 100644 --- a/build/patches/add-browser-policy.patch +++ b/build/patches/add-browser-policy.patch @@ -8,7 +8,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html chrome/android/java/AndroidManifest.xml | 4 - .../privacy_preferences_manager_impl.cc | 5 + .../metrics/chrome_feature_list_creator.cc | 12 ++ - .../search_engine_preconnector.cc | 1 + + .../search_engine_preconnector.cc | 3 + .../policy/chrome_browser_policy_connector.cc | 3 - ...nfiguration_policy_handler_list_factory.cc | 11 +- .../account_consistency_mode_manager.cc | 7 +- @@ -39,12 +39,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html extensions/common/extension_features.cc | 1 + google_apis/gaia/gaia_auth_fetcher.cc | 1 + net/socket/ssl_client_socket_impl.cc | 3 + - 35 files changed, 326 insertions(+), 162 deletions(-) + 35 files changed, 328 insertions(+), 162 deletions(-) diff --git a/base/win/win_util.cc b/base/win/win_util.cc --- a/base/win/win_util.cc +++ b/base/win/win_util.cc -@@ -157,80 +157,18 @@ bool EnablePerMonitorV2() { +@@ -152,80 +152,18 @@ bool EnablePerMonitorV2() { } bool* GetDomainEnrollmentStateStorage() { @@ -175,16 +175,16 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl diff --git a/chrome/browser/metrics/chrome_feature_list_creator.cc b/chrome/browser/metrics/chrome_feature_list_creator.cc --- a/chrome/browser/metrics/chrome_feature_list_creator.cc +++ b/chrome/browser/metrics/chrome_feature_list_creator.cc -@@ -57,6 +57,8 @@ +@@ -37,6 +37,8 @@ #include "content/public/common/content_switches.h" #include "services/network/public/cpp/network_switches.h" #include "ui/base/resource/resource_bundle.h" +#include "components/policy/core/common/policy_pref_names.h" +#include "components/policy/core/common/policy_switches.h" - #if BUILDFLAG(IS_CHROMEOS) - #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" -@@ -199,6 +201,16 @@ void ChromeFeatureListCreator::CreatePrefService() { + #if BUILDFLAG(IS_WIN) + #include "chrome/installer/util/google_update_settings.h" +@@ -188,6 +190,16 @@ void ChromeFeatureListCreator::CreatePrefService() { // ManagementService's cache. if (local_state_pref_store->ReadPrefs() == JsonPrefStore::PREF_READ_ERROR_NONE) { @@ -204,18 +204,20 @@ diff --git a/chrome/browser/metrics/chrome_feature_list_creator.cc b/chrome/brow diff --git a/chrome/browser/navigation_predictor/search_engine_preconnector.cc b/chrome/browser/navigation_predictor/search_engine_preconnector.cc --- a/chrome/browser/navigation_predictor/search_engine_preconnector.cc +++ b/chrome/browser/navigation_predictor/search_engine_preconnector.cc -@@ -52,6 +52,7 @@ namespace features { - - BASE_FEATURE(kPreconnectFromKeyedService, base::FEATURE_DISABLED_BY_DEFAULT); +@@ -63,6 +63,9 @@ namespace features { + BASE_FEATURE(kPreconnectFromKeyedService, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kPreconnectToSearch, base::FEATURE_ENABLED_BY_DEFAULT); -+SET_CROMITE_FEATURE_DISABLED(kPreconnectToSearch); - } // namespace features - WebContentVisibilityManager::WebContentVisibilityManager() ++SET_CROMITE_FEATURE_DISABLED(kPreconnectFromKeyedService); ++SET_CROMITE_FEATURE_DISABLED(kPreconnectToSearch); ++ + // Feature to control binding the receivers every time we attempt to + // preconnect. This will trigger the destruction of the previous receiver + // (and also the remote), and also the re-creation of the observer. diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/browser/policy/chrome_browser_policy_connector.cc --- a/chrome/browser/policy/chrome_browser_policy_connector.cc +++ b/chrome/browser/policy/chrome_browser_policy_connector.cc -@@ -134,9 +134,6 @@ bool ChromeBrowserPolicyConnector::HasMachineLevelPolicies() { +@@ -133,9 +133,6 @@ bool ChromeBrowserPolicyConnector::HasMachineLevelPolicies() { return true; } #endif // !BUILDFLAG(IS_CHROMEOS) @@ -228,7 +230,7 @@ diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/b diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -2499,9 +2499,9 @@ bool AreFuturePoliciesEnabledByDefault() { +@@ -2538,9 +2538,9 @@ bool AreFuturePoliciesEnabledByDefault() { if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) { return true; } @@ -241,7 +243,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc } } // namespace -@@ -3334,7 +3334,10 @@ std::unique_ptr BuildHandlerList( +@@ -3374,7 +3374,10 @@ std::unique_ptr BuildHandlerList( key::kExtensionInstallCloudPolicyChecksEnabled, extensions::pref_names::kExtensionInstallCloudPolicyChecksEnabled, base::Value::Type::BOOLEAN)); @@ -338,7 +340,7 @@ diff --git a/chrome/browser/signin/bound_session_credentials/throttled_gaia_auth diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc --- a/chrome/browser/signin/chrome_signin_client.cc +++ b/chrome/browser/signin/chrome_signin_client.cc -@@ -266,7 +266,9 @@ void ChromeSigninClient::DoFinalInit() { +@@ -278,7 +278,9 @@ void ChromeSigninClient::DoFinalInit() { bool ChromeSigninClient::ProfileAllowsSigninCookies(Profile* profile) { scoped_refptr cookie_settings = CookieSettingsFactory::GetForProfile(profile); @@ -349,7 +351,7 @@ diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/sign } PrefService* ChromeSigninClient::GetPrefs() { -@@ -387,6 +389,9 @@ bool ChromeSigninClient::AreNetworkCallsDelayed() { +@@ -404,6 +406,9 @@ bool ChromeSigninClient::AreNetworkCallsDelayed() { } void ChromeSigninClient::DelayNetworkCall(base::OnceClosure callback) { @@ -385,7 +387,7 @@ diff --git a/chrome/browser/signin/dice_response_handler.cc b/chrome/browser/sig diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browser/ui/webui/policy/policy_ui_handler.cc --- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc +++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc -@@ -26,6 +26,7 @@ +@@ -25,6 +25,7 @@ #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" @@ -393,7 +395,7 @@ diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browse #include "base/strings/utf_string_conversions.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" -@@ -72,6 +73,7 @@ +@@ -71,6 +72,7 @@ #include "components/policy/core/common/policy_details.h" #include "components/policy/core/common/policy_logger.h" #include "components/policy/core/common/policy_pref_names.h" @@ -401,7 +403,7 @@ diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browse #include "components/policy/core/common/policy_scheduler.h" #include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/policy_utils.h" -@@ -215,6 +217,10 @@ void PolicyUIHandler::RegisterMessages() { +@@ -214,6 +216,10 @@ void PolicyUIHandler::RegisterMessages() { "exportPoliciesJSON", base::BindRepeating(&PolicyUIHandler::HandleExportPoliciesJson, base::Unretained(this))); @@ -412,7 +414,7 @@ diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browse web_ui()->RegisterMessageCallback( "listenPoliciesUpdates", base::BindRepeating(&PolicyUIHandler::HandleListenPoliciesUpdates, -@@ -505,8 +511,102 @@ void PolicyUIHandler::SendPolicies() { +@@ -504,8 +510,102 @@ void PolicyUIHandler::SendPolicies() { "policies-updated", base::Value( policy_value_and_status_aggregator_->GetAggregatedPolicyNames()), @@ -601,7 +603,7 @@ diff --git a/components/commerce/core/commerce_feature_list.cc b/components/comm } // namespace BASE_FEATURE(kCommerceAllowLocalImages, base::FEATURE_DISABLED_BY_DEFAULT); -@@ -282,16 +232,15 @@ const base::FeatureParam kRevertIconOnFailure{ +@@ -278,16 +228,15 @@ const base::FeatureParam kRevertIconOnFailure{ &kShoppingList, kRevertIconOnFailureParam, false}; bool IsPartnerMerchant(const GURL& url) { @@ -621,7 +623,7 @@ diff --git a/components/commerce/core/commerce_feature_list.cc b/components/comm } bool IsCartDiscountFeatureEnabled() { -@@ -343,6 +292,7 @@ bool IsEnabledForCountryAndLocale(const base::Feature& feature, +@@ -339,6 +288,7 @@ bool IsEnabledForCountryAndLocale(const base::Feature& feature, bool IsRegionLockedFeatureEnabled(const base::Feature& feature, const std::string& country_code, const std::string& locale) { @@ -629,7 +631,7 @@ diff --git a/components/commerce/core/commerce_feature_list.cc b/components/comm auto* feature_list = base::FeatureList::GetInstance(); // If the feature has a server-side config, this check will ensure that -@@ -375,6 +325,7 @@ base::TimeDelta GetDiscountFetchDelay() { +@@ -371,6 +321,7 @@ base::TimeDelta GetDiscountFetchDelay() { } bool IsNoDiscountMerchant(const GURL& url) { @@ -637,7 +639,7 @@ diff --git a/components/commerce/core/commerce_feature_list.cc b/components/comm auto* pattern_from_component = commerce_heuristics::CommerceHeuristicsData::GetInstance() .GetNoDiscountMerchantPattern(); -@@ -386,4 +337,6 @@ bool IsNoDiscountMerchant(const GURL& url) { +@@ -382,4 +333,6 @@ bool IsNoDiscountMerchant(const GURL& url) { return RE2::PartialMatch(url.host(), *pattern_from_component); } #endif @@ -979,7 +981,7 @@ diff --git a/components/policy/resources/webui/policy_row.ts b/components/policy diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp -@@ -672,8 +672,8 @@ Additional details: +@@ -675,8 +675,8 @@ Additional details: Default @@ -993,7 +995,7 @@ diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc --- a/components/search/ntp_features.cc +++ b/components/search/ntp_features.cc -@@ -81,6 +81,7 @@ BASE_FEATURE(kNtpCalendarModule, base::FEATURE_ENABLED_BY_DEFAULT); +@@ -86,6 +86,7 @@ BASE_FEATURE(kNtpCalendarModule, base::FEATURE_ENABLED_BY_DEFAULT); // If enabled, chrome cart module will be shown. BASE_FEATURE(kNtpChromeCartModule, base::FEATURE_ENABLED_BY_DEFAULT); @@ -1016,7 +1018,7 @@ diff --git a/components/signin/features.gni b/components/signin/features.gni diff --git a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc --- a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc +++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc -@@ -465,6 +465,8 @@ void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -463,6 +463,8 @@ void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) { } void GaiaCookieManagerService::InitCookieListener() { @@ -1025,7 +1027,7 @@ diff --git a/components/signin/internal/identity_manager/gaia_cookie_manager_ser DCHECK(!cookie_listener_receiver_.is_bound()); network::mojom::CookieManager* cookie_manager = -@@ -859,6 +861,8 @@ void GaiaCookieManagerService::OnSetAccountsFinished( +@@ -857,6 +859,8 @@ void GaiaCookieManagerService::OnSetAccountsFinished( } void GaiaCookieManagerService::HandleNextRequest() { @@ -1037,7 +1039,7 @@ diff --git a/components/signin/internal/identity_manager/gaia_cookie_manager_ser diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc --- a/extensions/common/extension_features.cc +++ b/extensions/common/extension_features.cc -@@ -45,6 +45,7 @@ BASE_FEATURE(kApiRuntimeGetPlatformInfoNaClArch, +@@ -47,6 +47,7 @@ BASE_FEATURE(kWebRequestSecurityInfo, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kAllowWithholdingExtensionPermissionsOnInstall, base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/build/patches/allow-the-download-of-clang-for-windows-crossbuild.patch b/build/patches/allow-the-download-of-clang-for-windows-crossbuild.patch index 3ac09edc..f54de994 100644 --- a/build/patches/allow-the-download-of-clang-for-windows-crossbuild.patch +++ b/build/patches/allow-the-download-of-clang-for-windows-crossbuild.patch @@ -32,16 +32,16 @@ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py preserve_gcs_signature, dir=LLVM_BUILD_DIR): stamp_file = None -@@ -295,6 +297,8 @@ def UpdatePackage(package_name, - target_os = env.get('target_os', target_os) - except: - pass +@@ -302,6 +304,8 @@ def UpdatePackage(package_name, + break + except: + pass + if host_os != "": + target_os = [ host_os ] if os.path.exists(OLD_STAMP_FILE): # Delete the old stamp file so it doesn't look like an old version of clang -@@ -312,7 +316,7 @@ def UpdatePackage(package_name, +@@ -319,7 +323,7 @@ def UpdatePackage(package_name, # Updating the main clang package nukes the output dir. Any other packages # need to be updated *after* the clang package. @@ -50,7 +50,7 @@ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py RmTree(dir) DownloadAndUnpackPackage(package_file, dir, host_os) -@@ -360,6 +364,8 @@ def main(): +@@ -367,6 +371,8 @@ def main(): parser.add_argument('--print-clang-version', action='store_true', help=('Print current clang release version (e.g. 9.0.0) ' 'and exit.')) @@ -59,7 +59,7 @@ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py parser.add_argument('--preserve-gcs-signature', action='store_true', help='By default, this script removes gcs hash files ' -@@ -402,7 +408,7 @@ def main(): +@@ -409,7 +415,7 @@ def main(): print('--llvm-force-head-revision can only be used for --print-revision') return 1 diff --git a/build/patches/autofill-miscellaneous.patch b/build/patches/autofill-miscellaneous.patch index 55550176..4418d804 100644 --- a/build/patches/autofill-miscellaneous.patch +++ b/build/patches/autofill-miscellaneous.patch @@ -22,10 +22,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/crowdsourcing/votes_uploader.cc | 3 - .../browser/foundations/autofill_client.h | 4 -- .../browser/foundations/autofill_manager.cc | 11 ---- - .../autofill/core/common/autofill_features.cc | 2 + + .../autofill/core/common/autofill_features.cc | 1 + .../autofill/core/common/autofill_prefs.cc | 8 +-- .../password_generation_frame_helper.cc | 5 -- - 14 files changed, 12 insertions(+), 113 deletions(-) + 14 files changed, 11 insertions(+), 113 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AutofillOptionsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/AutofillOptionsLauncher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/AutofillOptionsLauncher.java @@ -41,7 +41,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AutofillOptions diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -1126,10 +1126,6 @@ ChromePasswordManagerClient::GetHttpAuthManager() { +@@ -1131,10 +1131,6 @@ ChromePasswordManagerClient::GetHttpAuthManager() { autofill::AutofillCrowdsourcingManager* ChromePasswordManagerClient::GetAutofillCrowdsourcingManager() { @@ -117,7 +117,7 @@ diff --git a/components/android_autofill/browser/android_autofill_client.h b/com diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc --- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc +++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc -@@ -504,33 +504,6 @@ std::optional GetUploadPayloadForApi( +@@ -506,33 +506,6 @@ std::optional GetUploadPayloadForApi( return std::move(payload); } @@ -151,7 +151,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci // Gets HTTP body payload for API POST request. std::optional GetAPIBodyPayload(std::string payload, CrowdsourcingRequestType type) { -@@ -562,15 +535,7 @@ std::optional GetAPIQueryPayload( +@@ -564,15 +537,7 @@ std::optional GetAPIQueryPayload( } std::string GetAPIKeyForUrl(version_info::Channel channel) { @@ -168,7 +168,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci } std::optional>& GetActiveExperiments() { -@@ -900,31 +865,13 @@ size_t AutofillCrowdsourcingManager::GetPayloadLength( +@@ -902,31 +867,13 @@ size_t AutofillCrowdsourcingManager::GetPayloadLength( std::tuple AutofillCrowdsourcingManager::GetRequestURLAndMethod( const FormRequestData& request_data) const { @@ -207,7 +207,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.h b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.h --- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.h +++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.h -@@ -35,8 +35,6 @@ namespace autofill { +@@ -37,8 +37,6 @@ namespace autofill { class AutofillClient; @@ -219,7 +219,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci diff --git a/components/autofill/core/browser/crowdsourcing/votes_uploader.cc b/components/autofill/core/browser/crowdsourcing/votes_uploader.cc --- a/components/autofill/core/browser/crowdsourcing/votes_uploader.cc +++ b/components/autofill/core/browser/crowdsourcing/votes_uploader.cc -@@ -418,9 +418,6 @@ void VotesUploader::UploadVote( +@@ -423,9 +423,6 @@ void VotesUploader::UploadVote( client_->GetUkmRecorder(), ukm_source_id, *submitted_form, submission_timestamp); } @@ -246,8 +246,8 @@ diff --git a/components/autofill/core/browser/foundations/autofill_client.h b/co diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/components/autofill/core/browser/foundations/autofill_manager.cc --- a/components/autofill/core/browser/foundations/autofill_manager.cc +++ b/components/autofill/core/browser/foundations/autofill_manager.cc -@@ -306,17 +306,6 @@ void AutofillManager::OnFormsParsed(const std::vector& forms) { - if (base::FeatureList::IsEnabled(features::test::kShowDomNodeIDs)) { +@@ -303,17 +303,6 @@ void AutofillManager::OnFormsParsed(const std::vector& forms) { + if (base::FeatureList::IsEnabled(features::debug::kShowDomNodeIDs)) { driver().ExposeDomNodeIdsInAllFrames(); } - @@ -267,15 +267,14 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/ diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc --- a/components/autofill/core/common/autofill_features.cc +++ b/components/autofill/core/common/autofill_features.cc -@@ -1007,6 +1007,8 @@ BASE_FEATURE(kAutofillUnionTypesSingleTypeInAutofillInformation, - // to be launched. - BASE_FEATURE(kAutofillUploadThrottling, base::FEATURE_ENABLED_BY_DEFAULT); - -+SET_CROMITE_FEATURE_DISABLED(kAutofillServerCommunication); +@@ -799,6 +799,7 @@ BASE_FEATURE(kAutofillPopupDontAcceptNonVisibleEnoughSuggestion, + // affect their functionality. + BASE_FEATURE(kAutofillPopupZOrderSecuritySurface, + base::FEATURE_ENABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_ENABLED(kAutofillPopupZOrderSecuritySurface); - } // namespace test - } // namespace autofill::features + // Allows the import of an Autofill profile if duplicate fields were present + // with identical field values. diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc @@ -288,7 +287,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterIntegerPref( kAutofillLastVersionDeduped, 0, -@@ -49,10 +49,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -52,10 +52,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { kAutofillHasSeenIban, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( @@ -301,7 +300,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( kAutofillPaymentCardBenefits, true, -@@ -104,7 +104,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -107,7 +107,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { #endif // Deprecated prefs registered for migration. diff --git a/build/patches/bromite-build-utils.patch b/build/patches/bromite-build-utils.patch index 4762378a..3c9848d9 100644 --- a/build/patches/bromite-build-utils.patch +++ b/build/patches/bromite-build-utils.patch @@ -424,7 +424,7 @@ new file mode 100644 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -834,3 +834,5 @@ if (is_component_build) { +@@ -832,3 +832,5 @@ if (is_component_build) { set_defaults("component") { configs = default_component_configs } @@ -670,7 +670,7 @@ new file mode 100755 diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/mojom_parser.py --- a/mojo/public/tools/mojom/mojom_parser.py +++ b/mojo/public/tools/mojom/mojom_parser.py -@@ -21,6 +21,7 @@ import os +@@ -20,6 +20,7 @@ import os import os.path import sys import traceback @@ -678,7 +678,7 @@ diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/m from collections import defaultdict from mojom.generate import module -@@ -177,11 +178,26 @@ def _CollectAllowedImportsFromBuildMetadata(build_metadata_filename): +@@ -180,11 +181,26 @@ def _CollectAllowedImportsFromBuildMetadata(build_metadata_filename): collect(build_metadata_filename) return allowed_imports @@ -700,14 +700,14 @@ diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/m # multiprocessing helper. -def _ParseAstHelper(mojom_abspath, enabled_features): +def _ParseAstHelper(mojom_abspath, enabled_features, input_root_paths): - with codecs.open(mojom_abspath, encoding='utf-8') as f: + with open(mojom_abspath, encoding='utf-8') as f: - ast = parser.Parse(f.read(), mojom_abspath) + src = _ResolveInclude(mojom_abspath, input_root_paths) + ast = parser.Parse(src, mojom_abspath) conditional_features.RemoveDisabledDefinitions(ast, enabled_features) return mojom_abspath, ast -@@ -301,7 +317,7 @@ def _ParseMojoms(mojom_files, +@@ -304,7 +320,7 @@ def _ParseMojoms(mojom_files, (path, abs_path) for abs_path, path in mojom_files_to_parse.items()) logging.info('Parsing %d .mojom into ASTs', len(mojom_files_to_parse)) diff --git a/build/patches/disable-WebView-variations-support.patch b/build/patches/disable-WebView-variations-support.patch index a470dbdf..72643377 100644 --- a/build/patches/disable-WebView-variations-support.patch +++ b/build/patches/disable-WebView-variations-support.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java -@@ -667,13 +667,6 @@ public class WebViewChromiumAwInit { +@@ -664,13 +664,6 @@ public class WebViewChromiumAwInit { } AwBrowserProcess.configureChildProcessLauncher(); @@ -29,7 +29,7 @@ diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewC diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java -@@ -687,10 +687,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { +@@ -661,10 +661,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { // This must happen after pref value has been read and SafeMode setup has completed. setupStartupTaskExperiments(androidXConfig); diff --git a/build/patches/disable-appending-variations-header.patch b/build/patches/disable-appending-variations-header.patch index 461c58d7..0395130c 100644 --- a/build/patches/disable-appending-variations-header.patch +++ b/build/patches/disable-appending-variations-header.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/variations/net/variations_http_headers.cc b/components/variations/net/variations_http_headers.cc --- a/components/variations/net/variations_http_headers.cc +++ b/components/variations/net/variations_http_headers.cc -@@ -119,10 +119,7 @@ URLValidationResult GetUrlValidationResult(const GURL& url) { +@@ -120,10 +120,7 @@ URLValidationResult GetUrlValidationResult(const GURL& url) { // Also, logs the result of validating |url| in histograms, one of which ends in // |suffix|. bool ShouldAppendVariationsHeader(const GURL& url, const std::string& suffix) { diff --git a/build/patches/do-not-block-build-incompatible-profiles.patch b/build/patches/do-not-block-build-incompatible-profiles.patch index 31b9f2a7..0528fbe2 100644 --- a/build/patches/do-not-block-build-incompatible-profiles.patch +++ b/build/patches/do-not-block-build-incompatible-profiles.patch @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/v8/BUILD.gn b/v8/BUILD.gn --- a/v8/BUILD.gn +++ b/v8/BUILD.gn -@@ -2619,7 +2619,7 @@ template("run_mksnapshot") { +@@ -2651,7 +2651,7 @@ template("run_mksnapshot") { # Replace this with --warn-about-builtin-profile-data to see the full # list of builtins with incompatible profiles. diff --git a/build/patches/eyeo-133.0.6943.49-android_api.patch b/build/patches/eyeo-133.0.6943.49-android_api.patch index a690a4e4..576ee200 100644 --- a/build/patches/eyeo-133.0.6943.49-android_api.patch +++ b/build/patches/eyeo-133.0.6943.49-android_api.patch @@ -97,7 +97,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn import("//build/config/android/config.gni") import("//build/config/cronet/config.gni") -@@ -556,6 +559,7 @@ if (_is_default_toolchain) { +@@ -541,6 +544,7 @@ if (_is_default_toolchain) { "//chrome/browser/xsurface:java", "//chrome/browser/xsurface_provider:dependency_provider_impl_java", "//chrome/browser/xsurface_provider:java", @@ -105,7 +105,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/android_autofill/browser:features_java", "//components/android_autofill/browser:java", "//components/autofill/android:autofill_features_java", -@@ -1482,6 +1486,7 @@ if (_is_default_toolchain) { +@@ -1473,6 +1477,7 @@ if (_is_default_toolchain) { "//chrome/test/data/translate/", "//chrome/test/data/webauthn/", "//chrome/test/media_router/resources/", @@ -113,8 +113,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/test/data/autofill/", "//components/test/data/payments/", "//content/test/data/browsing_data/", -@@ -3285,6 +3290,12 @@ if (_is_default_toolchain) { - sources += [ "java/src/org/chromium/chrome/browser/media/MediaCapturePickerDialogBridge.java" ] +@@ -3177,6 +3182,12 @@ if (_is_default_toolchain) { + sources += [ "java/src/org/chromium/chrome/browser/media/MediaCapturePickerManagerBridge.java" ] } + ### Android API module start @@ -126,7 +126,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn # Used for testing only, should not be shipped to end users. if (enable_offline_pages_harness) { sources += [ "java/src/org/chromium/chrome/browser/offlinepages/evaluation/OfflinePageEvaluationBridge.java" ] -@@ -3377,6 +3388,7 @@ if (_is_default_toolchain) { +@@ -3269,6 +3280,7 @@ if (_is_default_toolchain) { "//chrome/browser/ui/plus_addresses/android:jni_headers", "//chrome/browser/util:jni_headers", "//chrome/browser/webauthn/android:jni_headers", @@ -199,7 +199,7 @@ new file mode 100644 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3380,6 +3380,10 @@ static_library("browser") { +@@ -3392,6 +3392,10 @@ static_library("browser") { ] deps += [ "//chrome/browser/password_entry_edit/android" ] @@ -209,7 +209,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn + deps += [ ":delta_file_proto", - ":profile_token", + ":language_data_proto", diff --git a/chrome/browser/android/adblock/tab_id_translator_jni.cc b/chrome/browser/android/adblock/tab_id_translator_jni.cc new file mode 100644 --- /dev/null @@ -259,7 +259,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1050,6 +1050,12 @@ static_library("ui") { +@@ -1054,6 +1054,12 @@ static_library("ui") { deps += [ "//components/themes:ntp_background_proto", ] diff --git a/build/patches/eyeo-133.0.6943.49-android_settings.patch b/build/patches/eyeo-133.0.6943.49-android_settings.patch index a0919cfb..fc2d4760 100644 --- a/build/patches/eyeo-133.0.6943.49-android_settings.patch +++ b/build/patches/eyeo-133.0.6943.49-android_settings.patch @@ -237,7 +237,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module and Android API diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -289,6 +289,10 @@ if (_is_default_toolchain) { +@@ -266,6 +266,10 @@ if (_is_default_toolchain) { deps += [ "//chrome/browser:screen_capture_java_resources" ] } @@ -248,7 +248,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn if (enable_extensions_core) { deps += [ "//chrome/browser/ui/android/extensions:java_resources" ] } -@@ -818,6 +822,10 @@ if (_is_default_toolchain) { +@@ -805,6 +809,10 @@ if (_is_default_toolchain) { "//chrome/browser/password_entry_edit:public_java", ] diff --git a/build/patches/eyeo-133.0.6943.49-base.patch b/build/patches/eyeo-133.0.6943.49-base.patch index 996ebb5e..fedf73c1 100644 --- a/build/patches/eyeo-133.0.6943.49-base.patch +++ b/build/patches/eyeo-133.0.6943.49-base.patch @@ -9,7 +9,7 @@ Based on Chromium 133.0.6943.49 README.md | 12 + base/threading/thread_restrictions.h | 9 + base/trace_event/builtin_categories.h | 1 + - components/BUILD.gn | 4 + + components/BUILD.gn | 2 + components/adblock/BUILD.gn | 36 + components/adblock/CHANGELOG.md | 746 +++++++++ components/adblock/LICENSE | 674 ++++++++ @@ -365,7 +365,7 @@ Based on Chromium 133.0.6943.49 tools/eyeo/update_git_grafts.py | 138 ++ tools/gritsettings/resource_ids.spec | 12 + .../histograms/metadata/extensions/enums.xml | 8 +- - 361 files changed, 48838 insertions(+), 9 deletions(-) + 361 files changed, 48836 insertions(+), 9 deletions(-) create mode 100644 components/adblock/BUILD.gn create mode 100644 components/adblock/CHANGELOG.md create mode 100644 components/adblock/LICENSE @@ -719,8 +719,8 @@ diff --git a/DEPS b/DEPS + # If you change this, also update the libc++ revision in # //buildtools/deps_revisions.gni. - 'libcxx_revision': '8cd54f6b0741cdef08299711668e6b25fef26406', -@@ -1626,6 +1632,10 @@ deps = { + 'libcxx_revision': '07572e7b169225ef3a999584cba9d9004631ae66', +@@ -1628,6 +1634,10 @@ deps = { 'condition': 'checkout_android and checkout_src_internal', }, @@ -729,7 +729,7 @@ diff --git a/DEPS b/DEPS + }, + 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + '2acb551cf58ff3b6e6a093fe36deb8c625046900', + 'url': Var('chromium_git') + '/website.git' + '@' + 'd9a0c174b535ee5165fb8ef278324be9efa49352', }, diff --git a/LICENSE b/LICENSE --- a/LICENSE @@ -786,7 +786,7 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restri #ifndef BASE_THREADING_THREAD_RESTRICTIONS_H_ #define BASE_THREADING_THREAD_RESTRICTIONS_H_ -@@ -173,6 +177,9 @@ class OverlayProcessorWebView; +@@ -172,6 +176,9 @@ class OverlayProcessorWebView; class ScopedAllowInitGLBindings; class VizCompositorThreadRunnerWebView; } // namespace android_webview @@ -827,23 +827,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn "//components/affiliations/core/browser:unit_tests", "//components/aggregation_service:unit_tests", "//components/apdu:unit_tests", -@@ -986,6 +987,7 @@ test("components_unittests") { - - repack("components_tests_pak") { - sources = [ -+ "$root_gen_dir/components/adblock/core/resources/adblock_resources.pak", - "$root_gen_dir/components/arc/input_overlay_resources.pak", - "$root_gen_dir/components/autofill/core/browser/geo/autofill_address_rewriter_resources.pak", - "$root_gen_dir/components/components_resources.pak", -@@ -1004,6 +1006,7 @@ repack("components_tests_pak") { - # TODO(b/207518736): Input overlay resources will be changed to proto soon, - # thus not going to move this resource pak to under ash. - "//chromeos/ash/experiences/arc/input_overlay/resources:resources_grit", -+ "//components/adblock/core/resources:adblock_resources", - "//components/autofill/core/browser:autofill_address_rewriter_resources", - "//components/metrics:server_urls_grd", - "//components/omnibox/resources:omnibox_pedal_synonyms", -@@ -1109,6 +1112,7 @@ if (use_blink) { +@@ -1116,6 +1117,7 @@ if (use_blink) { deps = [ "//base", "//base/test:test_support", @@ -50244,7 +50228,7 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow #include "content/browser/loader/navigation_url_loader_impl.h" #include -@@ -1592,7 +1596,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect( +@@ -1576,7 +1580,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect( ? head->bypass_redirect_checks : bypass_redirect_checks_; @@ -50267,7 +50251,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b #include "content/browser/renderer_host/render_frame_host_impl.h" -@@ -3648,6 +3652,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod( +@@ -3635,6 +3639,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod( std::move(callback)); } @@ -50489,7 +50473,7 @@ diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_ #include "content/shell/app/shell_main_delegate.h" -@@ -33,7 +37,7 @@ +@@ -34,7 +38,7 @@ #include "content/public/common/main_function_params.h" #include "content/public/common/url_constants.h" #include "content/shell/app/shell_crash_reporter_client.h" @@ -50498,7 +50482,7 @@ diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_ #include "content/shell/common/shell_content_client.h" #include "content/shell/common/shell_paths.h" #include "content/shell/common/shell_switches.h" -@@ -476,7 +480,7 @@ ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { +@@ -477,7 +481,7 @@ ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { return browser_client_.get(); } #endif @@ -50825,7 +50809,7 @@ diff --git a/extensions/browser/api/web_request/web_request_proxying_url_loader_ #include "extensions/browser/api/web_request/web_request_proxying_url_loader_factory.h" #include -@@ -464,7 +468,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnReceiveRedirect( +@@ -474,7 +478,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnReceiveRedirect( head->bypass_redirect_checks = true; } @@ -50949,7 +50933,7 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_ #include "third_party/blink/renderer/core/dom/events/event_target.h" #include -@@ -849,7 +853,10 @@ bool EventTarget::dispatchEventForBindings(Event* event, +@@ -851,7 +855,10 @@ bool EventTarget::dispatchEventForBindings(Event* event, if (!GetExecutionContext()) return false; @@ -51075,7 +51059,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.h b/ diff --git a/third_party/blink/renderer/core/html/html_element.cc b/third_party/blink/renderer/core/html/html_element.cc --- a/third_party/blink/renderer/core/html/html_element.cc +++ b/third_party/blink/renderer/core/html/html_element.cc -@@ -2642,7 +2642,13 @@ void HTMLElement::setSpellcheck(bool enable) { +@@ -2842,7 +2842,13 @@ void HTMLElement::setSpellcheck(bool enable) { } void HTMLElement::click() { @@ -51104,7 +51088,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_ur #include "third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.h" #include -@@ -391,7 +395,7 @@ void MojoURLLoaderClient::OnReceiveRedirect( +@@ -396,7 +400,7 @@ void MojoURLLoaderClient::OnReceiveRedirect( return; } @@ -51754,7 +51738,7 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ # This file is used to assign starting resource ids for resources and strings # used by Chromium. This is done to ensure that resource ids are unique # across all the grd files. If you are adding a new grd file, please add -@@ -1234,6 +1238,14 @@ +@@ -1260,6 +1264,14 @@ "components/user_scripts/browser/resources/browser_resources.grd": { "includes": [7620], }, @@ -51783,7 +51767,7 @@ diff --git a/tools/metrics/histograms/metadata/extensions/enums.xml b/tools/metr --> +@@ -199,7 +203,7 @@ Called by update_extension_histograms.py.--> @@ -51792,7 +51776,7 @@ diff --git a/tools/metrics/histograms/metadata/extensions/enums.xml b/tools/metr -@@ -3231,6 +3235,8 @@ Called by update_extension_permission.py.--> +@@ -3255,6 +3259,8 @@ Called by update_extension_permission.py.--> diff --git a/build/patches/eyeo-133.0.6943.49-chrome_integration.patch b/build/patches/eyeo-133.0.6943.49-chrome_integration.patch index 71f5fcad..3edd5f26 100644 --- a/build/patches/eyeo-133.0.6943.49-chrome_integration.patch +++ b/build/patches/eyeo-133.0.6943.49-chrome_integration.patch @@ -39,17 +39,17 @@ diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegat +// Use of this source code is governed by the GPLv3 that can be found in the +// components/adblock/LICENSE file. - #ifdef UNSAFE_BUFFERS_BUILD - // TODO(crbug.com/40285824): Remove this and convert code to safer constructs. -@@ -42,6 +46,7 @@ + #include "chrome/app/chrome_main_delegate.h" + +@@ -37,6 +41,7 @@ + #include "base/time/time.h" #include "base/timer/timer.h" - #include "base/trace_event/trace_event_impl.h" #include "build/build_config.h" +#include "chrome/browser/adblock/adblock_chrome_content_browser_client.h" #include "chrome/browser/buildflags.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_resource_bundle_helper.h" -@@ -1606,7 +1611,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() { +@@ -1597,7 +1602,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() { content::ContentBrowserClient* ChromeMainDelegate::CreateContentBrowserClient() { chrome_content_browser_client_ = @@ -71,7 +71,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn import("//base/allocator/allocator.gni") import("//build/buildflag_header.gni") -@@ -199,6 +202,8 @@ static_library("browser") { +@@ -206,6 +209,8 @@ static_library("browser") { "accessibility/page_colors_controller_factory.h", "accessibility/prefers_default_scrollbar_styles_prefs.cc", "accessibility/prefers_default_scrollbar_styles_prefs.h", @@ -80,7 +80,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "after_startup_task_utils.cc", "after_startup_task_utils.h", "bad_message.cc", -@@ -2110,6 +2115,7 @@ static_library("browser") { +@@ -2103,6 +2108,7 @@ static_library("browser") { "//chrome/common/notifications", "//chrome/installer/util:with_no_strings", "//chrome/services/speech/buildflags", @@ -88,7 +88,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/application_locale_storage", "//components/assist_ranker", "//components/autofill/content/browser", -@@ -8496,6 +8502,7 @@ static_library("browser_public_dependencies") { +@@ -8508,6 +8514,7 @@ static_library("browser_public_dependencies") { "//chrome/services/file_util/public/mojom", "//components/account_id", "//components/autofill/content/browser", @@ -194,7 +194,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows #include "components/color/color_mixers.h" #include "components/device_event_log/device_event_log.h" #include "components/embedder_support/origin_trials/component_updater_utils.h" -@@ -1760,6 +1765,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1763,6 +1768,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // called inside PostProfileInit. content::WebUIControllerFactory::RegisterFactory( ChromeWebUIControllerFactory::GetInstance()); @@ -216,7 +216,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL import("//build/config/chromebox_for_meetings/buildflags.gni") import("//build/config/chromeos/ui_mode.gni") -@@ -493,6 +496,7 @@ source_set("extensions") { +@@ -488,6 +491,7 @@ source_set("extensions") { "window_controller_list.h", "window_controller_list_observer.h", ] @@ -224,7 +224,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL configs += [ "//build/config:precompiled_headers", "//build/config/compiler:wexit_time_destructors", -@@ -824,6 +828,7 @@ source_set("extensions") { +@@ -830,6 +834,7 @@ source_set("extensions") { ] } @@ -267,7 +267,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse #include "chrome/browser/prefs/chrome_pref_service_factory.h" -@@ -44,6 +48,7 @@ +@@ -45,6 +49,7 @@ #include "chrome/grit/branded_strings.h" #include "chrome/grit/browser_resources.h" #include "chrome/grit/generated_resources.h" @@ -275,7 +275,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse #include "components/component_updater/pref_names.h" #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/pref_registry/pref_registry_syncable.h" -@@ -197,6 +202,12 @@ const auto kTrackedPrefs = std::to_array({ +@@ -199,6 +204,12 @@ const auto kTrackedPrefs = std::to_array({ EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, #endif @@ -302,7 +302,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" -@@ -256,6 +260,15 @@ +@@ -254,6 +258,15 @@ #include "chrome/browser/webid/federated_identity_permission_context_factory.h" #include "chrome/common/buildflags.h" #include "chrome/common/chrome_features.h" @@ -318,7 +318,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "components/autofill/content/browser/autofill_log_router_factory.h" #include "components/breadcrumbs/core/breadcrumbs_status.h" #include "components/captive_portal/core/buildflags.h" -@@ -959,6 +972,15 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -954,6 +967,15 @@ void ChromeBrowserMainExtraPartsProfiles:: // Makes manual testing possible. FakeSmartCardDeviceServiceFactory::GetInstance(); #endif @@ -347,7 +347,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD. import("//chrome/browser/buildflags.gni") import("//chrome/common/features.gni") -@@ -302,6 +305,7 @@ group("dev_ui_resources") { +@@ -307,6 +310,7 @@ group("dev_ui_resources") { "predictors:resources", "privacy_sandbox/internals:resources", "usb_internals:resources", @@ -355,7 +355,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD. "//components/commerce/core/internals/resources", "//components/data_sharing/data_sharing_internals/resources", "//components/download/resources/download_internals:resources", -@@ -376,6 +380,7 @@ repack("dev_ui_paks") { +@@ -381,6 +385,7 @@ repack("dev_ui_paks") { "$root_gen_dir/chrome/predictors_resources.pak", "$root_gen_dir/chrome/privacy_sandbox_internals_resources.pak", "$root_gen_dir/chrome/usb_internals_resources.pak", @@ -376,7 +376,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn import("//build/config/buildflags_paint_preview.gni") import("//build/config/compiler/compiler.gni") -@@ -405,6 +408,7 @@ static_library("ui") { +@@ -408,6 +411,7 @@ static_library("ui") { "//chrome/services/media_gallery_util/public/mojom", "//components/access_code_cast/common:metrics", "//components/account_id", @@ -398,7 +398,7 @@ diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/p #include "chrome/browser/ui/prefs/pref_watcher.h" -@@ -21,6 +25,7 @@ +@@ -19,6 +23,7 @@ #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" #include "chrome/common/pref_names.h" @@ -406,7 +406,7 @@ diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/p #include "components/keyed_service/core/keyed_service.h" #include "components/language/core/browser/pref_names.h" #include "components/live_caption/pref_names.h" -@@ -82,6 +87,14 @@ const char* const kWebPrefsToObserve[] = { +@@ -87,6 +92,14 @@ const char* const kWebPrefsToObserve[] = { prefs::kAccessibilityFocusHighlightEnabled, #endif prefs::kPageColorsBlockList, @@ -444,7 +444,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "components/autofill/content/browser/content_autofill_client.h" #include "components/autofill/content/browser/content_autofill_driver_factory.h" #include "components/autofill/core/browser/foundations/browser_autofill_manager.h" -@@ -346,6 +352,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -341,6 +347,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { optimization_guide_decider); } } @@ -457,9 +457,9 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc autofill::AutofillClientProvider& autofill_client_provider = autofill::AutofillClientProviderFactory::GetForProfile(profile); autofill_client_provider.CreateClientForWebContents(web_contents); -@@ -400,6 +412,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { - ip_protection::IpProtectionStatus::CreateForWebContents(web_contents); - } +@@ -369,6 +381,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { + // completions. + HttpAuthCacheStatus::HttpAuthCacheStatus::CreateForWebContents(web_contents); #endif // BUILDFLAG(IS_ANDROID) + if (breadcrumbs::IsEnabled(g_browser_process->local_state())) { @@ -484,16 +484,16 @@ diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni "$root_gen_dir/chrome/segmentation_internals_resources.pak", + "$root_gen_dir/components/adblock/core/resources/adblock_resources.pak", "$root_gen_dir/components/autofill/core/browser/geo/autofill_address_rewriter_resources.pak", + "$root_gen_dir/components/autofill/core/browser/geo/autofill_alternative_state_name_map_resources.pak", "$root_gen_dir/components/autofill_and_password_manager_internals_resources.pak", - "$root_gen_dir/components/chrome_urls_resources.pak", -@@ -163,6 +167,7 @@ template("chrome_extra_paks") { +@@ -165,6 +169,7 @@ template("chrome_extra_paks") { "//chrome/browser/resources/connectors_internals:resources", "//chrome/browser/resources/saved_tab_groups_unsupported:resources", "//chrome/common:resources", + "//components/adblock/core/resources:adblock_resources", "//components/autofill/core/browser:autofill_address_rewriter_resources", + "//components/autofill/core/browser:autofill_alternative_state_name_map_resources", "//components/metrics:server_urls_grd", - "//components/resources", diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn diff --git a/build/patches/eyeo-133.0.6943.49-extension_api.patch b/build/patches/eyeo-133.0.6943.49-extension_api.patch index 8f4dc2ae..ec16d19d 100644 --- a/build/patches/eyeo-133.0.6943.49-extension_api.patch +++ b/build/patches/eyeo-133.0.6943.49-extension_api.patch @@ -72,7 +72,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -828,6 +828,17 @@ source_set("extensions") { +@@ -834,6 +834,17 @@ source_set("extensions") { ] } @@ -2138,7 +2138,7 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" #include "chrome/browser/extensions/api/bookmarks/bookmarks_api_watcher.h" -@@ -32,10 +36,12 @@ +@@ -33,10 +37,12 @@ #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h" @@ -2151,7 +2151,7 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h" #include "chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h" -@@ -105,6 +111,8 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { +@@ -106,6 +112,8 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { #if BUILDFLAG(ENABLE_EXTENSIONS) extensions::ActivityLogAPI::GetFactoryInstance(); @@ -3660,7 +3660,7 @@ diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/com "autofillPrivate": { "channel": "trunk", "extension_types": ["extension", "platform_app"], -@@ -413,6 +424,13 @@ +@@ -411,6 +422,13 @@ // "desktop_android" is not supported. "platforms": ["chromeos", "linux", "mac", "win"] }, @@ -3872,7 +3872,7 @@ diff --git a/chrome/common/extensions/api/api_sources.gni b/chrome/common/extens import("//chrome/common/features.gni") import("//pdf/features.gni") -@@ -36,6 +39,8 @@ schema_sources_ = [ +@@ -38,6 +41,8 @@ schema_sources_ = [ "tabs.json", "web_authentication_proxy.webidl", "web_navigation.json", @@ -4153,7 +4153,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -4275,6 +4275,20 @@ if (!is_android) { +@@ -4291,6 +4291,20 @@ if (!is_android) { ] } diff --git a/build/patches/kill-Location-fall-back-to-system.patch b/build/patches/kill-Location-fall-back-to-system.patch index 80807b95..43904968 100644 --- a/build/patches/kill-Location-fall-back-to-system.patch +++ b/build/patches/kill-Location-fall-back-to-system.patch @@ -60,12 +60,12 @@ diff --git a/services/device/public/cpp/device_features.cc b/services/device/pub @@ -63,6 +63,7 @@ BASE_FEATURE(kLocationProviderManager, base::FEATURE_ENABLED_BY_DEFAULT); #else BASE_FEATURE(kLocationProviderManager, base::FEATURE_DISABLED_BY_DEFAULT); - #endif // BUILDFLAG(IS_MAC) + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +SET_CROMITE_FEATURE_DISABLED(kLocationProviderManager); #if BUILDFLAG(IS_CHROMEOS) // Enables crash key logging for USB device open operations on ChromeOS. See -@@ -107,7 +108,7 @@ const base::FeatureParam +@@ -113,7 +114,7 @@ const base::FeatureParam const base::FeatureParam kLocationProviderManagerParam{ &kLocationProviderManager, "LocationProviderManagerMode", diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch index 154b7697..16de9ca7 100644 --- a/build/patches/kill-Vision.patch +++ b/build/patches/kill-Vision.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -318,8 +318,6 @@ if (_is_default_toolchain) { +@@ -295,8 +295,6 @@ if (_is_default_toolchain) { "$google_play_services_package:google_play_services_gcm_java", "$google_play_services_package:google_play_services_iid_java", "$google_play_services_package:google_play_services_tasks_java", diff --git a/build/patches/profile-resetter-disable-send-settings.patch b/build/patches/profile-resetter-disable-send-settings.patch index 98a00709..bec165fe 100644 --- a/build/patches/profile-resetter-disable-send-settings.patch +++ b/build/patches/profile-resetter-disable-send-settings.patch @@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/browser/profile_resetter/reset_report_uploader.cc --- a/chrome/browser/profile_resetter/reset_report_uploader.cc +++ b/chrome/browser/profile_resetter/reset_report_uploader.cc -@@ -20,7 +20,7 @@ +@@ -22,7 +22,7 @@ namespace { const char kResetReportUrl[] = diff --git a/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch b/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch index f4e39009..0368bec0 100644 --- a/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch +++ b/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch @@ -23,7 +23,7 @@ diff --git a/components/network_time/network_time_tracker.cc b/components/networ namespace { -@@ -275,7 +276,7 @@ void NetworkTimeTracker::UpdateNetworkTime(base::Time network_time, +@@ -300,7 +301,7 @@ void NetworkTimeTracker::UpdateNetworkTime(base::Time network_time, } bool NetworkTimeTracker::AreTimeFetchesEnabled() const { diff --git a/build/patches/ungoogled-chromium-Disable-intranet-detector.patch b/build/patches/ungoogled-chromium-Disable-intranet-detector.patch index 8aa3504c..c9ffe0c8 100644 --- a/build/patches/ungoogled-chromium-Disable-intranet-detector.patch +++ b/build/patches/ungoogled-chromium-Disable-intranet-detector.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc -@@ -117,9 +117,7 @@ void IntranetRedirectDetector::FinishSleep() { +@@ -118,9 +118,7 @@ void IntranetRedirectDetector::FinishSleep() { simple_loaders_.clear(); resulting_origins_.clear(); diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch index 4c3d50e1..66049538 100644 --- a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch +++ b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1247,8 +1247,6 @@ static_library("browser") { +@@ -1249,8 +1249,6 @@ static_library("browser") { "profiles/incognito_mode_policy_handler.h", "profiles/off_the_record_profile_impl.cc", "profiles/off_the_record_profile_impl.h", diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index 3a4de09a..561b78be 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -6,13 +6,13 @@ Remove translate offer License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../xml/languages_detailed_preferences.xml | 42 ----------------- + .../xml/languages_detailed_preferences.xml | 42 ---------------- .../java/res/xml/languages_preferences.xml | 5 -- - .../language/settings/LanguageSettings.java | 47 +------------------ + .../language/settings/LanguageSettings.java | 50 +------------------ .../strings/android_chrome_strings.grd | 3 -- .../core/browser/translate_manager.cc | 5 +- .../core/browser/translate_script.cc | 17 ++----- - 6 files changed, 10 insertions(+), 109 deletions(-) + 6 files changed, 10 insertions(+), 112 deletions(-) diff --git a/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml b/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml --- a/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml @@ -80,7 +80,15 @@ diff --git a/chrome/browser/language/android/java/res/xml/languages_preferences. diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -@@ -54,12 +54,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment +@@ -30,7 +30,6 @@ import org.chromium.chrome.browser.preferences.PrefServiceUtil; + import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment; + import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; + import org.chromium.chrome.browser.settings.SettingsNavigationFactory; +-import org.chromium.chrome.browser.translate.TranslateBridge; + import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; + import org.chromium.components.browser_ui.settings.SettingsUtils; + import org.chromium.components.prefs.PrefChangeRegistrar; +@@ -54,12 +53,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment static final String APP_LANGUAGE_PREFERENCE_KEY = "app_language_preference"; static final String PREFERRED_LANGUAGES_KEY = "preferred_languages"; static final String CONTENT_LANGUAGES_KEY = "content_languages_preference"; @@ -93,7 +101,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse private static final String TAG = "LanguageSettings"; -@@ -107,35 +101,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment +@@ -107,35 +100,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment ContentLanguagesPreference mLanguageListPref = (ContentLanguagesPreference) findPreference(PREFERRED_LANGUAGES_KEY); mLanguageListPref.initialize(this, getProfile(), getPrefService()); @@ -129,7 +137,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse } /** -@@ -150,8 +115,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment +@@ -150,8 +114,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment ContentLanguagesPreference mLanguageListPref = (ContentLanguagesPreference) findPreference(CONTENT_LANGUAGES_KEY); mLanguageListPref.initialize(this, getProfile(), getPrefService()); @@ -138,7 +146,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse } /** Setup the App Language section with a title and preference to choose the app language. */ -@@ -182,7 +145,7 @@ public class LanguageSettings extends ChromeBaseSettingsFragment +@@ -182,7 +144,7 @@ public class LanguageSettings extends ChromeBaseSettingsFragment * @param contentLanguagesPreference ContentLanguagesPreference reference to update about state * changes. */ @@ -147,7 +155,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse // Setup expandable advanced settings section. PreferenceCategory translationAdvancedSection = (PreferenceCategory) findPreference(TRANSLATION_ADVANCED_SECTION); -@@ -260,7 +223,7 @@ public class LanguageSettings extends ChromeBaseSettingsFragment +@@ -260,7 +222,7 @@ public class LanguageSettings extends ChromeBaseSettingsFragment return getPrefService().isManagedPreference(Pref.OFFER_TRANSLATE_ENABLED); } }); @@ -156,23 +164,28 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse @Override public void onStart() { -@@ -300,12 +263,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment - // Set the default target language to match the new app language. - TranslateBridge.setDefaultTargetLanguage(getProfile(), code); - } else if (requestCode == REQUEST_CODE_CHANGE_TARGET_LANGUAGE) { -- LanguageItemPickerPreference targetLanguagePreference = -- (LanguageItemPickerPreference) findPreference(TARGET_LANGUAGE_KEY); -- targetLanguagePreference.setLanguageItem(getProfile(), code); -- TranslateBridge.setDefaultTargetLanguage(getProfile(), code); -- LanguagesManager.recordAction( -- LanguagesManager.LanguageSettingsActionType.CHANGE_TARGET_LANGUAGE); +@@ -315,17 +277,9 @@ public class LanguageSettings extends ChromeBaseSettingsFragment + // Get the actual default system language to set as target language. + code = GlobalAppLocaleController.getInstance().getOriginalSystemLocale().getLanguage(); } +- // Set the default target language to match the new app language. +- TranslateBridge.setDefaultTargetLanguage(getProfile(), code); } + private void onChangeTargetLanguage(String code) { +- LanguageItemPickerPreference targetLanguagePreference = +- (LanguageItemPickerPreference) findPreference(TARGET_LANGUAGE_KEY); +- targetLanguagePreference.setLanguageItem(getProfile(), code); +- TranslateBridge.setDefaultTargetLanguage(getProfile(), code); +- LanguagesManager.recordAction( +- LanguagesManager.LanguageSettingsActionType.CHANGE_TARGET_LANGUAGE); + } + + /** diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1965,9 +1965,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1974,9 +1974,6 @@ Your Google account may have other forms of browsing history like searches and a Let websites know the languages you speak. They’ll show content in those languages, when possible. diff --git a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch index c8e5f853..70a43208 100644 --- a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch +++ b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc --- a/chrome/browser/android/rlz/rlz_ping_handler.cc +++ b/chrome/browser/android/rlz/rlz_ping_handler.cc -@@ -76,7 +76,7 @@ void RlzPingHandler::Ping( +@@ -78,7 +78,7 @@ void RlzPingHandler::Ping( DCHECK_EQ(id.length(), 50u); GURL request_url(base::StringPrintf( diff --git a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch index b9937eab..f5950fb6 100644 --- a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch +++ b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -146,7 +146,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -150,7 +150,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string()); registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false); registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls); diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch index 13b13c23..fecdbce1 100644 --- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -43,6 +43,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/omnibox/LocationBarMediator.java | 24 -- .../omnibox/geo/GeolocationHeader.java | 1 + .../ui/webui/new_tab_page/new_tab_page_ui.cc | 6 - + chrome/browser/ui/webui/ntp/new_tab_ui.cc | 3 +- chrome/browser/upgrade_detector/BUILD.gn | 2 - .../upgrade_detector/upgrade_detector_impl.cc | 6 - chrome/common/BUILD.gn | 2 - @@ -70,7 +71,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ...gled-chromium-no-special-hosts-domains.inc | 1 + net/base/url_util.cc | 25 +- services/network/network_context.cc | 2 +- - 63 files changed, 56 insertions(+), 885 deletions(-) + 64 files changed, 57 insertions(+), 887 deletions(-) create mode 100644 cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java @@ -84,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; -@@ -1378,10 +1377,8 @@ public class RootUiCoordinator +@@ -1427,10 +1426,8 @@ public class RootUiCoordinator Profile profile = tab.getProfile(); TemplateUrlService service = TemplateUrlServiceFactory.getForProfile(profile); String url = service.getUrlForSearchQuery(query); @@ -98,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -863,10 +863,6 @@ static_library("browser") { +@@ -867,10 +867,6 @@ static_library("browser") { "page_info/privacy_policy_insights_service_factory.h", "page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.cc", "page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.h", @@ -109,7 +110,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "page_load_metrics/observers/core/amp_page_load_metrics_observer.cc", "page_load_metrics/observers/core/amp_page_load_metrics_observer.h", "page_load_metrics/observers/core/ukm_page_load_metrics_observer.cc", -@@ -875,10 +871,6 @@ static_library("browser") { +@@ -879,10 +875,6 @@ static_library("browser") { "page_load_metrics/observers/document_write_page_load_metrics_observer.h", "page_load_metrics/observers/foreground_duration_ukm_observer.cc", "page_load_metrics/observers/foreground_duration_ukm_observer.h", @@ -120,7 +121,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "page_load_metrics/observers/histogram_suffixes.cc", "page_load_metrics/observers/histogram_suffixes.h", "page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer.cc", -@@ -1489,8 +1481,6 @@ static_library("browser") { +@@ -1483,8 +1475,6 @@ static_library("browser") { "supervised_user/supervised_user_browser_utils.h", "supervised_user/supervised_user_content_filters_service_factory.cc", "supervised_user/supervised_user_content_filters_service_factory.h", @@ -129,7 +130,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "supervised_user/supervised_user_interstitial_tab_closer.cc", "supervised_user/supervised_user_interstitial_tab_closer.h", "supervised_user/supervised_user_metrics_service_factory.cc", -@@ -1623,10 +1613,7 @@ static_library("browser") { +@@ -1608,10 +1598,7 @@ static_library("browser") { "//chrome/browser/content_settings:impl", "//chrome/browser/devtools", "//chrome/browser/favicon", @@ -137,10 +138,10 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn - "//chrome/browser/feedback:feedback_impl", "//chrome/browser/file_system_access:impl", - "//chrome/browser/google", - "//chrome/browser/ip_protection", "//chrome/browser/media/webrtc", "//chrome/browser/navigation_predictor:impl", -@@ -1810,7 +1797,6 @@ static_library("browser") { + +@@ -1794,7 +1781,6 @@ static_library("browser") { # New dependencies inside of //chrome/browser that generate header files # should be added to browser_generated_files. ":browser_public_dependencies", @@ -151,7 +152,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browser/android/metrics/uma_session_stats.cc --- a/chrome/browser/android/metrics/uma_session_stats.cc +++ b/chrome/browser/android/metrics/uma_session_stats.cc -@@ -289,16 +289,6 @@ static void JNI_UmaSessionStats_ChangeMetricsReportingConsent( +@@ -296,16 +296,6 @@ static void JNI_UmaSessionStats_ChangeMetricsReportingConsent( jint called_from) { UpdateMetricsPrefsOnPermissionChange( consent, static_cast(called_from)); @@ -171,7 +172,7 @@ diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browse diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1276,7 +1276,6 @@ BrowserProcessImpl::component_updater() { +@@ -1275,7 +1275,6 @@ BrowserProcessImpl::component_updater() { std::make_unique(); std::string brand; @@ -182,7 +183,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -497,11 +497,6 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -498,11 +498,6 @@ void ProcessSingletonNotificationCallbackImpl( StartupBrowserCreator::ProcessCommandLineAlreadyRunning( command_line, current_directory, startup_profile_path_info); @@ -194,7 +195,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows } // Handles notifications from other processes. The function receives the -@@ -1947,11 +1942,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1950,11 +1945,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { upgrade_util::SaveLastModifiedTimeOfExe(); #endif @@ -209,7 +210,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -2938,7 +2938,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2925,7 +2925,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kForceAppMode, #endif switches::kForceUIDirection, @@ -217,7 +218,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch switches::kJavaScriptHarmony, switches::kEnableExperimentalWebAssemblyFeatures, embedder_support::kOriginTrialDisabledFeatures, -@@ -5724,7 +5723,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) { +@@ -5735,7 +5734,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) { } #endif @@ -227,7 +228,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if BUILDFLAG(IS_ANDROID) const std::string& client_data_header, #endif -@@ -5764,7 +5764,7 @@ std::unique_ptr CreateGoogleURLLoaderThrottle( +@@ -5775,7 +5775,7 @@ std::unique_ptr CreateGoogleURLLoaderThrottle( std::move(bound_session_request_throttled_handler), #endif std::move(dynamic_params)); @@ -236,7 +237,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch std::vector> ChromeContentBrowserClient::CreateURLLoaderThrottles( -@@ -5821,15 +5821,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( +@@ -5832,15 +5832,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( GetClientDataHeader(frame_tree_node_id); #endif @@ -252,7 +253,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch { auto* factory = ProtocolHandlerRegistryFactory::GetForBrowserContext(browser_context); -@@ -5874,20 +5865,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( +@@ -5885,20 +5876,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( Profile* profile = Profile::FromBrowserContext(browser_context); DCHECK(profile); @@ -276,7 +277,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc --- a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc +++ b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc -@@ -364,7 +364,6 @@ void CreateAndAddChromeThrottlesForNavigation( +@@ -362,7 +362,6 @@ void CreateAndAddChromeThrottlesForNavigation( extensions::WebViewGuest::MaybeCreateAndAddNavigationThrottle(registry); #endif @@ -344,7 +345,7 @@ diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/br diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.cc --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.cc -@@ -53,13 +53,10 @@ HRESULT RunGoogleUpdateElevatedCommand(const wchar_t* command, +@@ -49,13 +49,10 @@ HRESULT RunGoogleUpdateElevatedCommand(const wchar_t* command, if (args.size() > kMaxCommandArgs) return E_INVALIDARG; @@ -360,12 +361,12 @@ diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/br + Microsoft::WRL::ComPtr app_command; _variant_t vargs[kMaxCommandArgs]; for (size_t i = 0; i < args.size(); ++i) { - vargs[i] = args[i].c_str(); + UNSAFE_TODO(vargs[i]) = args[i].c_str(); diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -519,7 +519,6 @@ source_set("extensions") { - "//chrome/browser/extensions:cws_item_service_proto", + "//chrome/browser/extensions:external_loader", "//chrome/browser/extensions/api:api_registration", "//chrome/browser/favicon", - "//chrome/browser/google", @@ -375,7 +376,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL diff --git a/chrome/browser/feedback/BUILD.gn b/chrome/browser/feedback/BUILD.gn --- a/chrome/browser/feedback/BUILD.gn +++ b/chrome/browser/feedback/BUILD.gn -@@ -102,7 +102,6 @@ source_set("feedback_impl") { +@@ -104,7 +104,6 @@ source_set("feedback_impl") { "//chrome/browser/devtools", "//chrome/browser/extensions", "//chrome/browser/first_party_sets", @@ -491,7 +492,7 @@ diff --git a/chrome/browser/long_screenshots/long_screenshots_tab_service.cc b/c diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -620,7 +620,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() { +@@ -634,7 +634,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() { } bool ChromeMetricsServiceClient::GetBrand(std::string* brand_code) { @@ -622,10 +623,10 @@ diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -930,7 +930,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( - void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( +@@ -933,7 +933,6 @@ void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( network::mojom::NetworkContextParams* network_context_params) { variations::UpdateCorsExemptHeaderForVariations(network_context_params); + variations::UpdateCorsExemptHeaderForOmniboxAutofocus(network_context_params); - GoogleURLLoaderThrottle::UpdateCorsExemptHeader(network_context_params); #if BUILDFLAG(ENABLE_REQUEST_HEADER_INTEGRITY) request_header_integrity::RequestHeaderIntegrityURLLoaderThrottle:: @@ -633,7 +634,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc -@@ -324,10 +324,11 @@ void OneGoogleBarLoaderImpl::SetAdditionalQueryParams( +@@ -322,10 +322,11 @@ void OneGoogleBarLoaderImpl::SetAdditionalQueryParams( } GURL OneGoogleBarLoaderImpl::GetApiUrl() const { @@ -649,7 +650,7 @@ diff --git a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_im diff --git a/chrome/browser/new_tab_page/promos/promo_service.cc b/chrome/browser/new_tab_page/promos/promo_service.cc --- a/chrome/browser/new_tab_page/promos/promo_service.cc +++ b/chrome/browser/new_tab_page/promos/promo_service.cc -@@ -81,11 +81,7 @@ bool CanBlockPromos() { +@@ -82,11 +82,7 @@ bool CanBlockPromos() { } GURL GetGoogleBaseUrl() { @@ -677,7 +678,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metri diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc --- a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc +++ b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc -@@ -203,14 +203,9 @@ void PageLoadMetricsEmbedder::RegisterObservers( +@@ -196,14 +196,9 @@ void PageLoadMetricsEmbedder::RegisterObservers( tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); @@ -777,10 +778,10 @@ diff --git a/chrome/browser/signin/android/signin_manager_android.cc b/chrome/br diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -293,7 +293,6 @@ static_library("ui") { +@@ -294,7 +294,6 @@ static_library("ui") { + "//chrome/browser/favicon", "//chrome/browser/feedback:feedback_impl", "//chrome/browser/file_system_access", - "//chrome/browser/fingerprinting_protection", - "//chrome/browser/google", "//chrome/browser/history", "//chrome/browser/image_decoder", @@ -788,27 +789,27 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn --- a/chrome/browser/ui/android/omnibox/BUILD.gn +++ b/chrome/browser/ui/android/omnibox/BUILD.gn -@@ -51,8 +51,6 @@ android_library("java") { - "java/src/org/chromium/chrome/browser/omnibox/UrlBarProperties.java", - "java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java", - "java/src/org/chromium/chrome/browser/omnibox/UrlFocusChangeListener.java", +@@ -68,8 +68,6 @@ android_library("java") { + "java/src/org/chromium/chrome/browser/omnibox/fusebox/FuseboxTabUtils.java", + "java/src/org/chromium/chrome/browser/omnibox/fusebox/FuseboxViewBinder.java", + "java/src/org/chromium/chrome/browser/omnibox/fusebox/FuseboxViewHolder.java", - "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java", - "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java", - "java/src/org/chromium/chrome/browser/omnibox/navattach/AttachmentDetailsFetcher.java", - "java/src/org/chromium/chrome/browser/omnibox/navattach/ComposeBoxQueryControllerBridge.java", - "java/src/org/chromium/chrome/browser/omnibox/navattach/NavigationAttachmentItemProperties.java", + "java/src/org/chromium/chrome/browser/omnibox/status/PageInfoIphController.java", + "java/src/org/chromium/chrome/browser/omnibox/status/StatusCoordinator.java", + "java/src/org/chromium/chrome/browser/omnibox/status/StatusIconView.java", diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java -@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.lifecycle.NativeInitObserver; - import org.chromium.chrome.browser.locale.LocaleManager; - import org.chromium.chrome.browser.merchant_viewer.MerchantTrustSignalsCoordinator; +@@ -49,7 +49,6 @@ import org.chromium.chrome.browser.multiwindow.MultiInstanceManager; import org.chromium.chrome.browser.omnibox.LocationBarMediator.OmniboxUma; + import org.chromium.chrome.browser.omnibox.fusebox.FuseboxCoordinator; + import org.chromium.chrome.browser.omnibox.fusebox.FuseboxCoordinator.FuseboxState; -import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader; - import org.chromium.chrome.browser.omnibox.navattach.NavigationAttachmentsCoordinator; import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.status.StatusCoordinator.PageInfoAction; -@@ -467,7 +466,6 @@ public class LocationBarCoordinator + import org.chromium.chrome.browser.omnibox.status.StatusView; +@@ -537,7 +536,6 @@ public class LocationBarCoordinator mLocationBarMediator.destroy(); mLocationBarMediator = null; @@ -819,15 +820,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -62,7 +62,6 @@ import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver; - import org.chromium.chrome.browser.locale.LocaleManager; - import org.chromium.chrome.browser.omnibox.UrlBar.UrlBarDelegate; - import org.chromium.chrome.browser.omnibox.UrlBarCoordinator.SelectionState; +@@ -68,7 +68,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarCoordinator.SelectionState; + import org.chromium.chrome.browser.omnibox.fusebox.FuseboxAttachmentModelList.FuseboxAttachmentChangeListener; + import org.chromium.chrome.browser.omnibox.fusebox.FuseboxCoordinator; + import org.chromium.chrome.browser.omnibox.fusebox.FuseboxCoordinator.FuseboxState; -import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader; import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; -@@ -388,22 +387,6 @@ class LocationBarMediator +@@ -419,22 +418,6 @@ class LocationBarMediator if (!mUrlFocusedWithoutAnimations) handleUrlFocusAnimation(hasFocus); @@ -850,7 +851,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow if (!hasFocus && mLocationBarDataProvider.hasTab()) { setUrl( mLocationBarDataProvider.getCurrentGurl(), -@@ -420,8 +403,6 @@ class LocationBarMediator +@@ -451,8 +434,6 @@ class LocationBarMediator Profile profile = mProfileSupplier.get(); assert profile != null; templateUrlService.addObserver(this); @@ -859,7 +860,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow })); mLocationBarLayout.onFinishNativeInitialization(); -@@ -685,9 +666,6 @@ class LocationBarMediator +@@ -720,9 +701,6 @@ class LocationBarMediator LoadUrlParams loadUrlParams = new LoadUrlParams(url); try (TimingMetric record = TimingMetric.shortUptime("Android.Omnibox.SetGeolocationHeadersTime")) { @@ -869,7 +870,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } loadUrlParams.setTransitionType( omniboxLoadUrlParams.transitionType | PageTransition.FROM_ADDRESS_BAR); -@@ -1943,7 +1921,6 @@ class LocationBarMediator +@@ -2044,7 +2022,6 @@ class LocationBarMediator if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled() && profile != null && templateUrlService != null) { @@ -877,7 +878,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } } -@@ -1951,7 +1928,6 @@ class LocationBarMediator +@@ -2052,7 +2029,6 @@ class LocationBarMediator public void onPauseWithNative() { OmniboxFeatures.updateLastExitTimestamp(); if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled()) { @@ -899,7 +900,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc -@@ -698,12 +698,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { +@@ -743,12 +743,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { // chrome-untrusted://new-tab-page for other external content and resources. // NOTE: Use caution when overriding content security policies as that cean // lead to subtle security bugs such as https://crbug.com/1251541. @@ -912,18 +913,31 @@ diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/br return source; } +diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc +--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc ++++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc +@@ -203,8 +203,7 @@ std::string NewTabUI::NewTabHTMLSource::GetContentSecurityPolicy( + network::mojom::CSPDirectiveName directive) { + if (directive == network::mojom::CSPDirectiveName::ScriptSrc) { + // 'unsafe-inline' and google resources are added to script-src. +- return "script-src chrome://resources 'self' 'unsafe-eval' 'unsafe-inline' " +- "*.google.com *.gstatic.com;"; ++ return "script-src chrome://resources 'self' 'unsafe-eval' 'unsafe-inline' "; + } else if (directive == network::mojom::CSPDirectiveName::StyleSrc) { + return "style-src 'self' chrome://resources 'unsafe-inline' " + "chrome://theme;"; diff --git a/chrome/browser/upgrade_detector/BUILD.gn b/chrome/browser/upgrade_detector/BUILD.gn --- a/chrome/browser/upgrade_detector/BUILD.gn +++ b/chrome/browser/upgrade_detector/BUILD.gn -@@ -98,7 +98,6 @@ source_set("impl") { - ] +@@ -99,7 +99,6 @@ source_set("impl") { deps += [ + "//base:build_time", "//chrome/browser:buildflags", - "//chrome/browser/google", "//content/public/browser", ] } else { -@@ -200,7 +199,6 @@ source_set("unit_tests") { +@@ -201,7 +200,6 @@ source_set("unit_tests") { deps += [ "//base:i18n", @@ -950,7 +964,7 @@ diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/b diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -139,8 +139,6 @@ static_library("common_lib") { +@@ -134,8 +134,6 @@ static_library("common_lib") { "content_restriction.h", "crash_keys.cc", "crash_keys.h", @@ -975,7 +989,7 @@ diff --git a/chrome/renderer/google_accounts_private_api_util.cc b/chrome/render diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/renderer/url_loader_throttle_provider_impl.cc --- a/chrome/renderer/url_loader_throttle_provider_impl.cc +++ b/chrome/renderer/url_loader_throttle_provider_impl.cc -@@ -313,17 +313,6 @@ URLLoaderThrottleProviderImpl::CreateThrottles( +@@ -237,17 +237,6 @@ URLLoaderThrottleProviderImpl::CreateThrottles( } #endif @@ -996,12 +1010,12 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -6947,7 +6947,6 @@ test("unit_tests") { +@@ -6960,7 +6960,6 @@ test("unit_tests") { + "//chrome/browser/file_system_access", "//chrome/browser/file_system_access:unit_tests", - "//chrome/browser/fingerprinting_protection", "//chrome/browser/first_party_sets", - "//chrome/browser/google:unit_tests", - "//chrome/browser/ip_protection:unit_tests", + "//chrome/browser/media:unittests", "//chrome/browser/media/prefs", "//chrome/browser/media/prefs:unit_tests", diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliability/BUILD.gn @@ -1094,7 +1108,7 @@ diff --git a/components/domain_reliability/google_configs.cc b/components/domain GoogleConfigParams>({ // Origins with subdomains and same-origin collectors. Currently, all // origins with same-origin collectors also run collectors on their www -@@ -514,7 +514,7 @@ const auto kGoogleConfigs = base::MakeFixedFlatMapRegisterStringPref(prefs::kWebRTCIPHandlingPolicy, @@ -45,7 +45,7 @@ diff --git a/third_party/blink/common/peerconnection/webrtc_ip_handling_policy.c diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc -@@ -1076,7 +1076,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -1064,7 +1064,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( break; } From 558348760fa8742f7fd8f4221b8c4a39670e8441 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 15 Jan 2026 12:59:11 +0100 Subject: [PATCH 2/9] Drop patch in 144 --- build/cromite_patches_list.txt | 6 - ...port-v144-android-extensions-changes.patch | 954 ------------------ .../Block-qjz9zk-or-trk-requests.patch | 277 ----- ...k-for-the-presence-of-use-remoteexec.patch | 18 - .../Follow-only-system-dark-mode.patch | 24 - ...formanceNavigationTiming-privacy-fix.patch | 50 - .../exit-on-failure-of-inclusion.patch | 32 - 7 files changed, 1361 deletions(-) delete mode 100644 build/patches/Backport-v144-android-extensions-changes.patch delete mode 100644 build/patches/Block-qjz9zk-or-trk-requests.patch delete mode 100644 build/patches/Do-not-check-for-the-presence-of-use-remoteexec.patch delete mode 100644 build/patches/Follow-only-system-dark-mode.patch delete mode 100644 build/patches/Temp-PerformanceNavigationTiming-privacy-fix.patch delete mode 100644 build/patches/exit-on-failure-of-inclusion.patch diff --git a/build/cromite_patches_list.txt b/build/cromite_patches_list.txt index 16153152..ec6b0c0a 100644 --- a/build/cromite_patches_list.txt +++ b/build/cromite_patches_list.txt @@ -1,5 +1,4 @@ Do-not-link-with-libatomic.patch -Do-not-check-for-the-presence-of-use-remoteexec.patch bromite-build-utils.patch Add-cromite-flags-support.patch Force-use-vpython3-for-some-scripts.patch @@ -10,7 +9,6 @@ Restore-chrome-password-store.patch Remove-EV-certificates.patch do-not-hide-.orig-files.patch do-not-add-suffix-to-package-name.patch -exit-on-failure-of-inclusion.patch Move-some-account-settings-back-to-privacy-settings.patch kill-Vision.patch kill-Location-fall-back-to-system.patch @@ -99,7 +97,6 @@ Block-gateway-attacks-via-websockets.patch Enable-darken-websites-checkbox-in-themes.patch Remove-blocklisted-URLs-upon-bookmark-creation.patch Disable-the-DIAL-repeating-discovery.patch -Block-qjz9zk-or-trk-requests.patch Hardening-against-incognito-mode-detection.patch Restore-Simplified-NTP-launch.patch Add-option-to-use-home-page-as-NTP.patch @@ -156,7 +153,6 @@ Enable-Certificate-Transparency.patch Invalidate-components-public-key.patch Improve-plain-text-rendering-on-mobile.patch Remove-segmentation-platform.patch -Follow-only-system-dark-mode.patch Remove-window-name-on-cross-origin-navigation.patch Remove-preload-of-com.google.android.gms.fonts.patch Partition-Blink-memory-cache.patch @@ -310,7 +306,6 @@ Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch Supporting-Dangling-Ptr-Detection-via-BackupRefPtr.patch # temporary or wip patches -Temp-PerformanceNavigationTiming-privacy-fix.patch Temp-disable-predictive-back-gesture.patch TEMP-Add-a-log-to-track-strange-behavior.patch Temp-guard-FileSystemAccessPersistentPermissions.patch @@ -331,5 +326,4 @@ Eyeo-Adblock-for-Cromite.patch # extension patches Experimental-support-for-extensions-on-Android.patch -Backport-v144-android-extensions-changes.patch Enable-extension-in-incognito.patch diff --git a/build/patches/Backport-v144-android-extensions-changes.patch b/build/patches/Backport-v144-android-extensions-changes.patch deleted file mode 100644 index b4a19d39..00000000 --- a/build/patches/Backport-v144-android-extensions-changes.patch +++ /dev/null @@ -1,954 +0,0 @@ -From: uazo -Date: Thu, 6 Nov 2025 13:22:24 +0000 -Subject: Backport-v144-android-extensions-changes - -Enable support for anonymous browsing. -Backport of bugid -7089957: extensions Use BrowserWindowInterface in ExtensionViewHost -https://chromium-review.googlesource.com/c/chromium/src/+/7089957 - -7126008: Destroy ExtensionWindowControllerBridge when its Profile is destroyed -https://chromium-review.googlesource.com/c/chromium/src/+/7126008 ---- - .../chrome/browser/ChromeTabbedActivity.java | 1 + - .../chrome/browser/app/ChromeActivity.java | 12 ++ - .../customtabs/BaseCustomTabActivity.java | 1 + - .../BaseCustomTabRootUiCoordinator.java | 5 + - .../tabbed_mode/TabbedRootUiCoordinator.java | 2 + - .../browser/toolbar/ToolbarManager.java | 4 + - .../chrome/browser/ui/RootUiCoordinator.java | 6 + - chrome/android/junit/BUILD.gn | 1 + - ...aseCustomTabRootUiCoordinatorUnitTest.java | 4 + - .../extensions/extension_view_host_factory.cc | 127 +++++++++--------- - .../extensions/extension_view_host_factory.h | 17 +-- - chrome/browser/ui/android/extensions/BUILD.gn | 1 + - .../extension_action_popup_contents.cc | 9 +- - .../ExtensionActionPopupContents.java | 14 +- - .../extensions/windowing/internal/BUILD.gn | 1 + - .../ExtensionWindowControllerBridgeImpl.java | 45 ++++++- - chrome/browser/ui/android/toolbar/BUILD.gn | 2 + - .../ExtensionActionListCoordinator.java | 10 +- - .../ExtensionActionListMediator.java | 16 ++- - .../ExtensionActionListMediatorTest.java | 11 +- - .../ExtensionToolbarCoordinator.java | 5 + - .../ExtensionToolbarCoordinatorImpl.java | 4 + - 22 files changed, 201 insertions(+), 97 deletions(-) - -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2937,6 +2937,7 @@ public class ChromeTabbedActivity extends ChromeActivity { - mLayoutStateProviderSupplier, - getBrowserControlsManager(), - getWindowAndroid(), -+ getChromeAndroidTaskSupplier(), - getLifecycleDispatcher(), - getLayoutManagerSupplier(), - /* menuOrKeyboardActionController= */ this, -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -62,6 +62,7 @@ import org.chromium.base.metrics.RecordUserAction; - import org.chromium.base.shared_preferences.SharedPreferencesManager; - import org.chromium.base.supplier.ObservableSupplier; - import org.chromium.base.supplier.ObservableSupplierImpl; -+import org.chromium.base.supplier.OneshotSupplier; - import org.chromium.base.supplier.OneshotSupplierImpl; - import org.chromium.base.supplier.UnownedUserDataSupplier; - import org.chromium.chrome.R; -@@ -447,6 +448,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity - - private @Nullable TabStateThemeResourceProvider mThemeResourceProvider; - -+ private final OneshotSupplierImpl mChromeAndroidTaskSupplier = -+ new OneshotSupplierImpl<>(); -+ - protected ChromeActivity() { - mManualFillingComponentSupplier.set(ManualFillingComponentFactory.createComponent()); - sNextActivityId++; -@@ -1093,9 +1097,17 @@ public abstract class ChromeActivity extends AsyncInitializationActivity - if (extensionWindowControllerBridge != null) { - chromeAndroidTask.addFeature(extensionWindowControllerBridge); - } -+ -+ // 4. Make the ChromeAndroidTask available via OneshotSupplier. -+ mChromeAndroidTaskSupplier.set(chromeAndroidTask); - } - } - -+ /** Returns an {@link OneshotSupplier} for {@link ChromeAndroidTask}. */ -+ protected final OneshotSupplier getChromeAndroidTaskSupplier() { -+ return mChromeAndroidTaskSupplier; -+ } -+ - @Override - public void onStartWithNative() { - assert mNativeInitialized : "onStartWithNative was called before native was initialized."; -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java -@@ -364,6 +364,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity { - getTabModelSelectorSupplier(), - getBrowserControlsManager(), - getWindowAndroid(), -+ getChromeAndroidTaskSupplier(), - getLifecycleDispatcher(), - getLayoutManagerSupplier(), - /* menuOrKeyboardActionController= */ this, -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java -@@ -30,6 +30,7 @@ import org.chromium.base.metrics.RecordHistogram; - import org.chromium.base.supplier.ObservableSupplier; - import org.chromium.base.supplier.ObservableSupplierImpl; - import org.chromium.base.supplier.OneShotCallback; -+import org.chromium.base.supplier.OneshotSupplier; - import org.chromium.base.supplier.OneshotSupplierImpl; - import org.chromium.base.supplier.SupplierUtils; - import org.chromium.chrome.R; -@@ -96,6 +97,7 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuBlocker; - import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator; - import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; - import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; - import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils; - import org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarCoordinator; -@@ -160,6 +162,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { - * @param tabModelSelectorSupplier Supplies the {@link TabModelSelector}. - * @param browserControlsManager Manages the browser controls. - * @param windowAndroid The current {@link WindowAndroid}. -+ * @param chromeAndroidTaskSupplier Supplies an {@link ChromeAndroidTask}. - * @param activityLifecycleDispatcher Allows observation of the activity lifecycle. - * @param layoutManagerSupplier Supplies the {@link LayoutManager}. - * @param menuOrKeyboardActionController Controls the menu or keyboard action controller. -@@ -200,6 +203,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { - @NonNull ObservableSupplier tabModelSelectorSupplier, - @NonNull BrowserControlsManager browserControlsManager, - @NonNull ActivityWindowAndroid windowAndroid, -+ @NonNull OneshotSupplier chromeAndroidTaskSupplier, - @NonNull ActivityLifecycleDispatcher activityLifecycleDispatcher, - @NonNull ObservableSupplier layoutManagerSupplier, - @NonNull MenuOrKeyboardActionController menuOrKeyboardActionController, -@@ -245,6 +249,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { - new OneshotSupplierImpl<>(), - browserControlsManager, - windowAndroid, -+ chromeAndroidTaskSupplier, - activityLifecycleDispatcher, - layoutManagerSupplier, - menuOrKeyboardActionController, -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -411,6 +411,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { - @NonNull OneshotSupplier layoutStateProviderOneshotSupplier, - @NonNull BrowserControlsManager browserControlsManager, - @NonNull ActivityWindowAndroid windowAndroid, -+ @NonNull OneshotSupplier chromeAndroidTaskSupplier, - @NonNull ActivityLifecycleDispatcher activityLifecycleDispatcher, - @NonNull ObservableSupplier layoutManagerSupplier, - @NonNull MenuOrKeyboardActionController menuOrKeyboardActionController, -@@ -461,6 +462,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { - layoutStateProviderOneshotSupplier, - browserControlsManager, - windowAndroid, -+ chromeAndroidTaskSupplier, - activityLifecycleDispatcher, - layoutManagerSupplier, - menuOrKeyboardActionController, -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -184,6 +184,7 @@ import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoord - import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator; - import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; - import org.chromium.chrome.browser.ui.appmenu.MenuButtonDelegate; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; - import org.chromium.chrome.browser.ui.native_page.NativePage; - import org.chromium.chrome.browser.ui.system.StatusBarColorController; -@@ -748,6 +749,7 @@ public class ToolbarManager - * @param omniboxFocusStateSupplier Supplier to access the focus state of the omnibox. - * @param promoShownOneshotSupplier Supplier for whether a promo was shown on startup. - * @param windowAndroid The {@link WindowAndroid} associated with the ToolbarManager. -+ * @param chromeAndroidTaskSupplier Supplier of the {@link ChromeAndroidTask}. - * @param isInOverviewModeSupplier Supplies whether the app is currently in overview mode. - * @param modalDialogManagerSupplier Supplies the {@link ModalDialogManager}. - * @param statusBarColorController The {@link StatusBarColorController} for the app. -@@ -800,6 +802,7 @@ public class ToolbarManager - ObservableSupplier omniboxFocusStateSupplier, - OneshotSupplier promoShownOneshotSupplier, - WindowAndroid windowAndroid, -+ OneshotSupplier chromeAndroidTaskSupplier, - Supplier isInOverviewModeSupplier, - Supplier modalDialogManagerSupplier, - StatusBarColorController statusBarColorController, -@@ -1127,6 +1130,7 @@ public class ToolbarManager - mActivity, - extensionToolbarStub, - windowAndroid, -+ chromeAndroidTaskSupplier, - (ObservableSupplier) profileSupplier, - (ObservableSupplier) tabProvider, - mTabCreatorManager.getTabCreator(false), -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -166,6 +166,7 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinatorFactory; - import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; - import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler; - import org.chromium.chrome.browser.ui.appmenu.AppMenuObserver; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils; - import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; - import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerCreator; -@@ -262,6 +263,7 @@ public class RootUiCoordinator - protected @Nullable AppMenuCoordinator mAppMenuCoordinator; - private final MenuOrKeyboardActionController mMenuOrKeyboardActionController; - protected final ActivityWindowAndroid mWindowAndroid; -+ private final OneshotSupplier mChromeAndroidTaskSupplier; - - protected final ActivityTabProvider mActivityTabProvider; - protected ObservableSupplier mShareDelegateSupplier; -@@ -401,6 +403,7 @@ public class RootUiCoordinator - * @param layoutStateProviderOneshotSupplier Supplier of the {@link LayoutStateProvider}. - * @param browserControlsManager Manages the browser controls. - * @param windowAndroid The current {@link WindowAndroid}. -+ * @param chromeAndroidTaskSupplier Supplies an {@link ChromeAndroidTask}. - * @param activityLifecycleDispatcher Allows observation of the activity lifecycle. - * @param layoutManagerSupplier Supplies the {@link LayoutManager}. - * @param menuOrKeyboardActionController Controls the menu or keyboard action controller. -@@ -446,6 +449,7 @@ public class RootUiCoordinator - @NonNull OneshotSupplier layoutStateProviderOneshotSupplier, - @NonNull BrowserControlsManager browserControlsManager, - @NonNull ActivityWindowAndroid windowAndroid, -+ @NonNull OneshotSupplier chromeAndroidTaskSupplier, - @NonNull ActivityLifecycleDispatcher activityLifecycleDispatcher, - @NonNull ObservableSupplier layoutManagerSupplier, - @NonNull MenuOrKeyboardActionController menuOrKeyboardActionController, -@@ -478,6 +482,7 @@ public class RootUiCoordinator - mCallbackController = new CallbackController(); - mActivity = activity; - mWindowAndroid = windowAndroid; -+ mChromeAndroidTaskSupplier = chromeAndroidTaskSupplier; - setupUnownedUserDataSuppliers(); - mOnOmniboxFocusChangedListener = onOmniboxFocusChangedListener; - mBrowserControlsManager = browserControlsManager; -@@ -1715,6 +1720,7 @@ public class RootUiCoordinator - mOmniboxFocusStateSupplier, - mPromoShownOneshotSupplier, - mWindowAndroid, -+ mChromeAndroidTaskSupplier, - mIsInOverviewModeSupplier, - mModalDialogManagerSupplier, - mStatusBarColorController, -diff --git a/chrome/android/junit/BUILD.gn b/chrome/android/junit/BUILD.gn ---- a/chrome/android/junit/BUILD.gn -+++ b/chrome/android/junit/BUILD.gn -@@ -205,6 +205,7 @@ if (is_android) { - "//chrome/browser/ui/android/signin:java", - "//chrome/browser/ui/android/theme:java", - "//chrome/browser/ui/android/toolbar:java", -+ "//chrome/browser/ui/browser_window/public/android:java", - "//chrome/browser/ui/messages/android:java", - "//chrome/browser/uid/android:java", - "//chrome/browser/url_constants/android:java", -diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinatorUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinatorUnitTest.java ---- a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinatorUnitTest.java -+++ b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinatorUnitTest.java -@@ -39,6 +39,7 @@ import org.chromium.base.TimeUtils; - import org.chromium.base.UnownedUserDataHost; - import org.chromium.base.supplier.ObservableSupplier; - import org.chromium.base.supplier.ObservableSupplierImpl; -+import org.chromium.base.supplier.OneshotSupplier; - import org.chromium.base.test.BaseRobolectricTestRunner; - import org.chromium.base.test.util.Batch; - import org.chromium.base.test.util.Features.DisableFeatures; -@@ -74,6 +75,7 @@ import org.chromium.chrome.browser.tabmodel.TabCreatorManager; - import org.chromium.chrome.browser.tabmodel.TabModelSelector; - import org.chromium.chrome.browser.ui.appmenu.AppMenuBlocker; - import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; - import org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarCoordinator; - import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; -@@ -123,6 +125,7 @@ public final class BaseCustomTabRootUiCoordinatorUnitTest { - mBrowserStateBrowserControlsVisibilityDelegate; - - @Mock private ActivityWindowAndroid mWindowAndroid; -+ @Mock private OneshotSupplier mChromeAndroidTask; - @Mock private ActivityLifecycleDispatcher mActivityLifecycleDispatcher; - @Mock private ObservableSupplier mLayoutManagerSupplier; - @Mock private MenuOrKeyboardActionController mMenuOrKeyboardActionController; -@@ -196,6 +199,7 @@ public final class BaseCustomTabRootUiCoordinatorUnitTest { - mTabModelSelectorSupplier, - mBrowserControlsManager, - mWindowAndroid, -+ mChromeAndroidTask, - mActivityLifecycleDispatcher, - mLayoutManagerSupplier, - mMenuOrKeyboardActionController, -diff --git a/chrome/browser/extensions/extension_view_host_factory.cc b/chrome/browser/extensions/extension_view_host_factory.cc ---- a/chrome/browser/extensions/extension_view_host_factory.cc -+++ b/chrome/browser/extensions/extension_view_host_factory.cc -@@ -12,6 +12,7 @@ - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/ui/browser_finder.h" - #include "chrome/browser/ui/browser_window/public/browser_window_features.h" -+#include "chrome/browser/ui/browser_window/public/browser_window_interface.h" - #include "chrome/common/url_constants.h" - #include "content/public/browser/keyboard_event_processing_result.h" - #include "content/public/browser/web_contents.h" -@@ -21,9 +22,9 @@ - #include "extensions/common/manifest_handlers/incognito_info.h" - #include "extensions/common/mojom/view_type.mojom.h" - --#if !BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(ENABLE_EXTENSIONS) - #include "chrome/browser/ui/browser.h" --#endif // !BUILDFLAG(IS_ANDROID) -+#endif // BUILDFLAG(ENABLE_EXTENSIONS) - - static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); - -@@ -31,51 +32,7 @@ namespace extensions { - - namespace { - --#if BUILDFLAG(IS_ANDROID) -- --// Delegate for ExtensionViewHost on Android. --class ExtensionViewHostDelegateAndroid : public ExtensionViewHost::Delegate { -- public: -- ExtensionViewHostDelegateAndroid() = default; -- ExtensionViewHostDelegateAndroid(const ExtensionViewHostDelegateAndroid&) = -- delete; -- ExtensionViewHostDelegateAndroid& operator=( -- const ExtensionViewHostDelegateAndroid&) = delete; -- ~ExtensionViewHostDelegateAndroid() override = default; -- -- content::WebContents* OpenURL( -- const content::OpenURLParams& params, -- base::OnceCallback -- navigation_handle_callback) override { -- // TODO(cbrug.com/385987224): Implement this method for Android. -- NOTIMPLEMENTED(); -- return nullptr; -- } -- -- content::KeyboardEventProcessingResult PreHandleKeyboardEvent( -- content::WebContents* source, -- const input::NativeWebKeyboardEvent& event) override { -- // TODO(cbrug.com/385987224): Implement this method for Android. -- NOTIMPLEMENTED(); -- return content::KeyboardEventProcessingResult::NOT_HANDLED; -- } -- -- std::unique_ptr OpenEyeDropper( -- content::RenderFrameHost* frame, -- content::EyeDropperListener* listener) override { -- // TODO(cbrug.com/385987224): Implement this method for Android. -- NOTIMPLEMENTED(); -- return nullptr; -- } -- -- WindowController* GetExtensionWindowController() const override { -- // TODO(cbrug.com/385987224): Implement this method for Android. -- NOTIMPLEMENTED(); -- return nullptr; -- } --}; -- --#else // BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(ENABLE_EXTENSIONS) - - // Delegate for ExtensionViewHost attached to a specific browser window. - class ExtensionViewHostBrowserDelegate : public ExtensionViewHost::Delegate { -@@ -175,7 +132,52 @@ class ExtensionViewHostTabDelegate : public ExtensionViewHost::Delegate { - - raw_ptr web_contents_; - }; --#endif // BUILDFLAG(IS_ANDROID) -+ -+#else // BUILDFLAG(ENABLE_EXTENSIONS) -+ -+// Delegate for ExtensionViewHost on Android. -+class ExtensionViewHostDelegateAndroid : public ExtensionViewHost::Delegate { -+ public: -+ ExtensionViewHostDelegateAndroid() = default; -+ ExtensionViewHostDelegateAndroid(const ExtensionViewHostDelegateAndroid&) = -+ delete; -+ ExtensionViewHostDelegateAndroid& operator=( -+ const ExtensionViewHostDelegateAndroid&) = delete; -+ ~ExtensionViewHostDelegateAndroid() override = default; -+ -+ content::WebContents* OpenURL( -+ const content::OpenURLParams& params, -+ base::OnceCallback -+ navigation_handle_callback) override { -+ // TODO(cbrug.com/385987224): Implement this method for Android. -+ NOTIMPLEMENTED(); -+ return nullptr; -+ } -+ -+ content::KeyboardEventProcessingResult PreHandleKeyboardEvent( -+ content::WebContents* source, -+ const input::NativeWebKeyboardEvent& event) override { -+ // TODO(cbrug.com/385987224): Implement this method for Android. -+ NOTIMPLEMENTED(); -+ return content::KeyboardEventProcessingResult::NOT_HANDLED; -+ } -+ -+ std::unique_ptr OpenEyeDropper( -+ content::RenderFrameHost* frame, -+ content::EyeDropperListener* listener) override { -+ // TODO(cbrug.com/385987224): Implement this method for Android. -+ NOTIMPLEMENTED(); -+ return nullptr; -+ } -+ -+ WindowController* GetExtensionWindowController() const override { -+ // TODO(cbrug.com/385987224): Implement this method for Android. -+ NOTIMPLEMENTED(); -+ return nullptr; -+ } -+}; -+ -+#endif // BUILDFLAG(ENABLE_EXTENSIONS) - - // Creates a new ExtensionHost with its associated view, grouping it in the - // appropriate SiteInstance (and therefore process) based on the URL and -@@ -264,28 +266,23 @@ std::unique_ptr CreateViewHost( - - } // namespace - --#if BUILDFLAG(IS_ANDROID) -- - // static - std::unique_ptr ExtensionViewHostFactory::CreatePopupHost( - const GURL& url, -- Profile* profile) { -- return CreateViewHost(url, profile, mojom::ViewType::kExtensionPopup, -- std::make_unique()); --} -- --#else // BUILDFLAG(IS_ANDROID) -- --// static --std::unique_ptr ExtensionViewHostFactory::CreatePopupHost( -- const GURL& url, -- Browser* browser) { -+ BrowserWindowInterface* browser) { - DCHECK(browser); -- return CreateViewHost( -- url, browser->profile(), mojom::ViewType::kExtensionPopup, -- std::make_unique(browser)); -+#if BUILDFLAG(ENABLE_EXTENSIONS) -+ auto delegate = std::make_unique( -+ browser->GetBrowserForMigrationOnly()); -+#else // BUILDFLAG(ENABLE_EXTENSIONS) -+ auto delegate = std::make_unique(); -+#endif // BUILDFLAG(ENABLE_EXTENSIONS) -+ return CreateViewHost(url, browser->GetProfile(), -+ mojom::ViewType::kExtensionPopup, std::move(delegate)); - } - -+#if BUILDFLAG(ENABLE_EXTENSIONS) -+ - // static - std::unique_ptr - ExtensionViewHostFactory::CreateSidePanelHost( -@@ -311,6 +308,6 @@ ExtensionViewHostFactory::CreateSidePanelHost( - std::move(delegate)); - } - --#endif // BUILDFLAG(IS_ANDROID) -+#endif // BUILDFLAG(ENABLE_EXTENSIONS) - - } // namespace extensions -diff --git a/chrome/browser/extensions/extension_view_host_factory.h b/chrome/browser/extensions/extension_view_host_factory.h ---- a/chrome/browser/extensions/extension_view_host_factory.h -+++ b/chrome/browser/extensions/extension_view_host_factory.h -@@ -12,10 +12,8 @@ - - static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); - --class Browser; - class BrowserWindowInterface; - class GURL; --class Profile; - - namespace tabs { - class TabInterface; -@@ -33,19 +31,14 @@ class ExtensionViewHostFactory { - ExtensionViewHostFactory(const ExtensionViewHostFactory&) = delete; - ExtensionViewHostFactory& operator=(const ExtensionViewHostFactory&) = delete; - --#if BUILDFLAG(IS_ANDROID) - // Creates a new ExtensionHost with its associated view, grouping it in the - // appropriate SiteInstance (and therefore process) based on the URL and - // profile. -- static std::unique_ptr CreatePopupHost(const GURL& url, -- Profile* profile); --#else // BUILDFLAG(IS_ANDROID) -- // Creates a new ExtensionHost with its associated view, grouping it in the -- // appropriate SiteInstance (and therefore process) based on the URL and -- // profile. -- static std::unique_ptr CreatePopupHost(const GURL& url, -- Browser* browser); -+ static std::unique_ptr CreatePopupHost( -+ const GURL& url, -+ BrowserWindowInterface* browser); - -+#if BUILDFLAG(ENABLE_EXTENSIONS) - // Creates a new ExtensionHost with its associated view, grouping it in the - // appropriate SiteInstance (and therefore process) based on the URL and - // profile. -@@ -54,7 +47,7 @@ class ExtensionViewHostFactory { - const GURL& url, - BrowserWindowInterface* browser, - tabs::TabInterface* tab_interface); --#endif // BUILDFLAG(IS_ANDROID) -+#endif // BUILDFLAG(ENABLE_EXTENSIONS) - }; - - } // namespace extensions -diff --git a/chrome/browser/ui/android/extensions/BUILD.gn b/chrome/browser/ui/android/extensions/BUILD.gn ---- a/chrome/browser/ui/android/extensions/BUILD.gn -+++ b/chrome/browser/ui/android/extensions/BUILD.gn -@@ -24,6 +24,7 @@ android_library("java") { - "//chrome/browser/tab:java", - "//chrome/browser/tabmodel:java", - "//chrome/browser/ui/android/theme:java", -+ "//chrome/browser/ui/browser_window/public/android:java", - "//components/browser_ui/widget/android:java", - "//third_party/android_deps:material_design_java", - "//ui/android:ui_full_java", -diff --git a/chrome/browser/ui/android/extensions/extension_action_popup_contents.cc b/chrome/browser/ui/android/extensions/extension_action_popup_contents.cc ---- a/chrome/browser/ui/android/extensions/extension_action_popup_contents.cc -+++ b/chrome/browser/ui/android/extensions/extension_action_popup_contents.cc -@@ -9,6 +9,7 @@ - #include "chrome/browser/extensions/extension_view_host.h" - #include "chrome/browser/extensions/extension_view_host_factory.h" - #include "chrome/browser/profiles/profile.h" -+#include "chrome/browser/ui/browser_window/internal/android/android_browser_window.h" - #include "content/public/browser/render_widget_host_view.h" - #include "content/public/browser/web_contents.h" - #include "extensions/browser/extension_action.h" -@@ -135,9 +136,13 @@ void ExtensionActionPopupContents::HandleCloseExtensionHost( - // popup. - static ScopedJavaLocalRef JNI_ExtensionActionPopupContents_Create( - JNIEnv* env, -- Profile* profile, -+ jlong browser_window_interface_ptr, - std::string& action_id, - int tab_id) { -+ BrowserWindowInterface* browser = -+ reinterpret_cast(browser_window_interface_ptr); -+ Profile* profile = browser->GetProfile(); -+ - ExtensionRegistry* registry = ExtensionRegistry::Get(profile); - DCHECK(registry); - -@@ -154,7 +159,7 @@ static ScopedJavaLocalRef JNI_ExtensionActionPopupContents_Create( - GURL popup_url = action->GetPopupUrl(tab_id); - - std::unique_ptr host = -- ExtensionViewHostFactory::CreatePopupHost(popup_url, profile); -+ ExtensionViewHostFactory::CreatePopupHost(popup_url, browser); - DCHECK(host); - - // The ExtensionActionPopupContents C++ object's lifetime is managed by its -diff --git a/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionActionPopupContents.java b/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionActionPopupContents.java ---- a/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionActionPopupContents.java -+++ b/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionActionPopupContents.java -@@ -12,7 +12,7 @@ import org.jni_zero.NativeMethods; - import org.chromium.base.lifetime.Destroyable; - import org.chromium.build.annotations.NullMarked; - import org.chromium.build.annotations.Nullable; --import org.chromium.chrome.browser.profiles.Profile; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.content_public.browser.WebContents; - - /** -@@ -50,8 +50,10 @@ public class ExtensionActionPopupContents implements Destroyable { - } - - /** Creates an {@link ExtensionActionPopupContents} instance. */ -- public static ExtensionActionPopupContents create(Profile profile, String actionId, int tabId) { -- return ExtensionActionPopupContentsJni.get().create(profile, actionId, tabId); -+ public static ExtensionActionPopupContents create( -+ ChromeAndroidTask task, String actionId, int tabId) { -+ return ExtensionActionPopupContentsJni.get() -+ .create(task.getOrCreateNativeBrowserWindowPtr(), actionId, tabId); - } - - /** -@@ -138,15 +140,13 @@ public class ExtensionActionPopupContents implements Destroyable { - /** - * Creates the native ExtensionActionPopupContents object and returns its Java peer. - * -- * @param profile The {@link Profile} associated with the extension. -+ * @param androidBrowserWindowPtr The address of a native {@code BrowserWindowInterface}. - * @param actionId The ID of the extension action. - * @param tabId The ID of the tab context. - * @return The Java {@link ExtensionActionPopupContents} object, or {@code null} on failure. - */ - ExtensionActionPopupContents create( -- @JniType("Profile*") Profile profile, -- @JniType("std::string") String actionId, -- int tabId); -+ long androidBrowserWindowPtr, @JniType("std::string") String actionId, int tabId); - - /** - * Destroys the native ExtensionActionPopupContents object. -diff --git a/chrome/browser/ui/android/extensions/windowing/internal/BUILD.gn b/chrome/browser/ui/android/extensions/windowing/internal/BUILD.gn ---- a/chrome/browser/ui/android/extensions/windowing/internal/BUILD.gn -+++ b/chrome/browser/ui/android/extensions/windowing/internal/BUILD.gn -@@ -38,6 +38,7 @@ android_library("java") { - ] - deps = [ - "//build/android:build_java", -+ "//chrome/browser/profiles/android:java", - "//chrome/browser/ui/android/extensions/windowing:java", - "//chrome/browser/ui/browser_window/public/android:java", - "//third_party/androidx:androidx_annotation_annotation_java", -diff --git a/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeImpl.java b/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeImpl.java ---- a/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeImpl.java -+++ b/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeImpl.java -@@ -11,6 +11,8 @@ import org.jni_zero.CalledByNative; - import org.jni_zero.NativeMethods; - - import org.chromium.build.annotations.NullMarked; -+import org.chromium.chrome.browser.profiles.Profile; -+import org.chromium.chrome.browser.profiles.ProfileManager; - import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - - import java.util.ArrayList; -@@ -19,7 +21,8 @@ import java.util.Map; - - /** Implements {@link ExtensionWindowControllerBridge}. */ - @NullMarked --final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowControllerBridge { -+final class ExtensionWindowControllerBridgeImpl -+ implements ExtensionWindowControllerBridge, ProfileManager.Observer { - - /** - * Events received by the native singleton {@code WindowControllerListObserverForTesting}. -@@ -82,6 +85,7 @@ final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowContro - assert mNativeExtensionWindowControllerBridge == 0 - : "ExtensionWindowControllerBridge is already added to a task."; - -+ ProfileManager.addObserver(this); - mNativeExtensionWindowControllerBridge = - ExtensionWindowControllerBridgeImplJni.get() - .create( -@@ -91,10 +95,8 @@ final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowContro - - @Override - public void onTaskRemoved() { -- if (mNativeExtensionWindowControllerBridge != 0) { -- ExtensionWindowControllerBridgeImplJni.get() -- .destroy(mNativeExtensionWindowControllerBridge); -- } -+ destroyNativeExtensionWindowControllerBridge(); -+ ProfileManager.removeObserver(this); - } - - @Override -@@ -113,6 +115,32 @@ final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowContro - } - } - -+ @Override -+ public void onProfileAdded(Profile profile) {} -+ -+ @Override -+ public void onProfileDestroyed(Profile profile) { -+ // This is a short-term fix for http://crbug.com/450234852. -+ // -+ // The native extension code is cross-platform and depends on BrowserWindowInterface. Per -+ // documentation of BrowserWindowInterface::GetProfile(), cross-platform code assumes -+ // BrowserWindowInterface will always be destroyed *before* its Profile. -+ // -+ // See: -+ // https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/browser_window/public/browser_window_interface.h;l=108;drc=c8dc70b538f1bb0862f1be58237d6e945ee81819 -+ // -+ // However, on Android, http://crbug.com/450234852 reveals a case where the Profile is -+ // destroyed before its BrowserWindowInterface, which caused native extension code to -+ // dereference an invalid Profile pointer. -+ // -+ // To avoid this issue, we destroy the native objects for extensions as soon as the native -+ // Profile is about to be destroyed. The long-term fix should be to correct the object -+ // destruction order for the case described in http://crbug.com/450234852. -+ if (profile == mChromeAndroidTask.getProfile()) { -+ destroyNativeExtensionWindowControllerBridge(); -+ } -+ } -+ - long getNativePtrForTesting() { - return mNativeExtensionWindowControllerBridge; - } -@@ -123,6 +151,13 @@ final class ExtensionWindowControllerBridgeImpl implements ExtensionWindowContro - .getExtensionWindowIdForTesting(mNativeExtensionWindowControllerBridge); // IN-TEST - } - -+ private void destroyNativeExtensionWindowControllerBridge() { -+ if (mNativeExtensionWindowControllerBridge != 0) { -+ ExtensionWindowControllerBridgeImplJni.get() -+ .destroy(mNativeExtensionWindowControllerBridge); -+ } -+ } -+ - @CalledByNative - private void clearNativePtr() { - mNativeExtensionWindowControllerBridge = 0; -diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn ---- a/chrome/browser/ui/android/toolbar/BUILD.gn -+++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -189,6 +189,7 @@ android_library("java") { - "//chrome/browser/ui/android/omnibox:java_resources", - "//chrome/browser/ui/android/pdf:java", - "//chrome/browser/ui/android/theme:java", -+ "//chrome/browser/ui/browser_window/public/android:java", - "//chrome/browser/url_constants/android:java", - "//chrome/browser/user_education:java", - "//chrome/browser/util:java", -@@ -478,6 +479,7 @@ robolectric_library("junit") { - "//chrome/browser/ui/android/omnibox:java_resources", - "//chrome/browser/ui/android/theme:java", - "//chrome/browser/ui/android/toolbar:java_resources", -+ "//chrome/browser/ui/browser_window/public/android:java", - "//chrome/browser/user_education:java", - "//chrome/test/android:chrome_java_unit_test_support", - "//components/browser_ui/bottomsheet/android:java", -diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java ---- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java -+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java -@@ -10,11 +10,13 @@ import android.view.LayoutInflater; - import org.chromium.base.lifetime.Destroyable; - import org.chromium.base.lifetime.LifetimeAssert; - import org.chromium.base.supplier.ObservableSupplier; -+import org.chromium.base.supplier.OneshotSupplier; - import org.chromium.build.annotations.NullMarked; - import org.chromium.build.annotations.Nullable; - import org.chromium.chrome.browser.profiles.Profile; - import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.toolbar.extensions.ExtensionActionButtonProperties.ListItemType; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.chrome.browser.ui.extensions.R; - import org.chromium.ui.base.WindowAndroid; - import org.chromium.ui.listmenu.ListMenuButton; -@@ -37,6 +39,7 @@ public class ExtensionActionListCoordinator implements Destroyable { - Context context, - ExtensionActionListContainer container, - WindowAndroid windowAndroid, -+ OneshotSupplier taskSupplier, - ObservableSupplier profileSupplier, - ObservableSupplier currentTabSupplier) { - mContainer = container; -@@ -44,7 +47,12 @@ public class ExtensionActionListCoordinator implements Destroyable { - mModels = new ModelList(); - mMediator = - new ExtensionActionListMediator( -- context, windowAndroid, mModels, profileSupplier, currentTabSupplier); -+ context, -+ windowAndroid, -+ mModels, -+ taskSupplier, -+ profileSupplier, -+ currentTabSupplier); - mAdapter = - new ViewGroupAdapter.Builder(mContainer, mModels) - .registerType( -diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediator.java ---- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediator.java -+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediator.java -@@ -12,6 +12,7 @@ import org.chromium.base.Log; - import org.chromium.base.lifetime.Destroyable; - import org.chromium.base.lifetime.LifetimeAssert; - import org.chromium.base.supplier.ObservableSupplier; -+import org.chromium.base.supplier.OneshotSupplier; - import org.chromium.build.annotations.NullMarked; - import org.chromium.build.annotations.Nullable; - import org.chromium.chrome.browser.extensions.ContextMenuSource; -@@ -19,6 +20,7 @@ import org.chromium.chrome.browser.profiles.Profile; - import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.toolbar.MenuBuilderHelper; - import org.chromium.chrome.browser.toolbar.extensions.ExtensionActionButtonProperties.ListItemType; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.chrome.browser.ui.extensions.ExtensionAction; - import org.chromium.chrome.browser.ui.extensions.ExtensionActionContextMenuBridge; - import org.chromium.chrome.browser.ui.extensions.ExtensionActionPopupContents; -@@ -38,6 +40,7 @@ class ExtensionActionListMediator implements Destroyable { - private final Context mContext; - private final WindowAndroid mWindowAndroid; - private final ModelList mModels; -+ private final OneshotSupplier mTaskSupplier; - private final ExtensionActionsUpdateHelper mExtensionActionsUpdateHelper; - - private final ActionsUpdateDelegate mActionsUpdateDelegate = new ActionsUpdateDelegate(); -@@ -50,11 +53,13 @@ class ExtensionActionListMediator implements Destroyable { - Context context, - WindowAndroid windowAndroid, - ModelList models, -+ OneshotSupplier taskSupplier, - ObservableSupplier profileSupplier, - ObservableSupplier currentTabSupplier) { - mContext = context; - mWindowAndroid = windowAndroid; - mModels = models; -+ mTaskSupplier = taskSupplier; - - mExtensionActionsUpdateHelper = - new ExtensionActionsUpdateHelper( -@@ -103,16 +108,19 @@ class ExtensionActionListMediator implements Destroyable { - // button while its popup is open. - closePopup(); - -- Tab currentTab = mExtensionActionsUpdateHelper.getCurrentTab(); -- Profile profile = mExtensionActionsUpdateHelper.getProfile(); -+ ChromeAndroidTask task = mTaskSupplier.get(); -+ if (task == null) { -+ return; -+ } - -- if (profile == null || currentTab == null) { -+ Tab currentTab = mExtensionActionsUpdateHelper.getCurrentTab(); -+ if (currentTab == null) { - return; - } - int tabId = currentTab.getId(); - - ExtensionActionPopupContents contents = -- ExtensionActionPopupContents.create(profile, actionId, tabId); -+ ExtensionActionPopupContents.create(task, actionId, tabId); - assert mCurrentPopup == null; - mCurrentPopup = - new ExtensionActionPopup(mContext, mWindowAndroid, buttonView, actionId, contents); -diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediatorTest.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediatorTest.java ---- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediatorTest.java -+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListMediatorTest.java -@@ -39,12 +39,14 @@ import org.mockito.junit.MockitoRule; - import org.robolectric.annotation.LooperMode; - - import org.chromium.base.supplier.ObservableSupplierImpl; -+import org.chromium.base.supplier.OneshotSupplierImpl; - import org.chromium.base.test.BaseRobolectricTestRunner; - import org.chromium.chrome.browser.extensions.ContextMenuSource; - import org.chromium.chrome.browser.profiles.Profile; - import org.chromium.chrome.browser.tab.MockTab; - import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.toolbar.extensions.ExtensionActionButtonProperties.ListItemType; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.chrome.browser.ui.extensions.ExtensionActionContextMenuBridge; - import org.chromium.chrome.browser.ui.extensions.ExtensionActionContextMenuBridgeJni; - import org.chromium.chrome.browser.ui.extensions.FakeExtensionActionsBridge; -@@ -86,6 +88,7 @@ public class ExtensionActionListMediatorTest { - private FakeExtensionActionsBridge.ProfileModel mProfileModel; - private MockTab mTab1; - private MockTab mTab2; -+ private OneshotSupplierImpl mTaskSupplier; - private ObservableSupplierImpl mProfileSupplier; - private ObservableSupplierImpl mCurrentTabSupplier; - private ModelList mModels; -@@ -108,12 +111,18 @@ public class ExtensionActionListMediatorTest { - mTab2 = new MockTab(TAB2_ID, mProfile); - mTab1.setWebContentsOverrideForTesting(mWebContents); - mTab2.setWebContentsOverrideForTesting(mWebContents); -+ mTaskSupplier = new OneshotSupplierImpl<>(); - mProfileSupplier = new ObservableSupplierImpl<>(); - mCurrentTabSupplier = new ObservableSupplierImpl<>(); - mModels = new ModelList(); - mMediator = - new ExtensionActionListMediator( -- context, mWindowAndroid, mModels, mProfileSupplier, mCurrentTabSupplier); -+ context, -+ mWindowAndroid, -+ mModels, -+ mTaskSupplier, -+ mProfileSupplier, -+ mCurrentTabSupplier); - - // Wait for the main thread to settle. - shadowOf(Looper.getMainLooper()).idle(); -diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinator.java ---- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinator.java -+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinator.java -@@ -11,6 +11,7 @@ import android.view.ViewStub; - import org.chromium.base.ServiceLoaderUtil; - import org.chromium.base.lifetime.Destroyable; - import org.chromium.base.supplier.ObservableSupplier; -+import org.chromium.base.supplier.OneshotSupplier; - import org.chromium.build.annotations.Initializer; - import org.chromium.build.annotations.NullMarked; - import org.chromium.build.annotations.Nullable; -@@ -18,6 +19,7 @@ import org.chromium.chrome.browser.profiles.Profile; - import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.tabmodel.TabCreator; - import org.chromium.chrome.browser.theme.ThemeColorProvider; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.ui.base.WindowAndroid; - - /** -@@ -40,6 +42,7 @@ public interface ExtensionToolbarCoordinator extends Destroyable { - Context context, - ViewStub extensionToolbarStub, - WindowAndroid windowAndroid, -+ OneshotSupplier taskSupplier, - ObservableSupplier profileSupplier, - ObservableSupplier currentTabSupplier, - TabCreator tabCreator, -@@ -53,6 +56,7 @@ public interface ExtensionToolbarCoordinator extends Destroyable { - context, - extensionToolbarStub, - windowAndroid, -+ taskSupplier, - profileSupplier, - currentTabSupplier, - tabCreator, -@@ -71,6 +75,7 @@ public interface ExtensionToolbarCoordinator extends Destroyable { - Context context, - ViewStub extensionToolbarStub, - WindowAndroid windowAndroid, -+ OneshotSupplier taskSupplier, - ObservableSupplier profileSupplier, - ObservableSupplier currentTabSupplier, - TabCreator tabCreator, -diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinatorImpl.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinatorImpl.java ---- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinatorImpl.java -+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionToolbarCoordinatorImpl.java -@@ -13,6 +13,7 @@ import android.widget.LinearLayout; - import org.chromium.base.Callback; - import org.chromium.base.lifetime.LifetimeAssert; - import org.chromium.base.supplier.ObservableSupplier; -+import org.chromium.base.supplier.OneshotSupplier; - import org.chromium.build.annotations.NullMarked; - import org.chromium.build.annotations.Nullable; - import org.chromium.build.annotations.ServiceImpl; -@@ -20,6 +21,7 @@ import org.chromium.chrome.browser.profiles.Profile; - import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.tabmodel.TabCreator; - import org.chromium.chrome.browser.theme.ThemeColorProvider; -+import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; - import org.chromium.chrome.browser.ui.extensions.ExtensionActionsBridge; - import org.chromium.chrome.browser.ui.extensions.ExtensionUi; - import org.chromium.chrome.browser.ui.extensions.R; -@@ -44,6 +46,7 @@ public class ExtensionToolbarCoordinatorImpl implements ExtensionToolbarCoordina - Context context, - ViewStub extensionToolbarStub, - WindowAndroid windowAndroid, -+ OneshotSupplier taskSupplier, - ObservableSupplier profileSupplier, - ObservableSupplier currentTabSupplier, - TabCreator tabCreator, -@@ -63,6 +66,7 @@ public class ExtensionToolbarCoordinatorImpl implements ExtensionToolbarCoordina - context, - container.findViewById(R.id.extension_action_list), - windowAndroid, -+ taskSupplier, - profileSupplier, - currentTabSupplier); - mExtensionsMenuCoordinator = --- diff --git a/build/patches/Block-qjz9zk-or-trk-requests.patch b/build/patches/Block-qjz9zk-or-trk-requests.patch deleted file mode 100644 index 2771f753..00000000 --- a/build/patches/Block-qjz9zk-or-trk-requests.patch +++ /dev/null @@ -1,277 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Wed, 30 Oct 2019 11:50:13 +0100 -Subject: Block 'qjz9zk' or 'trk:' requests - -An info bar is displayed unless the --disable-trkbar command-line flag or the chrome://flag option is used. -This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved' - -License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ---- - .../chrome_autocomplete_scheme_classifier.cc | 1 + - chrome/browser/history/history_utils.cc | 1 + - chrome/browser/ui/singleton_tabs.cc | 5 ++++ - .../omnibox/browser/autocomplete_input.cc | 8 ++++- - components/url_formatter/url_fixer.cc | 4 +++ - .../child_process_security_policy_impl.cc | 1 + - net/BUILD.gn | 2 ++ - net/url_request/trk_protocol_handler.cc | 25 ++++++++++++++++ - net/url_request/trk_protocol_handler.h | 30 +++++++++++++++++++ - net/url_request/url_request.cc | 8 +++++ - .../url_request_context_builder.cc | 3 ++ - url/url_constants.h | 1 + - url/url_util.cc | 2 ++ - 13 files changed, 90 insertions(+), 1 deletion(-) - create mode 100644 net/url_request/trk_protocol_handler.cc - create mode 100644 net/url_request/trk_protocol_handler.h - -diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc ---- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -72,6 +72,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme( - if (base::IsStringASCII(scheme) && - (ProfileIOData::IsHandledProtocol(scheme) || - base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) || -+ base::EqualsCaseInsensitiveASCII(scheme, url::kTraceScheme) || - base::EqualsCaseInsensitiveASCII(scheme, url::kJavaScriptScheme) || - base::EqualsCaseInsensitiveASCII(scheme, url::kDataScheme))) { - return metrics::OmniboxInputType::URL; -diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/history_utils.cc ---- a/chrome/browser/history/history_utils.cc -+++ b/chrome/browser/history/history_utils.cc -@@ -22,6 +22,7 @@ bool CanAddURLToHistory(const GURL& url) { - url.SchemeIs(content::kChromeUIScheme) || - url.SchemeIs(content::kChromeUIUntrustedScheme) || - url.SchemeIs(content::kViewSourceScheme) || -+ url.SchemeIs(url::kTraceScheme) || - url.SchemeIs(chrome::kChromeNativeScheme) || - url.SchemeIs(chrome::kChromeSearchScheme) || - url.SchemeIs(dom_distiller::kDomDistillerScheme)) -diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc ---- a/chrome/browser/ui/singleton_tabs.cc -+++ b/chrome/browser/ui/singleton_tabs.cc -@@ -144,6 +144,11 @@ int GetIndexOfExistingTab(BrowserWindowInterface* browser, - continue; - } - -+ // trk: URLs must not be rewritten -+ if (tab_url.SchemeIs(url::kTraceScheme)) { -+ continue; -+ } -+ - GURL rewritten_tab_url = tab_url; - content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( - &rewritten_tab_url, browser->GetProfile()); -diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc ---- a/components/omnibox/browser/autocomplete_input.cc -+++ b/components/omnibox/browser/autocomplete_input.cc -@@ -92,10 +92,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) { - bool HasScheme(const std::u16string& input, const char* scheme) { - std::string utf8_input(base::UTF16ToUTF8(input)); - url::Component view_source_scheme; -+ -+ if (url::FindAndCompareScheme(utf8_input, url::kTraceScheme, &view_source_scheme)) { -+ return false; -+ } - if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, - &view_source_scheme)) { - utf8_input.erase(0, view_source_scheme.end() + 1); - } -+ - return url::FindAndCompareScheme(utf8_input, scheme, nullptr); - } - -@@ -580,7 +585,8 @@ void AutocompleteInput::ParseForEmphasizeComponents( - // For the view-source and blob schemes, we should emphasize the host of the - // URL qualified by the view-source or blob prefix. - if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) || -- base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme)) && -+ base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme) || -+ base::EqualsCaseInsensitiveASCII(scheme_str, url::kTraceScheme)) && - (static_cast(text.length()) > after_scheme_and_colon)) { - // Obtain the URL prefixed by view-source or blob and parse it. - std::u16string real_url(text.substr(after_scheme_and_colon)); -diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc ---- a/components/url_formatter/url_fixer.cc -+++ b/components/url_formatter/url_fixer.cc -@@ -598,6 +598,10 @@ GURL FixupURLInternal(const std::string& text, - } - } - -+ if (scheme == url::kTraceScheme) { -+ return GURL(); -+ } -+ - // We handle the file scheme separately. - if (scheme == url::kFileScheme) { - return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); -diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc ---- a/content/browser/child_process_security_policy_impl.cc -+++ b/content/browser/child_process_security_policy_impl.cc -@@ -969,6 +969,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() - RegisterPseudoScheme(url::kJavaScriptScheme); - RegisterPseudoScheme(kViewSourceScheme); - RegisterPseudoScheme(kGoogleChromeScheme); -+ RegisterWebSafeScheme(url::kTraceScheme); - } - - ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() = default; -diff --git a/net/BUILD.gn b/net/BUILD.gn ---- a/net/BUILD.gn -+++ b/net/BUILD.gn -@@ -1147,6 +1147,8 @@ component("net") { - "url_request/url_request_http_job.cc", - "url_request/url_request_http_job.h", - "url_request/url_request_interceptor.cc", -+ "url_request/trk_protocol_handler.cc", -+ "url_request/trk_protocol_handler.h", - "url_request/url_request_interceptor.h", - "url_request/url_request_job.cc", - "url_request/url_request_job.h", -diff --git a/net/url_request/trk_protocol_handler.cc b/net/url_request/trk_protocol_handler.cc -new file mode 100644 ---- /dev/null -+++ b/net/url_request/trk_protocol_handler.cc -@@ -0,0 +1,25 @@ -+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#include "net/url_request/trk_protocol_handler.h" -+ -+#include "base/logging.h" -+#include "net/base/net_errors.h" -+#include "net/url_request/url_request_error_job.h" -+ -+namespace net { -+ -+TrkProtocolHandler::TrkProtocolHandler() = default; -+ -+std::unique_ptr TrkProtocolHandler::CreateJob( -+ URLRequest* request) const { -+ LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url(); -+ return std::make_unique(request, ERR_BLOCKED_BY_CLIENT); -+} -+ -+bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const { -+ return true; -+} -+ -+} // namespace net -diff --git a/net/url_request/trk_protocol_handler.h b/net/url_request/trk_protocol_handler.h -new file mode 100644 ---- /dev/null -+++ b/net/url_request/trk_protocol_handler.h -@@ -0,0 +1,30 @@ -+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ -+#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ -+ -+#include "base/compiler_specific.h" -+#include "net/base/net_export.h" -+#include "net/url_request/url_request_job_factory.h" -+ -+namespace net { -+ -+class URLRequestJob; -+ -+// Implements a ProtocolHandler for Trk jobs. -+class NET_EXPORT TrkProtocolHandler -+ : public URLRequestJobFactory::ProtocolHandler { -+ public: -+ TrkProtocolHandler(const TrkProtocolHandler&) = delete; -+ TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete; -+ -+ TrkProtocolHandler(); -+ std::unique_ptr CreateJob(URLRequest* request) const override; -+ bool IsSafeRedirectTarget(const GURL& location) const override; -+}; -+ -+} // namespace net -+ -+#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ -diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc ---- a/net/url_request/url_request.cc -+++ b/net/url_request/url_request.cc -@@ -15,6 +15,7 @@ - #include "base/notreached.h" - #include "base/rand_util.h" - #include "base/strings/utf_string_conversions.h" -+#include "base/strings/string_util.h" - #include "base/synchronization/lock.h" - #include "base/task/single_thread_task_runner.h" - #include "base/types/optional_util.h" -@@ -55,6 +56,7 @@ - #include "net/url_request/url_request_redirect_job.h" - #include "url/gurl.h" - #include "url/origin.h" -+#include "url/url_constants.h" - - namespace net { - -@@ -650,6 +652,12 @@ URLRequest::URLRequest(base::PassKey pass_key, - // Sanity check out environment. - DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault()); - -+ if (!url.SchemeIs(url::kTraceScheme) && -+ base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) { -+ LOG(ERROR) << "Block URL in URLRequest: " << url; -+ url_chain_[0] = GURL(url::kTraceScheme + (":" + url.possibly_invalid_spec())); -+ } -+ - context->url_requests()->insert(this); - net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, - [&](NetLogCaptureMode capture_mode) { -diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc ---- a/net/url_request/url_request_context_builder.cc -+++ b/net/url_request/url_request_context_builder.cc -@@ -55,6 +55,7 @@ - #include "net/socket/network_binding_client_socket_factory.h" - #include "net/ssl/ssl_config_service_defaults.h" - #include "net/url_request/static_http_user_agent_settings.h" -+#include "net/url_request/trk_protocol_handler.h" - #include "net/url_request/url_request_context.h" - #include "net/url_request/url_request_job_factory.h" - #include "url/url_constants.h" -@@ -619,6 +620,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { - job_factory->SetProtocolHandler(scheme_handler.first, - std::move(scheme_handler.second)); - } -+ job_factory->SetProtocolHandler(url::kTraceScheme, -+ std::make_unique()); - protocol_handlers_.clear(); - - context->set_job_factory(std::move(job_factory)); -diff --git a/url/url_constants.h b/url/url_constants.h ---- a/url/url_constants.h -+++ b/url/url_constants.h -@@ -34,6 +34,7 @@ inline constexpr char16_t kDataScheme16[] = u"data"; - inline constexpr char kDrivefsScheme[] = "drivefs"; - inline constexpr char kFileScheme[] = "file"; - inline constexpr char16_t kFileScheme16[] = u"file"; -+inline constexpr char kTraceScheme[] = "trk"; - inline constexpr char kFileSystemScheme[] = "filesystem"; - inline constexpr char16_t kFileSystemScheme16[] = u"filesystem"; - inline constexpr char kFtpScheme[] = "ftp"; -diff --git a/url/url_util.cc b/url/url_util.cc ---- a/url/url_util.cc -+++ b/url/url_util.cc -@@ -54,6 +54,7 @@ struct SchemeRegistry { - std::vector standard_schemes = { - {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION}, - {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION}, -+ {kTraceScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION}, - // Yes, file URLs can have a hostname, so file URLs should be handled as - // "standard". File URLs never have a port as specified by the SchemeType - // field. Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file -@@ -99,6 +100,7 @@ struct SchemeRegistry { - kAboutScheme, - kJavaScriptScheme, - kDataScheme, -+ kTraceScheme, - }; - - // Schemes that can be sent CORS requests. --- diff --git a/build/patches/Do-not-check-for-the-presence-of-use-remoteexec.patch b/build/patches/Do-not-check-for-the-presence-of-use-remoteexec.patch deleted file mode 100644 index 156452cd..00000000 --- a/build/patches/Do-not-check-for-the-presence-of-use-remoteexec.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: uazo -Date: Mon, 3 Mar 2025 12:04:53 +0000 -Subject: Do not check for the presence of use_remoteexec - ---- - build/toolchain/remoteexec_defaults.gni | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/toolchain/remoteexec_defaults.gni b/build/toolchain/remoteexec_defaults.gni ---- a/build/toolchain/remoteexec_defaults.gni -+++ b/build/toolchain/remoteexec_defaults.gni -@@ -1,4 +1,4 @@ - # rbe.gni and autoninja.py will read this file to get the default - # value of use_reclient. - use_reclient_on_siso = false --use_reclient_on_ninja = true -+use_reclient_on_ninja = false --- diff --git a/build/patches/Follow-only-system-dark-mode.patch b/build/patches/Follow-only-system-dark-mode.patch deleted file mode 100644 index 8705cf7f..00000000 --- a/build/patches/Follow-only-system-dark-mode.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: krlvm <51774833+krlvm@users.noreply.github.com> -Date: Mon, 4 Jul 2022 16:14:37 +0300 -Subject: Follow only system dark mode - -Follow only system dark mode preference when theme is set to system default - -License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ---- - .../browser/night_mode/GlobalNightModeStateController.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/GlobalNightModeStateController.java b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/GlobalNightModeStateController.java ---- a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/GlobalNightModeStateController.java -+++ b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/GlobalNightModeStateController.java -@@ -128,7 +128,7 @@ class GlobalNightModeStateController - } - - private void updateNightMode() { -- boolean powerSaveModeOn = mPowerSaveModeMonitor.powerSavingIsOn(); -+ boolean powerSaveModeOn = false; - final int theme = NightModeUtils.getThemeSetting(); - final boolean newNightModeOn = - (theme == ThemeType.SYSTEM_DEFAULT --- diff --git a/build/patches/Temp-PerformanceNavigationTiming-privacy-fix.patch b/build/patches/Temp-PerformanceNavigationTiming-privacy-fix.patch deleted file mode 100644 index fec3749b..00000000 --- a/build/patches/Temp-PerformanceNavigationTiming-privacy-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: uazo -Date: Wed, 11 Oct 2023 09:40:53 +0000 -Subject: Temp PerformanceNavigationTiming privacy fix - -License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html ---- - .../renderer/core/timing/performance_navigation_timing.cc | 2 ++ - .../blink/renderer/core/timing/performance_resource_timing.cc | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/third_party/blink/renderer/core/timing/performance_navigation_timing.cc b/third_party/blink/renderer/core/timing/performance_navigation_timing.cc ---- a/third_party/blink/renderer/core/timing/performance_navigation_timing.cc -+++ b/third_party/blink/renderer/core/timing/performance_navigation_timing.cc -@@ -89,6 +89,7 @@ void PerformanceNavigationTiming::OnBodyLoadFinished( - - V8NavigationEntropy::Enum PerformanceNavigationTiming::GetSystemEntropy() - const { -+ if ((true)) return V8NavigationEntropy::Enum::kHigh; - DocumentLoader* loader = GetDocumentLoader(); - switch (document_load_timing_values_->system_entropy_at_navigation_start) { - case mojom::blink::SystemEntropy::kHigh: -@@ -195,6 +196,7 @@ V8NavigationTimingType PerformanceNavigationTiming::type() const { - } - - AtomicString PerformanceNavigationTiming::deliveryType() const { -+ if ((true)) return g_empty_atom; - switch (navigation_delivery_type_) { - case NavigationDeliveryType::kDefault: - return GetDeliveryType(); -diff --git a/third_party/blink/renderer/core/timing/performance_resource_timing.cc b/third_party/blink/renderer/core/timing/performance_resource_timing.cc ---- a/third_party/blink/renderer/core/timing/performance_resource_timing.cc -+++ b/third_party/blink/renderer/core/timing/performance_resource_timing.cc -@@ -161,7 +161,7 @@ AtomicString PerformanceResourceTiming::GetDeliveryType() const { - } - return info_->cache_state == mojom::blink::CacheState::kNone - ? g_empty_atom -- : delivery_type_names::kCache; -+ : g_empty_atom; - } - - AtomicString PerformanceResourceTiming::deliveryType() const { -@@ -202,6 +202,7 @@ AtomicString PerformanceResourceTiming::GetNextHopProtocol( - returnedProtocol = g_empty_atom; - } - -+ returnedProtocol = g_empty_atom; - return returnedProtocol; - } - --- diff --git a/build/patches/exit-on-failure-of-inclusion.patch b/build/patches/exit-on-failure-of-inclusion.patch deleted file mode 100644 index 8df2c7f9..00000000 --- a/build/patches/exit-on-failure-of-inclusion.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Fri, 6 Apr 2018 10:29:05 +0200 -Subject: exit on failure of inclusion - -License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ---- - chrome/installer/linux/debian/build.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh ---- a/chrome/installer/linux/debian/build.sh -+++ b/chrome/installer/linux/debian/build.sh -@@ -250,15 +250,15 @@ DEB_CHANGELOG="${TMPFILEDIR}/changelog" - DEB_FILES="${TMPFILEDIR}/files" - DEB_CONTROL="${TMPFILEDIR}/control" - --source ${OUTPUTDIR}/installer/common/installer.include -+source ${OUTPUTDIR}/installer/common/installer.include || exit $? - - get_version_info - VERSIONFULL="${VERSION}-${PACKAGE_RELEASE}" - - if [ "$BRANDING" = "google_chrome" ]; then -- source "${OUTPUTDIR}/installer/common/google-chrome.info" -+ source "${OUTPUTDIR}/installer/common/google-chrome.info" || exit $? - else -- source "${OUTPUTDIR}/installer/common/chromium-browser.info" -+ source "${OUTPUTDIR}/installer/common/chromium-browser.info" || exit $? - fi - eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/\1='\2'/" \ - "${OUTPUTDIR}/installer/theme/BRANDING") --- From 0f2a45495e07fe27897b0eea089371f782ab75aa Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 15 Jan 2026 12:59:32 +0100 Subject: [PATCH 3/9] Patches for 144 (need some checks) --- .../Add-an-always-incognito-mode.patch | 145 +++--- ...Add-lifetime-options-for-permissions.patch | 218 ++++---- .../Add-menu-item-to-bookmark-all-tabs.patch | 98 ++-- .../Add-option-to-force-tablet-UI.patch | 120 ++--- ...tting-to-enable-Credman-for-passkeys.patch | 48 +- ...Ask-for-restart-on-connection-change.patch | 46 +- .../Content-settings-infrastructure.patch | 150 +++--- .../Disable-css-preferred-text-scale.patch | 63 ++- .../Enable-Global-Privacy-Control.patch | 83 +-- .../Enable-native-Android-autofill.patch | 83 ++- build/patches/Enable-snackbar-swipe.patch | 20 +- ...al-support-for-extensions-on-Android.patch | 492 +++++++----------- .../Move-navigation-bar-to-bottom.patch | 385 +++++++------- ...ulti-Screen-Window-Placement-API-fix.patch | 58 +-- build/patches/User-agent-customization.patch | 104 ++-- 15 files changed, 996 insertions(+), 1117 deletions(-) diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 0d9db740..c74afd8b 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../AppMenuPropertiesDelegateImpl.java | 7 +- .../ChromeContextMenuPopulator.java | 6 +- .../CustomTabActivityLifecycleUmaTracker.java | 31 ---- - .../CustomTabAppMenuPropertiesDelegate.java | 4 + + .../CustomTabAppMenuPropertiesDelegate.java | 5 + .../CustomTabIntentDataProvider.java | 10 + .../browser/download/DownloadUtils.java | 13 +- .../history/HistoryContentManager.java | 9 +- @@ -88,7 +88,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../add-an-always-incognito-mode.inc | 1 + .../add-an-always-incognito-mode.inc | 3 + .../add-an-always-incognito-mode.inc | 1 + - 69 files changed, 806 insertions(+), 106 deletions(-) + 69 files changed, 807 insertions(+), 106 deletions(-) create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java @@ -101,7 +101,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -650,6 +650,7 @@ chrome_java_resources = [ +@@ -669,6 +669,7 @@ chrome_java_resources = [ "java/res/xml/main_preferences.xml", "java/res/xml/manage_sync_preferences.xml", "java/res/xml/personalize_google_services_preferences.xml", @@ -120,7 +120,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", "java/src/org/chromium/chrome/browser/ActivityTabProvider.java", "java/src/org/chromium/chrome/browser/ActivityUtils.java", -@@ -936,6 +937,7 @@ chrome_java_sources = [ +@@ -949,6 +950,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/PasswordEchoSettingHandlerFactory.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", @@ -173,7 +173,7 @@ new file mode 100644 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -90,6 +90,11 @@ found in the LICENSE file. +@@ -84,6 +84,11 @@ found in the LICENSE file. android:key="secure_dns" android:title="@string/settings_secure_dns_title" android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" /> @@ -258,7 +258,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.IntentHandler.ExternalAppId; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.accessibility.settings.CaretBrowsingDialog; -@@ -825,15 +829,20 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -819,15 +823,20 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt BrowserWindowType.NORMAL, currentTabModel, mMultiInstanceManager); // For saving non-incognito tab closures for Recent Tabs. @@ -286,7 +286,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct // Defer creation of this helper so it triggers after TabGroupModelFilter observers. mUndoRefocusHelper = new UndoRefocusHelper( -@@ -3274,7 +3283,7 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -3282,7 +3291,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt // We determine SupportedProfileType in onPreCreate(). // We determine the model as soon as possible so every systems get initialized coherently. @@ -298,15 +298,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -101,6 +101,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerH - import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager; +@@ -106,6 +106,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager; + import org.chromium.chrome.browser.desktop_site.DesktopSiteUtils; import org.chromium.chrome.browser.device.DeviceClassManager; import org.chromium.chrome.browser.devtools.DevToolsWindowAndroid; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.dom_distiller.DomDistillerUiUtils; import org.chromium.chrome.browser.dom_distiller.ReaderModeManager; import org.chromium.chrome.browser.download.DownloadManagerService; -@@ -2144,6 +2145,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2189,6 +2190,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -319,7 +319,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -92,6 +92,8 @@ import java.util.Iterator; +@@ -93,6 +93,8 @@ import java.util.Iterator; import java.util.List; import java.util.function.Supplier; @@ -328,7 +328,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App /** * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu * items based on activity state. -@@ -633,8 +635,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties +@@ -669,8 +671,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties && !isNativePage && !isFileScheme && !isContentScheme @@ -343,7 +343,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -41,6 +41,7 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager; +@@ -43,6 +43,7 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.R; @@ -351,7 +351,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ContextMenuItemType; -@@ -437,6 +438,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -452,6 +453,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { mShowEphemeralTabNewLabel = null; mCustomActionMap.clear(); @@ -361,7 +361,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr List groupedItems = new ArrayList<>(); if (mParams.isPage() && shouldShowEmptySpaceContextMenu()) { -@@ -508,7 +512,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -523,7 +527,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -422,20 +422,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import org.chromium.chrome.browser.DefaultBrowserInfo; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; import org.chromium.chrome.browser.bookmarks.BookmarkModel; -@@ -248,6 +249,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat - openInChromeItemVisible = false; +@@ -240,6 +241,10 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat tryAddingReadAloud = false; } -+ if (AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()) { -+ downloadItemVisible = true; -+ } - boolean isNativePage = - url.getScheme().equals(UrlConstants.CHROME_SCHEME) ++ if (AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()) { ++ downloadItemVisible = true; ++ } ++ + if (CustomTabIntentDataProvider.isOpenInBrowserDisallowed(mUiType, mIsIncognitoBranded)) { + openInChromeItemVisible = false; + } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java -@@ -105,6 +105,9 @@ import org.chromium.components.embedder_support.util.UrlConstants; +@@ -106,6 +106,9 @@ import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.device.mojom.ScreenOrientationLockType; import org.chromium.net.NetId; @@ -445,7 +446,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; -@@ -1328,6 +1331,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -1362,6 +1365,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid return getInitialActivityWidth() > 0; } @@ -549,7 +550,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History mSelectableListLayout = null; mRootView = getIncognitoHistoryPlaceholderView(); return; -@@ -451,9 +459,22 @@ public class HistoryManager +@@ -458,9 +466,22 @@ public class HistoryManager onBackPressStateChanged(); } @@ -573,7 +574,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History // If Incognito placeholder is shown no need to call any destroy method. return; } -@@ -514,7 +535,7 @@ public class HistoryManager +@@ -521,7 +542,7 @@ public class HistoryManager * @return True if manager handles this event, false if it decides to ignore. */ private boolean onBackPressed() { @@ -618,7 +619,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java -@@ -25,6 +25,7 @@ import org.chromium.base.supplier.OneshotSupplier; +@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.R; @@ -626,7 +627,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.back_press.BackPressManager; -@@ -411,7 +412,8 @@ public class NativePageFactory { +@@ -425,7 +426,8 @@ public class NativePageFactory { NativePage page; @@ -879,7 +880,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation; -@@ -229,6 +230,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl +@@ -211,6 +212,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl SigninAndHistorySyncActivityLauncherImpl.get(), new SettingsCustomTabLauncherImpl())); } @@ -998,7 +999,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java -@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier; +@@ -27,6 +27,7 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.R; @@ -1006,7 +1007,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ai.AiAssistantService; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; -@@ -241,7 +242,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm +@@ -245,7 +246,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm // When the feature is enabled, show either "New Incognito tab" in incognito mode // or "New tab" in normal mode. When the feature is disabled, show both. @@ -1019,7 +1020,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -209,6 +209,8 @@ import org.chromium.content_public.common.ContentSwitches; +@@ -216,6 +216,8 @@ import org.chromium.content_public.common.ContentSwitches; import org.chromium.ui.UiUtils; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.DeviceFormFactor; @@ -1028,7 +1029,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.ui.base.IntentRequestTracker; import org.chromium.ui.base.UiAndroidFeatureList; import org.chromium.ui.display.DisplayUtil; -@@ -1257,7 +1259,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1309,7 +1311,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { () -> { mTabCreatorManagerSupplier .get() @@ -1040,7 +1041,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java -@@ -55,6 +55,10 @@ import org.chromium.url.GURL; +@@ -56,6 +56,10 @@ import org.chromium.url.GURL; import java.util.Collections; import java.util.function.Supplier; @@ -1051,7 +1052,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome /** This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabModelOrderController { /** -@@ -594,7 +598,6 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode +@@ -598,7 +602,6 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode // TODO(crbug.com/40691614): Clean up the launches from SearchActivity/Chrome. public @Nullable Tab launchUrlFromExternalApp( LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) { @@ -1062,7 +1063,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java -@@ -20,6 +20,7 @@ import org.chromium.build.annotations.Initializer; +@@ -20,6 +20,7 @@ import org.chromium.build.annotations.MonotonicNonNull; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.app.tabwindow.TabWindowManagerSingleton; @@ -1070,7 +1071,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.multiwindow.MultiInstanceManager; -@@ -139,6 +140,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod +@@ -138,6 +139,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod ProfileProvider profileProvider = mProfileProviderSupplier.get(); assert profileProvider != null; @@ -1090,7 +1091,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import org.chromium.chrome.browser.app.tabmodel.AsyncTabParamsManagerSingleton; import org.chromium.chrome.browser.crypto.CipherFactory; import org.chromium.chrome.browser.flags.ChromeFeatureList; -@@ -750,6 +751,12 @@ public class TabPersistentStoreImpl implements TabPersistentStore { +@@ -723,6 +724,12 @@ public class TabPersistentStoreImpl implements TabPersistentStore { } } } @@ -1229,7 +1230,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -461,6 +461,15 @@ ChromeAutocompleteProviderClient::GetAimEligibilityService() const { +@@ -462,6 +462,15 @@ ChromeAutocompleteProviderClient::GetAimEligibilityService() const { return AimEligibilityServiceFactory::GetForProfile(profile_); } @@ -1284,7 +1285,7 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc -@@ -37,6 +37,7 @@ +@@ -33,6 +33,7 @@ #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" #include "base/uuid.h" @@ -1292,7 +1293,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" #include "chrome/browser/commerce/shopping_service_factory.h" -@@ -214,6 +215,12 @@ ScopedJavaLocalRef JNI_BookmarkBridge_NativeGetForProfile( +@@ -210,6 +211,12 @@ static ScopedJavaLocalRef JNI_BookmarkBridge_NativeGetForProfile( if (!profile) return nullptr; @@ -1356,7 +1357,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -83,6 +83,12 @@ +@@ -80,6 +80,12 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #endif @@ -1369,7 +1370,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); using safe_browsing::SafeBrowsingNavigationObserverManager; -@@ -223,6 +229,16 @@ const int kExtensionReferrerUserGestureLimit = 2; +@@ -220,6 +226,16 @@ const int kExtensionReferrerUserGestureLimit = 2; WebstorePrivateApi::Delegate* test_delegate = nullptr; @@ -1386,7 +1387,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api // We allow the web store to set a string containing login information when a // purchase is made, so that when a user logs into sync with a different // account we can recognize the situation. The Get function returns the login if -@@ -429,7 +445,7 @@ WebstorePrivateBeginInstallWithManifest3Function::Run() { +@@ -426,7 +442,7 @@ WebstorePrivateBeginInstallWithManifest3Function::Run() { params_ = Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params_); @@ -1395,7 +1396,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api if (!crx_file::id_util::IdIsValid(details().id)) { return RespondNow(BuildResponse(api::webstore_private::Result::kInvalidId, -@@ -965,7 +981,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:: +@@ -948,7 +964,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:: DCHECK(extension); DCHECK(contents); @@ -1404,7 +1405,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api std::string message_from_admin = ExtensionManagementFactory::GetForBrowserContext(profile) -@@ -1001,7 +1017,7 @@ WebstorePrivateCompleteInstallFunction::Run() { +@@ -984,7 +1000,7 @@ WebstorePrivateCompleteInstallFunction::Run() { std::optional params = CompleteInstall::Params::Create(args()); EXTENSION_FUNCTION_VALIDATE(params); @@ -1413,7 +1414,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api if (profile->IsGuestSession() || profile->IsOffTheRecord()) { return RespondNow(Error(kIncognitoError)); } -@@ -1319,7 +1335,7 @@ ExtensionFunction::ResponseValue +@@ -1302,7 +1318,7 @@ ExtensionFunction::ResponseValue WebstorePrivateGetExtensionStatusFunction::BuildResponseWithoutManifest( const ExtensionId& extension_id) { ExtensionInstallStatus status = GetWebstoreExtensionInstallStatus( @@ -1422,7 +1423,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api api::webstore_private::ExtensionInstallStatus api_status = ConvertExtensionInstallStatusForAPI(status); return ArgumentList(GetExtensionStatus::Results::Create(api_status)); -@@ -1333,7 +1349,7 @@ void WebstorePrivateGetExtensionStatusFunction::OnManifestParsed( +@@ -1316,7 +1332,7 @@ void WebstorePrivateGetExtensionStatusFunction::OnManifestParsed( return; } @@ -1478,7 +1479,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h --- a/chrome/browser/history/history_tab_helper.h +++ b/chrome/browser/history/history_tab_helper.h -@@ -17,6 +17,8 @@ +@@ -18,6 +18,8 @@ #include "components/translate/core/browser/translate_driver.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" @@ -1487,7 +1488,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor namespace history { struct HistoryAddPageArgs; -@@ -59,6 +61,11 @@ class HistoryTabHelper +@@ -60,6 +62,11 @@ class HistoryTabHelper std::optional GetAppId() { return app_id_; } #endif @@ -1807,7 +1808,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -261,6 +261,7 @@ +@@ -262,6 +262,7 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h" @@ -1815,7 +1816,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h" #include "chrome/browser/android/preferences/browser_prefs_android.h" -@@ -2022,6 +2023,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1774,6 +1775,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); webapps::InstallPromptPrefs::RegisterProfilePrefs(registry); @@ -1880,7 +1881,7 @@ diff --git a/chrome/browser/profiles/profile_selections.h b/chrome/browser/profi diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn --- a/chrome/browser/ui/android/native_page/BUILD.gn +++ b/chrome/browser/ui/android/native_page/BUILD.gn -@@ -33,6 +33,8 @@ robolectric_library("junit") { +@@ -34,6 +34,8 @@ robolectric_library("junit") { deps = [ ":java", @@ -1901,7 +1902,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ /** An interface for pages that will be using Android views instead of html/rendered Web content. */ @NullMarked public interface NativePage { -@@ -192,7 +194,8 @@ public interface NativePage { +@@ -201,7 +203,8 @@ public interface NativePage { */ static boolean isNativePageUrl(GURL url, boolean isIncognito, boolean hasPdfDownload) { return url != null @@ -1911,7 +1912,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ } /** -@@ -202,7 +205,7 @@ public interface NativePage { +@@ -211,7 +214,7 @@ public interface NativePage { * not have chrome or chrome-native scheme. */ static boolean isChromePageUrl(GURL url, boolean isIncognito) { @@ -1920,7 +1921,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ } /** -@@ -216,7 +219,8 @@ public interface NativePage { +@@ -225,7 +228,8 @@ public interface NativePage { GURL url, @Nullable NativePage candidatePage, boolean isIncognito, @@ -1930,7 +1931,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ if (hasPdfDownload) { // For navigation with associated pdf download (e.g. open a pdf link), pdf page should // be created. -@@ -234,7 +238,7 @@ public interface NativePage { +@@ -243,7 +247,7 @@ public interface NativePage { // created after the pdf document is re-downloaded in other parts of the code. return NativePageType.NONE; } else { @@ -1939,7 +1940,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ } } -@@ -246,7 +250,7 @@ public interface NativePage { +@@ -255,7 +259,7 @@ public interface NativePage { * which do not have chrome or chrome-native scheme. */ private static @NativePageType int chromePageType( @@ -1948,7 +1949,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ String host = url.getHost(); String scheme = url.getScheme(); if (!UrlConstants.CHROME_NATIVE_SCHEME.equals(scheme) -@@ -266,7 +270,8 @@ public interface NativePage { +@@ -275,7 +279,8 @@ public interface NativePage { return NativePageType.DOWNLOADS; } else if (UrlConstants.HISTORY_HOST.equals(host)) { return NativePageType.HISTORY; @@ -1961,7 +1962,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -101,6 +101,11 @@ import org.chromium.ui.interpolators.Interpolators; +@@ -108,6 +108,11 @@ import org.chromium.ui.interpolators.Interpolators; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.url.GURL; @@ -1973,7 +1974,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import java.util.ArrayList; import java.util.Collection; import java.util.List; -@@ -497,6 +502,9 @@ class LocationBarMediator +@@ -528,6 +533,9 @@ class LocationBarMediator if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mContext)) return; Tab tab = mLocationBarDataProvider.getTab(); if (tab == null) return; @@ -1986,7 +1987,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -6900,6 +6900,31 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -6990,6 +6990,31 @@ To change this setting, BEGIN_LINKdelete the Chrome d Cookies, cache, and other site data @@ -2073,7 +2074,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro #include "chrome/common/url_constants.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_fetcher.h" -@@ -165,6 +166,11 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument( +@@ -166,6 +167,11 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument( // Download the OpenSearch description document. If this is successful, a // new keyword will be created when done. @@ -2088,7 +2089,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -4116,6 +4116,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] = +@@ -4153,6 +4153,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] = "net.out_of_process_system_dns_resolution_enabled"; #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) @@ -2104,7 +2105,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc -@@ -122,10 +122,12 @@ void PrefProvider::RegisterProfilePrefs( +@@ -129,10 +129,12 @@ void PrefProvider::RegisterProfilePrefs( PrefProvider::PrefProvider(PrefService* prefs, bool off_the_record, @@ -2117,7 +2118,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov store_last_modified_(store_last_modified), clock_(base::DefaultClock::GetInstance()) { TRACE_EVENT_BEGIN("startup", "PrefProvider::PrefProvider"); -@@ -148,10 +150,12 @@ PrefProvider::PrefProvider(PrefService* prefs, +@@ -155,10 +157,12 @@ PrefProvider::PrefProvider(PrefService* prefs, WebsiteSettingsRegistry* website_settings = WebsiteSettingsRegistry::GetInstance(); for (const WebsiteSettingsInfo* info : *website_settings) { @@ -2189,7 +2190,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. bool store_last_modified, bool restore_session, bool should_record_metrics); -@@ -551,6 +552,8 @@ class HostContentSettingsMap : public content_settings::Observer, +@@ -556,6 +557,8 @@ class HostContentSettingsMap : public content_settings::Observer, // Whether this settings map is for an incognito or guest session. bool is_off_the_record_; @@ -2201,10 +2202,10 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/components/omnibox/browser/autocomplete_provider_client.cc --- a/components/omnibox/browser/autocomplete_provider_client.cc +++ b/components/omnibox/browser/autocomplete_provider_client.cc -@@ -81,3 +81,7 @@ AutocompleteProviderClient::GetGeminiPrototypeOmniboxService() const { +@@ -77,3 +77,7 @@ base::WeakPtr + AutocompleteProviderClient::GetWeakPtr() { return nullptr; } - #endif // BUILDFLAG(IS_IOS) + +bool AutocompleteProviderClient::IsAlwaysIncognitoEnabled() const { + return false; @@ -2212,7 +2213,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/compon diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h --- a/components/omnibox/browser/autocomplete_provider_client.h +++ b/components/omnibox/browser/autocomplete_provider_client.h -@@ -161,6 +161,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client { +@@ -154,6 +154,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client { virtual bool IsOffTheRecord() const = 0; virtual bool IsIncognitoProfile() const = 0; virtual bool IsGuestSession() const = 0; @@ -2223,7 +2224,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc --- a/components/omnibox/browser/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc -@@ -401,7 +401,7 @@ bool BaseSearchProvider::CanSendSuggestRequest( +@@ -403,7 +403,7 @@ bool BaseSearchProvider::CanSendSuggestRequest( // Don't make a suggest request if in incognito mode; unless for the Lens // searchboxes. @@ -2235,7 +2236,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc --- a/components/omnibox/browser/search_provider.cc +++ b/components/omnibox/browser/search_provider.cc -@@ -922,7 +922,8 @@ std::unique_ptr SearchProvider::CreateSuggestLoader( +@@ -948,7 +948,8 @@ std::unique_ptr SearchProvider::CreateSuggestLoader( // is required. // Request for suggestions in OTR contexts is not allowed; except for the Lens // searchboxes. diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch index 3fd2a0ff..21b5d297 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -66,7 +66,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../core/browser/content_settings_utils.h | 6 ++ .../core/common/content_settings_enums.mojom | 9 ++ .../page_info/PageInfoController.java | 4 +- - .../PermissionParamsListBuilder.java | 13 ++- + .../PermissionParamsListBuilder.java | 12 ++- .../android/page_info_controller_android.cc | 10 ++- components/page_info/page_info.cc | 2 + components/page_info/page_info.h | 1 + @@ -89,7 +89,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/permissions/permission_request.h | 18 +++- .../permissions/permission_request_manager.cc | 49 ++++++----- .../permissions/permission_request_manager.h | 11 ++- - 37 files changed, 509 insertions(+), 75 deletions(-) + 37 files changed, 508 insertions(+), 75 deletions(-) diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc --- a/chrome/browser/permissions/last_tab_standing_tracker.cc @@ -178,7 +178,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome OneTimePermissionsTracker::~OneTimePermissionsTracker() = default; OneTimePermissionsTracker::OriginTrackEntry::OriginTrackEntry() = default; -@@ -255,6 +281,12 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed( +@@ -260,6 +286,12 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed( for (auto& observer : observer_list_) { observer.OnLastPageFromOriginClosed(origin); } @@ -202,7 +202,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.h b/chrome/ #include "components/content_settings/core/common/content_settings_types.h" #include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/visibility.h" -@@ -24,7 +25,7 @@ class OneTimePermissionsTracker : public KeyedService { +@@ -26,7 +27,7 @@ class OneTimePermissionsTracker : public KeyedService { void (OneTimePermissionsTracker::*)(const url::Origin&); public: @@ -211,7 +211,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.h b/chrome/ ~OneTimePermissionsTracker() override; OneTimePermissionsTracker(const OneTimePermissionsTracker&) = delete; -@@ -138,7 +139,7 @@ class OneTimePermissionsTracker : public KeyedService { +@@ -147,7 +148,7 @@ class OneTimePermissionsTracker : public KeyedService { base::ObserverList observer_list_; std::map origin_tracker_; @@ -233,7 +233,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker_factory.cc diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrome/browser/ui/views/permissions/chip/chip_controller.cc --- a/chrome/browser/ui/views/permissions/chip/chip_controller.cc +++ b/chrome/browser/ui/views/permissions/chip/chip_controller.cc -@@ -228,7 +228,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) { +@@ -227,7 +227,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) { active_chip_permission_request_manager_.value()->Accept(); break; case permissions::PermissionAction::GRANTED_ONCE: @@ -269,7 +269,7 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_v diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java -@@ -696,6 +696,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -715,6 +715,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment } @RequiresNonNull({"mSite"}) @@ -281,7 +281,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c private void setUpClearDataPreference() { ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA); long usage = mSite.getTotalUsage(); -@@ -1313,6 +1318,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1407,6 +1412,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment .getDefaultColor()); } } @@ -425,33 +425,33 @@ diff --git a/components/content_settings/core/common/content_settings_enums.mojo diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java -@@ -376,8 +376,8 @@ public class PageInfoController +@@ -387,9 +387,9 @@ public class PageInfoController */ @CalledByNative private void addPermissionSection( -- String name, String nameMidSentence, int type, boolean allowed) { -- mPermissionParamsListBuilder.addPermissionEntry(name, nameMidSentence, type, allowed); -+ String name, String nameMidSentence, int type, boolean allowed, boolean is_user_session) { -+ mPermissionParamsListBuilder.addPermissionEntry(name, nameMidSentence, type, allowed, is_user_session); +- String name, String nameMidSentence, int type, boolean allowed, boolean requested) { ++ String name, String nameMidSentence, int type, boolean allowed, boolean requested, boolean is_user_session) { + mPermissionParamsListBuilder.addPermissionEntry( +- name, nameMidSentence, type, allowed, requested); ++ name, nameMidSentence, type, allowed, requested, is_user_session); } /** Update the permissions view based on the contents of mDisplayedPermissions. */ diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java --- a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java -@@ -46,8 +46,9 @@ public class PermissionParamsListBuilder { - mEntries = new ArrayList<>(); +@@ -47,8 +47,8 @@ public class PermissionParamsListBuilder { } -- public void addPermissionEntry(String name, String nameMidSentence, int type, boolean allowed) { -- mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed)); -+ public void addPermissionEntry(String name, String nameMidSentence, int type, boolean allowed, -+ boolean is_user_session) { -+ mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, is_user_session)); + public void addPermissionEntry( +- String name, String nameMidSentence, int type, boolean allowed, boolean requested) { +- mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, requested)); ++ String name, String nameMidSentence, int type, boolean allowed, boolean requested, boolean is_user_session) { ++ mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, requested, is_user_session)); } public void clearPermissionEntries() { -@@ -84,6 +85,10 @@ public class PermissionParamsListBuilder { +@@ -85,6 +85,10 @@ public class PermissionParamsListBuilder { } else { warningTextResource = R.string.page_info_android_permission_blocked; } @@ -462,18 +462,20 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_ } } -@@ -112,12 +117,14 @@ public class PermissionParamsListBuilder { - public final String nameMidSentence; +@@ -115,14 +119,16 @@ public class PermissionParamsListBuilder { public final int type; public final boolean allowed; + public final boolean requested; + public final boolean is_user_session; -- PageInfoPermissionEntry(String name, String nameMidSentence, int type, boolean allowed) { -+ PageInfoPermissionEntry(String name, String nameMidSentence, int type, boolean allowed, boolean is_user_session) { + PageInfoPermissionEntry( +- String name, String nameMidSentence, int type, boolean allowed, boolean requested) { ++ String name, String nameMidSentence, int type, boolean allowed, boolean requested, boolean is_user_session) { this.name = name; this.nameMidSentence = nameMidSentence; this.type = type; this.allowed = allowed; + this.requested = requested; + this.is_user_session = is_user_session; } @@ -481,40 +483,40 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_ diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc --- a/components/page_info/android/page_info_controller_android.cc +++ b/components/page_info/android/page_info_controller_android.cc -@@ -207,6 +207,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( - - std::map - user_specified_settings_to_display; +@@ -214,6 +214,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( + // being requested. This is needed for the Loud Clapper experiment + // (crbug.com/458351800). + bool requested_notifications = false; + std::map + user_specified_settings_is_user_session; for (const auto& permission : permission_info_list) { if (base::Contains(permissions_to_display, permission.type)) { -@@ -219,6 +221,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( +@@ -226,6 +228,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( user_specified_settings_to_display[permission.type] = info->delegate().IsAnyPermissionAllowed(*setting_to_display); + user_specified_settings_is_user_session[permission.type] = + permission.is_user_session; } - } - } -@@ -235,7 +239,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( - ConvertUTF16ToJavaString(env, setting_title), + + // Notifications permission can have the setting to display as DEFAULT +@@ -252,7 +256,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( ConvertUTF16ToJavaString(env, setting_title_mid_sentence), static_cast(permission), -- user_specified_settings_to_display[permission]); -+ user_specified_settings_to_display[permission], + user_specified_settings_to_display[permission], +- requested_notifications); ++ requested_notifications, + user_specified_settings_is_user_session[permission]); } } -@@ -248,7 +253,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( +@@ -265,7 +270,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title), ConvertUTF16ToJavaString(env, object_title), static_cast(chosen_object->ui_info->content_settings_type), -- static_cast(CONTENT_SETTING_ALLOW)); -+ static_cast(CONTENT_SETTING_ALLOW), +- static_cast(CONTENT_SETTING_ALLOW), requested_notifications); ++ static_cast(CONTENT_SETTING_ALLOW), requested_notifications, + /* is_user_session */ false); } @@ -522,7 +524,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -1331,6 +1331,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, +@@ -1296,6 +1296,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, permission_info.is_one_time = (info.metadata.session_model() == content_settings::mojom::SessionModel::ONE_TIME); @@ -545,9 +547,9 @@ diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java --- a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java +++ b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java -@@ -16,6 +16,7 @@ import org.jni_zero.NativeMethods; - import org.chromium.build.annotations.NullMarked; +@@ -16,6 +16,7 @@ import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; + import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.WindowAndroid; +import org.chromium.components.content_settings.LifetimeMode; @@ -682,7 +684,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per diff --git a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc --- a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc +++ b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc -@@ -118,7 +118,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() { +@@ -123,7 +123,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() { delegate()->FinalizeCurrentRequests(); } @@ -707,7 +709,7 @@ diff --git a/components/permissions/android/permission_prompt/embedded_permissio diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc -@@ -137,6 +137,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() { +@@ -138,6 +138,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() { static_cast(permission_prompt_->GetEmbeddedPromptVariant())); } @@ -719,7 +721,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_ // static std::unique_ptr PermissionDialogDelegate::Create( content::WebContents* web_contents, -@@ -165,12 +170,22 @@ PermissionDialogDelegate::CreateForTesting( +@@ -166,12 +171,22 @@ PermissionDialogDelegate::CreateForTesting( void PermissionDialogDelegate::Accept(JNIEnv* env) { CHECK(permission_prompt_); @@ -743,7 +745,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_ } void PermissionDialogDelegate::Acknowledge(JNIEnv* env) { -@@ -180,6 +195,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env) { +@@ -181,6 +196,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env) { void PermissionDialogDelegate::Deny(JNIEnv* env) { CHECK(permission_prompt_); @@ -760,7 +762,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_ diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.h b/components/permissions/android/permission_prompt/permission_dialog_delegate.h --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.h +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.h -@@ -42,6 +42,7 @@ class PermissionDialogJavaDelegate { +@@ -43,6 +43,7 @@ class PermissionDialogJavaDelegate { const favicon_base::FaviconRawBitmapResult& favicon_result); virtual void DismissDialog(); @@ -789,7 +791,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_prompt_ diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.h b/components/permissions/android/permission_prompt/permission_prompt_android.h --- a/components/permissions/android/permission_prompt/permission_prompt_android.h +++ b/components/permissions/android/permission_prompt/permission_prompt_android.h -@@ -56,9 +56,10 @@ class PermissionPromptAndroid : public PermissionPrompt { +@@ -57,9 +57,10 @@ class PermissionPromptAndroid : public PermissionPrompt { const; virtual void Closing(); virtual void Accept(); @@ -851,24 +853,24 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr IsRequestingOriginDSE(request_data.requesting_origin); if (decision == PermissionDecision::kAllow && @@ -210,7 +221,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( - FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin, - request_data.embedding_origin, - std::move(callback), false /* persist */, -- PermissionDecision::kDeny, -+ PermissionDecision::kDeny, lifetime_option, - request_data.prompt_options); + FinishNotifyPermissionSet( + request_data.id, request_data.requesting_origin, + request_data.embedding_origin, std::move(callback), +- false /* persist */, PermissionDecision::kDeny, ++ false /* persist */, PermissionDecision::kDeny, lifetime_option, + request_data.prompt_options, + request_data.embedded_permission_request_descriptor.Clone()); return; - } -@@ -231,7 +242,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( - FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin, - request_data.embedding_origin, - std::move(callback), false /* persist */, -- PermissionDecision::kDeny, -+ PermissionDecision::kDeny, lifetime_option, - request_data.prompt_options); +@@ -232,7 +243,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( + FinishNotifyPermissionSet( + request_data.id, request_data.requesting_origin, + request_data.embedding_origin, std::move(callback), +- false /* persist */, PermissionDecision::kDeny, ++ false /* persist */, PermissionDecision::kDeny, lifetime_option, + request_data.prompt_options, + request_data.embedded_permission_request_descriptor.Clone()); return; - } -@@ -244,14 +255,14 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -246,14 +257,14 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( base::BindOnce( &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown, weak_factory_.GetWeakPtr(), request_data.requesting_origin, @@ -878,14 +880,14 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr return; } - FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin, - request_data.embedding_origin, std::move(callback), -- persist, decision, request_data.prompt_options); -+ persist, decision, lifetime_option, request_data.prompt_options); + FinishNotifyPermissionSet( + request_data.id, request_data.requesting_origin, +- request_data.embedding_origin, std::move(callback), persist, decision, ++ request_data.embedding_origin, std::move(callback), persist, decision, lifetime_option, + request_data.prompt_options, + request_data.embedded_permission_request_descriptor.Clone()); } - - content::PermissionResult -@@ -428,7 +439,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -432,7 +443,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( const GURL& requesting_origin, const GURL& embedding_origin, bool persist, @@ -894,7 +896,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr std::optional prompt_options, LocationSettingsDialogOutcome prompt_outcome) { bool is_default_search = IsRequestingOriginDSE(requesting_origin); -@@ -448,7 +459,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -452,7 +463,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( FinishNotifyPermissionSet(location_settings_dialog_request_id_, requesting_origin, embedding_origin, std::move(location_settings_dialog_callback_), @@ -903,18 +905,18 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr location_settings_dialog_request_id_ = PermissionRequestID(content::GlobalRenderFrameHostId(0, 0), -@@ -461,7 +472,7 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( +@@ -465,7 +476,7 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( const GURL& embedding_origin, BrowserPermissionCallback callback, bool persist, - PermissionDecision decision, + PermissionDecision decision, content_settings::mojom::LifetimeMode lifetime_option, - std::optional prompt_options) { - PermissionRequestData request_data( - this, id, -@@ -470,9 +481,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( - blink::PermissionType::GEOLOCATION)), - requesting_origin, embedding_origin); + std::optional prompt_options, + blink::mojom::EmbeddedPermissionRequestDescriptorPtr + embedded_permission_request_descriptor) { +@@ -478,9 +489,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( + request_data.embedded_permission_request_descriptor = + std::move(embedded_permission_request_descriptor); request_data.prompt_options = prompt_options.value_or(std::monostate()); - GeolocationPermissionContext::NotifyPermissionSet( + GeolocationPermissionContext::NotifyPermissionSetImpl( @@ -949,14 +951,14 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr std::optional prompt_options, LocationSettingsDialogOutcome prompt_outcome); -@@ -145,6 +152,7 @@ class GeolocationPermissionContextAndroid - BrowserPermissionCallback callback, - bool persist, - PermissionDecision decision, -+ content_settings::mojom::LifetimeMode lifetime_option, - std::optional prompt_options); - - std::unique_ptr location_settings_; +@@ -146,6 +153,7 @@ class GeolocationPermissionContextAndroid + BrowserPermissionCallback callback, + bool persist, + PermissionDecision decision, ++ content_settings::mojom::LifetimeMode lifetime_option, + std::optional prompt_options, + blink::mojom::EmbeddedPermissionRequestDescriptorPtr + embedded_permission_request_descriptor = nullptr); diff --git a/components/permissions/embedded_permission_prompt_flow_model.cc b/components/permissions/embedded_permission_prompt_flow_model.cc --- a/components/permissions/embedded_permission_prompt_flow_model.cc +++ b/components/permissions/embedded_permission_prompt_flow_model.cc @@ -972,7 +974,7 @@ diff --git a/components/permissions/embedded_permission_prompt_flow_model.cc b/c diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc --- a/components/permissions/permission_context_base.cc +++ b/components/permissions/permission_context_base.cc -@@ -282,6 +282,17 @@ PermissionContextBase::CreatePermissionRequest( +@@ -281,6 +281,17 @@ PermissionContextBase::CreatePermissionRequest( std::move(request_finished_callback), UsesAutomaticEmbargo()); } @@ -990,7 +992,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm bool PermissionContextBase::UsesAutomaticEmbargo() const { return true; } -@@ -626,7 +637,8 @@ void PermissionContextBase::DecidePermission( +@@ -624,7 +635,8 @@ void PermissionContextBase::DecidePermission( void PermissionContextBase::PermissionDecided( PermissionDecision decision, bool is_final_decision, @@ -1000,7 +1002,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm UserMadePermissionDecision(request_data.id, request_data.requesting_origin, request_data.embedding_origin, decision); // If a permission request originates from an embedded element, its -@@ -650,11 +662,12 @@ void PermissionContextBase::PermissionDecided( +@@ -648,11 +660,12 @@ void PermissionContextBase::PermissionDecided( // missing if a permission prompt was preignored and we already notified an // origin about it. if (request->second.second) { @@ -1017,7 +1019,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm } } -@@ -739,6 +752,30 @@ void PermissionContextBase::NotifyPermissionSet( +@@ -737,6 +750,30 @@ void PermissionContextBase::NotifyPermissionSet( bool persist, PermissionDecision decision, bool is_final_decision) { @@ -1048,7 +1050,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm DCHECK_CURRENTLY_ON(content::BrowserThread::UI); // Note that rfh may be null, see crbug.com/426909787. -@@ -754,8 +791,8 @@ void PermissionContextBase::NotifyPermissionSet( +@@ -752,8 +789,8 @@ void PermissionContextBase::NotifyPermissionSet( if (persist) { // Clone new value, because we need it again for the callback. @@ -1059,7 +1061,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm } if (is_final_decision) { -@@ -794,6 +831,17 @@ void PermissionContextBase::UpdateSetting( +@@ -811,6 +848,17 @@ void PermissionContextBase::UpdateSetting( const PermissionRequestData& request_data, PermissionSetting setting, bool is_one_time) { @@ -1077,7 +1079,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm DCHECK_EQ(request_data.requesting_origin, request_data.requesting_origin.DeprecatedGetOriginAsURL()); DCHECK_EQ(request_data.embedding_origin, -@@ -803,6 +851,8 @@ void PermissionContextBase::UpdateSetting( +@@ -820,6 +868,8 @@ void PermissionContextBase::UpdateSetting( constraints.set_session_model( is_one_time ? content_settings::mojom::SessionModel::ONE_TIME : content_settings::mojom::SessionModel::DURABLE); @@ -1133,7 +1135,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi // Implementors can override this method to avoid using automatic embargo. virtual bool UsesAutomaticEmbargo() const; -@@ -281,7 +304,8 @@ class PermissionContextBase : public content_settings::Observer { +@@ -285,7 +308,8 @@ class PermissionContextBase : public content_settings::Observer { // allows/blocks/dismisses a permission prompt. void PermissionDecided(PermissionDecision decision, bool is_final_decision, @@ -1177,7 +1179,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio PermissionRequest::~PermissionRequest() { std::move(request_finished_callback_).Run(); } -@@ -431,20 +441,40 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const { +@@ -433,20 +443,40 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const { return request_type() == RequestType::kStorageAccess; } @@ -1261,7 +1263,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission // Called when the user has cancelled the permission request. This // corresponds to a denial, but is segregated in case the context needs to -@@ -242,6 +253,9 @@ class PermissionRequest { +@@ -247,6 +258,9 @@ class PermissionRequest { // Called once a decision is made about the permission. PermissionDecidedCallback permission_decided_callback_; @@ -1274,7 +1276,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc --- a/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc -@@ -206,12 +206,12 @@ void PermissionRequestManager::AddRequest( +@@ -208,12 +208,12 @@ void PermissionRequestManager::AddRequest( if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kDenyPermissionPrompts)) { @@ -1289,7 +1291,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p return; } -@@ -282,9 +282,9 @@ void PermissionRequestManager::AddRequest( +@@ -284,9 +284,9 @@ void PermissionRequestManager::AddRequest( if (should_auto_approve_request) { if (should_auto_approve_request == PermissionAction::GRANTED) { @@ -1301,7 +1303,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } return; } -@@ -611,7 +611,8 @@ void PermissionRequestManager::Accept() { +@@ -615,7 +615,8 @@ void PermissionRequestManager::Accept() { StorePermissionActionForUMA(request->requesting_origin(), request->request_type(), action); PermissionGrantedIncludingDuplicates(request.get(), @@ -1309,9 +1311,9 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p + /*is_one_time=*/false, + content_settings::mojom::LifetimeMode::ALWAYS); - #if !BUILDFLAG(IS_ANDROID) + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) std::optional content_settings_type = -@@ -629,7 +630,7 @@ void PermissionRequestManager::Accept() { +@@ -633,7 +634,7 @@ void PermissionRequestManager::Accept() { CurrentRequestsDecided(action); } @@ -1320,7 +1322,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p if (ignore_callbacks_from_prompt_) { return; } -@@ -641,7 +642,8 @@ void PermissionRequestManager::AcceptThisTime() { +@@ -645,7 +646,8 @@ void PermissionRequestManager::AcceptThisTime() { StorePermissionActionForUMA(request->requesting_origin(), request->request_type(), action); PermissionGrantedIncludingDuplicates(request.get(), @@ -1330,7 +1332,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } NotifyRequestDecided(action); -@@ -649,6 +651,15 @@ void PermissionRequestManager::AcceptThisTime() { +@@ -653,6 +655,15 @@ void PermissionRequestManager::AcceptThisTime() { } void PermissionRequestManager::Deny() { @@ -1346,7 +1348,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p if (ignore_callbacks_from_prompt_) { return; } -@@ -669,7 +680,7 @@ void PermissionRequestManager::Deny() { +@@ -673,7 +684,7 @@ void PermissionRequestManager::Deny() { for (const auto& request : requests_) { StorePermissionActionForUMA(request->requesting_origin(), request->request_type(), action); @@ -1355,7 +1357,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } NotifyRequestDecided(action); -@@ -1306,32 +1317,32 @@ PermissionRequestManager::VisitDuplicateRequests( +@@ -1366,32 +1377,32 @@ PermissionRequestManager::VisitDuplicateRequests( void PermissionRequestManager::PermissionGrantedIncludingDuplicates( PermissionRequest* request, @@ -1398,7 +1400,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p request); } -@@ -1608,7 +1619,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() { +@@ -1679,7 +1690,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() { } switch (auto_response_for_test_) { case ACCEPT_ONCE: @@ -1422,7 +1424,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe void Dismiss() override; void Ignore() override; void FinalizeCurrentRequests() override; -@@ -426,9 +428,12 @@ class PermissionRequestManager +@@ -441,9 +443,12 @@ class PermissionRequestManager // Calls PermissionGranted on a request and all its duplicates. void PermissionGrantedIncludingDuplicates(PermissionRequest* request, diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index a39edfc9..f09fc190 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -18,8 +18,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../bookmark_ui_operations_helper.cc | 2 + .../bookmark_bar_page_handler.cc | 2 + components/bookmark_bar_strings.grdp | 6 +++ - .../bookmarks/browser/bookmark_codec.cc | 20 +++++++-- - components/bookmarks/browser/bookmark_codec.h | 7 ++- + .../bookmarks/browser/bookmark_codec.cc | 15 ++++++- + components/bookmarks/browser/bookmark_codec.h | 4 ++ .../browser/bookmark_load_details.cc | 15 +++++-- .../bookmarks/browser/bookmark_load_details.h | 2 + .../bookmarks/browser/bookmark_model.cc | 3 +- @@ -31,15 +31,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/bookmarks/browser/bookmark_uuids.h | 1 + components/bookmarks/browser/model_loader.cc | 9 +++- .../bookmark_specifics_conversions.cc | 1 + - 27 files changed, 257 insertions(+), 14 deletions(-) + 27 files changed, 252 insertions(+), 11 deletions(-) diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml --- a/chrome/android/java/res/values/ids.xml +++ b/chrome/android/java/res/values/ids.xml -@@ -194,6 +194,7 @@ found in the LICENSE file. - +@@ -197,6 +197,7 @@ found in the LICENSE file. + + @@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.compositor.layouts.Layout; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone; -@@ -294,6 +295,9 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate; +@@ -299,6 +300,9 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate; import org.chromium.chrome.browser.ui.browser_window.BrowserWindowType; import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils; @@ -65,16 +65,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin; import org.chromium.chrome.browser.ui.signin.BottomSheetSigninAndHistorySyncConfig; -@@ -308,6 +312,8 @@ import org.chromium.chrome.browser.usage_stats.UsageStatsService; - import org.chromium.chrome.browser.util.ChromeAccessibilityUtil; +@@ -314,6 +318,8 @@ import org.chromium.chrome.browser.util.ChromeAccessibilityUtil; import org.chromium.chrome.browser.xr.scenecore.XrSceneCoreSessionInitializerImpl; import org.chromium.chrome.browser.xr.scenecore.XrSceneCoreSessionManagerImpl; + import org.chromium.components.browser_ui.accessibility.AccessibilityFeatureMap; +import org.chromium.components.bookmarks.BookmarkId; +import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.share.ShareParams; import org.chromium.components.browser_ui.util.BrowserControlsVisibilityDelegate; -@@ -3886,6 +3892,8 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -3929,6 +3935,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt CloseAllTabsDialog.show( this, getModalDialogManagerSupplier(), tabModelSelector, closeAllTabsRunnable); RecordUserAction.record("MobileMenuCloseAllTabs"); @@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct } else if (id == R.id.close_all_incognito_tabs_menu_id) { boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion); -@@ -4013,6 +4021,41 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -4058,6 +4066,41 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus); } @@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java -@@ -288,6 +288,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm +@@ -292,6 +292,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm // Bookmarks modelList.add(buildBookmarksItem()); @@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab // Recent Tabs if (shouldShowRecentTabsItem()) modelList.add(buildRecentTabsItem()); -@@ -468,6 +476,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm +@@ -478,6 +486,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm } modelList.add(buildCloseAllTabsItem()); if (shouldShowTinkerTank()) modelList.add(buildTinkerTankItem()); @@ -160,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc -@@ -340,6 +340,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) { +@@ -336,6 +336,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) { return bookmark_model_->account_mobile_node() != nullptr; } @@ -194,7 +194,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse base::android::ScopedJavaLocalRef BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env, const GURL& url) { -@@ -452,6 +479,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( +@@ -448,6 +475,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( // Vector to temporarily contain all child bookmarks at same level for sorting std::vector bookmarks = { bookmark_model_->mobile_node(), @@ -202,7 +202,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse bookmark_model_->bookmark_bar_node(), bookmark_model_->other_node(), }; -@@ -560,6 +588,9 @@ std::vector BookmarkBridge::GetTopLevelFolderIdsImpl( +@@ -556,6 +584,9 @@ std::vector BookmarkBridge::GetTopLevelFolderIdsImpl( top_level_folders.push_back(other_node); } @@ -212,7 +212,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse const BookmarkNode* reading_list_node = local_or_syncable_reading_list_manager_->GetRoot(); if (IsPermanentFolderVisible( -@@ -1232,6 +1263,17 @@ void BookmarkBridge::GetBookmarksOfType( +@@ -1228,6 +1259,17 @@ void BookmarkBridge::GetBookmarksOfType( AddBookmarkNodesToBookmarkIdList(env, j_list, results); } @@ -460,7 +460,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4505,6 +4505,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4562,6 +4562,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Select tabs @@ -545,15 +545,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar } else { // No permanent node should have been provided. CHECK(!other_folder_node); -@@ -148,6 +152,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value, +@@ -144,6 +148,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value, BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, + BookmarkNode* tabs_folder_node, int64_t* max_id, std::string* sync_metadata_str) { - const int64_t max_already_assigned_id = -@@ -162,7 +167,8 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value, + if (sync_metadata_str) { +@@ -156,13 +161,15 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value, base::Uuid::ParseLowercase(kBookmarkBarNodeUuid), base::Uuid::ParseLowercase(kOtherBookmarksNodeUuid), base::Uuid::ParseLowercase(kMobileBookmarksNodeUuid), @@ -562,25 +562,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar + base::Uuid::ParseLowercase(kTabsCollectionBookmarksNodeUuid)}; ids_reassigned_ = false; uuids_reassigned_ = false; - ids_valid_ = true; -@@ -171,6 +177,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value, - stored_sha256_checksum_.clear(); - InitializeChecksum(); + nodes_requiring_id_reassignment_.clear(); + reassigned_ids_per_old_id_.clear(); + bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node, + tabs_folder_node, value, sync_metadata_str); - FinalizeChecksum(); + ReassignIDsIfRequired(); -@@ -180,7 +187,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value, - if (!ids_valid_ || (computed_checksum_ != stored_checksum_) || - (use_sha256 && computed_sha256_checksum_ != stored_sha256_checksum_)) { - maximum_id_ = max_already_assigned_id; -- ReassignIDs(bb_node, other_folder_node, mobile_folder_node); -+ ReassignIDs(bb_node, other_folder_node, mobile_folder_node, tabs_folder_node); - } - *max_id = maximum_id_ + 1; - return success; -@@ -239,6 +246,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo( +@@ -220,6 +227,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo( bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -588,7 +578,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar const base::Value::Dict& value, std::string* sync_metadata_str) { std::optional version = value.FindInt(kVersionKey); -@@ -284,6 +292,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, +@@ -243,6 +251,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, roots->FindDict(kOtherBookmarkFolderNameKey); const base::Value::Dict* mobile_folder_value = roots->FindDict(kMobileBookmarkFolderNameKey); @@ -597,7 +587,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar if (!bb_value || !other_folder_value || !mobile_folder_value) return false; -@@ -291,6 +301,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, +@@ -250,6 +260,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, DecodeNode(*bb_value, nullptr, bb_node); DecodeNode(*other_folder_value, nullptr, other_folder_node); DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node); @@ -606,18 +596,10 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar // Need to reset the title as the title is persisted and restored from // the file. -@@ -499,12 +511,14 @@ void BookmarkCodec::DecodeMetaInfoHelper( +@@ -461,6 +473,7 @@ void BookmarkCodec::ReassignIDsIfRequired() { + } - void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node, - BookmarkNode* other_node, -- BookmarkNode* mobile_node) { -+ BookmarkNode* mobile_node, -+ BookmarkNode* tabs_folder_node) { - ids_.clear(); - reassigned_ids_per_old_id_.clear(); - ReassignIDsHelper(bb_node); - ReassignIDsHelper(other_node); - ReassignIDsHelper(mobile_node); + nodes_requiring_id_reassignment_.clear(); + ReassignIDsHelper(tabs_folder_node); ids_reassigned_ = true; } @@ -641,7 +623,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark int64_t* max_node_id, std::string* sync_metadata_str); -@@ -100,6 +102,7 @@ class BookmarkCodec { +@@ -95,6 +97,7 @@ class BookmarkCodec { static const char kBookmarkBarFolderNameKey[]; static const char kOtherBookmarkFolderNameKey[]; static const char kMobileBookmarkFolderNameKey[]; @@ -649,7 +631,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark static const char kVersionKey[]; static const char kChecksumKey[]; static const char kChecksumSHA256Key[]; -@@ -133,6 +136,7 @@ class BookmarkCodec { +@@ -128,6 +131,7 @@ class BookmarkCodec { bool DecodeHelper(BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -657,16 +639,6 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark const base::Value::Dict& value, std::string* sync_metadata_str); -@@ -143,7 +147,8 @@ class BookmarkCodec { - // Reassigns bookmark IDs for all nodes. - void ReassignIDs(BookmarkNode* bb_node, - BookmarkNode* other_node, -- BookmarkNode* mobile_node); -+ BookmarkNode* mobile_node, -+ BookmarkNode* tabs_folder_node); - - // Helper to recursively reassign IDs. - void ReassignIDsHelper(BookmarkNode* node); diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/bookmarks/browser/bookmark_load_details.cc --- a/components/bookmarks/browser/bookmark_load_details.cc +++ b/components/bookmarks/browser/bookmark_load_details.cc @@ -749,7 +721,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc --- a/components/bookmarks/browser/bookmark_model.cc +++ b/components/bookmarks/browser/bookmark_model.cc -@@ -909,7 +909,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const { +@@ -908,7 +908,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const { (account_bookmark_bar_node_ && !account_bookmark_bar_node_->children().empty()) || (account_other_node_ && !account_other_node_->children().empty()) || @@ -758,7 +730,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar } bool BookmarkModel::IsBookmarked(const GURL& url) const { -@@ -1241,6 +1241,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { +@@ -1240,6 +1240,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { bookmark_bar_node_ = details->bb_node(); other_node_ = details->other_folder_node(); mobile_node_ = details->mobile_folder_node(); @@ -907,7 +879,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks &sync_metadata_str)) { ids_assigned_to_account_nodes = codec.release_assigned_ids(); -@@ -118,7 +122,8 @@ std::unique_ptr LoadBookmarks( +@@ -123,7 +127,8 @@ std::unique_ptr LoadBookmarks( if (root_dict.has_value() && codec.Decode(*root_dict, std::move(ids_assigned_to_account_nodes), details->bb_node(), details->other_folder_node(), diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 698efed8..0077d13e 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../preferences/ChromePreferenceKeys.java | 1 + .../preferences/ChromeSharedPreferences.java | 12 ++++++++++++ .../LegacyChromePreferenceKeys.java | 1 + - .../AppHeaderCoordinator.java | 2 ++ + .../ui/desktop_windowing/AppHeaderUtils.java | 2 ++ .../omnibox/LocationBarCoordinator.java | 2 +- .../strings/android_chrome_strings.grd | 7 +++++++ .../java/res/layout/control_container.xml | 8 ++++---- @@ -80,8 +80,8 @@ diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml -@@ -119,9 +119,13 @@ found in the LICENSE file. - 16dp +@@ -116,9 +116,13 @@ found in the LICENSE file. + 50dp - @dimen/default_action_bar_height @@ -98,7 +98,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java -@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; +@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerCreator; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeFieldTrialImpl; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils; @@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo import org.chromium.chrome.browser.ui.edge_to_edge.SimpleEdgeToEdgeController; import org.chromium.components.browser_ui.styles.SemanticColorUtils; import org.chromium.components.browser_ui.util.AutomotiveUtils; -@@ -146,6 +147,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity +@@ -145,6 +146,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity protected void attachBaseContext(Context newBase) { super.attachBaseContext(newBase); @@ -171,7 +171,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -818,7 +818,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -830,7 +830,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity // Inflate the correct toolbar layout for the device. int toolbarLayoutId = getToolbarLayoutId(); if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) { @@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java -@@ -136,6 +136,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService; +@@ -137,6 +137,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService; import org.chromium.components.tab_group_sync.TriggerSource; import org.chromium.components.tab_groups.TabGroupColorId; import org.chromium.ui.accessibility.AccessibilityState; @@ -194,7 +194,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.util.ColorUtils; -@@ -5308,8 +5309,13 @@ public class StripLayoutHelper +@@ -5317,8 +5318,13 @@ public class StripLayoutHelper mCloseButtonMenu.setAnchorView(tabView); // 3. Set the vertical offset to align the close button menu with bottom of the tab strip int tabHeight = mManagerHost.getHeight(); @@ -213,7 +213,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java -@@ -101,6 +101,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa +@@ -105,6 +105,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa import org.chromium.components.browser_ui.styles.SemanticColorUtils; import org.chromium.components.browser_ui.widget.scrim.ScrimProperties; import org.chromium.content_public.browser.LoadUrlParams; @@ -221,9 +221,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.base.PageTransition; import org.chromium.ui.base.WindowAndroid; -@@ -491,7 +492,10 @@ public class StripLayoutHelperManager - mIsLayoutOptimizationsEnabled = - ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled( +@@ -498,7 +499,10 @@ public class StripLayoutHelperManager + mIsHeaderCustomizationSupported = + ToolbarFeatures.isAppHeaderCustomizationSupported( /* isTablet= */ true, DisplayUtil.isContextInDefaultDisplay(mContext)); - mScrollableStripHeight = res.getDimension(R.dimen.tab_strip_height) / mDensity; + mScrollableStripHeight = @@ -231,7 +231,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over + ? res.getDimension(R.dimen.tab_strip_height_tabletui) + : res.getDimension(R.dimen.tab_strip_height_cromite)) / mDensity; mHeight = - mIsLayoutOptimizationsEnabled + mIsHeaderCustomizationSupported ? toolbarManager.getTabStripHeightSupplier().get() / mDensity diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java @@ -273,7 +273,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrow diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -766,7 +766,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -807,7 +807,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @Override public int getControlContainerHeightResource() { @@ -296,9 +296,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.quick_delete.QuickDeleteController; import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl; -@@ -1877,7 +1879,9 @@ public class RootUiCoordinator - if (!mSupportsFindInPageSupplier.getAsBoolean()) return; +@@ -1947,7 +1949,9 @@ public class RootUiCoordinator + protected int getFindToolbarStub() { int stubId = R.id.find_toolbar_stub; - if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { + if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity) && @@ -306,7 +306,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi + ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false)) { stubId = R.id.find_toolbar_tablet_stub; } - mFindToolbarManager = + return stubId; diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn --- a/chrome/browser/preferences/BUILD.gn +++ b/chrome/browser/preferences/BUILD.gn @@ -321,7 +321,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -348,6 +348,7 @@ public final class ChromePreferenceKeys { +@@ -358,6 +358,7 @@ public final class ChromePreferenceKeys { /** Whether the app-specific history info text was already seen by users. */ public static final String HISTORY_APP_SPECIFIC_INFO_SEEN = "Chrome.History.AppSpecificInfoSeen"; @@ -369,29 +369,29 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE, ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO, ChromePreferenceKeys.HOMEPAGE_ENABLED, -diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java ---- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java -+++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java -@@ -43,6 +43,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa - import org.chromium.ui.display.DisplayUtil; - import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider; - import org.chromium.ui.insets.CaptionBarInsetsRectProvider; +diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java +--- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java ++++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java +@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher.Activit + import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; + import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; + import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager; +import org.chromium.ui.base.DeviceFormFactor; - import org.chromium.ui.insets.InsetObserver; - import org.chromium.ui.insets.InsetObserver.WindowInsetsConsumer; + import org.chromium.ui.display.DisplayUtil; import org.chromium.ui.insets.InsetsRectProvider; -@@ -304,6 +305,7 @@ public class AppHeaderCoordinator - InsetsRectProvider insetsRectProvider, - @DesktopWindowHeuristicResult int currentResult, - boolean isOnExternalDisplay) { + +@@ -245,6 +246,7 @@ public class AppHeaderUtils { + */ + static @DesktopWindowHeuristicResult int checkIsInDesktopWindow( + InsetsRectProvider insetsRectProvider, Context context) { + if (DeviceFormFactor.isForceTabletUI()) return DesktopWindowHeuristicResult.IN_DESKTOP_WINDOW; @DesktopWindowHeuristicResult int newResult; - Insets captionBarInset = insetsRectProvider.getCachedInset(); + boolean isOnExternalDisplay = !DisplayUtil.isContextInDefaultDisplay(context); diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java -@@ -903,7 +903,7 @@ public class LocationBarCoordinator +@@ -1008,7 +1008,7 @@ public class LocationBarCoordinator } private boolean isTabletWindow() { @@ -403,7 +403,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1498,6 +1498,13 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1507,6 +1507,13 @@ Your Google account may have other forms of browsing history like searches and a Privacy guide explanation closed @@ -438,9 +438,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container android:layout_marginBottom="@dimen/toolbar_hairline_height" android:layout_height="@dimen/toolbar_height_no_shadow" /> -@@ -29,13 +29,13 @@ found in the LICENSE file. - android:layout_width="match_parent" +@@ -30,13 +30,13 @@ found in the LICENSE file. android:layout_height="wrap_content" + android:layout_gravity="bottom" app:layout_anchorGravity="bottom" - /> + android:layout_marginTop="@dimen/control_container_height_cromite" /> @@ -506,7 +506,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow import android.graphics.Canvas; import android.graphics.Color; import android.graphics.PorterDuff; -@@ -165,6 +166,24 @@ public class ToolbarControlContainer extends OptimizedFrameLayout +@@ -172,6 +173,24 @@ public class ToolbarControlContainer extends OptimizedFrameLayout @Initializer public void initWithToolbar(int toolbarLayoutId, int toolbarLayoutHeightResId) { try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) { @@ -534,7 +534,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java -@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp; +@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp; import org.chromium.components.feature_engagement.Tracker; import org.chromium.ui.base.ViewUtils; import org.chromium.ui.util.MotionEventUtils; @@ -542,7 +542,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow import org.chromium.ui.util.TokenHolder; import org.chromium.url.GURL; -@@ -582,7 +583,9 @@ public abstract class ToolbarLayout extends FrameLayout +@@ -588,7 +589,9 @@ public abstract class ToolbarLayout extends FrameLayout * not have a tab strip. */ protected int getTabStripHeightFromResource() { @@ -556,15 +556,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java -@@ -32,6 +32,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; - import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripHeightObserver; +@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer; import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionDelegate; + import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionHandler; import org.chromium.ui.base.ViewUtils; +import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.resources.dynamics.DynamicResourceReadyOnceCallback; import org.chromium.ui.util.TokenHolder; -@@ -561,6 +562,7 @@ class HeightTransitionHandler { +@@ -492,6 +493,7 @@ class HeightTransitionHandler { /** Get the min screen width (in dp) required for the tab strip to become visible. */ private static int getScreenWidthThresholdDp() { @@ -575,15 +575,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java -@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils; +@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils; import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState; import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager; import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager.AppHeaderObserver; +import org.chromium.ui.base.DeviceFormFactor; - /** Class used to manage tab strip visibility and height updates. */ - @NullMarked -@@ -148,7 +149,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea + /** + * Class used to manage tab strip visibility and height updates. +@@ -170,7 +171,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea mTabStripReservedTopPadding = controlContainerView() .getResources() @@ -613,17 +613,17 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java -@@ -29,6 +29,7 @@ import org.chromium.content_public.browser.ContentFeatureList; - import org.chromium.content_public.browser.ContentFeatureMap; +@@ -31,6 +31,7 @@ import org.chromium.content_public.browser.ContentFeatureMap; + import org.chromium.ui.base.UiAndroidFeatureList; import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment; +import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate; /** Fragment to keep track of all the accessibility related preferences. */ @NullMarked -@@ -45,6 +46,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment - public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions"; - public static final String PREF_CARET_BROWSING = "caret_browsing"; +@@ -51,6 +52,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment + public static final String PREF_TOUCHPAD_OVERSCROLL_HISTORY_NAVIGATION = + "touchpad_overscroll_history_navigation"; + private BooleanPreferenceDelegate mForceTabletUIDelegate; + static final String PREF_FORCE_TABLET_UI = "force_tablet_ui"; @@ -631,7 +631,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c private PageZoomPreference mPageZoomDefaultZoomPref; private ChromeSwitchPreference mPageZoomIncludeOSAdjustment; private ChromeSwitchPreference mPageZoomAlwaysShowPref; -@@ -119,6 +123,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -126,6 +130,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment mDelegate.getReaderAccessibilityDelegate().getValue()); readerForAccessibilityPref.setOnPreferenceChangeListener(this); @@ -644,7 +644,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c Preference captions = findPreference(PREF_CAPTIONS); captions.setOnPreferenceClickListener( preference -> { -@@ -191,6 +201,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -212,6 +222,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment public boolean onPreferenceChange(Preference preference, Object newValue) { if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { mDelegate.getForceEnableZoomAccessibilityDelegate().setValue((Boolean) newValue); @@ -669,7 +669,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java --- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java +++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java -@@ -79,6 +79,14 @@ public class DeviceFormFactor { +@@ -87,6 +87,14 @@ public class DeviceFormFactor { /** See {@link #setIsTabletForTesting(boolean)}. */ private static @Nullable Boolean sIsTabletForTesting; @@ -684,7 +684,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui /** * Each activity could be on a different display, and this will just tell you whether the * display associated with the application context is "tablet sized". Use {@link -@@ -87,6 +95,7 @@ public class DeviceFormFactor { +@@ -95,6 +103,7 @@ public class DeviceFormFactor { @CalledByNative @Deprecated public static boolean isTablet() { @@ -692,7 +692,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui if (sIsTabletForTesting != null) { return sIsTabletForTesting; } -@@ -117,6 +126,7 @@ public class DeviceFormFactor { +@@ -125,6 +134,7 @@ public class DeviceFormFactor { * E.g. http://developer.samsung.com/samsung-dex/testing */ public static boolean isNonMultiDisplayContextOnTablet(Context context) { @@ -700,7 +700,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET; } -@@ -151,6 +161,7 @@ public class DeviceFormFactor { +@@ -159,6 +169,7 @@ public class DeviceFormFactor { * @return The screen width bucket the device is in (see constants at the top of this class). */ private static int detectScreenWidthBucket(Context context) { @@ -708,7 +708,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui return context.getResources().getInteger(R.integer.min_screen_width_bucket); } -@@ -158,6 +169,7 @@ public class DeviceFormFactor { +@@ -166,6 +177,7 @@ public class DeviceFormFactor { ThreadUtils.assertOnUiThread(); Context context = windowAndroid.getContext().get(); if (context == null) return 0; @@ -716,7 +716,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui return context.getResources().getInteger(R.integer.min_screen_width_bucket); } -@@ -167,6 +179,7 @@ public class DeviceFormFactor { +@@ -175,6 +187,7 @@ public class DeviceFormFactor { */ @UiThread public static int getNonMultiDisplayMinimumTabletWidthPx(Context context) { @@ -724,7 +724,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui return getMinimumTabletWidthPx(DisplayAndroid.getNonMultiDisplay(context)); } -@@ -175,6 +188,7 @@ public class DeviceFormFactor { +@@ -183,6 +196,7 @@ public class DeviceFormFactor { * layout. */ public static int getMinimumTabletWidthPx(DisplayAndroid display) { diff --git a/build/patches/Add-setting-to-enable-Credman-for-passkeys.patch b/build/patches/Add-setting-to-enable-Credman-for-passkeys.patch index 011f5019..b94191c7 100644 --- a/build/patches/Add-setting-to-enable-Credman-for-passkeys.patch +++ b/build/patches/Add-setting-to-enable-Credman-for-passkeys.patch @@ -14,13 +14,13 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html ...etting-to-enable-Credman-for-passkeys.grdp | 12 ++++++++ .../webauthn/AuthenticatorImpl.java | 29 +++++++------------ .../components/webauthn/WebauthnFeatures.java | 2 ++ - .../cred_man/CredManSupportProvider.java | 27 +++++------------ + .../cred_man/CredManSupportProvider.java | 25 ++++------------ .../webauthn/android/webauthn_feature_map.cc | 1 + components/webauthn/features.cc | 4 +++ components/webauthn/features.h | 3 ++ device/fido/features.cc | 2 ++ .../authentication_credentials_container.cc | 5 ++++ - 10 files changed, 75 insertions(+), 37 deletions(-) + 10 files changed, 73 insertions(+), 37 deletions(-) create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java @@ -174,36 +174,36 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut - .WEBAUTHN_IMMEDIATE_GET) - && isUvpaa)); + false)); - boolean signal_supported = + boolean signalSupported = isUvpaa && DeviceFeatureMap.isEnabled( diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java -@@ -16,4 +16,6 @@ import org.chromium.build.annotations.NullMarked; - public abstract class WebauthnFeatures { +@@ -17,4 +17,6 @@ public abstract class WebauthnFeatures { public static final String WEBAUTHN_ANDROID_PASSKEY_CACHE_MIGRATION = "WebAuthenticationAndroidPasskeyCacheMigration"; + public static final String WEBAUTHN_ANDROID_CRED_MAN_FOR_DEV = "WebAuthnAndroidCredManForDev"; + public static final String WEBAUTHN_ANDROID_PASSKEY = + "WebAuthenticationAndroidPasskey"; } diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java -@@ -19,9 +19,11 @@ import org.chromium.base.version_info.VersionInfo; +@@ -19,11 +19,11 @@ import org.chromium.base.version_info.VersionInfo; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.components.webauthn.CredManSupport; -import org.chromium.components.webauthn.GmsCoreUtils; + import org.chromium.components.webauthn.WebauthnFeatureMap; + import org.chromium.components.webauthn.WebauthnFeatures; import org.chromium.components.webauthn.WebauthnMode; import org.chromium.components.webauthn.WebauthnModeProvider; -+import org.chromium.components.webauthn.WebauthnFeatureMap; -+import org.chromium.components.webauthn.WebauthnFeatures; +import org.chromium.components.webauthn.WebauthnLogger; @NullMarked public class CredManSupportProvider { -@@ -57,12 +59,12 @@ public class CredManSupportProvider { +@@ -79,12 +79,12 @@ public class CredManSupportProvider { } if (getAndroidVersion() < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { sCredManSupport = CredManSupport.DISABLED; @@ -219,15 +219,15 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut return sCredManSupport; } if (notSkippedBecauseInTests() -@@ -70,14 +72,14 @@ public class CredManSupportProvider { +@@ -92,14 +92,14 @@ public class CredManSupportProvider { == null) { sCredManSupport = CredManSupport.DISABLED; - recordCredManAvailability(/*available*/ false); + recordCredManAvailability(/* available= */ false); - log(TAG, "Disabled because CredentialManager is not available."); + WebauthnLogger.logError(TAG, "Disabled because CredentialManager is not available."); return sCredManSupport; } - recordCredManAvailability(/*available*/ true); + recordCredManAvailability(/* available= */ true); final CredManUiRecommender recommender = ServiceLoaderUtil.maybeCreate(CredManUiRecommender.class); @@ -236,7 +236,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut boolean gpmInCredMan = sOverrideForcesGpm != null ? sOverrideForcesGpm : customUiRecommended; boolean isChrome3pPwmMode = -@@ -116,13 +118,6 @@ public class CredManSupportProvider { +@@ -138,13 +138,6 @@ public class CredManSupportProvider { "WebAuthentication.Android.CredManAvailability", available); } @@ -250,7 +250,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut private static int getAndroidVersion() { return sOverrideAndroidVersion == null ? Build.VERSION.SDK_INT : sOverrideAndroidVersion; } -@@ -130,10 +125,4 @@ public class CredManSupportProvider { +@@ -152,10 +145,4 @@ public class CredManSupportProvider { private static boolean notSkippedBecauseInTests() { return sOverrideForcesGpm == null && sOverrideAndroidVersion == null; } @@ -264,10 +264,10 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut diff --git a/components/webauthn/android/webauthn_feature_map.cc b/components/webauthn/android/webauthn_feature_map.cc --- a/components/webauthn/android/webauthn_feature_map.cc +++ b/components/webauthn/android/webauthn_feature_map.cc -@@ -16,6 +16,7 @@ namespace { - // Array of features exposed through the Java WebauthnFeatureMap API. +@@ -17,6 +17,7 @@ namespace { const base::Feature* const kFeaturesExposedToJava[] = { &kWebAuthnAndroidPasskeyCacheMigration, + &kWebAuthnAndroidCredManForDev, + &kWebAuthnAndroidPasskey, }; @@ -275,9 +275,9 @@ diff --git a/components/webauthn/android/webauthn_feature_map.cc b/components/we diff --git a/components/webauthn/features.cc b/components/webauthn/features.cc --- a/components/webauthn/features.cc +++ b/components/webauthn/features.cc -@@ -16,6 +16,10 @@ BASE_FEATURE(kWebAuthnAndroidPasskeyCacheMigration, - "WebAuthenticationAndroidPasskeyCacheMigration", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -25,6 +25,10 @@ BASE_FEATURE(kWebAuthnAndroidCredManForDev, base::FEATURE_DISABLED_BY_DEFAULT); + const base::FeatureParam kWebAuthnAndroidCredManForDevMode{ + &kWebAuthnAndroidCredManForDev, "mode", ""}; +CROMITE_FEATURE(kWebAuthnAndroidPasskey, + "WebAuthenticationAndroidPasskey", @@ -289,9 +289,9 @@ diff --git a/components/webauthn/features.cc b/components/webauthn/features.cc diff --git a/components/webauthn/features.h b/components/webauthn/features.h --- a/components/webauthn/features.h +++ b/components/webauthn/features.h -@@ -20,6 +20,9 @@ namespace webauthn::features { +@@ -27,6 +27,9 @@ BASE_DECLARE_FEATURE(kWebAuthnAndroidCredManForDev); COMPONENT_EXPORT(WEBAUTHN) - BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskeyCacheMigration); + extern const base::FeatureParam kWebAuthnAndroidCredManForDevMode; +COMPONENT_EXPORT(WEBAUTHN) +BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskey); @@ -302,7 +302,7 @@ diff --git a/components/webauthn/features.h b/components/webauthn/features.h diff --git a/device/fido/features.cc b/device/fido/features.cc --- a/device/fido/features.cc +++ b/device/fido/features.cc -@@ -171,6 +171,7 @@ BASE_FEATURE(kWebAuthnImmediateGet, +@@ -188,6 +188,7 @@ BASE_FEATURE(kWebAuthnImmediateGet, #else base::FEATURE_ENABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_ANDROID) @@ -310,7 +310,7 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc BASE_FEATURE_PARAM(int, kWebAuthnImmediateMediationTimeoutMilliseconds, -@@ -183,6 +184,7 @@ BASE_FEATURE_PARAM(int, +@@ -200,6 +201,7 @@ BASE_FEATURE_PARAM(int, BASE_FEATURE(kWebAuthnImmediateGetAutoselect, "WebAuthenticationImmediateGetAutoselect", base::FEATURE_ENABLED_BY_DEFAULT); @@ -321,7 +321,7 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc diff --git a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc --- a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc +++ b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc -@@ -1076,6 +1076,11 @@ DOMException* AuthenticatorStatusToDOMException( +@@ -1090,6 +1090,11 @@ DOMException* AuthenticatorStatusToDOMException( const WebAuthnDOMExceptionDetailsPtr& dom_exception_details) { DCHECK_EQ(status != AuthenticatorStatus::ERROR_WITH_DOM_EXCEPTION_DETAILS, dom_exception_details.is_null()); diff --git a/build/patches/Ask-for-restart-on-connection-change.patch b/build/patches/Ask-for-restart-on-connection-change.patch index 8450bb8d..961f250c 100644 --- a/build/patches/Ask-for-restart-on-connection-change.patch +++ b/build/patches/Ask-for-restart-on-connection-change.patch @@ -284,7 +284,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -1441,7 +1441,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1525,7 +1525,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mActivity, mStatusIndicatorCoordinator, isUrlBarFocusedSupplier, @@ -299,7 +299,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java -@@ -201,6 +201,13 @@ public abstract class TabModelSelectorBase +@@ -200,6 +200,13 @@ public abstract class TabModelSelectorBase return null; } @@ -407,7 +407,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java --- a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java +++ b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java -@@ -135,6 +135,8 @@ public interface TabWindowManager { +@@ -138,6 +138,8 @@ public interface TabWindowManager { /** Returns the total number of incognito tabs across all tab model selectors. */ int getIncognitoTabCount(); @@ -419,7 +419,7 @@ diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java --- a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java +++ b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java -@@ -566,6 +566,16 @@ public class TabWindowManagerImpl implements TabWindowManager { +@@ -568,6 +568,16 @@ public class TabWindowManagerImpl implements TabWindowManager { return tabGroupModelFilter.getTabsInGroup(tabGroupId); } @@ -497,7 +497,7 @@ diff --git a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml b/c diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java -@@ -137,6 +137,8 @@ public class Snackbar { +@@ -140,6 +140,8 @@ public class Snackbar { private @Nullable String mTemplateText; private @Nullable String mActionText; private @Nullable Object mActionData; @@ -506,7 +506,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro private int mBackgroundColor; private int mTextApperanceResId; private boolean mDefaultLines = true; -@@ -243,6 +245,20 @@ public class Snackbar { +@@ -246,6 +248,20 @@ public class Snackbar { return this; } @@ -530,7 +530,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java -@@ -340,6 +340,12 @@ public class SnackbarManager +@@ -348,6 +348,12 @@ public class SnackbarManager new SnackbarView( mActivity, this, @@ -546,7 +546,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java -@@ -56,6 +56,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { +@@ -55,6 +55,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { protected final ViewGroup mSnackbarView; protected final TemplatePreservingTextView mMessageView; private final TextView mActionButtonView; @@ -554,38 +554,38 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro private final ImageView mProfileImageView; private final int mAnimationDuration; private final boolean mIsTablet; -@@ -102,11 +103,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { +@@ -100,11 +101,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { public SnackbarView( Activity activity, - OnClickListener listener, + SnackbarManager manager, + OnClickListener dismissListener, Snackbar snackbar, ViewGroup parentView, @Nullable WindowAndroid windowAndroid, boolean isTablet) { -- this(activity, listener, snackbar, parentView, windowAndroid, null, isTablet); -+ this(activity, listener, dismissListener, snackbar, parentView, windowAndroid, null, isTablet); +- this(activity, manager, snackbar, parentView, windowAndroid, null, isTablet); ++ this(activity, manager, dismissListener, snackbar, parentView, windowAndroid, null, isTablet); } /** -@@ -125,6 +127,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { +@@ -122,6 +124,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { public SnackbarView( Activity activity, - OnClickListener listener, + SnackbarManager manager, + OnClickListener dismissListener, Snackbar snackbar, ViewGroup parentView, @Nullable WindowAndroid windowAndroid, -@@ -155,6 +158,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { +@@ -158,6 +161,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { (TemplatePreservingTextView) mContainerView.findViewById(R.id.snackbar_message); mActionButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_button); - mActionButtonView.setOnClickListener(listener); + mActionButtonView.setOnClickListener(manager); + mDismissButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_dismiss); + mDismissButtonView.setOnClickListener(dismissListener); mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image); mEdgeToEdgeSupplier = edgeToEdgeSupplier; - // TODO(crbug/com/451807932): Replace with a custom pad adjuster to account for inset -@@ -431,6 +436,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { + // TODO(crbug.com/451807932): Replace with a custom pad adjuster to account for inset +@@ -434,6 +439,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { mActionButtonView.setVisibility(View.VISIBLE); mActionButtonView.setContentDescription(snackbar.getActionText()); setViewText(mActionButtonView, snackbar.getActionText(), animate); @@ -638,7 +638,7 @@ diff --git a/content/browser/web_contents/web_contents_android.h b/content/brows diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4151,8 +4151,10 @@ void WebContentsImpl::Stop() { +@@ -4096,8 +4096,10 @@ void WebContentsImpl::Stop() { void WebContentsImpl::SetPageFrozen(bool frozen) { TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen); @@ -665,7 +665,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon @Override public void setDisplayCutoutSafeArea(Rect insets) { if (mNativeWebContentsAndroid == 0) return; -@@ -1480,6 +1486,8 @@ public class WebContentsImpl +@@ -1486,6 +1492,8 @@ public class WebContentsImpl void setFocus(long nativeWebContentsAndroid, boolean focused); @@ -734,7 +734,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -4655,6 +4655,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) { +@@ -4665,6 +4665,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) { } void Document::DispatchFreezeEvent() { @@ -745,7 +745,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -3306,6 +3306,7 @@ void LocalFrame::DidFreeze() { +@@ -3321,6 +3321,7 @@ void LocalFrame::DidFreeze() { LoaderFreezeMode freeze_mode = GetLoaderFreezeMode(); GetDocument()->Fetcher()->SetDefersLoading(freeze_mode); Loader().SetDefersLoading(freeze_mode); @@ -753,7 +753,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ } void LocalFrame::DidResume() { -@@ -3320,6 +3321,7 @@ void LocalFrame::DidResume() { +@@ -3335,6 +3336,7 @@ void LocalFrame::DidResume() { GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone); Loader().SetDefersLoading(LoaderFreezeMode::kNone); diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index efe25dbc..31e3d6b3 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -47,7 +47,7 @@ Require: bromite-build-utils.patch ...tomTriStateSiteSettingsPreferenceImpl.java | 24 + .../ContentSettingsResources.java | 32 +- .../site_settings/SingleCategorySettings.java | 57 ++- - .../site_settings/SingleWebsiteSettings.java | 50 ++- + .../site_settings/SingleWebsiteSettings.java | 48 +- .../site_settings/SiteSettings.java | 33 +- .../site_settings/SiteSettingsCategory.java | 18 +- .../site_settings/SiteSettingsDelegate.java | 2 + @@ -85,7 +85,7 @@ Require: bromite-build-utils.patch .../platform/web_content_settings_client.h | 13 + .../execution_context/execution_context.cc | 16 + .../execution_context/execution_context.h | 5 + - 74 files changed, 1964 insertions(+), 106 deletions(-) + 74 files changed, 1962 insertions(+), 106 deletions(-) create mode 100644 components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java @@ -99,7 +99,7 @@ Require: bromite-build-utils.patch diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java -@@ -70,6 +70,10 @@ import org.chromium.url.GURL; +@@ -71,6 +71,10 @@ import org.chromium.url.GURL; import java.util.List; import java.util.Set; @@ -110,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C /** A SiteSettingsDelegate instance that contains Chrome-specific Site Settings logic. */ @NullMarked public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { -@@ -239,7 +243,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -240,7 +244,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { @Override public boolean isHelpAndFeedbackEnabled() { @@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C } @Override -@@ -377,6 +381,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -378,6 +382,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { return mPrivacySandboxBridge.getRelatedWebsiteSetOwner(memberOrigin); } @@ -152,7 +152,7 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_dele diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -358,6 +358,7 @@ build_webui("build") { +@@ -360,6 +360,7 @@ build_webui("build") { "privacy_sandbox/privacy_sandbox_browser_proxy.ts", "relaunch_mixin.ts", "reset_page/reset_browser_proxy.ts", @@ -160,7 +160,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc "route.ts", "router.ts", "safety_hub/safety_hub_browser_proxy.ts", -@@ -371,7 +372,6 @@ build_webui("build") { +@@ -373,7 +374,6 @@ build_webui("build") { "site_settings/constants.ts", "site_settings/site_settings_mixin.ts", "site_settings/site_settings_browser_proxy.ts", @@ -171,7 +171,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html -@@ -623,4 +623,5 @@ +@@ -609,4 +609,5 @@ @@ -288,7 +288,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc /** * Add all of the child routes that originate from the privacy route, -@@ -155,6 +156,7 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -150,6 +151,7 @@ function addPrivacyChildRoutes(r: Partial) { r.SITE_SETTINGS_LOCAL_NETWORK_ACCESS = r.SITE_SETTINGS.createChild('localNetworkAccess'); } @@ -395,7 +395,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/settings_category_d diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html --- a/chrome/browser/resources/settings/site_settings/site_details.html +++ b/chrome/browser/resources/settings/site_settings/site_details.html -@@ -334,5 +334,6 @@ +@@ -332,5 +332,6 @@ label="$i18n{siteSettingsLocalNetworkAccess}"> @@ -405,7 +405,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b diff --git a/chrome/browser/resources/settings/site_settings/site_details.ts b/chrome/browser/resources/settings/site_settings/site_details.ts --- a/chrome/browser/resources/settings/site_settings/site_details.ts +++ b/chrome/browser/resources/settings/site_settings/site_details.ts -@@ -71,8 +71,39 @@ export class SiteDetailsElement extends SiteDetailsElementBase { +@@ -73,8 +73,39 @@ export class SiteDetailsElement extends SiteDetailsElementBase { return 'site-details'; } @@ -609,7 +609,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_settings_mixin diff --git a/chrome/browser/resources/settings/site_settings/site_settings_page.ts b/chrome/browser/resources/settings/site_settings/site_settings_page.ts --- a/chrome/browser/resources/settings/site_settings/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings/site_settings_page.ts -@@ -51,7 +51,7 @@ function getCategoryItemMap(): Map { +@@ -52,7 +52,7 @@ function getCategoryItemMap(): Map { } // The following list is ordered alphabetically by |id|. The order in which // these appear in the UI is determined elsewhere in this file. @@ -739,7 +739,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_settings_util. diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1606,6 +1606,7 @@ static_library("ui") { +@@ -1620,6 +1620,7 @@ static_library("ui") { "//components/commerce/core/webui", "//components/contextual_search:public", "//components/endpoint_fetcher", @@ -747,7 +747,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "//components/enterprise/common:files_scan_data", "//components/feedback/proto", "//components/headless/console_message_logger", -@@ -4761,6 +4762,7 @@ static_library("ui") { +@@ -4790,6 +4791,7 @@ static_library("ui") { "//components/power_bookmarks/core", "//components/power_bookmarks/storage", "//components/prefs", @@ -787,7 +787,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc b/chrome diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc --- a/chrome/browser/ui/views/page_info/page_info_main_view.cc +++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc -@@ -58,6 +58,7 @@ +@@ -55,6 +55,7 @@ #include "ui/views/layout/box_layout.h" #include "ui/views/layout/flex_layout.h" #include "ui/views/vector_icons.h" @@ -795,7 +795,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b #include "ui/views/view_class_properties.h" #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -284,8 +285,20 @@ void PageInfoMainView::SetPermissionInfo( +@@ -259,8 +260,20 @@ void PageInfoMainView::SetPermissionInfo( scroll_view->SetDrawOverflowIndicator(false); auto* content_view = scroll_view->SetContents(std::make_unique()); @@ -818,7 +818,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b content_view->SetID(PageInfoViewFactory::VIEW_ID_PAGE_INFO_PERMISSION_VIEW); content_view->SetProperty(views::kElementIdentifierKey, kPermissionsElementId); -@@ -300,11 +313,16 @@ void PageInfoMainView::SetPermissionInfo( +@@ -275,11 +288,16 @@ void PageInfoMainView::SetPermissionInfo( } } @@ -835,7 +835,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b toggle_row->SetProperty(views::kCrossAxisAlignmentKey, views::LayoutAlignment::kStretch); syncable_permission_rows_.emplace(permission.type, toggle_row); -@@ -312,6 +330,8 @@ void PageInfoMainView::SetPermissionInfo( +@@ -287,6 +305,8 @@ void PageInfoMainView::SetPermissionInfo( } for (auto& object : chosen_object_info_list) { @@ -844,7 +844,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b // The view takes ownership of the object info. auto object_view = std::make_unique( std::move(object), -@@ -322,6 +342,10 @@ void PageInfoMainView::SetPermissionInfo( +@@ -297,6 +317,10 @@ void PageInfoMainView::SetPermissionInfo( content_view->AddChildView(std::move(object_view))); } @@ -867,7 +867,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom #include "components/page_info/core/features.h" #include "components/page_info/core/proto/about_this_site_metadata.pb.h" #include "components/page_info/page_info.h" -@@ -291,7 +293,14 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -280,7 +282,14 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( bool blocked_on_system_level) { PermissionSetting setting = permission.setting.value_or(permission.default_setting); @@ -882,7 +882,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom auto* info = content_settings::PermissionSettingsRegistry::GetInstance()->Get( permission.type); // For guard content settings and Automatic Picture-in-Picture, ASK is treated -@@ -595,6 +604,17 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -584,6 +593,17 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( icon = &vector_icons::kPrinterIcon; break; default: @@ -903,7 +903,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.h b/chrome/browser/ui/views/page_info/page_info_view_factory.h --- a/chrome/browser/ui/views/page_info/page_info_view_factory.h +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.h -@@ -97,6 +97,11 @@ class PageInfoViewFactory { +@@ -95,6 +95,11 @@ class PageInfoViewFactory { const PageInfo::PermissionInfo& info, bool blocked_on_system_level = false); @@ -1236,7 +1236,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide #include "components/password_manager/core/browser/leak_detection_dialog_utils.h" #include "components/password_manager/core/browser/manage_passwords_referrer.h" #include "components/password_manager/core/common/password_manager_features.h" -@@ -4048,6 +4052,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -4111,6 +4115,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); @@ -1296,7 +1296,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -46,6 +46,8 @@ +@@ -47,6 +47,8 @@ #include "chrome/grit/generated_resources.h" #include "components/content_settings/core/browser/content_settings_provider.h" #include "components/content_settings/core/browser/host_content_settings_map.h" @@ -1374,7 +1374,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b NOTREACHED() << static_cast(type) << " is not a recognized content settings type."; } -@@ -668,6 +689,13 @@ std::vector GetVisiblePermissionCategories( +@@ -664,6 +685,13 @@ std::vector GetVisiblePermissionCategories( base_types->push_back(ContentSettingsType::LOCAL_NETWORK_ACCESS); } @@ -1391,8 +1391,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b diff --git a/components/browser_ui/settings/android/BUILD.gn b/components/browser_ui/settings/android/BUILD.gn --- a/components/browser_ui/settings/android/BUILD.gn +++ b/components/browser_ui/settings/android/BUILD.gn -@@ -90,6 +90,7 @@ android_resources("java_resources") { - "java/res/layout/managed_disclaimer_preference_for_radio_groups.xml", +@@ -92,6 +92,7 @@ android_resources("java_resources") { + "java/res/layout/preference_chrome_button.xml", "java/res/layout/preference_chrome_image_view.xml", "java/res/layout/preference_spinner.xml", + "java/res/layout/preference_spinner_single_widget.xml", @@ -1579,7 +1579,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b } android_library("javatests") { -@@ -205,6 +222,7 @@ robolectric_library("junit") { +@@ -208,6 +225,7 @@ robolectric_library("junit") { } android_resources("java_resources") { @@ -2306,7 +2306,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -@@ -360,6 +360,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -361,6 +361,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment } else { @ContentSetting Integer contentSetting = website.site().getContentSetting(browserContextHandle, type); @@ -2317,7 +2317,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (contentSetting != null) { return ContentSetting.BLOCK == contentSetting; } -@@ -551,6 +555,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -552,6 +556,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment ? new HashSet<>(getArguments().getStringArrayList(EXTRA_SELECTED_DOMAINS)) : null; @@ -2325,7 +2325,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c configureGlobalToggles(); if (mCategory.getType() == SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE) { RecordUserAction.record("DesktopSiteContentSetting.SettingsPage.Entered"); -@@ -586,7 +591,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -587,7 +592,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment if (queryHasChanged) getInfoForOrigins(); }); @@ -2335,7 +2335,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c MenuItem help = menu.add( Menu.NONE, -@@ -598,12 +604,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -599,12 +605,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment getResources(), R.drawable.ic_help_and_feedback, getContext().getTheme())); @@ -2356,7 +2356,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (mCategory.getType() == SiteSettingsCategory.Type.PROTECTED_MEDIA) { getSiteSettingsDelegate() .launchProtectedContentHelpAndFeedbackActivity(getActivity()); -@@ -681,6 +695,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -682,6 +696,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment public boolean onPreferenceChange(Preference preference, Object newValue) { BrowserContextHandle browserContextHandle = getBrowserContextHandle(); PrefService prefService = UserPrefs.get(browserContextHandle); @@ -2368,7 +2368,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (BINARY_RADIO_BUTTON_KEY.equals(preference.getKey()) || BINARY_TOGGLE_KEY.equals(preference.getKey())) { assert !mCategory.isManaged(); -@@ -855,7 +874,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -856,7 +875,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment ? R.string.website_settings_add_site_description_javascript_optimizer_block : R.string.website_settings_add_site_description_javascript_optimizer_allow; } @@ -2377,7 +2377,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } // OnPreferenceClickListener: -@@ -973,17 +992,15 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -974,17 +993,15 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment break; } @@ -2398,7 +2398,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c String exceptionDialogMessage = exceptionDialogMessageResourceId != 0 ? getString(exceptionDialogMessageResourceId) -@@ -994,7 +1011,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -995,7 +1012,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment getStyledContext(), ADD_EXCEPTION_KEY, exceptionDialogMessage, @@ -2407,7 +2407,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c mCategory, this)); -@@ -1178,8 +1195,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1179,8 +1196,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment private boolean isBlocked() { switch (mGlobalToggleLayout) { case GlobalToggleLayout.TRI_STATE_TOGGLE: @@ -2424,7 +2424,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c return (triStateToggle.getCheckedSetting() == ContentSetting.BLOCK); case GlobalToggleLayout.TRI_STATE_COOKIE_TOGGLE: TriStateCookieSettingsPreference triStateCookieToggle = -@@ -1332,7 +1357,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1333,7 +1358,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment } else if (res_id != -1) { infoText.setSummary(res_id); } else { @@ -2437,7 +2437,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } // Hide the anti-abuse text preferences, as needed. -@@ -1371,6 +1400,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1372,6 +1401,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment } else { screen.removePreference(mLocationTriStatePref); } @@ -2445,7 +2445,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c maybeShowReasonToggleDisabled(screen); -@@ -1579,6 +1609,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1580,6 +1610,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment iconIds = ContentSettingsResources.getTriStateSettingIconIDs(contentType); } triStateToggle.initialize( @@ -2453,8 +2453,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c setting, descriptionIds, iconIds, -@@ -1867,6 +1898,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment - selectedButton.setChecked(true); +@@ -1891,6 +1922,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment + setLocationAccessEnabled.accept(allowButton.isChecked()); } + AlertDialog.Builder alertDialogBuilder = @@ -2471,7 +2471,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java -@@ -57,6 +57,7 @@ import java.util.Collection; +@@ -58,6 +58,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -2479,7 +2479,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c /** Shows the permissions and other settings for a particular website. */ @NullMarked -@@ -200,7 +201,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -204,7 +205,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment case ContentSettingsType.WINDOW_MANAGEMENT: return "window_management_permission_list"; default: @@ -2488,7 +2488,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } } -@@ -631,7 +632,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -650,7 +651,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment private void setupContentSettingsPreferences() { Preference permissionsHeaderPref = findPreference(PREF_PERMISSIONS_HEADER); mMaxPermissionOrder = permissionsHeaderPref.getOrder(); @@ -2498,7 +2498,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c Preference preference = getPermissionPreference(type); preference.setKey(getPreferenceKey(type)); -@@ -663,6 +665,19 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -682,6 +684,19 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment } private Preference getPermissionPreference(@ContentSettingsType.EnumType int type) { @@ -2518,25 +2518,23 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c boolean isOneTime = isOneTime(type); if (type == ContentSettingsType.GEOLOCATION_WITH_OPTIONS && !isOneTime) { return createTwoActionLocationSwitchPreference(); -@@ -1258,7 +1273,16 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment - @ContentSetting @Nullable Integer value, - boolean isEmbargoed, - boolean isOneTime) { +@@ -1354,7 +1369,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment + value = ContentSetting.BLOCK; + } + - if (value == null) return; -+ @ContentSettingsType.EnumType -+ int content_type = getContentSettingsTypeFromPreferenceKey(preference.getKey()); + BromiteCustomContentSetting cs = -+ BromiteCustomContentSettingImpl.getContentSetting(content_type); ++ BromiteCustomContentSettingImpl.getContentSetting(contentType); + if (value == null && cs == null) return; + if (value == null) { + if (cs.showIntoInfoPage() == false) return; + value = WebsitePreferenceBridge.getDefaultContentSetting( -+ getSiteSettingsDelegate().getBrowserContextHandle(), content_type); ++ getSiteSettingsDelegate().getBrowserContextHandle(), contentType); + } setUpPreferenceCommon(preference, value); preference.setOnPreferenceChangeListener(this); - @ContentSettingsType.EnumType -@@ -1310,10 +1334,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment + +@@ -1404,10 +1426,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment oneTimePreference.setBackgroundColor(mHighlightColor); } } else { @@ -2555,7 +2553,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c AppCompatResources.getColorStateList(getContext(), mHighlightColor) .getDefaultColor()); } -@@ -1619,7 +1647,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1713,7 +1739,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment if (newValue instanceof Boolean) { permission = (Boolean) newValue ? getEnabledValue(type) : ContentSetting.BLOCK; } else { @@ -2769,7 +2767,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java -@@ -361,7 +361,11 @@ public final class Website implements WebsiteEntry { +@@ -368,7 +368,11 @@ public final class Website implements WebsiteEntry { RecordUserAction.record("SoundContentSetting.UnmuteBy.SiteSettings"); } } @@ -2924,7 +2922,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. namespace content_settings { -@@ -858,6 +859,7 @@ void ContentSettingsRegistry::Init() { +@@ -848,6 +849,7 @@ void ContentSettingsRegistry::Init() { WebsiteSettingsRegistry::PLATFORM_CHROMEOS, ContentSettingsInfo::INHERIT_IN_INCOGNITO, PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -3271,7 +3269,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.mojom b/components/content_settings/core/common/content_settings_types.mojom --- a/components/content_settings/core/common/content_settings_types.mojom +++ b/components/content_settings/core/common/content_settings_types.mojom -@@ -495,5 +495,7 @@ enum ContentSettingsType { +@@ -492,5 +492,7 @@ enum ContentSettingsType { // when suspicious warning is shown. If the user has selected this, the // notification permission will not be revoked based on suspicious verdict. SUSPICIOUS_NOTIFICATION_SHOW_ORIGINAL, @@ -3392,7 +3390,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoPermissionsController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoPermissionsController.java --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoPermissionsController.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoPermissionsController.java -@@ -203,6 +203,15 @@ public class PageInfoPermissionsController extends PageInfoPreferenceSubpageCont +@@ -241,6 +241,15 @@ public class PageInfoPermissionsController extends PageInfoPreferenceSubpageCont : perm1.nameMidSentence.toString()); } @@ -3419,7 +3417,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/content_settings/core/common/features.h" -@@ -205,6 +206,15 @@ void PageInfoControllerAndroid::SetPermissionInfo( +@@ -206,6 +207,15 @@ void PageInfoControllerAndroid::SetPermissionInfo( permissions_to_display.push_back(ContentSettingsType::LOCAL_NETWORK_ACCESS); } @@ -3434,8 +3432,8 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp + std::map user_specified_settings_to_display; - std::map -@@ -267,6 +277,14 @@ std::optional PageInfoControllerAndroid::GetSettingToDisplay( + +@@ -284,6 +294,14 @@ std::optional PageInfoControllerAndroid::GetSettingToDisplay( return permission.setting; } @@ -3461,10 +3459,10 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. #include "components/content_settings/browser/ui/cookie_controls_controller.h" #include "components/content_settings/core/browser/content_settings_registry.h" #include "components/content_settings/core/browser/content_settings_uma_util.h" -@@ -1405,6 +1406,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, - // via `HasContentSettingChangedViaPageInfo(type)`. - bool PageInfo::ShouldShowPermission( - const PageInfo::PermissionInfo& info) const { +@@ -1391,6 +1392,14 @@ bool PageInfo::ShouldShowPermission( + } + #endif // BUILDFLAG(IS_ANDROID) + + content_settings::WebsiteSettingsRegistry* website_settings = + content_settings::WebsiteSettingsRegistry::GetInstance(); + for (const content_settings::WebsiteSettingsInfo* winfo : *website_settings) { @@ -3476,7 +3474,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. // Note |ContentSettingsType::ADS| will show up regardless of its default // value when it has been activated on the current origin. if (info.type == ContentSettingsType::ADS) { -@@ -1532,7 +1541,19 @@ void PageInfo::PresentSitePermissions() { +@@ -1514,7 +1523,19 @@ void PageInfo::PresentSitePermissions() { HostContentSettingsMap* content_settings = GetContentSettings(); DCHECK(web_contents_); @@ -3603,7 +3601,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -70,6 +70,22 @@ +@@ -77,6 +77,22 @@ namespace blink { @@ -3629,18 +3627,18 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -43,6 +43,7 @@ - #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink-forward.h" +@@ -44,6 +44,7 @@ + #include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-blink-forward.h" #include "third_party/blink/public/mojom/permissions_policy/policy_disposition.mojom-blink-forward.h" #include "third_party/blink/public/mojom/v8_cache_options.mojom-blink-forward.h" +#include "third_party/blink/public/platform/web_content_settings_client.h" #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/execution_context/security_context.h" -@@ -101,6 +102,10 @@ class SecurityOrigin; - class ScriptState; - class ScriptWrappable; - class TrustedTypePolicyFactory; +@@ -135,6 +136,10 @@ class TrustedTypePolicyFactory; + class WebCodecsLogger; + class WebPrintingManager; + class WebViewAndroid; +class WebContentSettingsClient; + +CORE_EXPORT WebContentSettingsClient* GetContentSettingsClientFor( diff --git a/build/patches/Disable-css-preferred-text-scale.patch b/build/patches/Disable-css-preferred-text-scale.patch index e460ad75..b8931070 100644 --- a/build/patches/Disable-css-preferred-text-scale.patch +++ b/build/patches/Disable-css-preferred-text-scale.patch @@ -6,9 +6,12 @@ Do not expose the user's preferred font scale to CSS. License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - .../blink/common/features_cc/Disable-CSSPreferredTextScale.inc | 1 + - .../blink/renderer/platform/runtime_enabled_features.json5 | 3 +-- - 2 files changed, 2 insertions(+), 2 deletions(-) + .../common/features_cc/Disable-CSSPreferredTextScale.inc | 1 + + .../core/css/document_style_environment_variables.cc | 6 ++++-- + .../blink/renderer/core/css/style_environment_variables.cc | 4 +++- + third_party/blink/renderer/core/page/page.cc | 4 +++- + .../blink/renderer/platform/runtime_enabled_features.json5 | 3 +++ + 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc @@ -17,17 +20,61 @@ new file mode 100644 +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kCSSPreferredTextScale); +diff --git a/third_party/blink/renderer/core/css/document_style_environment_variables.cc b/third_party/blink/renderer/core/css/document_style_environment_variables.cc +--- a/third_party/blink/renderer/core/css/document_style_environment_variables.cc ++++ b/third_party/blink/renderer/core/css/document_style_environment_variables.cc +@@ -55,8 +55,10 @@ DocumentStyleEnvironmentVariables::DocumentStyleEnvironmentVariables( + StyleEnvironmentVariables& parent, + Document& document) + : StyleEnvironmentVariables(parent), document_(&document) { +- SetPreferredTextScale( +- document_->GetSettings()->GetAccessibilityFontScaleFactor()); ++ if (RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) { ++ SetPreferredTextScale( ++ document_->GetSettings()->GetAccessibilityFontScaleFactor()); ++ } + } + + void DocumentStyleEnvironmentVariables::RecordVariableUsage( +diff --git a/third_party/blink/renderer/core/css/style_environment_variables.cc b/third_party/blink/renderer/core/css/style_environment_variables.cc +--- a/third_party/blink/renderer/core/css/style_environment_variables.cc ++++ b/third_party/blink/renderer/core/css/style_environment_variables.cc +@@ -49,7 +49,9 @@ void SetDefaultEnvironmentVariables(StyleEnvironmentVariables* instance) { + instance->SetVariable(UADefinedVariable::kKeyboardInsetHeight, + kKeyboardInsetDefault); + +- instance->SetVariable(UADefinedVariable::kPreferredTextScale, "1"); ++ if (RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) { ++ instance->SetVariable(UADefinedVariable::kPreferredTextScale, "1"); ++ } + } + + } // namespace. +diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc +--- a/third_party/blink/renderer/core/page/page.cc ++++ b/third_party/blink/renderer/core/page/page.cc +@@ -1056,7 +1056,9 @@ void Page::SettingsChanged(ChangeType change_type) { + } + break; + case ChangeType::kFontScaleFactor: +- ++ if (!RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) { ++ break; ++ } + for (Frame* frame = MainFrame(); frame; + frame = frame->Tree().TraverseNext()) { + LocalFrame* local_frame = DynamicTo(frame); diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1548,8 +1548,7 @@ +@@ -1582,6 +1582,9 @@ + name: "CSSPositionStickyStaticScrollPosition", status: "test", }, - { -- name: "CSSPreferredTextScale", -- status: "stable", ++ { + name: "CSSPreferredTextScale", status: "test", public: true - }, ++ }, // https://drafts.csswg.org/css-values-5/#progress // progress() + { -- diff --git a/build/patches/Enable-Global-Privacy-Control.patch b/build/patches/Enable-Global-Privacy-Control.patch index 4c69d898..62e9290e 100644 --- a/build/patches/Enable-Global-Privacy-Control.patch +++ b/build/patches/Enable-Global-Privacy-Control.patch @@ -20,7 +20,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../settings/privacy_page/gpc_toggle.ts | 112 ++++++++++++++++++ .../Enable-Global-Privacy-Control.grdp | 15 +++ chrome/browser/ui/prefs/pref_watcher.cc | 4 + - chrome/browser/ui/prefs/pref_watcher.h | 1 + + chrome/browser/ui/prefs/pref_watcher.h | 2 + .../settings_localized_strings_provider.cc | 3 + .../tracking_protection_prefs.cc | 1 + .../tracking_protection_prefs.h | 2 + @@ -46,7 +46,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../web_service_worker_fetch_context_impl.cc | 3 + ...shared_worker_global_scope_context_impl.cc | 3 + .../platform/runtime_enabled_features.json5 | 5 + - 42 files changed, 390 insertions(+) + 42 files changed, 391 insertions(+) create mode 100644 chrome/android/java/res/xml/gpc_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/GpcSettings.java create mode 100644 chrome/browser/resources/settings/privacy_page/gpc_toggle.html @@ -61,7 +61,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -656,6 +656,7 @@ chrome_java_resources = [ +@@ -675,6 +675,7 @@ chrome_java_resources = [ "java/res/xml/contextual_search_preferences.xml", "java/res/xml/developer_preferences.xml", "java/res/xml/do_not_track_preferences.xml", @@ -72,7 +72,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -940,6 +940,7 @@ chrome_java_sources = [ +@@ -953,6 +953,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java", "java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java", "java/src/org/chromium/chrome/browser/policy/PolicyAuditorBridge.java", @@ -103,7 +103,7 @@ new file mode 100644 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -54,6 +54,10 @@ found in the LICENSE file. +@@ -48,6 +48,10 @@ found in the LICENSE file. android:key="do_not_track" android:title="@string/do_not_track_title" android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" /> @@ -178,7 +178,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -127,6 +127,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -128,6 +128,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private static final String PREF_HTTPS_FIRST_MODE_LEGACY = "https_first_mode_legacy"; private static final String PREF_SECURE_DNS = "secure_dns"; private static final String PREF_USAGE_STATS = "usage_stats_reporting"; @@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_SAFE_BROWSING = "safe_browsing"; private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection"; private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; -@@ -575,6 +576,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -567,6 +568,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment : R.string.text_off); } @@ -204,7 +204,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -1928,6 +1928,21 @@ +@@ -1943,6 +1943,21 @@ Learn more about Do Not Track @@ -229,7 +229,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -415,6 +415,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -419,6 +419,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { (*s_allowlist)[::prefs::kTrackingProtectionLevel] = settings_api::PrefType::kNumber; (*s_allowlist)[::prefs::kEnableDoNotTrack] = settings_api::PrefType::kBoolean; @@ -240,10 +240,10 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc --- a/chrome/browser/renderer_preferences_util.cc +++ b/chrome/browser/renderer_preferences_util.cc -@@ -146,6 +146,9 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs, +@@ -152,6 +152,9 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs, + prefs->referrers_policy = pref_service->GetInteger(prefs::kReferrersPolicy); prefs->enable_do_not_track = - TrackingProtectionSettingsFactory::GetForProfile(profile) - ->IsDoNotTrackEnabled(); + pref_service->GetBoolean(prefs::kEnableDoNotTrack); + prefs->enable_gpc = + TrackingProtectionSettingsFactory::GetForProfile(profile) + ->IsGPCEnabled(); @@ -253,10 +253,10 @@ diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/render diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -130,6 +130,7 @@ build_webui("build") { +@@ -129,6 +129,7 @@ build_webui("build") { + "performance_page/tab_discard/exception_tabbed_add_dialog.ts", "privacy_page/cookies_page.ts", "privacy_page/do_not_track_toggle.ts", - "privacy_page/incognito_tracking_protections_page.ts", + "privacy_page/gpc_toggle.ts", "privacy_page/personalization_options.ts", "privacy_page/privacy_guide/privacy_guide_ad_topics_fragment.ts", @@ -264,7 +264,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/privacy_page/cookies_page.html b/chrome/browser/resources/settings/privacy_page/cookies_page.html --- a/chrome/browser/resources/settings/privacy_page/cookies_page.html +++ b/chrome/browser/resources/settings/privacy_page/cookies_page.html -@@ -205,6 +205,8 @@ +@@ -206,6 +206,8 @@ @@ -276,7 +276,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/cookies_page.html b/ diff --git a/chrome/browser/resources/settings/privacy_page/cookies_page.ts b/chrome/browser/resources/settings/privacy_page/cookies_page.ts --- a/chrome/browser/resources/settings/privacy_page/cookies_page.ts +++ b/chrome/browser/resources/settings/privacy_page/cookies_page.ts -@@ -20,6 +20,7 @@ import '../privacy_icons.html.js'; +@@ -22,6 +22,7 @@ import '../privacy_icons.html.js'; import '../settings_page/settings_subpage.js'; import '../settings_shared.css.js'; import '../site_settings/site_list.js'; @@ -461,7 +461,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/pref_watcher.cc --- a/chrome/browser/ui/prefs/pref_watcher.cc +++ b/chrome/browser/ui/prefs/pref_watcher.cc -@@ -175,6 +175,10 @@ void PrefWatcher::OnDoNotTrackEnabledChanged() { +@@ -199,6 +199,10 @@ void PrefWatcher::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) { UpdateRendererPreferences(); } @@ -475,18 +475,19 @@ diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/p diff --git a/chrome/browser/ui/prefs/pref_watcher.h b/chrome/browser/ui/prefs/pref_watcher.h --- a/chrome/browser/ui/prefs/pref_watcher.h +++ b/chrome/browser/ui/prefs/pref_watcher.h -@@ -44,6 +44,7 @@ class PrefWatcher : public KeyedService, +@@ -41,6 +41,8 @@ class PrefWatcher : public KeyedService, + // ui::NativeThemeObserver: void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override; - void OnDoNotTrackEnabledChanged() override; + void OnGPCEnabledChanged() override; - ++ void UpdateRendererPreferences(); void OnWebPrefChanged(const std::string& pref_name); + void OnLiveCaptionEnabledPrefChanged(const std::string& pref_name); diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2140,6 +2140,9 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -2166,6 +2166,9 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"doNotTrackDialogMessage", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT}, {"doNotTrackDialogLearnMoreA11yLabel", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_LEARN_MORE_ACCESSIBILITY_LABEL}, @@ -499,7 +500,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide diff --git a/components/privacy_sandbox/tracking_protection_prefs.cc b/components/privacy_sandbox/tracking_protection_prefs.cc --- a/components/privacy_sandbox/tracking_protection_prefs.cc +++ b/components/privacy_sandbox/tracking_protection_prefs.cc -@@ -17,6 +17,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -16,6 +16,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( prefs::kFingerprintingProtectionEnabled, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); @@ -510,9 +511,9 @@ diff --git a/components/privacy_sandbox/tracking_protection_prefs.cc b/component diff --git a/components/privacy_sandbox/tracking_protection_prefs.h b/components/privacy_sandbox/tracking_protection_prefs.h --- a/components/privacy_sandbox/tracking_protection_prefs.h +++ b/components/privacy_sandbox/tracking_protection_prefs.h -@@ -108,6 +108,8 @@ inline constexpr char kFingerprintingProtectionEnabled[] = - // Whether to send the DNT header. - inline constexpr char kEnableDoNotTrack[] = "enable_do_not_track"; +@@ -101,6 +101,8 @@ inline constexpr char kIpProtectionInitializedByDogfood[] = + inline constexpr char kFingerprintingProtectionEnabled[] = + "tracking_protection.fingerprinting_protection_enabled"; +inline constexpr char kEnableGPC[] = "enable_gpc"; + @@ -524,7 +525,7 @@ diff --git a/components/privacy_sandbox/tracking_protection_settings.cc b/compon +++ b/components/privacy_sandbox/tracking_protection_settings.cc @@ -48,6 +48,11 @@ TrackingProtectionSettings::TrackingProtectionSettings( base::BindRepeating( - &TrackingProtectionSettings::OnDoNotTrackEnabledPrefChanged, + &TrackingProtectionSettings::OnIpProtectionPrefChanged, base::Unretained(this))); + pref_change_registrar_.Add( + prefs::kEnableGPC, @@ -532,9 +533,9 @@ diff --git a/components/privacy_sandbox/tracking_protection_settings.cc b/compon + &TrackingProtectionSettings::OnGPCEnabledPrefChanged, + base::Unretained(this))); pref_change_registrar_.Add( - prefs::kIpProtectionEnabled, + prefs::kBlockAll3pcToggleEnabled, base::BindRepeating( -@@ -218,6 +223,16 @@ void TrackingProtectionSettings::OnDoNotTrackEnabledPrefChanged() { +@@ -135,6 +140,16 @@ void TrackingProtectionSettings::OnEnterpriseControlForPrefsChanged() { } } @@ -554,19 +555,19 @@ diff --git a/components/privacy_sandbox/tracking_protection_settings.cc b/compon diff --git a/components/privacy_sandbox/tracking_protection_settings.h b/components/privacy_sandbox/tracking_protection_settings.h --- a/components/privacy_sandbox/tracking_protection_settings.h +++ b/components/privacy_sandbox/tracking_protection_settings.h -@@ -65,6 +65,8 @@ class TrackingProtectionSettings : public KeyedService, - // Returns whether "do not track" is enabled. - bool IsDoNotTrackEnabled() const; +@@ -49,6 +49,8 @@ class TrackingProtectionSettings : public KeyedService { + void AddObserver(TrackingProtectionSettingsObserver* observer); + void RemoveObserver(TrackingProtectionSettingsObserver* observer); + bool IsGPCEnabled() const; + // Returns whether tracking protection for 3PCD (prefs + UX) is enabled. bool IsTrackingProtection3pcdEnabled() const; -@@ -111,6 +113,7 @@ class TrackingProtectionSettings : public KeyedService, +@@ -70,6 +72,7 @@ class TrackingProtectionSettings : public KeyedService { + void OnEnterpriseControlForPrefsChanged(); // Callbacks for pref observation. - void OnDoNotTrackEnabledPrefChanged(); + void OnGPCEnabledPrefChanged(); void OnBlockAllThirdPartyCookiesPrefChanged(); void OnTrackingProtection3pcdPrefChanged(); @@ -574,9 +575,9 @@ diff --git a/components/privacy_sandbox/tracking_protection_settings.h b/compone diff --git a/components/privacy_sandbox/tracking_protection_settings_observer.h b/components/privacy_sandbox/tracking_protection_settings_observer.h --- a/components/privacy_sandbox/tracking_protection_settings_observer.h +++ b/components/privacy_sandbox/tracking_protection_settings_observer.h -@@ -24,6 +24,8 @@ class TrackingProtectionSettingsObserver { - // For observation of DNT. - virtual void OnDoNotTrackEnabledChanged() {} +@@ -21,6 +21,8 @@ class TrackingProtectionSettingsObserver { + + virtual ~TrackingProtectionSettingsObserver() = default; + virtual void OnGPCEnabledChanged() {} + @@ -602,7 +603,7 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4403,6 +4403,10 @@ void RenderFrameImpl::FinalizeRequestInternal( +@@ -4458,6 +4458,10 @@ void RenderFrameImpl::FinalizeRequestInternal( request.SetHttpHeaderField( blink::WebString::FromUTF8(blink::kDoNotTrackHeader), "1"); } @@ -686,7 +687,7 @@ diff --git a/third_party/blink/public/mojom/renderer_preferences.mojom b/third_p diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1283,6 +1283,11 @@ static_idl_files_in_modules = [ +@@ -1276,6 +1276,11 @@ static_idl_files_in_modules = [ "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl", ] @@ -701,7 +702,7 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_part diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -3620,6 +3620,9 @@ void WebViewImpl::UpdateRendererPreferences( +@@ -3605,6 +3605,9 @@ void WebViewImpl::UpdateRendererPreferences( GetSettings()->SetCaretBrowsingEnabled( renderer_preferences_.caret_browsing_enabled); @@ -714,7 +715,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn -@@ -169,6 +169,10 @@ component("modules") { +@@ -167,6 +167,10 @@ component("modules") { "//third_party/blink/renderer/modules/xr", ] @@ -826,7 +827,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicat diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -3267,6 +3267,11 @@ +@@ -3374,6 +3374,11 @@ status: "stable", base_feature: "none", }, diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index eaf1172f..0da68e7a 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -16,7 +16,7 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../settings/PasswordSettings.java | 84 ++++++++++++++++++- - .../chrome/browser/settings/MainSettings.java | 16 +--- + .../chrome/browser/settings/MainSettings.java | 17 +--- .../chromium/chrome/browser/tab/TabImpl.java | 42 ++++++++-- chrome/browser/android/tab_android.cc | 4 +- chrome/browser/autofill/android/BUILD.gn | 2 +- @@ -42,10 +42,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/foundations/autofill_manager.h | 2 + .../foundations/browser_autofill_manager.cc | 2 + .../foundations/browser_autofill_manager.h | 2 + - .../autofill/core/common/autofill_features.cc | 1 - .../autofill/core/common/autofill_prefs.cc | 4 +- .../autofill/core/common/autofill_prefs.h | 5 ++ - 30 files changed, 238 insertions(+), 121 deletions(-) + 29 files changed, 238 insertions(+), 121 deletions(-) create mode 100644 components/android_autofill/browser/java/src/org/chromium/components/autofill/BrowserSelectionActionMenuDelegate.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java @@ -187,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -@@ -465,20 +465,8 @@ public class MainSettings extends ChromeBaseSettingsFragment +@@ -579,21 +579,8 @@ public class MainSettings extends ChromeBaseSettingsFragment } private void updateAutofillPreferences() { @@ -196,7 +195,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe - Preference autofillOptionsPreference = findPreference(PREF_AUTOFILL_OPTIONS); - autofillOptionsPreference.setFragment(null); - autofillOptionsPreference.setOnPreferenceClickListener( -- unused -> { +- preference -> { +- onPreferenceSelected(preference); - SettingsNavigationFactory.createSettingsNavigation() - .startSettings( - getContext(), @@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe + removePreferenceIfPresent(PREF_AUTOFILL_OPTIONS); findPreference(PREF_AUTOFILL_PAYMENTS) .setOnPreferenceClickListener( - preference -> + preference -> { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java @@ -227,19 +227,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav /** * Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}. This * class is not intended to be extended. -@@ -1269,6 +1276,11 @@ class TabImpl implements Tab { - for (TabObserver observer : mObservers) observer.onDestroyed(this); - mObservers.clear(); +@@ -1286,6 +1293,11 @@ class TabImpl implements Tab { + } + mObservers.clear(); + if (mAutofillProvider != null) { + mAutofillProvider.destroy(); + mAutofillProvider = null; + } + - mUserDataHost.destroy(); + if (!abortNavigationsFromTabClosures) mUserDataHost.destroy(); mTabViewManager.destroy(); hideNativePage(false, null); -@@ -1612,7 +1624,7 @@ class TabImpl implements Tab { +@@ -1636,7 +1648,7 @@ class TabImpl implements Tab { * @return iff the AutofillProvider should provide a ViewStructure when prompted. */ boolean providesAutofillStructure() { @@ -248,7 +248,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav if (mProfile == null || !mProfile.isNativeInitialized()) { return false; } -@@ -2378,16 +2390,21 @@ class TabImpl implements Tab { +@@ -2402,16 +2414,21 @@ class TabImpl implements Tab { * @return true if the the provider is available for the given WebContents. */ private boolean prepareAutofillProvider(WebContents newWebContents) { @@ -276,7 +276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav // TODO: crbug.com/432447902 — Provide only an activity context and push changes. mAutofillProvider = new AutofillProvider( -@@ -2397,7 +2414,16 @@ class TabImpl implements Tab { +@@ -2421,7 +2438,16 @@ class TabImpl implements Tab { getContext().getString(R.string.app_name)); TabImplJni.get().initializeAutofillIfNecessary(mNativeTabAndroid); } @@ -305,7 +305,7 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_ #include "chrome/browser/ui/android/context_menu_helper.h" #include "chrome/browser/ui/android/tab_model/tab_model.h" #include "chrome/browser/ui/android/tab_model/tab_model_list.h" -@@ -447,8 +448,7 @@ void TabAndroid::InitializeAutofillIfNecessary(JNIEnv* env) { +@@ -451,8 +452,7 @@ void TabAndroid::InitializeAutofillIfNecessary(JNIEnv* env) { ->MaybeInitKeyboardSuppressor(); return; } @@ -318,7 +318,7 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_ diff --git a/chrome/browser/autofill/android/BUILD.gn b/chrome/browser/autofill/android/BUILD.gn --- a/chrome/browser/autofill/android/BUILD.gn +++ b/chrome/browser/autofill/android/BUILD.gn -@@ -161,7 +161,7 @@ android_library("bottom_sheet_utils_java") { +@@ -164,7 +164,7 @@ android_library("bottom_sheet_utils_java") { generate_jni("jni_headers") { sources = [ "java/src/org/chromium/chrome/browser/autofill/AddressNormalizerFactory.java", @@ -355,7 +355,7 @@ diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -317,6 +317,12 @@ CHAR_LIMIT guidelines: +@@ -329,6 +329,12 @@ CHAR_LIMIT guidelines: You and Google @@ -382,8 +382,9 @@ diff --git a/chrome/browser/ui/autofill/autofill_client_provider.cc b/chrome/bro namespace autofill { -namespace { -- --#if BUILDFLAG(IS_ANDROID) + ++AutofillClientProvider::AutofillClientProvider(PrefService* prefs) { + #if BUILDFLAG(IS_ANDROID) -void RecordAvailabilityStatus(AndroidAutofillAvailabilityStatus availability) { - base::UmaHistogramEnumeration("Autofill.AndroidAutofillAvailabilityStatus", - availability); @@ -441,14 +442,13 @@ diff --git a/chrome/browser/ui/autofill/autofill_client_provider.cc b/chrome/bro - return false; -#endif // BUILDFLAG(IS_ANDROID) -} - +- -} // namespace - -AutofillClientProvider::AutofillClientProvider(PrefService* prefs) - : uses_platform_autofill_( - UsesVirtualViewStructureForAutofill(CHECK_DEREF(prefs))) { -+AutofillClientProvider::AutofillClientProvider(PrefService* prefs) { - #if BUILDFLAG(IS_ANDROID) +-#if BUILDFLAG(IS_ANDROID) - RecordWhetherAndroidPrefResets(*prefs, uses_platform_autofill_); - // Ensure the pref is reset if platform autofill is restricted. prefs->SetBoolean(prefs::kAutofillUsingVirtualViewStructure, @@ -495,7 +495,7 @@ diff --git a/chrome/browser/ui/autofill/autofill_client_provider.h b/chrome/brow diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -406,9 +406,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -375,9 +375,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { web_contents); ChainedBackNavigationTracker::CreateForWebContents(web_contents); chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents); @@ -649,7 +649,7 @@ new file mode 100644 diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc --- a/components/autofill/content/browser/content_autofill_driver.cc +++ b/components/autofill/content/browser/content_autofill_driver.cc -@@ -275,6 +275,13 @@ void RouteToManager(ContentAutofillDriver& source, +@@ -277,6 +277,13 @@ void RouteToManager(ContentAutofillDriver& source, AutofillManager& manager = target.GetAutofillManager(); (manager.* manager_fun)(WithNewVersion(std::forward(args))...); @@ -663,7 +663,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }, source, Lift(source, std::forward(args))...); } -@@ -665,6 +672,10 @@ ContentAutofillDriver::GetAutofillAgent() { +@@ -679,6 +686,10 @@ ContentAutofillDriver::GetAutofillAgent() { return autofill_agent_; } @@ -690,7 +690,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com content::RenderFrameHost* render_frame_host() { return &*render_frame_host_; } const content::RenderFrameHost* render_frame_host() const { return &*render_frame_host_; -@@ -310,6 +316,10 @@ class ContentAutofillDriver : public AutofillDriver, +@@ -312,6 +318,10 @@ class ContentAutofillDriver : public AutofillDriver, // The factory that created this driver. Outlives `this`. const raw_ref owner_; @@ -733,7 +733,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc --- a/components/autofill/content/renderer/autofill_agent.cc +++ b/components/autofill/content/renderer/autofill_agent.cc -@@ -1547,14 +1547,19 @@ void AutofillAgent::ShowSuggestions( +@@ -1403,14 +1403,19 @@ void AutofillAgent::ShowSuggestions( password_generation_agent_->ShowPasswordGenerationSuggestions( input_element, form_cache)) { is_popup_possibly_visible_ = true; @@ -756,7 +756,7 @@ diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc --- a/components/autofill/content/renderer/password_autofill_agent.cc +++ b/components/autofill/content/renderer/password_autofill_agent.cc -@@ -851,7 +851,10 @@ void PasswordAutofillAgent::UpdatePasswordStateForTextChange( +@@ -852,7 +852,10 @@ void PasswordAutofillAgent::UpdatePasswordStateForTextChange( void PasswordAutofillAgent::TrackAutofilledElement( const WebFormControlElement& element) { @@ -771,7 +771,7 @@ diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/c diff --git a/components/autofill/core/browser/foundations/autofill_driver.h b/components/autofill/core/browser/foundations/autofill_driver.h --- a/components/autofill/core/browser/foundations/autofill_driver.h +++ b/components/autofill/core/browser/foundations/autofill_driver.h -@@ -151,6 +151,8 @@ class AutofillDriver { +@@ -172,6 +172,8 @@ class AutofillDriver { // Returns the AutofillManager owned by the AutofillDriver. virtual AutofillManager& GetAutofillManager() = 0; @@ -797,7 +797,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_driver_factor diff --git a/components/autofill/core/browser/foundations/autofill_manager.h b/components/autofill/core/browser/foundations/autofill_manager.h --- a/components/autofill/core/browser/foundations/autofill_manager.h +++ b/components/autofill/core/browser/foundations/autofill_manager.h -@@ -238,6 +238,8 @@ class AutofillManager +@@ -239,6 +239,8 @@ class AutofillManager LifecycleState new_state, base::PassKey pass_key); @@ -809,15 +809,15 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.h b/c diff --git a/components/autofill/core/browser/foundations/browser_autofill_manager.cc b/components/autofill/core/browser/foundations/browser_autofill_manager.cc --- a/components/autofill/core/browser/foundations/browser_autofill_manager.cc +++ b/components/autofill/core/browser/foundations/browser_autofill_manager.cc -@@ -828,6 +828,8 @@ base::WeakPtr BrowserAutofillManager::GetWeakPtr() { +@@ -811,6 +811,8 @@ base::WeakPtr BrowserAutofillManager::GetWeakPtr() { return weak_ptr_factory_.GetWeakPtr(); } +bool BrowserAutofillManager::IsAndroidAutofill() const { return false; } + - CreditCardAccessManager& BrowserAutofillManager::GetCreditCardAccessManager() { + CreditCardAccessManager* BrowserAutofillManager::GetCreditCardAccessManager() { if (!credit_card_access_manager_) { - credit_card_access_manager_ = std::make_unique( + credit_card_access_manager_ = diff --git a/components/autofill/core/browser/foundations/browser_autofill_manager.h b/components/autofill/core/browser/foundations/browser_autofill_manager.h --- a/components/autofill/core/browser/foundations/browser_autofill_manager.h +++ b/components/autofill/core/browser/foundations/browser_autofill_manager.h @@ -830,21 +830,10 @@ diff --git a/components/autofill/core/browser/foundations/browser_autofill_manag // Whether the `trigger_field` should show an entry to scan a credit card. bool ShouldShowScanCreditCard(const FormStructure& form, const AutofillField& trigger_field); -diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc ---- a/components/autofill/core/common/autofill_features.cc -+++ b/components/autofill/core/common/autofill_features.cc -@@ -871,7 +871,6 @@ BASE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid, - // virtual view structures to third party providers. - BASE_FEATURE(kAutofillThirdPartyModeContentProvider, - base::FEATURE_ENABLED_BY_DEFAULT); -- - #endif // BUILDFLAG(IS_ANDROID) - - // Defines if the "Your Saved Info" page is eligible to be shown in Chrome diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc -@@ -75,6 +75,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -78,6 +78,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(kAutofillCreditCardFidoAuthOfferCheckboxState, true); #endif @@ -853,7 +842,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto registry->RegisterIntegerPref(kAutocompleteLastVersionRetentionPolicy, 0); registry->RegisterStringPref(kAutofillUploadEncodingSeed, ""); registry->RegisterDictionaryPref(kAutofillVoteUploadEvents); -@@ -114,7 +116,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -117,7 +119,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -865,7 +854,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto diff --git a/components/autofill/core/common/autofill_prefs.h b/components/autofill/core/common/autofill_prefs.h --- a/components/autofill/core/common/autofill_prefs.h +++ b/components/autofill/core/common/autofill_prefs.h -@@ -140,6 +140,11 @@ inline constexpr char kAutofillWasNameAndEmailProfileUsed[] = +@@ -151,6 +151,11 @@ inline constexpr char kAutofillWasNameAndEmailProfileUsed[] = // retention policy was run. inline constexpr char kAutocompleteLastVersionRetentionPolicy[] = "autocomplete.retention_policy_last_version"; @@ -875,6 +864,6 @@ diff --git a/components/autofill/core/common/autofill_prefs.h b/components/autof +inline constexpr char kAutofillAndroidIncognitoEnabled[] = + "autofill.android_autofill_incognito_enabled"; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_IOS) + BUILDFLAG(IS_IOS) || BUILDFLAG(IS_CHROMEOS) // Boolean that is set when payment methods mandatory re-auth is enabled by the -- diff --git a/build/patches/Enable-snackbar-swipe.patch b/build/patches/Enable-snackbar-swipe.patch index 0efad72a..e0b50078 100644 --- a/build/patches/Enable-snackbar-swipe.patch +++ b/build/patches/Enable-snackbar-swipe.patch @@ -6,8 +6,8 @@ Allows swipe of snackbar notifications License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - .../ui/messages/snackbar/SnackbarView.java | 78 ++++++++++++++++++- - 1 file changed, 76 insertions(+), 2 deletions(-) + .../ui/messages/snackbar/SnackbarView.java | 84 +++++++++++++++++-- + 1 file changed, 76 insertions(+), 8 deletions(-) diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java @@ -24,7 +24,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro import android.view.Gravity; import android.view.LayoutInflater; import android.view.SurfaceView; -@@ -34,6 +36,9 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; +@@ -33,6 +35,9 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerFactory; import org.chromium.chrome.ui.messages.R; import org.chromium.components.browser_ui.styles.SemanticColorUtils; @@ -34,7 +34,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro import org.chromium.components.browser_ui.widget.text.TemplatePreservingTextView; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.edge_to_edge.EdgeToEdgePadAdjuster; -@@ -47,7 +52,7 @@ import org.chromium.ui.interpolators.Interpolators; +@@ -46,7 +51,7 @@ import org.chromium.ui.interpolators.Interpolators; // TODO (jianli): Change this class and its methods back to package protected after the offline // indicator experiment is done. @NullMarked @@ -43,7 +43,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro private static final int MAX_LINES = 5; private static final int DEFAULT_LINES = 2; -@@ -89,6 +94,16 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { +@@ -88,6 +93,16 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { } }; @@ -60,10 +60,16 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro /** * Creates an instance of the {@link SnackbarView}. * -@@ -150,7 +165,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { +@@ -147,13 +162,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { // Make sure clicks are not consumed by content beneath the container view. mContainerView.setClickable(true); +- mContainerView.setOnClickListener((event) -> manager.resetSnackbarTimeout()); +- mContainerView.setOnTouchListener( +- (view, event) -> { +- mContainerView.performClick(); +- return true; +- }); - + mSwipeGestureListener = new SwipeGestureListenerImpl(mContainerView.getContext(), this); + if (!snackbar.isTypePersistent()) { @@ -74,7 +80,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro mSnackbarView = mContainerView.findViewById(R.id.snackbar); mAnimationDuration = mContainerView.getResources().getInteger(android.R.integer.config_mediumAnimTime); -@@ -505,4 +525,58 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { +@@ -508,4 +522,58 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { public @Nullable EdgeToEdgePadAdjuster getEdgeToEdgePadAdjusterForTesting() { return mEdgeToEdgePadAdjuster; } diff --git a/build/patches/Experimental-support-for-extensions-on-Android.patch b/build/patches/Experimental-support-for-extensions-on-Android.patch index 20fecbe2..8ff7fa6d 100644 --- a/build/patches/Experimental-support-for-extensions-on-Android.patch +++ b/build/patches/Experimental-support-for-extensions-on-Android.patch @@ -36,20 +36,19 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../ChromeSiteSettingsDelegate.java | 2 +- .../site_settings/ManageSpaceActivity.java | 20 ++++++ ...InterceptNavigationDelegateClientImpl.java | 2 +- - .../browser/tab/RequestDesktopUtils.java | 6 +- - .../tab/TabContextMenuItemDelegate.java | 8 ++- + .../browser/tab/RequestDesktopUtils.java | 2 +- .../TabbedAppMenuPropertiesDelegate.java | 2 +- .../tabbed_mode/TabbedRootUiCoordinator.java | 2 +- .../chrome/browser/ui/RootUiCoordinator.java | 2 +- chrome/app/extensions_strings.grdp | 7 ++ chrome/app/theme/theme_resources.grd | 4 +- chrome/browser/BUILD.gn | 8 +-- - chrome/browser/about_flags.cc | 6 +- + chrome/browser/about_flags.cc | 4 ++ ...chrome_selection_dropdown_menu_delegate.cc | 4 +- .../bookmarks/bar/BookmarkBarUtils.java | 6 +- .../bar/BookmarkBarVisibilityProvider.java | 2 +- chrome/browser/browser_process_impl.cc | 2 +- - chrome/browser/chrome_browser_field_trials.cc | 72 +++++++++---------- + chrome/browser/chrome_browser_field_trials.cc | 70 +++++++++---------- .../chrome_browser_interface_binders_webui.cc | 4 +- .../browser/chrome_content_browser_client.cc | 4 +- chrome/browser/devtools/BUILD.gn | 2 +- @@ -60,7 +59,6 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../browser/extensions/extension_management.h | 2 +- chrome/browser/extensions/extension_util.cc | 11 +++ .../feedback/DeviceInfoFeedbackSource.java | 2 +- - chrome/browser/file_system_access/BUILD.gn | 2 +- chrome/browser/media/router/BUILD.gn | 4 +- .../browser/media/router/discovery/BUILD.gn | 2 +- .../media/router/media_router_feature.cc | 10 +-- @@ -111,14 +109,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../ui/browser_window/internal/BUILD.gn | 2 +- chrome/browser/ui/prefs/BUILD.gn | 4 +- chrome/browser/ui/prefs/prefs_tab_helper.cc | 10 +-- - chrome/browser/ui/tab_contents/BUILD.gn | 2 +- chrome/browser/ui/tabs/tab_list_interface.h | 4 +- chrome/browser/ui/webid/BUILD.gn | 2 +- .../browser/ui/webui/chrome_web_ui_configs.cc | 4 +- .../browser/ui/webui/current_channel_logo.cc | 2 +- .../browser/ui/webui/discards/discards_ui.cc | 8 +-- chrome/chrome_paks.gni | 2 +- - chrome/common/BUILD.gn | 2 +- chrome/common/chrome_switches.cc | 2 +- chrome/common/chrome_switches.h | 2 +- chrome/common/extensions/api/api_sources.gni | 7 ++ @@ -180,13 +176,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html ui/base/accelerators/command.cc | 2 +- ui/base/device_form_factor_android.cc | 2 +- ui/gl/features.gni | 2 +- - ui/gl/gl_switches.cc | 4 +- ui/resources/ui_resources.grd | 2 +- ui/webui/resources/BUILD.gn | 4 +- ui/webui/resources/cr_elements/BUILD.gn | 2 +- .../cr_elements/cr_toolbar/cr_toolbar.css | 6 ++ ui/webui/resources/css/BUILD.gn | 2 +- - 174 files changed, 572 insertions(+), 289 deletions(-) + 169 files changed, 557 insertions(+), 278 deletions(-) create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Enable-extensions-Android.grdp create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Extensions-Android.grdp create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Extensions-Android.inc @@ -194,7 +189,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn --- a/android_webview/BUILD.gn +++ b/android_webview/BUILD.gn -@@ -1303,7 +1303,7 @@ declare_args() { +@@ -1301,7 +1301,7 @@ declare_args() { # logic more easily on an emulator, so the decision to use the arm64 # orderfile for x64 (instead of arm32) is somewhat arbitrary. We just # needed to use some real orderfile. @@ -206,7 +201,7 @@ diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn diff --git a/base/android/device_info.cc b/base/android/device_info.cc --- a/base/android/device_info.cc +++ b/base/android/device_info.cc -@@ -100,10 +100,14 @@ bool is_foldable() { +@@ -104,10 +104,14 @@ bool is_foldable() { return get_device_info().isFoldable; } @@ -222,7 +217,7 @@ diff --git a/base/android/device_info.cc b/base/android/device_info.cc // Available only on Android T+. int32_t vulkan_deqp_level() { return get_device_info().vulkanDeqpLevel; -@@ -119,7 +123,7 @@ bool is_xr() { +@@ -123,7 +127,7 @@ bool is_xr() { // check) as a first choice, but fall back to this if not feasible. bool is_tablet() { return was_launched_on_large_display() && !is_tv() && !is_automotive() && @@ -247,7 +242,7 @@ diff --git a/base/android/device_info.h b/base/android/device_info.h diff --git a/base/android/java/src/org/chromium/base/DeviceInfo.java b/base/android/java/src/org/chromium/base/DeviceInfo.java --- a/base/android/java/src/org/chromium/base/DeviceInfo.java +++ b/base/android/java/src/org/chromium/base/DeviceInfo.java -@@ -119,10 +119,14 @@ public final class DeviceInfo { +@@ -128,10 +128,14 @@ public final class DeviceInfo { return getInstance().mIDeviceInfo.isFoldable; } @@ -292,7 +287,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni --- a/build/config/chrome_build.gni +++ b/build/config/chrome_build.gni -@@ -26,7 +26,8 @@ declare_args() { +@@ -34,7 +34,8 @@ declare_args() { # Set to true to set defaults that enable features on Android that are more # typically available on desktop. @@ -302,7 +297,7 @@ diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni if (is_android) { # By default, Trichrome channels are compiled using separate package names. -@@ -44,12 +45,12 @@ declare_args() { +@@ -56,12 +57,12 @@ is_internal_chrome_branded = enable_src_internal && is_chrome_branded # Ensure !is_android implies !is_high_end_android. is_high_end_android = is_high_end_android && is_android @@ -344,7 +339,7 @@ diff --git a/build/config/compiler/pgo/BUILD.gn b/build/config/compiler/pgo/BUIL diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -971,7 +971,7 @@ if (_is_default_toolchain) { +@@ -958,7 +958,7 @@ if (_is_default_toolchain) { "//chrome/browser/password_entry_edit/android/internal:java", ] @@ -353,7 +348,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn deps += [ "//chrome/browser/ui/android/extensions/windowing/internal:java", "//chrome/browser/ui/browser_window/internal:java", -@@ -1235,7 +1235,7 @@ if (_is_default_toolchain) { +@@ -1225,7 +1225,7 @@ if (_is_default_toolchain) { deps += [ "//chrome/browser/ui/android/extensions:junit" ] } @@ -362,7 +357,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn deps += [ "//chrome/browser/ui/browser_window/internal:junit" ] } } -@@ -2440,7 +2440,7 @@ if (_is_default_toolchain) { +@@ -2416,7 +2416,7 @@ if (_is_default_toolchain) { "//components/ip_protection/android/android_auth_client_lib/javatests:ip_protection_auth_javatests", ] @@ -423,7 +418,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java -@@ -580,7 +580,7 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity +@@ -578,7 +578,7 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity applySingleThemeOverlay(R.style.ThemeOverlay_BrowserUI_OptOutEdgeToEdge); } @@ -435,7 +430,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -1137,7 +1137,7 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties +@@ -1173,7 +1173,7 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties && !shouldShowReaderModePrefs(currentTab) && currentTab != null && currentTab.getWebContents() != null @@ -459,7 +454,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appearance/sett diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutUtils.java -@@ -408,7 +408,7 @@ public class StripLayoutUtils { +@@ -420,7 +420,7 @@ public class StripLayoutUtils { public static boolean shouldApplyMoreDensity() { return ChromeFeatureList.sTabStripDensityChangeAndroid.isEnabled() @@ -471,7 +466,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over diff --git a/chrome/android/java/src/org/chromium/chrome/browser/desktop_site/DesktopSiteSettingsIphController.java b/chrome/android/java/src/org/chromium/chrome/browser/desktop_site/DesktopSiteSettingsIphController.java --- a/chrome/android/java/src/org/chromium/chrome/browser/desktop_site/DesktopSiteSettingsIphController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/desktop_site/DesktopSiteSettingsIphController.java -@@ -81,7 +81,7 @@ public class DesktopSiteSettingsIphController { +@@ -80,7 +80,7 @@ public class DesktopSiteSettingsIphController { View toolbarMenuButton, AppMenuHandler appMenuHandler) { // Desktop site settings are default enabled on desktop. Do not show IPH. @@ -495,7 +490,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitT diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationServiceImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationServiceImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationServiceImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationServiceImpl.java -@@ -197,7 +197,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl +@@ -216,7 +216,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl } } } @@ -504,16 +499,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCapt if (mNotifications.size() > 1 && mNotifications.firstKey() == notificationId) { // For large screen device, we use the previous notification to update // foreground -@@ -212,7 +212,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl +@@ -231,7 +231,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl } mNotificationManager.cancel(NOTIFICATION_NAMESPACE, notificationId); - mNotificationsType.delete(notificationId); + mNotificationsType.remove(notificationId); - if (DeviceInfo.isDesktop()) { + if (DeviceInfo.isDesktopFalse()) { mNotifications.remove(notificationId); } updateSharedPreferencesEntry(notificationId, true); -@@ -260,7 +260,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl +@@ -305,7 +305,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl appContext.getString(R.string.app_name), contentIntent, stopIntent); @@ -521,11 +516,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCapt + if (DeviceInfo.isDesktopFalse()) { // For large screen device, we use the latest notification to start or update // the foreground service. - startOrUpdateForegroundService(notificationId, notification, mediaType); -@@ -268,7 +268,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl + startOrUpdateForegroundService(notificationId, notification, mediaTypes); +@@ -313,7 +313,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl mNotificationManager.notify(notification); } - mNotificationsType.put(notificationId, mediaType); + mNotificationsType.put(notificationId, mediaTypes); - if (DeviceInfo.isDesktop()) { + if (DeviceInfo.isDesktopFalse()) { mNotifications.put(notificationId, notification); @@ -534,19 +529,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCapt diff --git a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java -@@ -221,7 +221,7 @@ public class MultiWindowUtils implements ActivityStateListener { +@@ -217,7 +217,7 @@ public class MultiWindowUtils implements ActivityStateListener { return TabWindowManager.MAX_SELECTORS_S; } -- if (DeviceInfo.isDesktop() || DeviceInfo.isXr()) { -+ if (DeviceInfo.isDesktopFalse() || DeviceInfo.isXr()) { +- if (DeviceInfo.isDesktop()) { ++ if (DeviceInfo.isDesktopFalse()) { return TabWindowManager.MAX_SELECTORS; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java -@@ -174,7 +174,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -175,7 +175,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { return PermissionUtil.handTrackingNeedsAdditionalPermissions(); case SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE: // Desktop Android always requests desktop sites, so hide the category. @@ -621,25 +616,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNa diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java -@@ -191,7 +191,7 @@ public class RequestDesktopUtils { - */ - static boolean shouldDefaultEnableGlobalSetting(double displaySizeInInches, Context context) { - // Desktop Android always requests desktop sites. -- if (DeviceInfo.isDesktop()) { -+ if (DeviceInfo.isDesktopFalse()) { - return true; - } - -@@ -270,7 +270,7 @@ public class RequestDesktopUtils { - boolean isOnExternalDisplay = isOnExternalDisplay(activity); - if (isOnExternalDisplay - || smallestScreenWidthDp < DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP -- || DeviceInfo.isDesktop()) { -+ || DeviceInfo.isDesktopFalse()) { - return; - } - PrefService prefService = UserPrefs.get(profile); -@@ -293,7 +293,7 @@ public class RequestDesktopUtils { +@@ -107,7 +107,7 @@ public class RequestDesktopUtils { // Desktop devices always request desktop sites so there's no need to show a message to // the user. @@ -648,35 +625,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesk return false; } -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java -@@ -285,7 +285,9 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { - */ - public void openInOtherWindow(GURL url, @Nullable Referrer referrer, boolean isIncognito) { - LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec()); -- loadUrlParams.setReferrer(referrer); -+ if (!isIncognito) { -+ loadUrlParams.setReferrer(referrer); -+ } - if (IncognitoUtils.shouldOpenIncognitoAsWindow() && mMultiInstanceManager != null) { - mMultiInstanceManager.openUrlInSelectedWindow(loadUrlParams, mTab.getParentId()); - } else { -@@ -304,7 +306,9 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate { - public void openInAnotherWindow(GURL url, @Nullable Referrer referrer, boolean isIncognito) { - ChromeAsyncTabLauncher chromeAsyncTabLauncher = new ChromeAsyncTabLauncher(isIncognito); - LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec()); -- loadUrlParams.setReferrer(referrer); -+ if (!isIncognito) { -+ loadUrlParams.setReferrer(referrer); -+ } - Activity activity = TabUtils.getActivity(mTab); - assumeNonNull(activity); - // null if there are no foreground window activities. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java -@@ -764,7 +764,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm +@@ -826,7 +826,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm // PDF. NativePage nativePage = currentTab.getNativePage(); boolean isPdfPage = nativePage != null && nativePage.isPdf(); @@ -688,7 +640,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -1928,7 +1928,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -2014,7 +2014,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { } else if (id == R.id.toggle_bookmark_bar) { // isActivityStateBookmarkBarCompatible already checks the flag sAndroidBookmarkBar. if (BookmarkBarUtils.isActivityStateBookmarkBarCompatible(mActivity)) { @@ -700,8 +652,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -682,7 +682,7 @@ public class RootUiCoordinator - } +@@ -714,7 +714,7 @@ public class RootUiCoordinator + mXrSpaceModeObservableSupplier = xrSpaceModeObservableSupplier; if (BrowserControlsUtils.doSyncMinHeightWithTotalHeightV2()) { - if (DeviceInfo.isDesktop() @@ -732,7 +684,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings. diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd -@@ -370,7 +370,7 @@ +@@ -372,7 +372,7 @@ @@ -741,7 +693,7 @@ diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resou -@@ -379,7 +379,7 @@ +@@ -381,7 +381,7 @@ @@ -753,7 +705,7 @@ diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resou diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4905,7 +4905,7 @@ static_library("browser") { +@@ -4916,7 +4916,7 @@ static_library("browser") { } } @@ -762,7 +714,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn deps += [ "//chrome/browser/ui/browser_window" ] } -@@ -7647,7 +7647,7 @@ static_library("browser") { +@@ -7642,7 +7642,7 @@ static_library("browser") { deps += [ "//media/mojo/mojom:remoting" ] } @@ -771,7 +723,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn sources += [ "download/download_crx_util_android.cc" ] } -@@ -7961,7 +7961,7 @@ static_library("browser") { +@@ -7956,7 +7956,7 @@ static_library("browser") { # TODO(https://crbug.com/356905053): Add more dependencies here and merge this # block with the `enable_extensions` block above. @@ -780,7 +732,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn sources += [ # TODO(https://crbug.com/356905053): These files are temporary workarounds # allow for a lightweight extensions runtime in desktop-android builds. -@@ -8724,7 +8724,7 @@ static_library("browser_generated_files") { +@@ -8736,7 +8736,7 @@ static_library("browser_generated_files") { [ "//chrome/browser/ui/webui/new_tab_page/foo:mojo_bindings" ] } } @@ -792,7 +744,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -365,6 +365,10 @@ +@@ -369,6 +369,10 @@ #include "extensions/common/switches.h" #endif // BUILDFLAG(ENABLE_EXTENSIONS_CORE) @@ -803,15 +755,6 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if BUILDFLAG(ENABLE_PDF) #include "pdf/pdf_features.h" #endif -@@ -13585,7 +13589,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - enterprise_signals::features::kProfileSignalsReportingEnabled)}, - --#if BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS) -+#if BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS_CROMITE) - {"enable-extensions-for-corp-desktop-android", - flag_descriptions::kEnableExtensionsForCorpDesktopAndroidName, - flag_descriptions::kEnableExtensionsForCorpDesktopAndroidDescription, diff --git a/chrome/browser/android/selection/chrome_selection_dropdown_menu_delegate.cc b/chrome/browser/android/selection/chrome_selection_dropdown_menu_delegate.cc --- a/chrome/browser/android/selection/chrome_selection_dropdown_menu_delegate.cc +++ b/chrome/browser/android/selection/chrome_selection_dropdown_menu_delegate.cc @@ -876,7 +819,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -348,7 +348,7 @@ void BrowserProcessImpl::Init() { +@@ -357,7 +357,7 @@ void BrowserProcessImpl::Init() { // TODO(devlin): Move this block out of BrowserProcessImpl to somewhere like // //chrome/browser/initialize_extensions_browser_client, analogous to // `EnsureExtensionsClientInitialized()` above? @@ -912,9 +855,9 @@ diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chro - feature_overrides.EnableFeature(features::kAndroidCaretBrowsing); + // feature_overrides.EnableFeature(features::kAndroidCaretBrowsing); - // If enabled, render processes associated only with tabs in unfocused windows - // will be downgraded to "vis" priority, rather than remaining at "fg". This -@@ -154,8 +154,8 @@ void ChromeBrowserFieldTrials::RegisterFeatureOverrides( + // Enable the link hover status bar. + // TODO(crbug.com/404678510): Remove when the feature is stable. +@@ -153,8 +153,8 @@ void ChromeBrowserFieldTrials::RegisterFeatureOverrides( // Enables media capture (tab+window+screen sharing). // TODO(crbug.com/352187279): Remove when tablet rollout is complete. @@ -924,8 +867,8 @@ diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chro + // feature_overrides.EnableFeature(features::kUserMediaScreenCapturing); // Enable desktop tab management features. - // TODO(crbug.com/422902940): Remove when tablet rollout is complete. -@@ -171,7 +171,7 @@ void ChromeBrowserFieldTrials::RegisterFeatureOverrides( + // TODO(crbug.com/422902625): Remove when rollout is complete to all form +@@ -166,7 +166,7 @@ void ChromeBrowserFieldTrials::RegisterFeatureOverrides( feature_overrides.EnableFeature(features::kRendererProcessLimitOnAndroid); // Enable V8 optimizations for high-end Android Desktop devices. // TODO(crbug.com/425860368): Remove when the feature is stable. @@ -934,7 +877,7 @@ diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chro // TODO(b/432367402): Use a new Android API to replace this hack with a proper // solution. feature_overrides.EnableFeature(features::kAndroidCaptureKeyEvents); -@@ -180,74 +180,74 @@ void ChromeBrowserFieldTrials::RegisterFeatureOverrides( +@@ -175,12 +175,12 @@ void ChromeBrowserFieldTrials::RegisterFeatureOverrides( feature_overrides.EnableFeature(features::kAndroidDevToolsFrontend); // TODO(crbug.com/430304112): Remove when rollout is complete to all form // factors. @@ -948,6 +891,10 @@ diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chro - chrome::android::kLockTopControlsOnLargeTablets); + // feature_overrides.EnableFeature( + // chrome::android::kLockTopControlsOnLargeTablets); + // TODO(crbug.com/445446479): Remove when rollout is complete to all form + // factors. + feature_overrides.EnableFeature( +@@ -188,13 +188,13 @@ void ChromeBrowserFieldTrials::RegisterFeatureOverrides( // Bypass the WebAudio output buffer, to reduce audio latency. // TODO(crbug.com/436988695): Remove when the long term solution is // implemented. @@ -963,9 +910,10 @@ diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chro // TODO(crbug.com/440210010): Remove when the feature experiment is done. - feature_overrides.EnableFeature(features::kAudioStereoInputStreamParameters); + // feature_overrides.EnableFeature(features::kAudioStereoInputStreamParameters); - // Enables picture-in-picture in the right-click context menu. - // TODO(crbug.com/403851785): Remove when the feature is verified to be stable - // on desktop Android. + // Enables automatic picture-in-picture. + // TODO(crbug.com/421608904): Remove when rollout is complete to all form + // factors. +@@ -205,49 +205,49 @@ void ChromeBrowserFieldTrials::RegisterFeatureOverrides( feature_overrides.EnableFeature(media::kContextMenuPictureInPictureAndroid); // Disables the enhanced pip transition and uses the default animation. // TODO(crbug.com/440384447): Remove when enhanced pip transition is fixed. @@ -1002,10 +950,6 @@ diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chro - chrome::android::kAndroidPinnedTabsTabletTabStrip); + // feature_overrides.EnableFeature( + // chrome::android::kAndroidPinnedTabsTabletTabStrip); - // TODO(crbug.com/433879656): Remove when this feature on LFF device is - // stable. -- feature_overrides.EnableFeature(features::kFluidResize); -+ // feature_overrides.EnableFeature(features::kFluidResize); // Three flags are required for the bookmarks bar feature. // TODO(crbug.com/430059235): Remove once feature is launched to 100% on all @@ -1035,13 +979,13 @@ diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chro // SitePerProcess is enabled for all necessary or eligible Android devices. - feature_overrides.EnableFeature(::features::kSitePerProcess); + // feature_overrides.EnableFeature(::features::kSitePerProcess); - #endif // BUILDFLAG(IS_DESKTOP_ANDROID) - // Desktop-first features which are past incubation should either end up here, - // or to a finch trial that enables it for all form factors. + + // Enable all tabs to have WebContents at all times for desktop platforms. + // TODO(crbug.com/448420873): Remove once we enable this feature for all form diff --git a/chrome/browser/chrome_browser_interface_binders_webui.cc b/chrome/browser/chrome_browser_interface_binders_webui.cc --- a/chrome/browser/chrome_browser_interface_binders_webui.cc +++ b/chrome/browser/chrome_browser_interface_binders_webui.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "mojo/public/cpp/bindings/binder_map.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -1050,7 +994,7 @@ diff --git a/chrome/browser/chrome_browser_interface_binders_webui.cc b/chrome/b #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #include "chrome/browser/ui/webui/discards/site_data.mojom.h" -@@ -135,7 +135,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -139,7 +139,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -1062,7 +1006,7 @@ diff --git a/chrome/browser/chrome_browser_interface_binders_webui.cc b/chrome/b diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -4283,7 +4283,7 @@ base::OnceClosure ChromeContentBrowserClient::SelectClientCertificate( +@@ -4270,7 +4270,7 @@ base::OnceClosure ChromeContentBrowserClient::SelectClientCertificate( // TODO(wenz): This should instead proceed with the selected certificate // when there are matching certificates in the OS. #if BUILDFLAG(ENABLE_EXTENSIONS) && \ @@ -1071,7 +1015,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch if (matching_certificates.empty() && nonmatching_certificates.empty()) { extensions::ProcessMap* process_map = extensions::ProcessMap::Get(profile); -@@ -4507,7 +4507,7 @@ void ChromeContentBrowserClient::OverrideWebPreferences( +@@ -4499,7 +4499,7 @@ void ChromeContentBrowserClient::OverrideWebPreferences( // Fill font preferences. These are not registered on Android unless we're built // with extensions (the chrome.fontSettings API can change these). // - http://crbug.com/308033, http://crbug.com/696364. @@ -1083,7 +1027,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn --- a/chrome/browser/devtools/BUILD.gn +++ b/chrome/browser/devtools/BUILD.gn -@@ -339,7 +339,7 @@ static_library("devtools") { +@@ -345,7 +345,7 @@ static_library("devtools") { } } @@ -1107,7 +1051,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1736,7 +1736,7 @@ source_set("chrome_extensions_browser_client") { +@@ -1735,7 +1735,7 @@ source_set("chrome_extensions_browser_client") { "//extensions/browser/updater:keepalive", ] @@ -1116,7 +1060,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL sources += [ "chrome_extensions_browser_client_android.cc" ] deps += [ -@@ -1751,6 +1751,16 @@ source_set("chrome_extensions_browser_client") { +@@ -1750,6 +1750,16 @@ source_set("chrome_extensions_browser_client") { "//extensions/browser", "//extensions/browser/kiosk", ] @@ -1136,7 +1080,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client_android.cc b/chrome/browser/extensions/api/chrome_extensions_api_client_android.cc --- a/chrome/browser/extensions/api/chrome_extensions_api_client_android.cc +++ b/chrome/browser/extensions/api/chrome_extensions_api_client_android.cc -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ // The stubs are implemented here instead of falling back to ExtensionsAPIClient // to allow NOTIMPLEMENTED() logging and a place to put TODOs with bug IDs. @@ -1174,7 +1118,7 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/ diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h --- a/chrome/browser/extensions/extension_management.h +++ b/chrome/browser/extensions/extension_management.h -@@ -94,7 +94,7 @@ class ExtensionManagement : public KeyedService { +@@ -107,7 +107,7 @@ class ExtensionManagement : public KeyedService, // from the command line, or when loaded as an unpacked extension). bool BlocklistedByDefault() const; @@ -1223,18 +1167,6 @@ diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browse type = TYPE_DESKTOP; } else if (DeviceFormFactor.isNonMultiDisplayContextOnTablet( ContextUtils.getApplicationContext())) { -diff --git a/chrome/browser/file_system_access/BUILD.gn b/chrome/browser/file_system_access/BUILD.gn ---- a/chrome/browser/file_system_access/BUILD.gn -+++ b/chrome/browser/file_system_access/BUILD.gn -@@ -61,7 +61,7 @@ source_set("impl") { - deps += [ "//chrome/browser/ui/android/tab_model" ] - } - -- if (!is_android || is_desktop_android) { -+ if (!is_android || is_desktop_android_cromite) { - deps += [ "//chrome/browser/ui/browser_window" ] - } - diff --git a/chrome/browser/media/router/BUILD.gn b/chrome/browser/media/router/BUILD.gn --- a/chrome/browser/media/router/BUILD.gn +++ b/chrome/browser/media/router/BUILD.gn @@ -1340,7 +1272,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager.cc b/chrome/br bool enabled = false; #else bool enabled = true; -@@ -464,7 +464,7 @@ WebRtcEventLogManager::CreateRemoteLogFileWriterFactory() { +@@ -463,7 +463,7 @@ WebRtcEventLogManager::CreateRemoteLogFileWriterFactory() { if (remote_log_file_writer_factory_for_testing_) { return std::move(remote_log_file_writer_factory_for_testing_); } else { @@ -1364,7 +1296,7 @@ diff --git a/chrome/browser/policy/policy_value_and_status_aggregator.cc b/chrom diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -663,7 +663,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -659,7 +659,7 @@ void ChromeBrowserMainExtraPartsProfiles:: chromeos_extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt(); #endif extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt(); @@ -1421,7 +1353,7 @@ diff --git a/chrome/browser/profiles/profile_destroyer.cc b/chrome/browser/profi diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn -@@ -125,7 +125,7 @@ group("resources") { +@@ -126,7 +126,7 @@ group("resources") { ] } @@ -1617,7 +1549,7 @@ diff --git a/chrome/browser/task_manager/common/task_manager_features.cc b/chrom diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -671,7 +671,7 @@ static_library("ui") { +@@ -672,7 +672,7 @@ static_library("ui") { "//v8:v8_version", ] @@ -1626,16 +1558,16 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn sources += [ "browser_navigator.h", "incognito_allowed_url.cc", -@@ -686,7 +686,7 @@ static_library("ui") { +@@ -687,7 +687,7 @@ static_library("ui") { ] # Desktop-Android-only dependencies. - if (is_desktop_android) { + if (is_desktop_android_cromite) { sources += [ "//chrome/browser/ui/android/browser_navigator_android.cc" ] - deps += [ "//chrome/browser/ui/android/extensions/windowing/internal" ] - } -@@ -2897,7 +2897,7 @@ static_library("ui") { + deps += [ + "//chrome/browser/ui/android/extensions/windowing/internal", +@@ -2912,7 +2912,7 @@ static_library("ui") { allow_circular_includes_from += [ "//chrome/browser/ui/wallet" ] } @@ -1716,7 +1648,7 @@ diff --git a/chrome/browser/ui/android/context_menu_helper.h b/chrome/browser/ui diff --git a/chrome/browser/ui/android/extensions/BUILD.gn b/chrome/browser/ui/android/extensions/BUILD.gn --- a/chrome/browser/ui/android/extensions/BUILD.gn +++ b/chrome/browser/ui/android/extensions/BUILD.gn -@@ -76,8 +76,8 @@ if (enable_extensions_core) { +@@ -78,8 +78,8 @@ if (enable_extensions_core) { # BuildConfig. java_cpp_template("generate_buildflags") { sources = [ "java/templates/ExtensionsBuildflags.template" ] @@ -1745,8 +1677,8 @@ diff --git a/chrome/browser/ui/android/extensions/extension_actions_bridge.cc b/ #include "extensions/browser/extension_action.h" #include "extensions/browser/extension_action_manager.h" #include "extensions/browser/extension_registry.h" -@@ -209,6 +212,26 @@ bool ExtensionActionsBridge::ExtensionsEnabled(JNIEnv* env) { - return extension_management->ExtensionsEnabledForDesktopAndroid(); +@@ -203,6 +206,26 @@ ExtensionAction::ShowAction ExtensionActionsBridge::RunAction( + return runner->RunAction(extension, /*grant_tab_permissions=*/true); } +void ExtensionActionsBridge::ClearExtensionData(JNIEnv* env) { @@ -1775,10 +1707,10 @@ diff --git a/chrome/browser/ui/android/extensions/extension_actions_bridge.cc b/ diff --git a/chrome/browser/ui/android/extensions/extension_actions_bridge.h b/chrome/browser/ui/android/extensions/extension_actions_bridge.h --- a/chrome/browser/ui/android/extensions/extension_actions_bridge.h +++ b/chrome/browser/ui/android/extensions/extension_actions_bridge.h -@@ -54,6 +54,7 @@ class ExtensionActionsBridge : public ToolbarActionsModel::Observer, +@@ -53,6 +53,7 @@ class ExtensionActionsBridge : public ToolbarActionsModel::Observer, + const ToolbarActionsModel::ActionId& action_id, int tab_id, content::WebContents* web_contents); - bool ExtensionsEnabled(JNIEnv* env); + void ClearExtensionData(JNIEnv* env); jni_zero::ScopedJavaLocalRef HandleKeyDownEvent( JNIEnv* env, @@ -1842,10 +1774,10 @@ diff --git a/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/b + @NativeMethods public interface Natives { - ExtensionActionsBridge get(@JniType("Profile*") Profile profile); + boolean extensionsEnabled(@JniType("Profile*") Profile profile); @@ -272,6 +276,8 @@ public class ExtensionActionsBridge { - - boolean extensionsEnabled(long nativeExtensionActionsBridge); + int tabId, + @JniType("content::WebContents*") WebContents webContents); + void clearExtensionData(long nativeExtensionActionsBridge); + @@ -1901,7 +1833,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/android/tab_model/BUILD.gn b/chrome/browser/ui/android/tab_model/BUILD.gn --- a/chrome/browser/ui/android/tab_model/BUILD.gn +++ b/chrome/browser/ui/android/tab_model/BUILD.gn -@@ -65,7 +65,7 @@ source_set("impl") { +@@ -67,7 +67,7 @@ source_set("impl") { "//ui/base:types", ] @@ -1910,7 +1842,7 @@ diff --git a/chrome/browser/ui/android/tab_model/BUILD.gn b/chrome/browser/ui/an deps += [ "//chrome/browser/ui/browser_window", "//chrome/browser/ui/browser_window/internal", -@@ -95,7 +95,7 @@ source_set("test_support") { +@@ -97,7 +97,7 @@ source_set("test_support") { "//chrome/browser/ui/android/tab_model", ] @@ -1952,7 +1884,7 @@ diff --git a/chrome/browser/ui/android/tab_model/tab_model.cc b/chrome/browser/u diff --git a/chrome/browser/ui/android/tab_model/tab_model.h b/chrome/browser/ui/android/tab_model/tab_model.h --- a/chrome/browser/ui/android/tab_model/tab_model.h +++ b/chrome/browser/ui/android/tab_model/tab_model.h -@@ -290,7 +290,7 @@ class TabModel : public TabListInterface { +@@ -292,7 +292,7 @@ class TabModel : public TabListInterface { LocationBarModel* GetLocationBarModel(); @@ -1964,7 +1896,7 @@ diff --git a/chrome/browser/ui/android/tab_model/tab_model.h b/chrome/browser/ui diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc --- a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc +++ b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc -@@ -43,7 +43,7 @@ +@@ -45,7 +45,7 @@ // "chrome/browser/ui/browser_window" is available on desktop Android, but not // other Android builds. @@ -1973,7 +1905,7 @@ diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc b/chrom #include "chrome/browser/ui/browser_window/internal/android/android_browser_window.h" // nogncheck #include "chrome/browser/ui/browser_window/public/browser_window_interface.h" // nogncheck #include "chrome/browser/ui/browser_window/public/browser_window_interface_iterator.h" // nogncheck -@@ -76,7 +76,7 @@ std::vector GetAllTabsFromHandles( +@@ -78,7 +78,7 @@ std::vector GetAllTabsFromHandles( return tabs; } @@ -1982,7 +1914,7 @@ diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc b/chrom AndroidBrowserWindow* GetAndroidBrowserWindow(SessionID session_id) { for (BrowserWindowInterface* window : GetAllBrowserWindowInterfaces()) { if (window->GetSessionID() == session_id) { -@@ -115,7 +115,7 @@ void TabModelJniBridge::AssociateWithBrowserWindow( +@@ -117,7 +117,7 @@ void TabModelJniBridge::AssociateWithBrowserWindow( long native_android_browser_window) { // BrowserWindowInterface is available on desktop Android, but not other Android // builds. For non-desktop Android, this function should be a no-op. @@ -1991,7 +1923,7 @@ diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc b/chrom BrowserWindowInterface* android_browser_window = reinterpret_cast(native_android_browser_window); CHECK(android_browser_window != nullptr); -@@ -152,7 +152,7 @@ void TabModelJniBridge::MoveTabToWindowForTesting( +@@ -153,7 +153,7 @@ void TabModelJniBridge::MoveTabToWindowForTesting( TabAndroid* tab, long android_browser_window_ptr, int new_index) { @@ -2000,7 +1932,7 @@ diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc b/chrom SessionID destination_window_id = reinterpret_cast(android_browser_window_ptr) ->GetSessionID(); -@@ -167,7 +167,7 @@ void TabModelJniBridge::MoveTabGroupToWindowForTesting( +@@ -168,7 +168,7 @@ void TabModelJniBridge::MoveTabGroupToWindowForTesting( const base::Token& group_id, long android_browser_window_ptr, int new_index) { @@ -2009,7 +1941,7 @@ diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc b/chrom SessionID destination_window_id = reinterpret_cast(android_browser_window_ptr) ->GetSessionID(); -@@ -631,7 +631,7 @@ void TabModelJniBridge::MoveTabGroupToWindow(tab_groups::TabGroupId group_id, +@@ -633,7 +633,7 @@ void TabModelJniBridge::MoveTabGroupToWindow(tab_groups::TabGroupId group_id, ScopedJavaLocalRef TabModelJniBridge::GetActivityForWindow( SessionID window_id) { ScopedJavaLocalRef jactivity; @@ -2033,7 +1965,7 @@ diff --git a/chrome/browser/ui/android/tab_model/tab_model_test_helper.h b/chrom diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml -@@ -59,6 +59,12 @@ found in the LICENSE file. +@@ -65,6 +65,12 @@ found in the LICENSE file. android:layout_width="52dp" style="@style/ToolbarHoverableButton"/> @@ -2082,15 +2014,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow import android.view.ViewStub; import android.widget.LinearLayout; -@@ -20,6 +21,7 @@ import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.tabmodel.TabCreator; +@@ -22,6 +23,7 @@ import org.chromium.chrome.browser.tabmodel.TabCreator; import org.chromium.chrome.browser.theme.ThemeColorProvider; + import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; import org.chromium.chrome.browser.ui.extensions.ExtensionActionsBridge; +import org.chromium.chrome.browser.ui.extensions.ExtensionUi; import org.chromium.chrome.browser.ui.extensions.R; import org.chromium.ui.base.WindowAndroid; -@@ -51,6 +53,11 @@ public class ExtensionToolbarCoordinatorImpl implements ExtensionToolbarCoordina +@@ -54,6 +56,11 @@ public class ExtensionToolbarCoordinatorImpl implements ExtensionToolbarCoordina extensionToolbarStub.setLayoutResource(R.layout.extension_toolbar_container); LinearLayout container = (LinearLayout) extensionToolbarStub.inflate(); @@ -2102,8 +2034,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow mExtensionActionListCoordinator = new ExtensionActionListCoordinator( context, -@@ -66,7 +73,8 @@ public class ExtensionToolbarCoordinatorImpl implements ExtensionToolbarCoordina - themeColorProvider, +@@ -71,7 +78,8 @@ public class ExtensionToolbarCoordinatorImpl implements ExtensionToolbarCoordina + taskSupplier, profileSupplier, currentTabSupplier, - tabCreator); @@ -2115,25 +2047,25 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionsMenuCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionsMenuCoordinator.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionsMenuCoordinator.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionsMenuCoordinator.java -@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.tab.TabLaunchType; - import org.chromium.chrome.browser.tabmodel.TabCreator; +@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.tabmodel.TabCreator; import org.chromium.chrome.browser.theme.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.MenuBuilderHelper; + import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; +import org.chromium.chrome.browser.toolbar.extensions.ExtensionActionListCoordinator; import org.chromium.chrome.browser.ui.extensions.R; import org.chromium.chrome.browser.ui.theme.BrandedColorScheme; import org.chromium.components.embedder_support.util.UrlConstants; -@@ -82,7 +83,8 @@ public class ExtensionsMenuCoordinator implements Destroyable { - ThemeColorProvider themeColorProvider, - ObservableSupplier profileSupplier, - ObservableSupplier currentTabSupplier, +@@ -86,7 +87,8 @@ public class ExtensionsMenuCoordinator implements Destroyable { + OneshotSupplier taskSupplier, + ObservableSupplier<@Nullable Profile> profileSupplier, + ObservableSupplier<@Nullable Tab> currentTabSupplier, - TabCreator tabCreator) { + TabCreator tabCreator, + ExtensionActionListCoordinator extensionActionListCoordinator) { mContext = context; mCurrentTabSupplier = currentTabSupplier; mTabCreator = tabCreator; -@@ -160,7 +162,8 @@ public class ExtensionsMenuCoordinator implements Destroyable { +@@ -165,7 +167,8 @@ public class ExtensionsMenuCoordinator implements Destroyable { mExtensionsMenuButton.setVisibility(visibility); mExtensionsMenuTabSwitcherDivider.setVisibility(visibility); }, @@ -2174,34 +2106,35 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionsMenuMediator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionsMenuMediator.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionsMenuMediator.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionsMenuMediator.java -@@ -17,6 +17,7 @@ import org.chromium.build.annotations.Nullable; - import org.chromium.chrome.browser.extensions.ContextMenuSource; +@@ -19,6 +19,7 @@ import org.chromium.chrome.browser.extensions.ContextMenuSource; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; + import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTask; +import org.chromium.chrome.browser.toolbar.extensions.ExtensionActionListCoordinator; import org.chromium.chrome.browser.ui.extensions.ExtensionAction; import org.chromium.chrome.browser.ui.extensions.ExtensionActionContextMenuBridge; import org.chromium.chrome.browser.ui.extensions.ExtensionActionsBridge; -@@ -41,6 +42,7 @@ class ExtensionsMenuMediator implements Destroyable { +@@ -44,6 +45,7 @@ class ExtensionsMenuMediator implements Destroyable { private final ExtensionActionsUpdateHelper mExtensionActionsUpdateHelper; - private final Callback mProfileUpdatedCallback = this::onProfileUpdated; + private final Callback<@Nullable Profile> mProfileUpdatedCallback = this::onProfileUpdated; private final View mRootView; + private final ExtensionActionListCoordinator mExtensionActionListCoordinator; - @Nullable private Profile mProfile; - -@@ -51,7 +53,9 @@ class ExtensionsMenuMediator implements Destroyable { + public ExtensionsMenuMediator( + Context context, +@@ -53,8 +55,10 @@ class ExtensionsMenuMediator implements Destroyable { ModelList extensionModels, Runnable onUpdateFinishedRunnable, Callback onExtensionsAvailableCallback, - View rootView) { + View rootView, + ExtensionActionListCoordinator extensionActionListCoordinator) { + mTaskSupplier = taskSupplier; + mExtensionActionListCoordinator = extensionActionListCoordinator; mProfileSupplier = profileSupplier; mProfileSupplier.addObserver(mProfileUpdatedCallback); -@@ -169,6 +173,9 @@ class ExtensionsMenuMediator implements Destroyable { +@@ -164,6 +168,9 @@ class ExtensionsMenuMediator implements Destroyable { new PropertyModel.Builder(ExtensionsMenuItemProperties.ALL_KEYS) .with(ExtensionsMenuItemProperties.TITLE, action.getTitle()) .with(ExtensionsMenuItemProperties.ICON, icon) @@ -2235,7 +2168,7 @@ diff --git a/chrome/browser/ui/browser_navigator_params.cc b/chrome/browser/ui/b diff --git a/chrome/browser/ui/browser_navigator_params.h b/chrome/browser/ui/browser_navigator_params.h --- a/chrome/browser/ui/browser_navigator_params.h +++ b/chrome/browser/ui/browser_navigator_params.h -@@ -77,7 +77,7 @@ struct NavigateParams { +@@ -76,7 +76,7 @@ struct NavigateParams { std::unique_ptr contents_to_insert); #endif @@ -2244,7 +2177,7 @@ diff --git a/chrome/browser/ui/browser_navigator_params.h b/chrome/browser/ui/br NavigateParams(BrowserWindowInterface* a_browser, const GURL& a_url, ui::PageTransition a_transition); -@@ -264,7 +264,7 @@ struct NavigateParams { +@@ -263,7 +263,7 @@ struct NavigateParams { }; PathBehavior path_behavior = RESPECT; @@ -2280,7 +2213,7 @@ diff --git a/chrome/browser/ui/browser_window/internal/BUILD.gn b/chrome/browser diff --git a/chrome/browser/ui/prefs/BUILD.gn b/chrome/browser/ui/prefs/BUILD.gn --- a/chrome/browser/ui/prefs/BUILD.gn +++ b/chrome/browser/ui/prefs/BUILD.gn -@@ -63,7 +63,7 @@ source_set("impl") { +@@ -67,7 +67,7 @@ source_set("impl") { } } @@ -2289,7 +2222,7 @@ diff --git a/chrome/browser/ui/prefs/BUILD.gn b/chrome/browser/ui/prefs/BUILD.gn source_set("browser_tests") { testonly = true defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] -@@ -81,7 +81,7 @@ if (!is_android || enable_desktop_android_extensions) { +@@ -85,7 +85,7 @@ if (!is_android || enable_desktop_android_extensions) { "//third_party/blink/public/common:headers", ] @@ -2301,16 +2234,16 @@ diff --git a/chrome/browser/ui/prefs/BUILD.gn b/chrome/browser/ui/prefs/BUILD.gn diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc -@@ -64,7 +64,7 @@ +@@ -65,7 +65,7 @@ #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS) -+ BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS_CROMITE) +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS_CROMITE) // If a font name in prefs default values starts with a comma, consider it's a // comma-separated font list and resolve it to the first available font. #define PREFS_FONT_LIST 1 -@@ -78,7 +78,7 @@ using content::WebContents; +@@ -79,7 +79,7 @@ using content::WebContents; namespace { @@ -2319,7 +2252,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre // Registers a preference under the path |pref_name| for each script used for // per-script font prefs. // For example, for WEBKIT_WEBPREFS_FONTS_SERIF ("fonts.serif"): -@@ -151,7 +151,7 @@ constexpr auto kFontDefaults = std::to_array({ +@@ -152,7 +152,7 @@ constexpr auto kFontDefaults = std::to_array({ {prefs::kWebKitFantasyFontFamily, IDS_FANTASY_FONT_FAMILY}, {prefs::kWebKitMathFontFamily, IDS_MATH_FONT_FAMILY}, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -2328,7 +2261,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre {prefs::kWebKitStandardFontFamilyJapanese, IDS_STANDARD_FONT_FAMILY_JAPANESE}, {prefs::kWebKitFixedFontFamilyJapanese, IDS_FIXED_FONT_FAMILY_JAPANESE}, -@@ -290,7 +290,7 @@ void OverrideFontFamily(blink::web_pref::WebPreferences* prefs, +@@ -291,7 +291,7 @@ void OverrideFontFamily(blink::web_pref::WebPreferences* prefs, (*map)[script] = base::UTF8ToUTF16(pref_value); } @@ -2337,7 +2270,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre void RegisterLocalizedFontPref(user_prefs::PrefRegistrySyncable* registry, const char* path, int default_message_id) { -@@ -446,7 +446,7 @@ void PrefsTabHelper::RegisterProfilePrefs( +@@ -452,7 +452,7 @@ void PrefsTabHelper::RegisterProfilePrefs( } // Register font prefs. This is only configurable on desktop Chrome. @@ -2346,18 +2279,6 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre RegisterFontFamilyPrefs(registry, fonts_with_defaults); registry->RegisterIntegerPref(prefs::kWebKitDefaultFontSize, 16); -diff --git a/chrome/browser/ui/tab_contents/BUILD.gn b/chrome/browser/ui/tab_contents/BUILD.gn ---- a/chrome/browser/ui/tab_contents/BUILD.gn -+++ b/chrome/browser/ui/tab_contents/BUILD.gn -@@ -88,7 +88,7 @@ source_set("impl") { - "//chrome/browser/ui/views/side_panel", - ] - } -- if (!is_android || is_desktop_android) { -+ if (!is_android || is_desktop_android_cromite) { - deps += [ "//chrome/browser/ui/browser_window" ] - } - if (enable_extensions) { diff --git a/chrome/browser/ui/tabs/tab_list_interface.h b/chrome/browser/ui/tabs/tab_list_interface.h --- a/chrome/browser/ui/tabs/tab_list_interface.h +++ b/chrome/browser/ui/tabs/tab_list_interface.h @@ -2394,7 +2315,7 @@ diff --git a/chrome/browser/ui/webid/BUILD.gn b/chrome/browser/ui/webid/BUILD.gn diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -180,7 +180,7 @@ +@@ -181,7 +181,7 @@ // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -2403,7 +2324,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) -@@ -408,7 +408,7 @@ void RegisterChromeWebUIConfigs() { +@@ -414,7 +414,7 @@ void RegisterChromeWebUIConfigs() { // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -2466,7 +2387,7 @@ diff --git a/chrome/browser/ui/webui/discards/discards_ui.cc b/chrome/browser/ui diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni --- a/chrome/chrome_paks.gni +++ b/chrome/chrome_paks.gni -@@ -509,7 +509,7 @@ template("chrome_extra_paks") { +@@ -513,7 +513,7 @@ template("chrome_extra_paks") { deps += [ "//chrome/browser/resources/app_settings:resources" ] } @@ -2475,22 +2396,10 @@ diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni sources += [ "$root_gen_dir/chrome/discards_resources.pak" ] deps += [ "//chrome/browser/resources/discards:resources" ] } -diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn ---- a/chrome/common/BUILD.gn -+++ b/chrome/common/BUILD.gn -@@ -28,7 +28,7 @@ assert(enable_supervised_users) - assert(!is_fuchsia, "Fuchsia shouldn't use anything in //chrome") - - declare_args() { -- enable_android_site_isolation = is_desktop_android -+ enable_android_site_isolation = is_desktop_android_cromite - } - - fuzzer_test("ini_parser_fuzzer") { diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc -@@ -784,7 +784,7 @@ const char kMarketUrlForTesting[] = "market-url-for-testing"; +@@ -802,7 +802,7 @@ const char kMarketUrlForTesting[] = "market-url-for-testing"; const char kRequestDesktopSites[] = "request-desktop-sites"; #endif // BUILDFLAG(IS_ANDROID) @@ -2502,7 +2411,7 @@ diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h -@@ -231,7 +231,7 @@ extern const char kMarketUrlForTesting[]; +@@ -238,7 +238,7 @@ extern const char kMarketUrlForTesting[]; extern const char kRequestDesktopSites[]; #endif // BUILDFLAG(IS_ANDROID) @@ -2514,7 +2423,7 @@ diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h diff --git a/chrome/common/extensions/api/api_sources.gni b/chrome/common/extensions/api/api_sources.gni --- a/chrome/common/extensions/api/api_sources.gni +++ b/chrome/common/extensions/api/api_sources.gni -@@ -64,6 +64,13 @@ uncompiled_sources_ = [ +@@ -66,6 +66,13 @@ uncompiled_sources_ = [ "top_sites.json", ] @@ -2531,7 +2440,7 @@ diff --git a/chrome/common/extensions/api/api_sources.gni b/chrome/common/extens diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -204,7 +204,7 @@ base::span ChromeURLHosts() { +@@ -207,7 +207,7 @@ base::span ChromeURLHosts() { kChromeUIInternetDetailDialogHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -2543,7 +2452,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -565,7 +565,7 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome://internal/"; +@@ -566,7 +566,7 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome://internal/"; #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -2586,7 +2495,7 @@ diff --git a/chrome/renderer/sandbox_status_extension_android.h b/chrome/rendere diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -367,7 +367,7 @@ static_library("test_support") { +@@ -364,7 +364,7 @@ static_library("test_support") { ] } @@ -2595,7 +2504,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn public_deps += [ "//extensions/browser:test_support", "//extensions/common:test_support", -@@ -484,7 +484,7 @@ static_library("test_support") { +@@ -477,7 +477,7 @@ static_library("test_support") { # TODO(https://crbug.com/356905053): Continue pulling more common test # support pieces into here and eventually merge this with the # `enable_extensions` block above. @@ -2604,7 +2513,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn deps += [ "//chrome/renderer/extensions" ] public_deps += [ -@@ -1527,7 +1527,7 @@ source_set("platform_browser_tests") { +@@ -1535,7 +1535,7 @@ source_set("platform_browser_tests") { sources += [ "../browser/enterprise/remote_commands/user_remote_commands_service_browsertest.cc" ] } @@ -2613,7 +2522,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn deps += [ "//chrome/browser/ui/prefs:browser_tests" ] } -@@ -1777,7 +1777,7 @@ source_set("platform_browser_tests") { +@@ -1788,7 +1788,7 @@ source_set("platform_browser_tests") { "//chrome/browser/ui/browser_window", ] } @@ -2622,7 +2531,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn sources += [ "../browser/devtools/global_confirm_info_bar_browsertest.cc" ] } -@@ -2065,7 +2065,7 @@ if (is_android) { +@@ -2074,7 +2074,7 @@ if (is_android) { extra_args = [] @@ -2631,7 +2540,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn sources += [ "../browser/ui/android/browser_navigator_android_browsertest.cc" ] deps += [ -@@ -2161,7 +2161,7 @@ if (is_android) { +@@ -2175,7 +2175,7 @@ if (is_android) { ] } @@ -2640,8 +2549,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn sources += [ # These API tests can't be part of platform_browser_tests because they # run in interactive_ui_tests on Win/Mac/Linux. -@@ -8041,7 +8041,7 @@ test("unit_tests") { - deps += [ "//chrome/browser/android/extensions:android" ] +@@ -8063,7 +8063,7 @@ test("unit_tests") { + deps += [ "//chrome/browser/ui/browser_window/internal:unit_tests" ] } - if (is_desktop_android) { @@ -2652,16 +2561,16 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn diff --git a/chrome/version.gni b/chrome/version.gni --- a/chrome/version.gni +++ b/chrome/version.gni -@@ -323,7 +323,7 @@ if (is_android) { - # in the android_chrome_versions.txt above - if (_use_stable_package_name_for_trichrome) { - chrome_version_code = chrome_beta_version_code -- } else if (is_desktop_android) { -+ } else if (is_desktop_android_false) { - chrome_version_code = chrome_desktop_version_code - } - -@@ -355,7 +355,7 @@ if (is_android) { +@@ -56,7 +56,7 @@ if (target_os == "android") { + # Generate hybrid configurations for target_cpu's that can run in hybrid configurations. + # i.e. "riscv64" does not show up in this list, as it's a 64-bit-only target_cpu. + if (target_cpu == "arm64" || target_cpu == "x64") { +- if (is_desktop_android) { ++ if (is_desktop_android_false) { + _version_dictionary_template += + "chrome_desktop_version_code = \"@CHROME_DESKTOP_VERSION_CODE@\" " + _version_dictionary_template += +@@ -383,7 +383,7 @@ if (is_android) { } else { true_true_true_true = trichrome_64_32_version_code } @@ -2689,7 +2598,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. diff --git a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/view/ContentView.java b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/view/ContentView.java --- a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/view/ContentView.java +++ b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/view/ContentView.java -@@ -429,7 +429,7 @@ public class ContentView extends FrameLayout +@@ -449,7 +449,7 @@ public class ContentView extends FrameLayout } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && Build.VERSION.SDK_INT <= 38 @@ -2813,7 +2722,7 @@ diff --git a/components/policy/core/browser/configuration_policy_handler_list.cc diff --git a/components/policy/core/common/cloud/cloud_policy_constants.cc b/components/policy/core/common/cloud/cloud_policy_constants.cc --- a/components/policy/core/common/cloud/cloud_policy_constants.cc +++ b/components/policy/core/common/cloud/cloud_policy_constants.cc -@@ -132,7 +132,7 @@ const char* GetChromeUserPolicyType() { +@@ -142,7 +142,7 @@ const char* GetChromeUserPolicyType() { #if BUILDFLAG(IS_CHROMEOS) return "google/chromeos/user"; #elif BUILDFLAG(IS_ANDROID) @@ -2832,8 +2741,8 @@ diff --git a/components/policy/core/common/features.cc b/components/policy/core/ -#if BUILDFLAG(IS_DESKTOP_ANDROID) +#if BUILDFLAG(IS_DESKTOP_ANDROID_CROMITE) BASE_FEATURE(kFuturePoliciesOnDesktopAndroid, - "FuturePoliciesOnDesktopAndroid", base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_DESKTOP_ANDROID) diff --git a/components/variations/service/variations_service_client.cc b/components/variations/service/variations_service_client.cc --- a/components/variations/service/variations_service_client.cc +++ b/components/variations/service/variations_service_client.cc @@ -2966,7 +2875,7 @@ diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/conte diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc -@@ -182,7 +182,7 @@ bool IsTooltipsEnabled() { +@@ -183,7 +183,7 @@ bool IsTooltipsEnabled() { // Only show on desktop devices up to B due to tooltips bug b/445244223. if (base::android::android_info::sdk_int() <= base::android::android_info::SDK_VERSION_BAKLAVA) { @@ -2995,7 +2904,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Conten diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -577,7 +577,7 @@ BASE_FEATURE(kLoadingPredictorLimitPreconnectSocketCount, +@@ -622,7 +622,7 @@ BASE_FEATURE(kLoadingPredictorLimitPreconnectSocketCount, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kLogJsConsoleMessages, @@ -3061,7 +2970,7 @@ diff --git a/cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn --- a/extensions/browser/BUILD.gn +++ b/extensions/browser/BUILD.gn -@@ -9,7 +9,7 @@ import("//pdf/features.gni") +@@ -10,7 +10,7 @@ import("//pdf/features.gni") import("//rlz/buildflags/buildflags.gni") import("//testing/libfuzzer/fuzzer_test.gni") @@ -3070,7 +2979,7 @@ diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn import("//build/config/android/rules.gni") } -@@ -1094,7 +1094,7 @@ source_set("unit_tests") { +@@ -1161,7 +1161,7 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:no_exit_time_destructors" ] } @@ -3228,7 +3137,7 @@ diff --git a/extensions/common/api/schema.gni b/extensions/common/api/schema.gni diff --git a/extensions/common/command.cc b/extensions/common/command.cc --- a/extensions/common/command.cc +++ b/extensions/common/command.cc -@@ -119,7 +119,7 @@ std::string Command::CommandPlatform() { +@@ -118,7 +118,7 @@ std::string Command::CommandPlatform() { return ui::kKeybindingPlatformChromeOs; #elif BUILDFLAG(IS_LINUX) return ui::kKeybindingPlatformLinux; @@ -3240,7 +3149,7 @@ diff --git a/extensions/common/command.cc b/extensions/common/command.cc diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc --- a/extensions/common/extension_features.cc +++ b/extensions/common/extension_features.cc -@@ -56,7 +56,7 @@ BASE_FEATURE(kSkipResetServiceWorkerURLLoaderFactories, +@@ -58,7 +58,7 @@ BASE_FEATURE(kSkipResetServiceWorkerURLLoaderFactories, BASE_FEATURE(kEnableWebHidInWebView, base::FEATURE_ENABLED_BY_DEFAULT); @@ -3249,7 +3158,7 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi // Disabled by default because on first-run we don't have a Finch seed yet, so // we want to default to the safe behavior of no extensions. BASE_FEATURE(kEnableExtensionsForCorpDesktopAndroid, -@@ -150,7 +150,7 @@ BASE_FEATURE(kDisableExtensionsOnChromeUrlsSwitch, +@@ -151,7 +151,7 @@ BASE_FEATURE(kDisableExtensionsOnChromeUrlsSwitch, // TODO (crbug.com/426554244): Determine if this switch should be // removed for desktop-android builds as well. #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_CHROMEOS) && \ @@ -3258,7 +3167,7 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -189,4 +189,10 @@ CROMITE_FEATURE(kEnableExtensionAutoupdate, +@@ -190,4 +190,10 @@ CROMITE_FEATURE(kEnableExtensionAutoupdate, CROMITE_FEATURE(kEnableExtensionManagementToChromeStore, "EnableExtensionToChromeStore", base::FEATURE_DISABLED_BY_DEFAULT); @@ -3281,7 +3190,7 @@ diff --git a/extensions/common/extension_features.h b/extensions/common/extensio // If enabled, extensions will be enabled for @google.com and @managedchrome.com // users on desktop Android. Otherwise they will be blocked. BASE_DECLARE_FEATURE(kEnableExtensionsForCorpDesktopAndroid); -@@ -310,6 +310,10 @@ BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate); +@@ -317,6 +317,10 @@ BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate); // Allows the installation of new extensions. // If active, exposes all features to the chrome web store like chromium. BASE_DECLARE_FEATURE(kEnableExtensionManagementToChromeStore); @@ -3319,7 +3228,7 @@ diff --git a/extensions/renderer/bindings/api_binding_util.cc b/extensions/rende diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc --- a/gpu/config/gpu_finch_features.cc +++ b/gpu/config/gpu_finch_features.cc -@@ -572,7 +572,7 @@ bool IsSkiaGraphiteSupportedByDevice(const base::CommandLine* command_line) { +@@ -587,7 +587,7 @@ bool IsSkiaGraphiteSupportedByDevice(const base::CommandLine* command_line) { // Desktop Android isn't ready to pick up the fieldtrial_testing_config.json // change that enables graphite. However, it's the same platform as regular // Android and does. Skip enabling the feature there for now. @@ -3328,7 +3237,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc return false; } -@@ -685,7 +685,7 @@ bool ShouldEnableDrDc() { +@@ -700,7 +700,7 @@ bool ShouldEnableDrDc() { // Chrome on Android desktop aims to be Vulkan-only, which can result // in crashes when enabled together with DrDc. Re-enable DrDc after // crbug.com/380295059 is fixed if it is shown beneficial on desktop. @@ -3366,7 +3275,7 @@ diff --git a/skia/features.gni b/skia/features.gni diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -2386,7 +2386,7 @@ BASE_FEATURE(kStopInBackground, +@@ -2340,7 +2340,7 @@ BASE_FEATURE(kStopInBackground, // b/248036988 - Disable this for Chromecast on Android builds to prevent apps // that play audio in the background from stopping. #if BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CAST_ANDROID) && \ @@ -3378,24 +3287,24 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc --- a/third_party/blink/renderer/modules/modules_initializer.cc +++ b/third_party/blink/renderer/modules/modules_initializer.cc -@@ -121,7 +121,7 @@ +@@ -119,7 +119,7 @@ + namespace blink { - namespace { -#if BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_DESKTOP_ANDROID) +#if BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_DESKTOP_ANDROID_FALSE) class SuspendCaptureObserver : public GarbageCollected, - public Supplement, -@@ -369,7 +369,7 @@ void ModulesInitializer::ProvideModulesToPage( + public PageVisibilityObserver { +@@ -365,7 +365,7 @@ void ModulesInitializer::ProvideModulesToPage( const SessionStorageNamespaceId& namespace_id) const { StorageNamespace::ProvideSessionStorageNamespaceTo(page, namespace_id); AudioGraphTracer::ProvideAudioGraphTracerTo(page); -#if BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_DESKTOP_ANDROID) +#if BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_DESKTOP_ANDROID_FALSE) - page.ProvideSupplement(MakeGarbageCollected(page)); + page.SetSuspendCaptureObserver( + MakeGarbageCollected(page)); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_DESKTOP_ANDROID) - } diff --git a/tools/grit/grit_args.gni b/tools/grit/grit_args.gni --- a/tools/grit/grit_args.gni +++ b/tools/grit/grit_args.gni @@ -3443,31 +3352,31 @@ diff --git a/ui/android/java/src/org/chromium/ui/widget/PopupSpecCalculator.java diff --git a/ui/android/javatests/src/org/chromium/ui/test/util/UiDisableIfSkipCheck.java b/ui/android/javatests/src/org/chromium/ui/test/util/UiDisableIfSkipCheck.java --- a/ui/android/javatests/src/org/chromium/ui/test/util/UiDisableIfSkipCheck.java +++ b/ui/android/javatests/src/org/chromium/ui/test/util/UiDisableIfSkipCheck.java -@@ -44,7 +44,7 @@ public class UiDisableIfSkipCheck extends DisableIfSkipCheck { - } - - private boolean isDesktop() { -- return DeviceInfo.isDesktop(); -+ return DeviceInfo.isDesktopFalse(); - } - - private boolean isTablet() { +@@ -38,7 +38,7 @@ public class UiDisableIfSkipCheck extends DisableIfSkipCheck { + case DeviceFormFactor.TABLET_OR_DESKTOP: + return isTablet(); + case DeviceFormFactor.PHONE_OR_TABLET: +- return !DeviceInfo.isDesktop(); ++ return !DeviceInfo.isDesktopFalse(); + default: + return false; + } diff --git a/ui/android/javatests/src/org/chromium/ui/test/util/UiRestriction.java b/ui/android/javatests/src/org/chromium/ui/test/util/UiRestriction.java --- a/ui/android/javatests/src/org/chromium/ui/test/util/UiRestriction.java +++ b/ui/android/javatests/src/org/chromium/ui/test/util/UiRestriction.java -@@ -24,7 +24,7 @@ public final class UiRestriction { - - private static boolean isDesktop() { - if (sIsDesktop == null) { -- sIsDesktop = DeviceInfo.isDesktop(); -+ sIsDesktop = DeviceInfo.isDesktopFalse(); - } - return sIsDesktop; +@@ -31,7 +31,7 @@ public final class UiRestriction { + if (sIsDesktop == null) { + // See the following link for implementation details: + // https://source.chromium.org/chromium/chromium/src/+/main:base/android/java/src/org/chromium/base/DeviceInfo.java;l=285-287;drc=61d3d9feb38d8045309dd9e237f5305de987523d +- sIsDesktop = DeviceInfo.isDesktop(); ++ sIsDesktop = DeviceInfo.isDesktopFalse(); + } + return sIsDesktop; } diff --git a/ui/base/accelerators/command.cc b/ui/base/accelerators/command.cc --- a/ui/base/accelerators/command.cc +++ b/ui/base/accelerators/command.cc -@@ -87,7 +87,7 @@ std::string Command::CommandPlatform() { +@@ -86,7 +86,7 @@ std::string Command::CommandPlatform() { // TODO(crbug.com/40220501): Change this once we decide what string should be // used for Fuchsia. return ui::kKeybindingPlatformLinux; @@ -3500,27 +3409,6 @@ diff --git a/ui/gl/features.gni b/ui/gl/features.gni # Should Dawn test binaries (unittests, end2end_tests, perf_tests) be built? # Independent of use_dawn, which controls whether Dawn is used in Chromium. -diff --git a/ui/gl/gl_switches.cc b/ui/gl/gl_switches.cc ---- a/ui/gl/gl_switches.cc -+++ b/ui/gl/gl_switches.cc -@@ -269,7 +269,7 @@ BASE_FEATURE(kDefaultANGLEMetal, base::FEATURE_ENABLED_BY_DEFAULT); - - // Default to using ANGLE's Vulkan backend. - BASE_FEATURE(kDefaultANGLEVulkan, --#if BUILDFLAG(IS_DESKTOP_ANDROID) -+#if false //BUILDFLAG(IS_DESKTOP_ANDROID_FALSE) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -282,7 +282,7 @@ BASE_FEATURE(kTrackCurrentShaders, base::FEATURE_DISABLED_BY_DEFAULT); - - // Enable sharing Vulkan device queue with ANGLE's Vulkan backend. - BASE_FEATURE(kVulkanFromANGLE, --#if BUILDFLAG(IS_DESKTOP_ANDROID) -+#if false //BUILDFLAG(IS_DESKTOP_ANDROID_FALSE) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index bc2a2bc1..53384cb2 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -56,10 +56,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/toolbar/ToolbarManager.java | 37 ++++- .../chrome/browser/ui/BottomContainer.java | 18 +++ .../ui/system/StatusBarColorController.java | 8 + - .../android/compositor/layer/toolbar_layer.cc | 10 +- + .../android/compositor/layer/toolbar_layer.cc | 5 + .../scene_layer/tab_strip_scene_layer.cc | 16 +- .../BottomControlsStacker.java | 2 +- - .../BrowserControlsMarginSupplier.java | 5 + + .../BrowserControlsMarginAdapter.java | 5 + .../BrowserControlsStateProvider.java | 6 + .../browser/feed/FeedListContentManager.java | 6 +- .../flags/android/chrome_feature_list.cc | 3 + @@ -68,10 +68,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome/browser/hub/HubCoordinator.java | 9 ++ .../chrome/browser/hub/HubManagerImpl.java | 16 +- .../browser/hub/ReversedLinearLayout.java | 42 +++++ - .../android/res/layout/hub_layout.xml | 24 ++- + .../android/res/layout/hub_layout.xml | 9 +- .../android/res/layout/hub_toolbar_layout.xml | 4 +- chrome/browser/prefs/browser_prefs.cc | 2 +- - .../chrome/browser/ui/appmenu/AppMenu.java | 39 ++++- + .../chrome/browser/ui/appmenu/AppMenu.java | 38 ++++- .../ui/appmenu/AppMenuHandlerImpl.java | 10 ++ .../EdgeToEdgeControllerImpl.java | 1 + .../ui/edge_to_edge/EdgeToEdgeUtils.java | 2 + @@ -104,7 +104,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../render_widget_host_view_android.cc | 3 + .../Move-navigation-bar-to-bottom.inc | 17 ++ .../renderer/core/frame/viewport_data.cc | 1 + - 91 files changed, 1074 insertions(+), 95 deletions(-) + 91 files changed, 1060 insertions(+), 88 deletions(-) create mode 100644 chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/ReversedLinearLayout.java create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Move-navigation-bar-to-bottom.inc @@ -164,7 +164,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -5279,6 +5279,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { +@@ -5292,6 +5292,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { if (scroll_delta.IsZero()) return false; @@ -195,7 +195,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser ObservableSupplierImpl tabStripTokenSupplier = new ObservableSupplierImpl<>(); var currentTabGroupModelFilterSupplier = -@@ -291,7 +293,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T +@@ -293,7 +295,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T sharedImageTilesConfigBuilder, mThemeColorProvider, onSnapshotTokenChange, @@ -312,7 +312,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser private void setupToolbarButtons() { View.OnClickListener showGroupDialogOnClickListener = view -> { -@@ -587,6 +635,7 @@ public class TabGroupUiMediator implements BackPressHandler { +@@ -585,6 +633,7 @@ public class TabGroupUiMediator implements BackPressHandler { @SuppressWarnings("NullAway") public void destroy() { @@ -432,7 +432,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import android.graphics.Rect; import android.util.Size; import android.view.InputDevice; -@@ -74,6 +80,8 @@ import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter; +@@ -75,6 +81,8 @@ import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter; import org.chromium.ui.recyclerview.widget.ItemTouchHelper2; import org.chromium.ui.widget.ViewLookupCachingFrameLayout; @@ -441,7 +441,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; -@@ -162,6 +170,124 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -163,6 +171,124 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO private int mAwaitingTabId = Tab.INVALID_TAB_ID; private @TabActionState int mTabActionState; @@ -566,7 +566,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** * Construct a coordinator for UI that shows a list of tabs. * -@@ -417,6 +543,12 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -423,6 +549,12 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO checkAwaitingLayout(); } }; @@ -579,7 +579,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mRecyclerView.setLayoutManager(gridLayoutManager); mMediator.registerOrientationListener(gridLayoutManager); mMediator.updateSpanCount( -@@ -436,6 +568,17 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -442,6 +574,17 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO } }; mRecyclerView.setLayoutManager(layoutManager); @@ -597,16 +597,16 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } mMediator.setRecyclerViewItemAnimationToggle(mRecyclerView::setDisableItemAnimations); } -@@ -456,7 +599,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO - assumeNonNull(mTabListEmptyCoordinator); +@@ -461,7 +604,7 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO + if (emptyViewParent != null) { mTabListEmptyCoordinator = new TabListEmptyCoordinator( -- parentView, mModelList, this::runOnItemAnimatorFinished); -+ parentView, mModelList, this::runOnItemAnimatorFinished, mBrowserControlsStateProvider); +- emptyViewParent, mModelList, this::runOnItemAnimatorFinished); ++ emptyViewParent, mModelList, this::runOnItemAnimatorFinished, mBrowserControlsStateProvider); } mTabListHighlighter = new TabListHighlighter(mModelList); mTabListMergeAnimationManager = new TabListMergeAnimationManager(mRecyclerView); -@@ -793,6 +936,9 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO +@@ -798,6 +941,9 @@ public class TabListCoordinator implements PriceWelcomeMessageProvider, DestroyO void prepareTabSwitcherPaneView() { registerLayoutChangeListener(); mRecyclerView.setupCustomItemAnimator(); @@ -676,7 +676,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java -@@ -45,6 +45,7 @@ import org.chromium.build.BuildConfig; +@@ -44,6 +44,7 @@ import org.chromium.build.BuildConfig; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.compositor.CompositorViewHolder; @@ -684,7 +684,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import org.chromium.chrome.browser.hub.DisplayButtonData; import org.chromium.chrome.browser.hub.FadeHubLayoutAnimationFactory; import org.chromium.chrome.browser.hub.FullButtonData; -@@ -177,6 +178,7 @@ public abstract class TabSwitcherPaneBase implements Pane, TabSwitcher, TabSwitc +@@ -174,6 +175,7 @@ public abstract class TabSwitcherPaneBase implements Pane, TabSwitcher, TabSwitc private @Nullable PaneHubController mPaneHubController; private @Nullable Long mWaitForTabStateInitializedStartTimeMs; private final @Nullable ObservableSupplier mXrSpaceModeObservableSupplier; @@ -692,7 +692,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** * @param context The activity context. -@@ -493,6 +495,13 @@ public abstract class TabSwitcherPaneBase implements Pane, TabSwitcher, TabSwitc +@@ -490,6 +492,13 @@ public abstract class TabSwitcherPaneBase implements Pane, TabSwitcher, TabSwitc Log.d(TAG, "Geometry not ready using fallback animation."); useFallbackAnimation = true; } @@ -709,7 +709,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java -@@ -19,6 +19,7 @@ import android.os.Looper; +@@ -21,6 +21,7 @@ import android.os.Looper; import android.os.SystemClock; import android.view.Gravity; import android.view.LayoutInflater; @@ -717,7 +717,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -@@ -697,6 +698,9 @@ public class FeedSurfaceCoordinator +@@ -763,6 +764,9 @@ public class FeedSurfaceCoordinator ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); layoutParams.setMarginStart(margin); layoutParams.setMarginEnd(margin); @@ -754,7 +754,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1077,7 +1077,8 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -1074,7 +1074,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt mRootUiCoordinator.getDataSharingTabManager(), mRootUiCoordinator.getBottomSheetController(), mRootUiCoordinator.getShareDelegateSupplier(), @@ -985,7 +985,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo import java.util.ArrayList; import java.util.List; -@@ -525,7 +527,11 @@ public class ToolbarSwipeLayout extends Layout { +@@ -527,7 +529,11 @@ public class ToolbarSwipeLayout extends Layout { mLeftToolbarOverlay.setXOffset(leftX * dpToPx); } mLeftTab.setX(leftX); @@ -998,7 +998,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo needUpdate = updateSnap(dt, mLeftTab) || needUpdate; } else if (mLeftToolbarOverlay != null) { mLeftToolbarOverlay.setManualVisibility(false); -@@ -538,7 +544,11 @@ public class ToolbarSwipeLayout extends Layout { +@@ -540,7 +546,11 @@ public class ToolbarSwipeLayout extends Layout { mRightToolbarOverlay.setXOffset(rightX * dpToPx); } mRightTab.setX(rightX); @@ -1026,7 +1026,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java -@@ -112,6 +112,8 @@ import org.chromium.ui.interpolators.Interpolators; +@@ -116,6 +116,8 @@ import org.chromium.ui.interpolators.Interpolators; import org.chromium.ui.resources.ResourceManager; import org.chromium.ui.util.ColorUtils; import org.chromium.url.GURL; @@ -1035,7 +1035,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over import java.util.ArrayList; import java.util.List; -@@ -269,12 +271,16 @@ public class StripLayoutHelperManager +@@ -276,12 +278,16 @@ public class StripLayoutHelperManager // Drag-Drop private @Nullable TabStripDragHandler mTabStripDragHandler; @@ -1052,7 +1052,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over if (mModelSelectorButton != null && mModelSelectorButton.onDown(x, y, buttons)) { return; } -@@ -299,6 +305,7 @@ public class StripLayoutHelperManager +@@ -306,6 +312,7 @@ public class StripLayoutHelperManager if (DragDropGlobalState.hasValue()) { return; } @@ -1060,7 +1060,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over if (mModelSelectorButton != null) { mModelSelectorButton.drag(x, y); } -@@ -310,6 +317,7 @@ public class StripLayoutHelperManager +@@ -317,6 +324,7 @@ public class StripLayoutHelperManager if (DragDropGlobalState.hasValue()) { return; } @@ -1068,7 +1068,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over long time = time(); if (mModelSelectorButton != null && mModelSelectorButton.click(x, y, buttons)) { mModelSelectorButton.handleClick(time, buttons, modifiers); -@@ -323,6 +331,7 @@ public class StripLayoutHelperManager +@@ -330,6 +338,7 @@ public class StripLayoutHelperManager if (DragDropGlobalState.hasValue()) { return; } @@ -1076,7 +1076,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over getActiveStripLayoutHelper().fling(time(), velocityX); } -@@ -331,6 +340,7 @@ public class StripLayoutHelperManager +@@ -338,6 +347,7 @@ public class StripLayoutHelperManager if (DragDropGlobalState.hasValue()) { return; } @@ -1084,7 +1084,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over getActiveStripLayoutHelper().onLongPress(x, y); } -@@ -470,7 +480,8 @@ public class StripLayoutHelperManager +@@ -477,7 +487,8 @@ public class StripLayoutHelperManager DataSharingTabManager dataSharingTabManager, BottomSheetController bottomSheetController, Supplier shareDelegateSupplier, @@ -1094,7 +1094,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over mContext = context; Resources res = context.getResources(); mManagerHost = managerHost; -@@ -590,6 +601,8 @@ public class StripLayoutHelperManager +@@ -597,6 +608,8 @@ public class StripLayoutHelperManager multiInstanceManager, shareDelegateSupplier, TabGroupListBottomSheetCoordinator::new); @@ -1103,8 +1103,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over tabHoverCardViewStub.setOnInflateListener( (viewStub, view) -> { -@@ -856,6 +869,10 @@ public class StripLayoutHelperManager - yOffset = 0; +@@ -861,6 +874,10 @@ public class StripLayoutHelperManager + getStripTransitionScrimColor(), mStripTransitionScrimOpacity); } + int topControlsHeight = 0; @@ -1114,7 +1114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over mTabStripTreeProvider.pushAndUpdateStrip( this, mLayerTitleCacheSupplier.get(), -@@ -869,7 +886,9 @@ public class StripLayoutHelperManager +@@ -874,7 +891,9 @@ public class StripLayoutHelperManager mStripTransitionScrimOpacity, getActiveStripLayoutHelper().getLeftPaddingToDraw(), getActiveStripLayoutHelper().getRightPaddingToDraw(), @@ -1122,10 +1122,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over + mTopPadding, + viewport.height(), + topControlsHeight); - return mTabStripTreeProvider; } -@@ -935,11 +954,21 @@ public class StripLayoutHelperManager + private float getVisibleHeightDp(float topControlOffsetDp) { +@@ -976,11 +995,21 @@ public class StripLayoutHelperManager mRightPadding, mTopPadding); @@ -1276,7 +1276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow /** A class that manages browser control visibility and positioning. */ @NullMarked public class BrowserControlsManager implements ActivityStateListener, BrowserControlsSizer { -@@ -618,6 +620,14 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon +@@ -581,6 +583,14 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon } } @@ -1291,7 +1291,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow @Override public int getTopControlsMinHeight() { return mTopControlsMinHeight; -@@ -719,6 +729,8 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon +@@ -682,6 +692,8 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon @Override public float getTopVisibleContentOffset() { @@ -1342,19 +1342,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/messages/Messag diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java --- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java -@@ -354,7 +354,7 @@ public class ChromeTabModalPresenter extends TabModalPresenter - Resources resources, BrowserControlsStateProvider provider) { - int scrimVerticalMargin = - resources.getDimensionPixelSize(R.dimen.tab_modal_scrim_vertical_margin); -- return provider.getTopControlsHeight() - scrimVerticalMargin; -+ return provider.getTopControlsHeightRealOffset() - scrimVerticalMargin; +@@ -348,7 +348,7 @@ public class ChromeTabModalPresenter extends TabModalPresenter + * @return The container top margin. + */ + public static int getContainerTopMargin(BrowserControlsStateProvider provider) { +- return provider.getTopControlsHeight(); ++ return provider.getTopControlsHeightRealOffset(); } /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -@@ -129,6 +129,7 @@ import org.chromium.content_public.browser.NavigationController; +@@ -132,6 +132,7 @@ import org.chromium.content_public.browser.NavigationController; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.WindowAndroid; import org.chromium.url.GURL; @@ -1362,7 +1362,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. import androidx.annotation.NonNull; import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpener; -@@ -873,11 +874,16 @@ public class NewTabPage +@@ -916,11 +917,16 @@ public class NewTabPage final int topControlsDistanceToRest = mBrowserControlsStateProvider.getContentOffset() - mBrowserControlsStateProvider.getTopControlsHeight(); @@ -1381,7 +1381,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. if (topMargin != layoutParams.topMargin || bottomMargin != layoutParams.bottomMargin) { layoutParams.topMargin = topMargin; -@@ -893,9 +899,7 @@ public class NewTabPage +@@ -936,9 +942,7 @@ public class NewTabPage * strip. */ private int getToolbarExtraYOffset() { @@ -1548,7 +1548,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java -@@ -207,6 +207,11 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl +@@ -189,6 +189,11 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl if (fragment instanceof INeedSnackbarManager) { ((INeedSnackbarManager)fragment).setSnackbarManagerSupplier(mSnackbarManagerSupplier); } @@ -1589,18 +1589,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java --- a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java -@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.layouts.components.VirtualView; +@@ -15,6 +15,7 @@ import org.chromium.chrome.browser.layouts.SceneOverlay; import org.chromium.chrome.browser.layouts.scene_layer.SceneLayer; import org.chromium.chrome.browser.layouts.scene_layer.SceneOverlayLayer; import org.chromium.ui.resources.ResourceManager; +import org.chromium.chrome.browser.flags.ChromeFeatureList; - import java.util.List; - -@@ -80,7 +81,10 @@ class StatusIndicatorSceneLayer extends SceneOverlayLayer implements SceneOverla + /** + * A composited view that is positioned below the status bar and is persistent. Typically used to +@@ -75,7 +76,10 @@ class StatusIndicatorSceneLayer extends SceneOverlayLayer implements SceneOverla @Override public SceneOverlayLayer getUpdatedSceneOverlayTree( - RectF viewport, RectF visibleViewport, ResourceManager resourceManager, float yOffset) { + RectF viewport, RectF visibleViewport, ResourceManager resourceManager) { - final int offset = mBrowserControlsStateProvider.getTopControlsMinHeightOffset(); + int offset = mBrowserControlsStateProvider.getTopControlsMinHeightOffset(); + if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) { @@ -1612,7 +1612,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -232,6 +232,9 @@ import org.chromium.url.GURL; +@@ -235,6 +235,9 @@ import org.chromium.url.GURL; import java.util.List; import java.util.function.Supplier; @@ -1622,7 +1622,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar /** * Contains logic for managing the toolbar visual component. This class manages the interactions * with the rest of the application to ensure the toolbar is always visually up to date. -@@ -892,6 +895,17 @@ public class ToolbarManager +@@ -904,6 +907,17 @@ public class ToolbarManager /* matchTrustedCdnUrl= */ mIsCustomTab); mControlContainer = controlContainer; mToolbarHairline = mControlContainer.findViewById(R.id.toolbar_hairline); @@ -1640,7 +1640,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mBookmarkModelSupplier = bookmarkModelSupplier; mBookmarkModelSupplier.addObserver(mBookmarkModelSupplierObserver); -@@ -1568,6 +1582,7 @@ public class ToolbarManager +@@ -1623,6 +1637,7 @@ public class ToolbarManager // the height won't be measured by the background image. if (mControlContainer.getBackground() == null) { setControlContainerTopMargin(getToolbarExtraYOffset()); @@ -1648,7 +1648,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar } else if (mLayoutChangeListener == null) { mLayoutChangeListener = (view, -@@ -1581,6 +1596,7 @@ public class ToolbarManager +@@ -1636,6 +1651,7 @@ public class ToolbarManager oldBottom) -> { if (mControlContainer.getBackground() == null) { setControlContainerTopMargin(getToolbarExtraYOffset()); @@ -1656,7 +1656,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mControlContainer.removeOnLayoutChangeListener( mLayoutChangeListener); mLayoutChangeListener = null; -@@ -2206,9 +2222,21 @@ public class ToolbarManager +@@ -2264,9 +2280,21 @@ public class ToolbarManager return ((LocationBarCoordinator) mLocationBar).getUrlBarViewRectProvider(); } @@ -1679,7 +1679,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar assert mTabGroupUiOneshotSupplier == null; assert mUndoBarThrottle != null; assert mLayoutManager != null; -@@ -2226,7 +2254,7 @@ public class ToolbarManager +@@ -2284,7 +2312,7 @@ public class ToolbarManager mActivityTabProvider, mTabModelSelector, mActivity, @@ -1688,7 +1688,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mBrowserControlsSizer, mScrimManager, mOmniboxFocusStateSupplier, -@@ -2253,7 +2281,7 @@ public class ToolbarManager +@@ -2311,7 +2339,7 @@ public class ToolbarManager mControlsVisibilityDelegate, mFullscreenManager, mEdgeToEdgeControllerSupplier, @@ -1697,7 +1697,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar bottomControlsContentDelegateSupplier, mTabObscuringHandler, mOverlayPanelVisibilitySupplier, -@@ -2261,7 +2289,8 @@ public class ToolbarManager +@@ -2319,7 +2347,8 @@ public class ToolbarManager /* readAloudRestoringSupplier= */ () -> { final var readAloud = mReadAloudControllerSupplier.get(); return readAloud != null && readAloud.isRestoringPlayer(); @@ -1750,15 +1750,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContai diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java -@@ -8,6 +8,7 @@ import android.content.Context; - import android.graphics.Color; +@@ -12,6 +12,7 @@ import android.graphics.Color; + import android.os.Build; import android.view.View; import android.view.Window; +import android.os.Build; import androidx.annotation.ColorInt; import androidx.annotation.VisibleForTesting; -@@ -20,6 +21,7 @@ import org.chromium.build.annotations.NullMarked; +@@ -24,6 +25,7 @@ import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; @@ -1766,19 +1766,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu import org.chromium.chrome.browser.layouts.LayoutManager; import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver; -@@ -537,6 +539,12 @@ public class StatusBarColorController - UiUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons); +@@ -586,6 +588,12 @@ public class StatusBarColorController UiUtils.setStatusBarColor(window, color); } + + if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled() && + Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + UiUtils.setNavigationBarIconColor(window.getDecorView().getRootView(), + needsDarkStatusBarIcons); + window.setNavigationBarColor(color); + } - } - - /** + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + var taskDescription = + new ActivityManager.TaskDescription.Builder().setStatusBarColor(color).build(); diff --git a/chrome/browser/android/compositor/layer/toolbar_layer.cc b/chrome/browser/android/compositor/layer/toolbar_layer.cc --- a/chrome/browser/android/compositor/layer/toolbar_layer.cc +++ b/chrome/browser/android/compositor/layer/toolbar_layer.cc @@ -1790,22 +1790,17 @@ diff --git a/chrome/browser/android/compositor/layer/toolbar_layer.cc b/chrome/b #include "cc/resources/scoped_ui_resource.h" #include "cc/slim/layer.h" #include "cc/slim/nine_patch_layer.h" -@@ -118,8 +119,13 @@ void ToolbarLayer::PushResource(int toolbar_resource_id, - debug_layer_->RemoveFromParent(); +@@ -134,6 +135,10 @@ void ToolbarLayer::PushResource(int toolbar_resource_id, + y_offset = legacy_content_offset - layer_->bounds().height(); + } - // Position the toolbar at the bottom of the space available for top controls. -- layer_->SetPosition( -- gfx::PointF(x_offset, content_offset - layer_->bounds().height())); + if (base::FeatureList::IsEnabled(::features::kMoveTopToolbarToBottom)) { -+ layer_->SetPosition( -+ gfx::PointF(x_offset, content_offset + layer_->bounds().height())); -+ } else { -+ layer_->SetPosition( -+ gfx::PointF(x_offset, content_offset - layer_->bounds().height())); ++ y_offset = legacy_content_offset + layer_->bounds().height(); + } ++ + layer_->SetPosition(gfx::PointF(x_offset, y_offset)); if (features::IsAndroidAnimatedProgressBarInVizEnabled()) { - toolbar_layers_->SetOffsetTag(offset_tag); diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc --- a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc +++ b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc @@ -1865,18 +1860,18 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom return mBrowserControlsSizer; } -diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java ---- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java -+++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java -@@ -9,6 +9,7 @@ import android.graphics.Rect; - import org.chromium.base.supplier.DestroyableObservableSupplier; +diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginAdapter.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginAdapter.java +--- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginAdapter.java ++++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginAdapter.java +@@ -10,6 +10,7 @@ import org.chromium.base.lifetime.Destroyable; + import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.build.annotations.NullMarked; +import org.chromium.chrome.browser.flags.ChromeFeatureList; /** - * An implementation of {@link DestroyableObservableSupplier} that monitors changes to browser -@@ -63,6 +64,10 @@ public class BrowserControlsMarginSupplier extends ObservableSupplierImpl + * An implementation of {@link ObservableSupplier} that monitors changes to browser controls and +@@ -75,6 +76,10 @@ public class BrowserControlsMarginAdapter int bottomMargin = mBrowserControlsStateProvider.getBottomControlsHeight() - mBrowserControlsStateProvider.getBottomControlOffset(); @@ -1884,7 +1879,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom + bottomMargin += topMargin; + topMargin = 0; + } - super.set(new Rect(0, topMargin, 0, bottomMargin)); + mTargetSupplier.set(new Rect(0, topMargin, 0, bottomMargin)); } } diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java @@ -1937,7 +1932,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse #include "chrome/browser/android/webapk/webapk_features.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/contextmenu/context_menu_features.h" -@@ -375,6 +376,8 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -377,6 +378,8 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kNewTabPageCustomizationToolbarButton, &kNewTabPageCustomizationV2, &kNotificationPermissionBottomSheet, @@ -1949,7 +1944,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -507,6 +507,10 @@ public abstract class ChromeFeatureList { +@@ -513,6 +513,10 @@ public abstract class ChromeFeatureList { public static final String NAV_BAR_COLOR_ANIMATION = "NavBarColorAnimation"; public static final String NEW_TAB_PAGE_CUSTOMIZATION = "NewTabPageCustomization"; public static final String NEW_TAB_PAGE_CUSTOMIZATION_FOR_MVT = "NewTabPageCustomizationForMvt"; @@ -1960,9 +1955,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON = "NewTabPageCustomizationToolbarButton"; public static final String NEW_TAB_PAGE_CUSTOMIZATION_V2 = "NewTabPageCustomizationV2"; -@@ -1016,6 +1020,10 @@ public abstract class ChromeFeatureList { - public static final CachedFlag sOptimizationGuidePushNotifications = - newCachedFlag(OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, true); +@@ -1023,6 +1027,10 @@ public abstract class ChromeFeatureList { + public static final CachedFlag sNotificationTrampoline = + newCachedFlag(NOTIFICATION_TRAMPOLINE, false); public static final CachedFlag sPCctMinimumHeight = newCachedFlag(PCCT_MINIMUM_HEIGHT, true); + public static final CachedFlag sDisableToolbarSwipeUp = + newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false); @@ -1971,9 +1966,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false); public static final CachedFlag sPostGetMyMemoryStateToBackground = newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true); -@@ -1248,6 +1256,8 @@ public abstract class ChromeFeatureList { +@@ -1260,6 +1268,8 @@ public abstract class ChromeFeatureList { + sNewTabPageCustomizationV2, sNotificationTrampoline, - sOptimizationGuidePushNotifications, sPCctMinimumHeight, + sMoveTopToolbarToBottom, + sDisableToolbarSwipeUp, @@ -2013,7 +2008,7 @@ diff --git a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/br import org.chromium.base.Callback; import org.chromium.base.DeviceInfo; -@@ -24,6 +25,7 @@ import org.chromium.base.supplier.TransitiveObservableSupplier; +@@ -23,6 +24,7 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.feature_engagement.TrackerFactory; @@ -2021,7 +2016,7 @@ diff --git a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/br import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileProvider; import org.chromium.chrome.browser.tab.Tab; -@@ -172,6 +174,13 @@ public class HubCoordinator implements PaneHubController, BackPressHandler { +@@ -171,6 +173,13 @@ public class HubCoordinator implements PaneHubController, BackPressHandler { paneManager.getFocusedPaneSupplier(), hubColorMixer, defaultPaneId); @@ -2034,7 +2029,7 @@ diff --git a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/br + } ObservableSupplier<@Nullable View> overlayViewSupplier = - new TransitiveObservableSupplier( + mPaneManager diff --git a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubManagerImpl.java b/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubManagerImpl.java --- a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubManagerImpl.java +++ b/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubManagerImpl.java @@ -2138,7 +2133,7 @@ new file mode 100644 diff --git a/chrome/browser/hub/internal/android/res/layout/hub_layout.xml b/chrome/browser/hub/internal/android/res/layout/hub_layout.xml --- a/chrome/browser/hub/internal/android/res/layout/hub_layout.xml +++ b/chrome/browser/hub/internal/android/res/layout/hub_layout.xml -@@ -8,20 +8,28 @@ found in the LICENSE file. +@@ -8,11 +8,14 @@ found in the LICENSE file. android:layout_width="match_parent" android:layout_height="match_parent"> @@ -2149,28 +2144,18 @@ diff --git a/chrome/browser/hub/internal/android/res/layout/hub_layout.xml b/chr android:layout_width="match_parent" android:layout_height="match_parent"> -- -- - - -- -+ -+ -+ ++ + + + + +- +- +- + @@ -2199,7 +2184,7 @@ diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.x diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -2282,7 +2282,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2034,7 +2034,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #if BUILDFLAG(IS_ANDROID) registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault, @@ -2219,45 +2204,47 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch import android.os.SystemClock; import android.view.Gravity; import android.view.KeyEvent; -@@ -256,6 +257,12 @@ class AppMenu implements OnKeyListener { +@@ -424,6 +425,13 @@ class AppMenu implements OnKeyListener { + mListView.setVerticalScrollBarEnabled(false); } - mListView = contentView.findViewById(R.id.app_menu_list); + if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) { + // always scroll to the bottom to show new items + mListView.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL); + // fill content starting from the bottom of the view + mListView.setStackFromBottom(true); + } - ++ int footerHeight = attachFooter(footer, (ViewGroup) contentView, menuWidth); int headerHeight = attachHeader(header, menuWidth); -@@ -294,7 +301,7 @@ class AppMenu implements OnKeyListener { - Math.min( - Math.abs(mTempLocation[1] - visibleDisplayFrame.top), - Math.abs(mTempLocation[1] - visibleDisplayFrame.bottom)); -- setMenuHeight( -+ int popupHeight = setMenuHeight( - mInitialSizingHelper, - visibleDisplayFrame, - sizingPadding, -@@ -312,8 +319,14 @@ class AppMenu implements OnKeyListener { - sizingPadding, + +@@ -471,7 +479,8 @@ class AppMenu implements OnKeyListener { + anchorView, + anchorViewOffset); + +- popup.setHeight(calculateMenuHeight()); ++ int popupHeight = calculateMenuHeight(); ++ popup.setHeight(popupHeight); + + int[] popupPosition = + getPopupPosition( +@@ -483,8 +492,14 @@ class AppMenu implements OnKeyListener { + padding, anchorView, popupWidth, - anchorView.getRootView().getLayoutDirection()); + anchorView.getRootView().getLayoutDirection(), + popupHeight); - mPopup.setContentView(contentView); + popup.setContentView(contentView); + if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) { + // due to some unknown behaviour, the popup must be resized to + // allow selection without leaving touch + mPopup.setHeight(popupHeight - 1); + } - // Post the show call to handle keyboard click events. - if (ChromeFeatureList.sAndroidWebAppMenuButton.isEnabled()) { -@@ -385,11 +398,20 @@ class AppMenu implements OnKeyListener { + mHierarchicalMenuController.setupFlyoutController( + /* flyoutHandler= */ flyoutHandler, +@@ -609,11 +624,20 @@ class AppMenu implements OnKeyListener { Rect padding, View anchorView, int popupWidth, @@ -2279,18 +2266,9 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch int[] offsets = new int[2]; // If we have a hardware menu button, locate the app menu closer to the estimated // hardware menu button location. -@@ -495,7 +517,7 @@ class AppMenu implements OnKeyListener { - } - - @RequiresNonNull("mPopup") -- private void setMenuHeight( -+ private int setMenuHeight( - InitialSizingHelper sizingHelper, - Rect appDimensions, - Rect padding, -@@ -513,7 +535,13 @@ class AppMenu implements OnKeyListener { - - footerHeight - - headerHeight +@@ -744,7 +768,13 @@ class AppMenu implements OnKeyListener { + - mMenuSpec.footerHeight + - mMenuSpec.headerHeight - anchorViewImpactHeight; - + if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) { @@ -2300,21 +2278,13 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch + availableScreenSpace -= anchorView.getHeight(); + } + } - if (mIsByPermanentButton) availableScreenSpace -= padding.top; + if (mIsByPermanentButton) availableScreenSpace -= mMenuSpec.padding.top; if (availableScreenSpace <= 0 && sExceptionReporter != null) { String logMessage = -@@ -550,6 +578,7 @@ class AppMenu implements OnKeyListener { - int menuHeight = calculateHeightForItems(heightList, canBeLastList, availableScreenSpace); - menuHeight += footerHeight + headerHeight + padding.top + padding.bottom; - mPopup.setHeight(menuHeight); -+ return menuHeight; - } - - @VisibleForTesting diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java -@@ -28,6 +28,7 @@ import androidx.core.content.ContextCompat; +@@ -29,6 +29,7 @@ import androidx.core.content.ContextCompat; import org.chromium.base.Callback; import org.chromium.base.metrics.RecordUserAction; @@ -2322,7 +2292,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch import org.chromium.build.annotations.MonotonicNonNull; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; -@@ -274,7 +275,16 @@ class AppMenuHandlerImpl +@@ -295,7 +296,16 @@ class AppMenuHandlerImpl assert !(isByPermanentButton && startDragging); mModelList = mDelegate.getMenuItems(); @@ -2408,7 +2378,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java -@@ -232,6 +232,7 @@ public class LocationBarCoordinator +@@ -259,6 +259,7 @@ public class LocationBarCoordinator ? ControlsPosition.TOP : mBrowserControlsStateProvider.getControlsPosition(), mDeferredIMEWindowInsetApplicationCallback::getCurrentKeyboardHeight, @@ -2492,7 +2462,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } if (isTablet()) { -@@ -343,6 +360,13 @@ class OmniboxSuggestionsDropdownEmbedderImpl +@@ -335,6 +352,13 @@ class OmniboxSuggestionsDropdownEmbedderImpl height = Math.min(windowSpace, contentSpace) - top; } @@ -2506,7 +2476,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow // TODO(pnoland@, https://crbug.com/1416985): avoid pushing changes that are identical to // the previous alignment value. OmniboxAlignment omniboxAlignment = -@@ -351,6 +375,14 @@ class OmniboxSuggestionsDropdownEmbedderImpl +@@ -343,6 +367,14 @@ class OmniboxSuggestionsDropdownEmbedderImpl mOmniboxAlignmentSupplier.set(omniboxAlignment); } @@ -2532,7 +2502,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import androidx.annotation.ColorInt; import androidx.annotation.VisibleForTesting; import androidx.core.view.ViewCompat; -@@ -52,6 +53,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -51,6 +52,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modelutil.LazyConstructionPropertyMcp; import org.chromium.ui.modelutil.MVCListAdapter.ModelList; import org.chromium.ui.modelutil.PropertyModel; @@ -2540,7 +2510,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import java.util.ArrayList; import java.util.List; -@@ -72,6 +74,7 @@ public class AutocompleteCoordinator +@@ -70,6 +72,7 @@ public class AutocompleteCoordinator implements OmniboxSuggestionsVisualState { private @Nullable OmniboxSuggestionsDropdown mDropdown; private final ObserverList mScrollListenerList = new ObserverList<>(); @@ -2548,7 +2518,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** An observer watching for changes to the visual state of the omnibox suggestions. */ public interface OmniboxSuggestionsVisualStateObserver { -@@ -106,6 +109,7 @@ public class AutocompleteCoordinator +@@ -104,6 +107,7 @@ public class AutocompleteCoordinator implements OmniboxSuggestionsVisualState { Context context = parent.getContext(); ModelList listItems = new ModelList(); @@ -2556,7 +2526,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow PropertyModel listModel = new PropertyModel.Builder(SuggestionListProperties.ALL_KEYS) .with(SuggestionListProperties.EMBEDDER, dropdownEmbedder) -@@ -231,6 +235,18 @@ public class AutocompleteCoordinator +@@ -229,6 +233,18 @@ public class AutocompleteCoordinator implements OmniboxSuggestionsVisualState { container.findViewById(R.id.omnibox_suggestions_dropdown); dropdown.setAdapter(mAdapter); @@ -2578,7 +2548,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java -@@ -73,6 +73,8 @@ import org.chromium.ui.modelutil.PropertyModel; +@@ -74,6 +74,8 @@ import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.mojom.WindowOpenDisposition; import org.chromium.url.GURL; @@ -2587,7 +2557,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import java.util.List; import java.util.function.Supplier; -@@ -1241,7 +1243,9 @@ class AutocompleteMediator +@@ -1304,7 +1306,9 @@ class AutocompleteMediator @Override public void onSuggestionDropdownScroll() { mSuggestionsListScrolled = true; @@ -2675,7 +2645,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1530,6 +1530,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1539,6 +1539,12 @@ Your Google account may have other forms of browsing history like searches and a Force Tablet Mode @@ -2691,7 +2661,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -216,6 +216,7 @@ android_library("java") { +@@ -219,6 +219,7 @@ android_library("java") { "//content/public/android:content_java", "//third_party/android_deps:material_design_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", @@ -2702,7 +2672,7 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/andr diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java -@@ -18,6 +18,7 @@ import org.chromium.components.browser_ui.widget.scrim.ScrimProperties; +@@ -20,6 +20,7 @@ import org.chromium.components.browser_ui.widget.scrim.ScrimProperties; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.util.ColorUtils; @@ -2710,7 +2680,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** Handles showing and hiding a scrim when url bar focus changes. */ @NullMarked -@@ -63,6 +64,10 @@ public class LocationBarFocusScrimHandler implements UrlFocusChangeListener { +@@ -68,6 +69,10 @@ public class LocationBarFocusScrimHandler implements UrlFocusChangeListener { mContext = context; int topMargin = tabStripHeightSupplier.get() == null ? 0 : tabStripHeightSupplier.get(); @@ -2774,7 +2744,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -@@ -34,6 +34,8 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor; +@@ -33,6 +33,8 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor; import org.chromium.ui.resources.ResourceManager; import org.chromium.ui.resources.dynamics.ViewResourceAdapter; import org.chromium.ui.widget.Toast; @@ -2783,7 +2753,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow import java.util.HashSet; import java.util.Set; -@@ -90,6 +92,8 @@ public class BottomControlsCoordinator implements BackPressHandler { +@@ -88,6 +90,8 @@ public class BottomControlsCoordinator implements BackPressHandler { * @param constraintsSupplier Used to access current constraints of the browser controls. * @param readAloudRestoringSupplier Supplier that returns true if Read Aloud is currently * restoring its player, e.g. after theme change. @@ -2792,7 +2762,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow */ @SuppressLint("CutPasteId") // Not actually cut and paste since it's View vs ViewGroup. public BottomControlsCoordinator( -@@ -105,7 +109,9 @@ public class BottomControlsCoordinator implements BackPressHandler { +@@ -103,7 +107,9 @@ public class BottomControlsCoordinator implements BackPressHandler { TabObscuringHandler tabObscuringHandler, ObservableSupplier overlayPanelVisibilitySupplier, ObservableSupplier<@Nullable Integer> constraintsSupplier, @@ -2803,7 +2773,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow mRootFrameLayout = root; root.setConstraintsSupplier(constraintsSupplier); PropertyModel model = new PropertyModel(BottomControlsProperties.ALL_KEYS); -@@ -173,7 +179,8 @@ public class BottomControlsCoordinator implements BackPressHandler { +@@ -171,7 +177,8 @@ public class BottomControlsCoordinator implements BackPressHandler { mMediator.setBottomControlsVisible(isVisible); } }, @@ -2913,16 +2883,16 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java -@@ -24,6 +24,8 @@ import org.chromium.ui.resources.ResourceManager; - - import java.util.List; +@@ -20,6 +20,8 @@ import org.chromium.chrome.browser.layouts.scene_layer.SceneOverlayLayer; + import org.chromium.components.browser_ui.widget.ViewResourceFrameLayout; + import org.chromium.ui.resources.ResourceManager; +import org.chromium.chrome.browser.flags.ChromeFeatureList; + /** * A composited view that sits at the bottom of the screen and listens to changes in the browser * controls. When visible, the view will mimic the behavior of the top browser controls when -@@ -44,6 +46,9 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements +@@ -40,6 +42,9 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements /** The current Y offset of the bottom view in px. */ private int mCurrentYOffsetPx; @@ -2932,7 +2902,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** The current X offset of the bottom view in px. */ private int mCurrentXOffsetPx; -@@ -101,6 +106,13 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements +@@ -97,6 +102,13 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements mOffsetTag = offsetTag; } @@ -2946,7 +2916,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** * @param visible Whether this {@link SceneLayer} is visible. */ -@@ -132,6 +144,11 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements +@@ -128,6 +140,11 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements isShadowVisible = mBottomView.getVisibility() != View.VISIBLE; } @@ -2958,7 +2928,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow ScrollingBottomViewSceneLayerJni.get() .updateScrollingBottomViewLayer( mNativePtr, -@@ -139,7 +156,7 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements +@@ -135,7 +152,7 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements mResourceId, mTopShadowHeightPx, mCurrentXOffsetPx, @@ -2970,7 +2940,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java -@@ -76,6 +76,10 @@ import java.lang.annotation.RetentionPolicy; +@@ -78,6 +78,10 @@ import java.lang.annotation.RetentionPolicy; import java.util.function.BooleanSupplier; import java.util.function.Supplier; @@ -2981,7 +2951,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** Layout for the browser controls (omnibox, menu, tab strip, etc..). */ @NullMarked public class ToolbarControlContainer extends OptimizedFrameLayout -@@ -184,6 +188,11 @@ public class ToolbarControlContainer extends OptimizedFrameLayout +@@ -191,6 +195,11 @@ public class ToolbarControlContainer extends OptimizedFrameLayout if (view != null) ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height; } @@ -2996,15 +2966,14 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayCoordinator.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayCoordinator.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayCoordinator.java -@@ -23,12 +23,15 @@ import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; +@@ -23,11 +23,14 @@ import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; import org.chromium.chrome.browser.toolbar.R; + import org.chromium.chrome.browser.toolbar.ToolbarProgressBar; import org.chromium.components.browser_ui.widget.ClipDrawableProgressBar; +import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.resources.ResourceManager; - import java.util.List; import java.util.function.Supplier; +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; @@ -3025,10 +2994,10 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow .build(); mSceneLayer = new TopToolbarSceneLayer(resourceManagerSupplier); mChangeProcessor = -@@ -138,6 +147,7 @@ public class TopToolbarOverlayCoordinator implements SceneOverlay { +@@ -151,6 +160,7 @@ public class TopToolbarOverlayCoordinator implements SceneOverlay { @Override public SceneOverlayLayer getUpdatedSceneOverlayTree( - RectF viewport, RectF visibleViewport, ResourceManager resourceManager, float yOffset) { + RectF viewport, RectF visibleViewport, ResourceManager resourceManager) { + mModel.set(TopToolbarOverlayProperties.VIEWPORT_HEIGHT, viewport.height()); return mSceneLayer; } @@ -3036,7 +3005,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayProperties.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayProperties.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayProperties.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayProperties.java -@@ -58,6 +58,12 @@ public class TopToolbarOverlayProperties { +@@ -71,6 +71,12 @@ public class TopToolbarOverlayProperties { public static final WritableLongPropertyKey CAPTURE_RESOURCE_ID = new WritableLongPropertyKey(); @@ -3049,8 +3018,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow public static final PropertyKey[] ALL_KEYS = new PropertyKey[] { ANONYMIZE, -@@ -72,5 +78,5 @@ public class TopToolbarOverlayProperties { - CONTENT_OFFSET, +@@ -86,5 +92,5 @@ public class TopToolbarOverlayProperties { + LEGACY_CONTENT_OFFSET, TOOLBAR_OFFSET_TAG, CAPTURE_RESOURCE_ID - }; @@ -3071,7 +3040,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** Push all information about the texture to native at once. */ private void pushProperties(PropertyModel model) { if (mResourceManagerSupplier.get() == null) return; -+ float offsetY = model.get(TopToolbarOverlayProperties.CONTENT_OFFSET); ++ float offsetY = model.get(TopToolbarOverlayProperties.LEGACY_CONTENT_OFFSET); + if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) { + // fix the offset of the fake top controls, used only for animations + offsetY = model.get(TopToolbarOverlayProperties.VIEWPORT_HEIGHT) - @@ -3081,11 +3050,11 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow TopToolbarSceneLayerJni.get() .updateToolbarLayer( mNativePtr, -@@ -54,7 +62,7 @@ class TopToolbarSceneLayer extends SceneOverlayLayer { - model.get(TopToolbarOverlayProperties.URL_BAR_RESOURCE_ID), +@@ -55,7 +63,7 @@ class TopToolbarSceneLayer extends SceneOverlayLayer { model.get(TopToolbarOverlayProperties.URL_BAR_COLOR), model.get(TopToolbarOverlayProperties.X_OFFSET), -- model.get(TopToolbarOverlayProperties.CONTENT_OFFSET), + model.get(TopToolbarOverlayProperties.Y_OFFSET), +- model.get(TopToolbarOverlayProperties.LEGACY_CONTENT_OFFSET), + offsetY, model.get(TopToolbarOverlayProperties.SHOW_SHADOW), model.get(TopToolbarOverlayProperties.VISIBLE), @@ -3093,7 +3062,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml -@@ -66,4 +66,12 @@ found in the LICENSE file. +@@ -71,4 +71,12 @@ found in the LICENSE file. app:featureName="disable-pull-to-refresh-effect" app:needRestart="true" /> @@ -3109,7 +3078,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java -@@ -49,6 +49,11 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -55,6 +55,11 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment private BooleanPreferenceDelegate mForceTabletUIDelegate; static final String PREF_FORCE_TABLET_UI = "force_tablet_ui"; @@ -3121,7 +3090,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c private PageZoomPreference mPageZoomDefaultZoomPref; private ChromeSwitchPreference mPageZoomIncludeOSAdjustment; private ChromeSwitchPreference mPageZoomAlwaysShowPref; -@@ -64,6 +69,10 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -71,6 +76,10 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment mDelegate = delegate; } @@ -3132,7 +3101,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); -@@ -129,6 +138,18 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -136,6 +145,18 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment forceTabletUiPref.setChecked(mForceTabletUIDelegate.getValue()); forceTabletUiPref.setOnPreferenceChangeListener(this); @@ -3151,7 +3120,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c Preference captions = findPreference(PREF_CAPTIONS); captions.setOnPreferenceClickListener( preference -> { -@@ -217,6 +238,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -238,6 +259,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment mDelegate.getBrowserContextHandle(), (Integer) newValue); } else if (PREF_PAGE_ZOOM_ALWAYS_SHOW.equals(preference.getKey())) { PageZoomUtils.setShouldAlwaysShowZoomMenuItem((Boolean) newValue); @@ -3219,7 +3188,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ #include "cc/base/math_util.h" #include "cc/slim/layer.h" #include "components/input/cursor_manager.h" -@@ -956,6 +957,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( +@@ -957,6 +958,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( // factor. Thus, |top_content_offset| in CSS pixels is also in DIPs. float top_content_offset = metadata.top_controls_height * metadata.top_controls_shown_ratio; diff --git a/build/patches/Multi-Screen-Window-Placement-API-fix.patch b/build/patches/Multi-Screen-Window-Placement-API-fix.patch index 5aee8319..7598ae24 100644 --- a/build/patches/Multi-Screen-Window-Placement-API-fix.patch +++ b/build/patches/Multi-Screen-Window-Placement-API-fix.patch @@ -7,38 +7,32 @@ granted by user License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - .../permissions/permission_service_impl.cc | 6 +++- + .../permissions/permission_service_impl.cc | 1 - .../renderer_host/render_frame_host_impl.cc | 3 +- - .../core/frame/cached_permission_status.cc | 2 +- + .../core/frame/cached_permission_status.cc | 4 +-- .../core/frame/cached_permission_status.h | 1 + .../blink/renderer/core/frame/screen.cc | 35 +++++++++++++++++-- - .../blink/renderer/core/frame/screen.h | 16 +++++++++ - 6 files changed, 58 insertions(+), 5 deletions(-) + .../blink/renderer/core/frame/screen.h | 17 ++++++++- + 6 files changed, 54 insertions(+), 7 deletions(-) diff --git a/content/browser/permissions/permission_service_impl.cc b/content/browser/permissions/permission_service_impl.cc --- a/content/browser/permissions/permission_service_impl.cc +++ b/content/browser/permissions/permission_service_impl.cc -@@ -388,8 +388,12 @@ void PermissionServiceImpl::AddPageEmbeddedPermissionObserver( +@@ -384,7 +384,6 @@ void PermissionServiceImpl::AddPermissionObserver( ReceivedBadMessage(); return; } -+ bool should_include_device_status = -+ PermissionUtil::IsDevicePermission(permission); - PermissionResult current_result = -- GetCombinedPermissionAndDeviceResult(permission); -+ should_include_device_status -+ ? GetCombinedPermissionAndDeviceResult(permission) -+ : GetPermissionResultForCurrentContext(permission); +- + PermissionResult current_result = GetPermissionResult(permission); context_->CreateSubscription( permission, origin_, current_result, PermissionResult(last_known_status), - /*should_include_device_status=*/true, std::move(observer)); diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -19291,7 +19291,8 @@ RenderFrameHostImpl::GetCachedPermissionStatuses() { - std::to_array>( - {{PermissionName::VIDEO_CAPTURE, PermissionType::VIDEO_CAPTURE}, - {PermissionName::AUDIO_CAPTURE, PermissionType::AUDIO_CAPTURE}, +@@ -19186,7 +19186,8 @@ RenderFrameHostImpl::GetCachedPermissionStatuses() { + {PermissionName::WEB_APP_INSTALLATION, + PermissionType::WEB_APP_INSTALLATION}, + #endif - {PermissionName::GEOLOCATION, PermissionType::GEOLOCATION}}); + {PermissionName::GEOLOCATION, PermissionType::GEOLOCATION}, + {PermissionName::WINDOW_MANAGEMENT, PermissionType::WINDOW_MANAGEMENT}}); @@ -48,19 +42,22 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b diff --git a/third_party/blink/renderer/core/frame/cached_permission_status.cc b/third_party/blink/renderer/core/frame/cached_permission_status.cc --- a/third_party/blink/renderer/core/frame/cached_permission_status.cc +++ b/third_party/blink/renderer/core/frame/cached_permission_status.cc -@@ -36,7 +36,7 @@ CachedPermissionStatus::CachedPermissionStatus(LocalDOMWindow* local_dom_window) +@@ -32,9 +32,9 @@ CachedPermissionStatus::CachedPermissionStatus(LocalDOMWindow* local_dom_window) permission_service_(local_dom_window), permission_observer_receivers_(this, local_dom_window) { CHECK(local_dom_window); -- CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(local_dom_window)); -+ // CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(local_dom_window)); see https://source.chromium.org/chromium/chromium/src/+/81a9e9b66a03e12cb438eef0834f5e5f7a0506ee +- CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(local_dom_window) || ++ // CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(local_dom_window) || + RuntimeEnabledFeatures::GeolocationElementEnabled(local_dom_window) || +- RuntimeEnabledFeatures::UserMediaElementEnabled(local_dom_window)); ++ RuntimeEnabledFeatures::UserMediaElementEnabled(local_dom_window)); see https://source.chromium.org/chromium/chromium/src/+/81a9e9b66a03e12cb438eef0834f5e5f7a0506ee } void CachedPermissionStatus::Trace(Visitor* visitor) const { diff --git a/third_party/blink/renderer/core/frame/cached_permission_status.h b/third_party/blink/renderer/core/frame/cached_permission_status.h --- a/third_party/blink/renderer/core/frame/cached_permission_status.h +++ b/third_party/blink/renderer/core/frame/cached_permission_status.h -@@ -71,6 +71,7 @@ class CORE_EXPORT CachedPermissionStatus final +@@ -68,6 +68,7 @@ class CORE_EXPORT CachedPermissionStatus final private: friend class HTMLPermissionElement; @@ -133,10 +130,10 @@ diff --git a/third_party/blink/renderer/core/frame/screen.h b/third_party/blink/ #include "third_party/blink/renderer/core/dom/events/event_target.h" #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h" +#include "third_party/blink/renderer/core/frame/cached_permission_status.h" - #include "third_party/blink/renderer/platform/heap/garbage_collected.h" + #include "third_party/blink/renderer/platform/forward_declared_member.h" +#include "third_party/blink/public/mojom/permissions/permission.mojom-blink.h" +#include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h" - #include "third_party/blink/renderer/platform/supplementable.h" + #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/wtf/text/atomic_string.h" #include "ui/gfx/geometry/rect.h" @@ -145,15 +142,16 @@ diff --git a/third_party/blink/renderer/core/frame/screen.h b/third_party/blink/ namespace display { struct ScreenInfo; } -@@ -47,6 +52,7 @@ class LocalDOMWindow; +@@ -46,7 +51,7 @@ namespace blink { + class LocalDOMWindow; + class ScreenScreenOrientation; - class CORE_EXPORT Screen : public EventTarget, - public ExecutionContextClient, -+ public CachedPermissionStatus::Client, - public Supplementable { +-class CORE_EXPORT Screen : public EventTarget, public ExecutionContextClient { ++class CORE_EXPORT Screen : public EventTarget, public CachedPermissionStatus::Client, public ExecutionContextClient { DEFINE_WRAPPERTYPEINFO(); -@@ -89,8 +95,18 @@ class CORE_EXPORT Screen : public EventTarget, + public: +@@ -97,10 +102,20 @@ class CORE_EXPORT Screen : public EventTarget, public ExecutionContextClient { gfx::Rect GetRect(bool available) const; const display::ScreenInfo& GetScreenInfo() const; @@ -166,6 +164,8 @@ diff --git a/third_party/blink/renderer/core/frame/screen.h b/third_party/blink/ + // The internal id of the underlying display, to support multi-screen devices. int64_t display_id_; + + ForwardDeclaredMember screen_screen_orientation_; + + private: + bool window_management_permission_granted_ = false; diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 1de68144..01b74bd8 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -18,13 +18,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../layout/custom_useragent_preferences.xml | 106 ++++++++++ .../android/java/res/xml/main_preferences.xml | 5 + .../java/res/xml/useragent_preferences.xml | 25 +++ - .../chrome/browser/app/ChromeActivity.java | 1 + + .../chrome/browser/app/ChromeActivity.java | 5 +- .../init/ChromeBrowserInitializer.java | 3 + .../PrivacyPreferencesManagerImpl.java | 42 ++++ .../settings/UserAgentPreferences.java | 189 ++++++++++++++++++ - .../browser/tab/RequestDesktopUtils.java | 1 + .../chromium/chrome/browser/tab/TabImpl.java | 64 +++++- - .../chromium/chrome/browser/tab/TabUtils.java | 7 +- + .../chromium/chrome/browser/tab/TabUtils.java | 8 +- .../browser/android/content/content_utils.cc | 32 ++- .../preferences/browser_prefs_android.cc | 7 + .../privacy_preferences_manager_impl.cc | 126 ++++++++++++ @@ -35,6 +34,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../org/chromium/chrome/browser/tab/Tab.java | 2 + .../browser/tabwindow/TabWindowManager.java | 2 + .../tabwindow/TabWindowManagerImpl.java | 18 ++ + .../desktop_site/DesktopSiteUtils.java | 1 + .../strings/android_chrome_strings.grd | 26 +++ chrome/common/pref_names.h | 8 + ...omiteRequestDesktopSiteContentSetting.java | 76 +++++++ @@ -46,7 +46,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/web_contents/web_contents_impl.cc | 6 +- .../framehost/NavigationControllerImpl.java | 3 +- content/renderer/render_thread_impl.cc | 1 - - 36 files changed, 800 insertions(+), 17 deletions(-) + 36 files changed, 803 insertions(+), 19 deletions(-) create mode 100644 chrome/android/java/res/layout/custom_useragent_preferences.xml create mode 100644 chrome/android/java/res/xml/useragent_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/UserAgentPreferences.java @@ -92,7 +92,7 @@ diff --git a/base/base_switches.h b/base/base_switches.h diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -665,6 +665,8 @@ chrome_java_resources = [ +@@ -684,6 +684,8 @@ chrome_java_resources = [ "java/res/xml/search_widget_info.xml", "java/res/xml/tracing_preferences.xml", "java/res/xml/unified_account_settings_preferences.xml", @@ -104,7 +104,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -919,6 +919,7 @@ chrome_java_sources = [ +@@ -932,6 +932,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java", "java/src/org/chromium/chrome/browser/payments/ui/LineItem.java", "java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java", @@ -271,14 +271,18 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2776,6 +2776,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity - TabUtils.switchUserAgent( - currentTab, - usingDesktopUserAgent, -+ /* forcedByUser= */ true, - UseDesktopUserAgentCaller.ON_MENU_OR_KEYBOARD_ACTION); +@@ -2814,7 +2814,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity + profile, currentTab.getUrl(), usingDesktopUserAgent); + // Use TabUtils.switchUserAgent() instead of Tab.reload(). Because we need to reload + // with LoadOriginalRequestURL. See http://crbug/1418587 for details. +- TabUtils.switchUserAgent(currentTab, usingDesktopUserAgent); ++ TabUtils.switchUserAgent( ++ currentTab, ++ usingDesktopUserAgent, ++ /* forcedByUser= */ true); TrackerFactory.getTrackerForProfile(profile) .notifyEvent(EventConstants.APP_MENU_DESKTOP_SITE_EXCEPTION_ADDED); + RequestDesktopUtils.recordUserChangeUserAgent(usingDesktopUserAgent, getActivityTab()); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java @@ -556,17 +560,6 @@ new file mode 100644 + UpdateAllTabs(); + } +} -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java -@@ -142,6 +142,7 @@ public class RequestDesktopUtils { - */ - public static void setRequestDesktopSiteContentSettingsForUrl( - Profile profile, GURL url, boolean useDesktopUserAgent) { -+ if ((true)) return; - boolean isOffTheRecord = profile.isOffTheRecord(); - String domainWildcardPattern = - WebsitePreferenceBridge.toDomainWildcardPattern(url.getSpec()); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java @@ -590,17 +583,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav /** * Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}. This * class is not intended to be extended. -@@ -2318,9 +2324,6 @@ class TabImpl implements Tab { +@@ -2342,9 +2348,6 @@ class TabImpl implements Tab { } if (mWebContents != null) { - // Invoke switchUserAgentIfNeeded() from restoreIfNeeded() instead of loadIfNeeded() - // to avoid reload without explicit user intent. -- switchUserAgentIfNeeded(UseDesktopUserAgentCaller.LOAD_IF_NEEDED + caller); +- switchUserAgentIfNeeded(); mWebContents.getNavigationController().loadIfNecessary(); } mIsBeingRestored = true; -@@ -2720,6 +2723,11 @@ class TabImpl implements Tab { +@@ -2744,6 +2747,11 @@ class TabImpl implements Tab { url = webContents.getVisibleUrl(); } @@ -610,18 +603,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav + return UserAgentOverrideOption.TRUE; + boolean shouldRequestDesktopSite = - RequestDesktopUtils.shouldOverrideDesktopSite(mProfile, url, getContext()); + DesktopSiteUtils.shouldOverrideDesktopSite(mProfile, url, getContext()); -@@ -2749,7 +2757,7 @@ class TabImpl implements Tab { +@@ -2773,7 +2781,7 @@ class TabImpl implements Tab { } boolean usingDesktopUserAgent = getWebContents().getNavigationController().getUseDesktopUserAgent(); -- TabUtils.switchUserAgent(this, /* switchToDesktop= */ !usingDesktopUserAgent, caller); -+ TabUtils.switchUserAgent(this, /* switchToDesktop= */ !usingDesktopUserAgent, /* forcedByUser= */ false, caller); +- TabUtils.switchUserAgent(this, /* switchToDesktop= */ !usingDesktopUserAgent); ++ TabUtils.switchUserAgent(this, /* switchToDesktop= */ !usingDesktopUserAgent, /* forcedByUser= */ false); } /** Sets the TabLaunchType for tabs launched with an unset launch type. */ -@@ -2899,6 +2907,54 @@ class TabImpl implements Tab { +@@ -2923,6 +2931,54 @@ class TabImpl implements Tab { /* allowDialog= */ false); } @@ -679,16 +672,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java -@@ -130,11 +130,8 @@ public class TabUtils { +@@ -113,12 +113,8 @@ public class TabUtils { * @param switchToDesktop Whether switching the user agent to desktop. * @param caller The caller of this method. */ -- public static void switchUserAgent(Tab tab, boolean switchToDesktop, int caller) { +- public static void switchUserAgent(Tab tab, boolean switchToDesktop) { - final boolean reloadOnChange = !tab.isNativePage(); - assumeNonNull(tab.getWebContents()) - .getNavigationController() -- .setUseDesktopUserAgent(switchToDesktop, reloadOnChange, caller); -+ public static void switchUserAgent(Tab tab, boolean switchToDesktop, boolean forcedByUser, int caller) { +- .setUseDesktopUserAgent( +- switchToDesktop, reloadOnChange, /* skipOnInitialNavigation= */ true); ++ public static void switchUserAgent(Tab tab, boolean switchToDesktop, boolean forcedByUser) { + tab.SetOverrideUserAgent(switchToDesktop, forcedByUser); } @@ -815,11 +809,10 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl static jboolean JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingEnabled( JNIEnv* env) { PrefService* local_state = g_browser_process->local_state(); -@@ -36,3 +62,103 @@ JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy( - metrics::prefs::kMetricsReportingEnabled) && +@@ -37,4 +63,104 @@ JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy( !local_state->GetBoolean(metrics::prefs::kMetricsReportingEnabled); } -+ + +static void UpdateOverrideUserAgent() { + bool overrideUserAgentEnabled = + g_browser_process->local_state()->GetBoolean(prefs::kOverrideUserAgentEnabled); @@ -919,6 +912,8 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl + enabled); + UpdateOverrideUserAgent(); +} ++ + DEFINE_JNI(PrivacyPreferencesManagerImpl) diff --git a/chrome/browser/content_settings/request_desktop_site_web_contents_observer_android.cc b/chrome/browser/content_settings/request_desktop_site_web_contents_observer_android.cc --- a/chrome/browser/content_settings/request_desktop_site_web_contents_observer_android.cc +++ b/chrome/browser/content_settings/request_desktop_site_web_contents_observer_android.cc @@ -976,7 +971,7 @@ diff --git a/chrome/browser/content_settings/request_desktop_site_web_contents_o diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -1243,8 +1243,6 @@ public final class ChromePreferenceKeys { +@@ -1281,8 +1281,6 @@ public final class ChromePreferenceKeys { SIGNIN_PROMO_NTP_LAST_SHOWN_TIME, SYNC_PROMO_TOTAL_SHOW_COUNT, SEARCH_RESUMPTION_MODULE_COLLAPSE_ON_NTP, @@ -1006,7 +1001,7 @@ diff --git a/chrome/browser/privacy/settings/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.java --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.java +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.java -@@ -388,6 +388,8 @@ public interface Tab extends TabLifecycle { +@@ -391,6 +391,8 @@ public interface Tab extends TabLifecycle { /** Goes to the navigation entry after the current one. */ void goForward(); @@ -1018,7 +1013,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.jav diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java --- a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java +++ b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java -@@ -174,6 +174,8 @@ public interface TabWindowManager { +@@ -177,6 +177,8 @@ public interface TabWindowManager { @Nullable List getGroupedTabsByWindow( @WindowId int windowId, Token tabGroupId, boolean isIncognito); @@ -1030,7 +1025,7 @@ diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java --- a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java +++ b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java -@@ -499,6 +499,24 @@ public class TabWindowManagerImpl implements TabWindowManager { +@@ -501,6 +501,24 @@ public class TabWindowManagerImpl implements TabWindowManager { return null; } @@ -1055,10 +1050,21 @@ diff --git a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chr @Override public @Nullable Tab getTabById(@TabId int tabId) { for (TabModelSelector selector : getAllTabModelSelectors()) { +diff --git a/chrome/browser/ui/android/desktop_site/java/src/org/chromium/chrome/browser/desktop_site/DesktopSiteUtils.java b/chrome/browser/ui/android/desktop_site/java/src/org/chromium/chrome/browser/desktop_site/DesktopSiteUtils.java +--- a/chrome/browser/ui/android/desktop_site/java/src/org/chromium/chrome/browser/desktop_site/DesktopSiteUtils.java ++++ b/chrome/browser/ui/android/desktop_site/java/src/org/chromium/chrome/browser/desktop_site/DesktopSiteUtils.java +@@ -66,6 +66,7 @@ public class DesktopSiteUtils { + */ + public static void setRequestDesktopSiteContentSettingsForUrl( + Profile profile, GURL url, boolean useDesktopUserAgent) { ++ if ((true)) return; + boolean isOffTheRecord = profile.isOffTheRecord(); + String domainWildcardPattern = + WebsitePreferenceBridge.toDomainWildcardPattern(url.getSpec()); diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -238,6 +238,32 @@ CHAR_LIMIT guidelines: +@@ -250,6 +250,32 @@ CHAR_LIMIT guidelines: Visit help page @@ -1094,7 +1100,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1899,6 +1899,14 @@ inline constexpr char kNaviOnboardGroup[] = "browser.navi_onboard_group"; +@@ -1916,6 +1916,14 @@ inline constexpr char kNaviOnboardGroup[] = "browser.navi_onboard_group"; inline constexpr char kHadThreeConsecutiveNotificationPermissionDenies[] = "profile.content_settings.had_three_consecutive_denies.notifications"; @@ -1269,7 +1275,7 @@ diff --git a/content/browser/renderer_host/navigation_controller_android.h b/con diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3815,6 +3815,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3842,6 +3842,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( #if BUILDFLAG(IS_CHROMEOS) switches::kSchedulerBoostUrgent, #endif @@ -1288,7 +1294,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser #include "base/check_op.h" #include "base/command_line.h" #include "base/containers/contains.h" -@@ -2449,8 +2450,6 @@ void WebContentsImpl::SetUserAgentOverride( +@@ -2375,8 +2376,6 @@ void WebContentsImpl::SetUserAgentOverride( OPTIONAL_TRACE_EVENT2("content", "WebContentsImpl::SetUserAgentOverride", "ua_override", ua_override.ua_string_override, "override_in_new_tabs", override_in_new_tabs); @@ -1297,7 +1303,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser if (GetUserAgentOverride() == ua_override) { return; -@@ -3818,6 +3817,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences( +@@ -3750,6 +3749,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences( #else prefs.viewport_meta_enabled = false; #endif @@ -1318,7 +1324,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/frameh params.getInitiatorOrigin(), params.getHasUserGesture(), params.getShouldClearHistoryList(), -@@ -445,7 +446,7 @@ import org.chromium.url.Origin; +@@ -447,7 +448,7 @@ import org.chromium.url.Origin; @Nullable String dataUrlAsString, boolean canLoadLocalResources, boolean isRendererInitiated, @@ -1330,7 +1336,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/frameh diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -850,7 +850,6 @@ void RenderThreadImpl::InitializeRenderer( +@@ -848,7 +848,6 @@ void RenderThreadImpl::InitializeRenderer( uint64_t trace_id) { TRACE_EVENT("navigation", "RenderThreadImpl::InitializeRenderer", perfetto::TerminatingFlow::Global(trace_id)); From c82c4d77cfb52efaeaf27bc4af0d0b33fd6f0901 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 15 Jan 2026 13:00:07 +0100 Subject: [PATCH 4/9] Bump to 144.0.7559.59 --- build/RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/RELEASE b/build/RELEASE index 1c598eee..22feb614 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -143.0.7499.147 \ No newline at end of file +144.0.7559.59 \ No newline at end of file From 5f09697d4c92b52a2c190286ff43714eec3210ba Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Mon, 19 Jan 2026 14:09:28 +0100 Subject: [PATCH 5/9] Patches for v144 --- .../Add-bookmark-import-export-actions.patch | 9 +- build/patches/Add-cromite-flags-support.patch | 4 +- .../Add-menu-item-to-bookmark-all-tabs.patch | 14 +- .../Add-setting-to-clear-data-on-exit.patch | 38 ++- ...tting-to-enable-Credman-for-passkeys.patch | 22 +- ...roid-fonts-fingerprinting-mitigation.patch | 80 +++++- .../Content-settings-infrastructure.patch | 42 +-- ...romite-Branding--improve-settings-ui.patch | 12 +- .../patches/Disable-all-predictors-code.patch | 270 ++++++++++++------ ...Disable-fetching-of-all-field-trials.patch | 2 +- ...isable-speechSynthesis-getVoices-API.patch | 2 +- .../Enable-Do-Not-Track-by-default.patch | 2 +- .../Enable-Global-Privacy-Control.patch | 153 +++------- .../Enable-extension-in-incognito.patch | 171 +++++++++-- .../Enable-native-Android-autofill.patch | 51 +++- .../Enable-network-isolation-features.patch | 23 +- ...le-search-engine-settings-desktop-ui.patch | 51 +++- build/patches/Enable-snackbar-swipe.patch | 21 +- ...al-support-for-extensions-on-Android.patch | 113 ++++++-- build/patches/Eyeo-Adblock-for-Cromite.patch | 87 +++--- ...story-number-of-days-privacy-setting.patch | 29 +- .../patches/Improve-the-browser-sandbox.patch | 13 +- .../Move-navigation-bar-to-bottom.patch | 59 ++-- ...ulti-Screen-Window-Placement-API-fix.patch | 11 +- ...referrals-in-cross-origin-navigation.patch | 6 +- .../Remove-binary-blob-integrations.patch | 10 +- .../Restore-chrome-password-store.patch | 12 +- build/patches/Show-NTP-at-startup.patch | 2 +- build/patches/Timezone-customization.patch | 143 +++++++--- .../Use-list-mode-for-tab-switcher.patch | 47 ++- build/patches/User-agent-customization.patch | 32 ++- build/patches/bromite-build-utils.patch | 2 +- 32 files changed, 1076 insertions(+), 457 deletions(-) diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 5a290585..0bf83ec5 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../app/bookmarks/BookmarkActivity.java | 32 ++ .../native_page/NativePageFactory.java | 9 +- chrome/browser/BUILD.gn | 11 +- - .../bookmarks/android/bookmark_bridge.cc | 192 ++++++++++++ + .../bookmarks/android/bookmark_bridge.cc | 193 ++++++++++++ .../bookmarks/android/bookmark_bridge.h | 30 +- .../browser/bookmarks/BookmarkBridge.java | 39 +++ .../browser/bookmarks/BookmarkDelegate.java | 10 + @@ -51,7 +51,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ui/shell_dialogs/select_file_dialog_linux.cc | 4 + ui/shell_dialogs/select_file_dialog_linux.h | 2 + ui/shell_dialogs/select_file_dialog_win.cc | 5 + - 40 files changed, 805 insertions(+), 24 deletions(-) + 40 files changed, 806 insertions(+), 24 deletions(-) create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc @@ -322,7 +322,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv* env) { -@@ -843,6 +869,172 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -843,6 +869,173 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -450,7 +450,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse + } + + std::vector buffer(fileLength); -+ if (-1 == file.ReadAtCurrentPos(buffer.data(), fileLength)) { ++ base::span buffer_span = base::as_writable_byte_span(buffer); ++ if (-1 == file.ReadAtCurrentPos(buffer_span)) { + select_file_dialog_->ShowToast("Could not read bookmarks file"); + return ""; + } diff --git a/build/patches/Add-cromite-flags-support.patch b/build/patches/Add-cromite-flags-support.patch index e9357a6f..0978f91f 100644 --- a/build/patches/Add-cromite-flags-support.patch +++ b/build/patches/Add-cromite-flags-support.patch @@ -1554,8 +1554,8 @@ diff --git a/components/webui/flags/resources/experiment.html.ts b/components/we return html`
-
-+
++
${this.showingSearchHit_? html`

GetRoot(); if (IsPermanentFolderVisible( -@@ -1228,6 +1259,17 @@ void BookmarkBridge::GetBookmarksOfType( +@@ -1229,6 +1260,17 @@ void BookmarkBridge::GetBookmarksOfType( AddBookmarkNodesToBookmarkIdList(env, j_list, results); } @@ -596,14 +596,6 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar // Need to reset the title as the title is persisted and restored from // the file. -@@ -461,6 +473,7 @@ void BookmarkCodec::ReassignIDsIfRequired() { - } - - nodes_requiring_id_reassignment_.clear(); -+ ReassignIDsHelper(tabs_folder_node); - ids_reassigned_ = true; - } - diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h --- a/components/bookmarks/browser/bookmark_codec.h +++ b/components/bookmarks/browser/bookmark_codec.h diff --git a/build/patches/Add-setting-to-clear-data-on-exit.patch b/build/patches/Add-setting-to-clear-data-on-exit.patch index d122936e..e20e9f60 100644 --- a/build/patches/Add-setting-to-clear-data-on-exit.patch +++ b/build/patches/Add-setting-to-clear-data-on-exit.patch @@ -31,16 +31,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../core/browsing_data_policies_utils.h | 11 +++ .../browsing_data/core/browsing_data_utils.cc | 31 ++++++++ .../core/clear_browsing_data_tab.h | 3 +- + components/browsing_data/core/features.h | 1 + components/browsing_data/core/pref_names.cc | 17 ++++ components/browsing_data/core/pref_names.h | 10 +++ components/favicon/core/favicon_database.cc | 9 +++ - components/favicon/core/favicon_database.h | 2 + + components/favicon/core/favicon_database.h | 3 + .../search_engines/template_url_service.cc | 1 + content/browser/btm/btm_service_impl.cc | 2 +- - content/browser/storage_partition_impl.cc | 1 + + content/browser/storage_partition_impl.cc | 2 + .../public/browser/browsing_data_remover.h | 7 +- .../Add-setting-to-clear-data-on-exit.inc | 8 ++ - 36 files changed, 407 insertions(+), 34 deletions(-) + 37 files changed, 410 insertions(+), 34 deletions(-) create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc @@ -881,6 +882,17 @@ diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/component } // namespace browsing_data +diff --git a/components/browsing_data/core/features.h b/components/browsing_data/core/features.h +--- a/components/browsing_data/core/features.h ++++ b/components/browsing_data/core/features.h +@@ -19,6 +19,7 @@ BASE_DECLARE_FEATURE(kBrowsingDataModel); + // updates to history counter logic and removal of the bulk password deletion + // option from the dialog. + BASE_DECLARE_FEATURE(kDbdRevampDesktop); ++SET_CROMITE_FEATURE_DISABLED(kDbdRevampDesktop); + + // When enabled, calls to browsingData.removePasswords extension API would + // result in an error response instead of a console warning. diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_data/core/pref_names.cc --- a/components/browsing_data/core/pref_names.cc +++ b/components/browsing_data/core/pref_names.cc @@ -957,7 +969,15 @@ diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/co diff --git a/components/favicon/core/favicon_database.h b/components/favicon/core/favicon_database.h --- a/components/favicon/core/favicon_database.h +++ b/components/favicon/core/favicon_database.h -@@ -33,6 +33,8 @@ namespace favicon { +@@ -9,6 +9,7 @@ + #include + #include + ++#include "base/feature_list.h" + #include "base/gtest_prod_util.h" + #include "base/memory/ref_counted.h" + #include "components/favicon/core/favicon_types.h" +@@ -33,6 +34,8 @@ namespace favicon { // All earlier updates are ignored. static const int kFaviconUpdateLastRequestedAfterDays = 10; @@ -992,7 +1012,15 @@ diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_s diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc -@@ -1557,6 +1557,7 @@ void StoragePartitionImpl::Initialize( +@@ -19,6 +19,7 @@ + #include "base/containers/contains.h" + #include "base/dcheck_is_on.h" + #include "base/feature_list.h" ++#include "base/files/file_util.h" + #include "base/functional/bind.h" + #include "base/functional/callback_helpers.h" + #include "base/functional/concurrent_closures.h" +@@ -1557,6 +1558,7 @@ void StoragePartitionImpl::Initialize( .AppendASCII("Code Cache"); } DCHECK_GE(settings.size_in_bytes(), 0); diff --git a/build/patches/Add-setting-to-enable-Credman-for-passkeys.patch b/build/patches/Add-setting-to-enable-Credman-for-passkeys.patch index b94191c7..204e8403 100644 --- a/build/patches/Add-setting-to-enable-Credman-for-passkeys.patch +++ b/build/patches/Add-setting-to-enable-Credman-for-passkeys.patch @@ -11,6 +11,7 @@ Conditional immediate support is disabled. License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- .../settings/PasswordSettings.java | 27 +++++++++++++++++ + .../touch_to_fill_controller.cc | 2 ++ ...etting-to-enable-Credman-for-passkeys.grdp | 12 ++++++++ .../webauthn/AuthenticatorImpl.java | 29 +++++++------------ .../components/webauthn/WebauthnFeatures.java | 2 ++ @@ -20,7 +21,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html components/webauthn/features.h | 3 ++ device/fido/features.cc | 2 ++ .../authentication_credentials_container.cc | 5 ++++ - 10 files changed, 73 insertions(+), 37 deletions(-) + 11 files changed, 75 insertions(+), 37 deletions(-) create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java @@ -81,6 +82,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage private void displayManageAccountLink() { SyncService syncService = SyncServiceFactory.getForProfile(getProfile()); if (syncService == null || !syncService.isEngineInitialized()) { +diff --git a/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc b/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc +--- a/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc ++++ b/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc +@@ -312,6 +312,7 @@ void TouchToFillController::Reset() { + } + visibility_controller_->Reset(); + credentials_.clear(); ++ cred_man_delegate_ = nullptr; + } + + void TouchToFillController::ActionCompleted() { +@@ -319,6 +320,7 @@ void TouchToFillController::ActionCompleted() { + visibility_controller_->SetShown(); + } + ttf_delegate_.reset(); ++ cred_man_delegate_ = nullptr; + } + + DisplayTarget TouchToFillController::GetResponsibleDisplayTarget( diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp new file mode 100644 --- /dev/null diff --git a/build/patches/Android-fonts-fingerprinting-mitigation.patch b/build/patches/Android-fonts-fingerprinting-mitigation.patch index c84c6fb7..1c483034 100644 --- a/build/patches/Android-fonts-fingerprinting-mitigation.patch +++ b/build/patches/Android-fonts-fingerprinting-mitigation.patch @@ -8,10 +8,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- .../common/ProductionSupportedFlagList.java | 3 + .../component_updater/registration.cc | 9 + + build/config/freetype/freetype.gni | 2 +- .../java/res/xml/developer_preferences.xml | 5 + chrome/browser/BUILD.gn | 7 + .../browser/component_updater/registration.cc | 10 + ...droid-fonts-fingerprinting-mitigation.grdp | 9 + + chrome/browser/ui/prefs/prefs_tab_helper.cc | 9 +- chrome/renderer/BUILD.gn | 4 + .../installer_policies/BUILD.gn | 7 + .../fonts_pack_component_installer.cc | 96 + @@ -29,10 +31,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html content/child/BUILD.gn | 7 + content/renderer/BUILD.gn | 4 + .../renderer/renderer_blink_platform_impl.cc | 55 +- + ...renderer_main_platform_delegate_android.cc | 2 +- ...ndroid-fonts-fingerprinting-mitigation.inc | 12 + ...ndroid-fonts-fingerprinting-mitigation.inc | 7 + ...ndroid-fonts-fingerprinting-mitigation.inc | 5 + skia/BUILD.gn | 12 + + skia/ext/font_utils.cc | 1 + .../include/ports/SkFontConfigInterface.h | 2 + .../skia/include/ports/SkFontMgr_android.h | 42 +- .../skia/src/ports/SkFontConfigInterface.cpp | 4 + @@ -40,9 +44,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../src/ports/SkFontConfigInterface_direct.h | 1 + .../skia/src/ports/SkFontMgr_android.cpp | 278 ++- .../skia/src/ports/SkFontMgr_android_data.cpp | 1640 +++++++++++++++++ + .../skia/src/ports/SkFontMgr_android_ndk.cpp | 2 +- .../src/ports/SkFontMgr_android_parser.cpp | 49 +- .../skia/src/ports/SkFontMgr_android_parser.h | 5 +- - 36 files changed, 2416 insertions(+), 76 deletions(-) + 41 files changed, 2424 insertions(+), 84 deletions(-) create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Android-fonts-fingerprinting-mitigation.grdp create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.cc create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.h @@ -90,6 +95,16 @@ diff --git a/android_webview/nonembedded/component_updater/registration.cc b/and component_installer_list.push_back( std::make_unique< component_updater::OriginTrialsComponentInstallerPolicy>()); +diff --git a/build/config/freetype/freetype.gni b/build/config/freetype/freetype.gni +--- a/build/config/freetype/freetype.gni ++++ b/build/config/freetype/freetype.gni +@@ -26,5 +26,5 @@ declare_args() { + # https://crbug.com/370816215 + # + # Note: //build should not import directly from //pdf for layering reasons. +- enable_freetype = !is_android && !is_ios && (is_linux || !is_castos) ++ enable_freetype = !is_ios && (is_linux || !is_castos) + } diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/android/java/res/xml/developer_preferences.xml --- a/chrome/android/java/res/xml/developer_preferences.xml +++ b/chrome/android/java/res/xml/developer_preferences.xml @@ -158,6 +173,32 @@ new file mode 100644 + Replaces all system fonts with the same for all devices + + +diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc +--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc ++++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc +@@ -64,8 +64,7 @@ + #include + #endif + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + // If a font name in prefs default values starts with a comma, consider it's a + // comma-separated font list and resolve it to the first available font. + #define PREFS_FONT_LIST 1 +@@ -442,9 +441,9 @@ void PrefsTabHelper::RegisterProfilePrefs( + value = gfx::FontList::FirstAvailableOrFirst(value); + } + #else // !PREFS_FONT_LIST +- DCHECK(!value.starts_with(',')) +- << "This platform doesn't support default font lists. " +- << pref.pref_name << "=" << value; ++ // DCHECK(!value.starts_with(',')) ++ // << "This platform doesn't support default font lists. " ++ // << pref.pref_name << "=" << value; + #endif // PREFS_FONT_LIST + registry->RegisterStringPref(pref.pref_name, value); + fonts_with_defaults.insert(pref.pref_name); diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -806,6 +847,18 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +diff --git a/content/renderer/renderer_main_platform_delegate_android.cc b/content/renderer/renderer_main_platform_delegate_android.cc +--- a/content/renderer/renderer_main_platform_delegate_android.cc ++++ b/content/renderer/renderer_main_platform_delegate_android.cc +@@ -35,7 +35,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() { + // Android 14+ user devices with updated system fonts will call statx and + // possibly other system calls that are not allowed in the sandbox. + // See https://crbug.com/40618213 for details. +- [[maybe_unused]] auto mgr = skia::DefaultFontMgr(); ++ // [[maybe_unused]] auto mgr = skia::DefaultFontMgr(); + } + + void RendererMainPlatformDelegate::PlatformUninitialize() { diff --git a/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc b/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc new file mode 100644 --- /dev/null @@ -867,6 +920,17 @@ diff --git a/skia/BUILD.gn b/skia/BUILD.gn if (is_linux || is_chromeos || is_android) { # Retain the files for the SkFontMgr_Android on linux to emulate android # fonts. See content/zygote/zygote_main_linux.cc +diff --git a/skia/ext/font_utils.cc b/skia/ext/font_utils.cc +--- a/skia/ext/font_utils.cc ++++ b/skia/ext/font_utils.cc +@@ -59,6 +59,7 @@ SkFontMgr* g_fontmgr_override = nullptr; + #if BUILDFLAG(IS_ANDROID) + // https://crbug.com/461659286 Failure to create any font causes crash. + BASE_FEATURE(kUseAndroidNDKFontAPI, base::FEATURE_DISABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_DISABLED(kUseAndroidNDKFontAPI); + #endif + + } // namespace diff --git a/third_party/skia/include/ports/SkFontConfigInterface.h b/third_party/skia/include/ports/SkFontConfigInterface.h --- a/third_party/skia/include/ports/SkFontConfigInterface.h +++ b/third_party/skia/include/ports/SkFontConfigInterface.h @@ -3051,6 +3115,18 @@ new file mode 100644 + + return false; +} +diff --git a/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp b/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp +--- a/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp ++++ b/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp +@@ -996,7 +996,7 @@ public: + } + + std::vector> xmlFamilies; +- SkFontMgr_Android_Parser::GetSystemFontFamilies(xmlFamilies); ++ SkFontMgr_Android_Parser::GetSystemFontFamilies(xmlFamilies, /*custom*/ nullptr); + + skia_private::THashMap> streamForPath; + diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_party/skia/src/ports/SkFontMgr_android_parser.cpp --- a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp +++ b/third_party/skia/src/ports/SkFontMgr_android_parser.cpp @@ -3129,7 +3205,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par void SkFontMgr_Android_Parser::GetSystemFontFamilies( - std::vector>& fontFamilies) + std::vector>& fontFamilies, -+ const SkFontMgr_Android_CustomFonts* custom) ++ const SkFontMgr_Android_CustomFonts* custom) { // Version 21 of the system font configuration does not need any fallback configuration files. SkString basePath(getenv("ANDROID_ROOT")); diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index 31e3d6b3..481e2061 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -13,9 +13,8 @@ Require: bromite-build-utils.patch --- .../ChromeSiteSettingsDelegate.java | 17 +- ...page_specific_content_settings_delegate.cc | 2 +- - chrome/browser/resources/settings/BUILD.gn | 2 +- .../privacy_page/privacy_page_index.html | 1 + - .../privacy_page/privacy_page_index.ts | 82 +++- + .../privacy_page/privacy_page_index.ts | 83 +++- chrome/browser/resources/settings/route.ts | 2 + ...settings_category_default_radio_group.html | 12 + .../settings_category_default_radio_group.ts | 23 +- @@ -85,7 +84,7 @@ Require: bromite-build-utils.patch .../platform/web_content_settings_client.h | 13 + .../execution_context/execution_context.cc | 16 + .../execution_context/execution_context.h | 5 + - 74 files changed, 1962 insertions(+), 106 deletions(-) + 73 files changed, 1962 insertions(+), 105 deletions(-) create mode 100644 components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java @@ -149,25 +148,6 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_dele rules->mixed_content_rules.push_back(ContentSettingPatternSource( ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK), -diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn ---- a/chrome/browser/resources/settings/BUILD.gn -+++ b/chrome/browser/resources/settings/BUILD.gn -@@ -360,6 +360,7 @@ build_webui("build") { - "privacy_sandbox/privacy_sandbox_browser_proxy.ts", - "relaunch_mixin.ts", - "reset_page/reset_browser_proxy.ts", -+ "site_settings/site_settings_util.ts", - "route.ts", - "router.ts", - "safety_hub/safety_hub_browser_proxy.ts", -@@ -373,7 +374,6 @@ build_webui("build") { - "site_settings/constants.ts", - "site_settings/site_settings_mixin.ts", - "site_settings/site_settings_browser_proxy.ts", -- "site_settings/site_settings_util.ts", - "site_settings/website_usage_browser_proxy.ts", - "time.ts", - "tooltip_mixin.ts", diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html @@ -175,12 +155,20 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.h -+
++
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts --- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts -@@ -29,6 +29,8 @@ import {PrivacyGuideAvailabilityMixin} from './privacy_guide/privacy_guide_avail +@@ -9,6 +9,7 @@ import '../settings_page/settings_section.js'; + import '../settings_shared.css.js'; + import './privacy_guide/privacy_guide_promo.js'; + import './privacy_page.js'; ++import '../controls/settings_dropdown_menu.js'; + + import {PrefsMixin} from '/shared/settings/prefs/prefs_mixin.js'; + import type {CrViewManagerElement} from 'chrome://resources/cr_elements/cr_view_manager/cr_view_manager.js'; +@@ -29,6 +30,8 @@ import {PrivacyGuideAvailabilityMixin} from './privacy_guide/privacy_guide_avail import type {PrivacyGuideBrowserProxy} from './privacy_guide/privacy_guide_browser_proxy.js'; import {MAX_PRIVACY_GUIDE_PROMO_IMPRESSION, PrivacyGuideBrowserProxyImpl} from './privacy_guide/privacy_guide_browser_proxy.js'; import {getTemplate} from './privacy_page_index.html.js'; @@ -189,7 +177,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.t // clang-format off // -@@ -53,8 +55,86 @@ export class SettingsPrivacyPageIndexElement extends +@@ -53,8 +56,86 @@ export class SettingsPrivacyPageIndexElement extends return 'settings-privacy-page-index'; } @@ -399,7 +387,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b label="$i18n{siteSettingsLocalNetworkAccess}"> -+
++
diff --git a/chrome/browser/resources/settings/site_settings/site_details.ts b/chrome/browser/resources/settings/site_settings/site_details.ts @@ -2546,7 +2534,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + if (preference instanceof ChromeSwitchPreference) { + ((ChromeSwitchPreference)switchPreference).setChecked(value != ContentSetting.BLOCK); + } else { -+ BromiteCustomContentSettingImpl.setWebSitePreferenceValue(content_type, preference, value); ++ BromiteCustomContentSettingImpl.setWebSitePreferenceValue(contentType, preference, value); + } + if (preference instanceof ChromeSwitchPreference && contentType == mHighlightedPermission) { + ((ChromeSwitchPreference)switchPreference).setBackgroundColor( diff --git a/build/patches/Cromite-Branding--improve-settings-ui.patch b/build/patches/Cromite-Branding--improve-settings-ui.patch index 8422cac8..2bc5c4f6 100644 --- a/build/patches/Cromite-Branding--improve-settings-ui.patch +++ b/build/patches/Cromite-Branding--improve-settings-ui.patch @@ -8,10 +8,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/android/chrome_java_resources.gni | 2 +- .../android/java/res/xml/main_preferences.xml | 4 +- - .../res/xml/privacy_preferences_cromite.xml | 197 ++++++++++++++++++ + .../res/xml/privacy_preferences_cromite.xml | 191 ++++++++++++++++++ .../privacy/settings/PrivacySettings.java | 6 +- .../Cromite-settings-ui.grdp | 15 ++ - 5 files changed, 219 insertions(+), 5 deletions(-) + 5 files changed, 213 insertions(+), 5 deletions(-) create mode 100644 chrome/android/java/res/xml/privacy_preferences_cromite.xml create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp @@ -52,7 +52,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences_cromite.xml b/chrom new file mode 100644 --- /dev/null +++ b/chrome/android/java/res/xml/privacy_preferences_cromite.xml -@@ -0,0 +1,197 @@ +@@ -0,0 +1,191 @@ + ++ ++ ++ ++ ++ ++ ++ diff --git a/components/browser_ui/widget/android/java/res/layout/title_and_description_layout.xml b/components/browser_ui/widget/android/java/res/layout/title_and_description_layout.xml --- a/components/browser_ui/widget/android/java/res/layout/title_and_description_layout.xml +++ b/components/browser_ui/widget/android/java/res/layout/title_and_description_layout.xml diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 01b74bd8..c93c4142 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -26,7 +26,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chromium/chrome/browser/tab/TabUtils.java | 8 +- .../browser/android/content/content_utils.cc | 32 ++- .../preferences/browser_prefs_android.cc | 7 + - .../privacy_preferences_manager_impl.cc | 126 ++++++++++++ + .../privacy_preferences_manager_impl.cc | 127 ++++++++++++ ...ktop_site_web_contents_observer_android.cc | 11 + ...sktop_site_web_contents_observer_android.h | 2 + .../preferences/ChromePreferenceKeys.java | 2 - @@ -44,9 +44,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../navigation_controller_android.h | 1 + .../renderer_host/render_process_host_impl.cc | 1 + .../browser/web_contents/web_contents_impl.cc | 6 +- - .../framehost/NavigationControllerImpl.java | 3 +- + .../framehost/NavigationControllerImpl.java | 17 +- content/renderer/render_thread_impl.cc | 1 - - 36 files changed, 803 insertions(+), 19 deletions(-) + 36 files changed, 811 insertions(+), 26 deletions(-) create mode 100644 chrome/android/java/res/layout/custom_useragent_preferences.xml create mode 100644 chrome/android/java/res/xml/useragent_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/UserAgentPreferences.java @@ -654,7 +654,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav + + NavigationController navigationController = webContents.getNavigationController(); + navigationController.setUseDesktopUserAgent( -+ usingDesktopUserAgent, !this.isNativePage(), UseDesktopUserAgentCaller.OTHER); ++ usingDesktopUserAgent, !this.isNativePage(), /*skipOnInitialNavigation*/ false); + } + else if (this.getPendingLoadParams() != null) { + if (usingDesktopUserAgent) { @@ -809,7 +809,7 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl static jboolean JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingEnabled( JNIEnv* env) { PrefService* local_state = g_browser_process->local_state(); -@@ -37,4 +63,104 @@ JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy( +@@ -37,4 +63,105 @@ JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy( !local_state->GetBoolean(metrics::prefs::kMetricsReportingEnabled); } @@ -838,6 +838,7 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl + /*user_agent*/ ua, /*metadata*/ blink::UserAgentMetadata(), + cors_exempt_header_list, + g_browser_process->GetOriginTrialsSettingsStorage()->GetSettings(), ++ ChromeContentBrowserClient().GetCpuPerformanceTier(), + trace_id); + } + } @@ -1324,6 +1325,27 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/frameh params.getInitiatorOrigin(), params.getHasUserGesture(), params.getShouldClearHistoryList(), +@@ -266,13 +267,13 @@ import org.chromium.url.Origin; + public void setUseDesktopUserAgent( + boolean override, boolean reloadOnChange, boolean skipOnInitialNavigation) { + if (mNativeNavigationControllerAndroid != 0) { +- Log.i( +- TAG, +- "Thread dump for debugging, override: " +- + override +- + " reloadOnChange: " +- + reloadOnChange); +- Thread.dumpStack(); ++ // Log.i( ++ // TAG, ++ // "Thread dump for debugging, override: " ++ // + override ++ // + " reloadOnChange: " ++ // + reloadOnChange); ++ // Thread.dumpStack(); + + NavigationControllerImplJni.get() + .setUseDesktopUserAgent( @@ -447,7 +448,7 @@ import org.chromium.url.Origin; @Nullable String dataUrlAsString, boolean canLoadLocalResources, diff --git a/build/patches/bromite-build-utils.patch b/build/patches/bromite-build-utils.patch index 3c9848d9..8ec63b3f 100644 --- a/build/patches/bromite-build-utils.patch +++ b/build/patches/bromite-build-utils.patch @@ -684,7 +684,7 @@ diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/m +def _ResolveInclude(mojom_abspath, input_root_paths): + mojom_abspath = _ResolveRelativeImportPath(mojom_abspath, mojom_abspath, input_root_paths) -+ with codecs.open(mojom_abspath, encoding='utf-8') as f: ++ with open(mojom_abspath, encoding='utf-8') as f: + src = f.read() + + lines = src.splitlines(); From 245b33a60048e6ba18fe38fb83bb67b7bf3a8d99 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Mon, 19 Jan 2026 14:10:42 +0100 Subject: [PATCH 6/9] Set the screen frame rate to 60 Hz: fix blink freeze with viewtransitions (#2582) --- .../Set-the-screen-frame-rate-to-60-Hz.patch | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/patches/Set-the-screen-frame-rate-to-60-Hz.patch b/build/patches/Set-the-screen-frame-rate-to-60-Hz.patch index 441ada5b..03ce4c65 100644 --- a/build/patches/Set-the-screen-frame-rate-to-60-Hz.patch +++ b/build/patches/Set-the-screen-frame-rate-to-60-Hz.patch @@ -24,7 +24,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../root_compositor_frame_sink_impl.cc | 10 ++++++++-- .../Set-the-screen-frame-rate-to-60-Hz.inc | 7 +++++++ .../renderer/core/animation/animation_clock.cc | 11 ++++++++--- - 15 files changed, 117 insertions(+), 12 deletions(-) + .../core/view_transition/view_transition.cc | 2 ++ + 16 files changed, 119 insertions(+), 12 deletions(-) create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Set-the-screen-frame-rate-to-60-Hz.grdp create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Set-the-screen-frame-rate-to-60-Hz.inc @@ -381,4 +382,18 @@ diff --git a/third_party/blink/renderer/core/animation/animation_clock.cc b/thir DCHECK_GE(new_time, time_); } UpdateTime(new_time); +diff --git a/third_party/blink/renderer/core/view_transition/view_transition.cc b/third_party/blink/renderer/core/view_transition/view_transition.cc +--- a/third_party/blink/renderer/core/view_transition/view_transition.cc ++++ b/third_party/blink/renderer/core/view_transition/view_transition.cc +@@ -989,8 +989,10 @@ CSSStyleSheet* ViewTransition::UAStyleSheet() const { + void ViewTransition::WillCommitCompositorFrame() { + // There should only be 1 commit when we're in the capturing phase and + // rendering is paused immediately after it finishes. ++#if !BUILDFLAG(IS_WIN) + if (state_ == State::kCapturing) + PauseRendering(); ++#endif + } + + gfx::Size ViewTransition::GetSnapshotRootSize() const { -- From e77ef4cb3afb280e945a4d3023a4bfc085fd3573 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Mon, 19 Jan 2026 14:16:28 +0100 Subject: [PATCH 7/9] Disable CpuPerformance api and DBSC --- build/cromite_patches_list.txt | 2 ++ .../Disable-device-bound-session.patch | 25 ++++++++++++++++++ .../Keep-disabled-CpuPerformance.patch | 26 +++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 build/patches/Disable-device-bound-session.patch create mode 100644 build/patches/Keep-disabled-CpuPerformance.patch diff --git a/build/cromite_patches_list.txt b/build/cromite_patches_list.txt index ec6b0c0a..939e2208 100644 --- a/build/cromite_patches_list.txt +++ b/build/cromite_patches_list.txt @@ -304,6 +304,8 @@ Temp-disable-UseContextSnapshot.patch Enable-ClientHello-Segmentation.patch Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch Supporting-Dangling-Ptr-Detection-via-BackupRefPtr.patch +Disable-device-bound-session.patch +Keep-disabled-CpuPerformance.patch # temporary or wip patches Temp-disable-predictive-back-gesture.patch diff --git a/build/patches/Disable-device-bound-session.patch b/build/patches/Disable-device-bound-session.patch new file mode 100644 index 00000000..c38e9c80 --- /dev/null +++ b/build/patches/Disable-device-bound-session.patch @@ -0,0 +1,25 @@ +From: uazo +Date: Mon, 19 Jan 2026 12:00:34 +0000 +Subject: Disable device bound session + +Disable DBSC due to potential privacy issues +see https://w3c.github.io/webappsec-dbsc/#privacy-considerations + +License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +--- + net/features.gni | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/features.gni b/net/features.gni +--- a/net/features.gni ++++ b/net/features.gni +@@ -57,7 +57,7 @@ declare_args() { + chrome_root_store_only = is_win || is_mac || is_linux || is_chromeos + + # DBSC is only supported on Windows, Linux and Mac for now. +- enable_device_bound_sessions = is_win || is_linux || is_mac ++ enable_device_bound_sessions = false + + # Bracketed URIs parsing is only available for debug builds. + # TODO(crbug.com/365771838): Ensure tests are updated if needed if this +-- diff --git a/build/patches/Keep-disabled-CpuPerformance.patch b/build/patches/Keep-disabled-CpuPerformance.patch new file mode 100644 index 00000000..60d6b5ad --- /dev/null +++ b/build/patches/Keep-disabled-CpuPerformance.patch @@ -0,0 +1,26 @@ +From: uazo +Date: Mon, 19 Jan 2026 12:01:31 +0000 +Subject: Keep disabled CpuPerformance + +Keep disabled CpuPerformance due to potential privacy issues +see https://github.com/explainers-by-googlers/cpu-performance?tab=readme-ov-file#accessibility-privacy-and-security-considerations + +License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +--- + .../blink/renderer/platform/runtime_enabled_features.json5 | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 +--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 ++++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 +@@ -1266,8 +1266,7 @@ + // CPU Performance API, work in progress. + // https://chromestatus.com/feature/5189864286978048 + // https://github.com/explainers-by-googlers/cpu-performance +- name: "CpuPerformance", +- status: "experimental" ++ status: "experimental", name: "CpuPerformance", + }, + { + name: "CrashReportingStorageAPI", +-- From 90c3c80a4efbb50064328de33dcc831b48e51bab Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Mon, 19 Jan 2026 14:22:12 +0100 Subject: [PATCH 8/9] Bump to 144.0.7559.76 --- build/RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/RELEASE b/build/RELEASE index 22feb614..8a30f13f 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -144.0.7559.59 \ No newline at end of file +144.0.7559.76 \ No newline at end of file From 6cb4f95cb053cfc1eac6d313ea66f88d25a67853 Mon Sep 17 00:00:00 2001 From: uazo <29201891+uazo@users.noreply.github.com> Date: Mon, 19 Jan 2026 13:26:00 +0000 Subject: [PATCH 9/9] [AUTO] Patches auto-rebase --- build/patches/Add-webGL-site-setting.patch | 4 ++-- ...Block-gateway-attacks-via-websockets.patch | 2 +- .../Content-settings-infrastructure.patch | 4 ++-- .../Disable-third-party-origin-trials.patch | 2 +- ...ulti-Screen-Window-Placement-API-fix.patch | 20 +++++++++---------- ...l-of-execution-context-address-space.patch | 4 ++-- ...script-content-setting-secondary-url.patch | 2 +- build/patches/Viewport-Protection-flag.patch | 10 +++++----- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 4a2f54d1..ee2e0063 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -189,7 +189,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -93,6 +93,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor( +@@ -94,6 +94,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor( return settings; } @@ -206,7 +206,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -148,6 +148,8 @@ enum ReasonForCallingCanExecuteScripts { +@@ -149,6 +149,8 @@ enum ReasonForCallingCanExecuteScripts { enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag }; diff --git a/build/patches/Block-gateway-attacks-via-websockets.patch b/build/patches/Block-gateway-attacks-via-websockets.patch index 532be148..6af1d50f 100644 --- a/build/patches/Block-gateway-attacks-via-websockets.patch +++ b/build/patches/Block-gateway-attacks-via-websockets.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -424,6 +424,7 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext, +@@ -425,6 +425,7 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext, void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space); HeapObserverList& ContextLifecycleObserverSet(); diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index 481e2061..4b069ab4 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -3589,7 +3589,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -77,6 +77,22 @@ +@@ -78,6 +78,22 @@ namespace blink { @@ -3623,7 +3623,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/execution_context/security_context.h" -@@ -135,6 +136,10 @@ class TrustedTypePolicyFactory; +@@ -136,6 +137,10 @@ class TrustedTypePolicyFactory; class WebCodecsLogger; class WebPrintingManager; class WebViewAndroid; diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch index 0629dfa6..7b6cd7db 100644 --- a/build/patches/Disable-third-party-origin-trials.patch +++ b/build/patches/Disable-third-party-origin-trials.patch @@ -76,7 +76,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -9793,7 +9793,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() { +@@ -9798,7 +9798,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() { void NavigationRequest::ForceEnableOriginTrials( const std::vector& trials) { DCHECK(!HasCommitted()); diff --git a/build/patches/Multi-Screen-Window-Placement-API-fix.patch b/build/patches/Multi-Screen-Window-Placement-API-fix.patch index ab464b4c..0c00b286 100644 --- a/build/patches/Multi-Screen-Window-Placement-API-fix.patch +++ b/build/patches/Multi-Screen-Window-Placement-API-fix.patch @@ -42,16 +42,16 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b diff --git a/third_party/blink/renderer/core/frame/cached_permission_status.cc b/third_party/blink/renderer/core/frame/cached_permission_status.cc --- a/third_party/blink/renderer/core/frame/cached_permission_status.cc +++ b/third_party/blink/renderer/core/frame/cached_permission_status.cc -@@ -32,9 +32,9 @@ CachedPermissionStatus::CachedPermissionStatus(LocalDOMWindow* local_dom_window) - permission_service_(local_dom_window), - permission_observer_receivers_(this, local_dom_window) { - CHECK(local_dom_window); -- CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(local_dom_window) || -- RuntimeEnabledFeatures::GeolocationElementEnabled(local_dom_window) || -- RuntimeEnabledFeatures::UserMediaElementEnabled(local_dom_window)); -+ // CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(local_dom_window) || -+ // RuntimeEnabledFeatures::GeolocationElementEnabled(local_dom_window) || -+ // RuntimeEnabledFeatures::UserMediaElementEnabled(local_dom_window)); see https://source.chromium.org/chromium/chromium/src/+/81a9e9b66a03e12cb438eef0834f5e5f7a0506ee +@@ -33,9 +33,9 @@ CachedPermissionStatus::CachedPermissionStatus(ExecutionContext* context) + permission_service_(context), + permission_observer_receivers_(this, context) { + CHECK(context); +- CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(context) || +- RuntimeEnabledFeatures::GeolocationElementEnabled(context) || +- RuntimeEnabledFeatures::UserMediaElementEnabled(context)); ++ // CHECK(RuntimeEnabledFeatures::PermissionElementEnabled(context) || ++ // RuntimeEnabledFeatures::GeolocationElementEnabled(context) || ++ // RuntimeEnabledFeatures::UserMediaElementEnabled(context)); see https://source.chromium.org/chromium/chromium/src/+/81a9e9b66a03e12cb438eef0834f5e5f7a0506ee } void CachedPermissionStatus::Trace(Visitor* visitor) const { diff --git a/build/patches/Revert-removal-of-execution-context-address-space.patch b/build/patches/Revert-removal-of-execution-context-address-space.patch index e55eef73..82401602 100644 --- a/build/patches/Revert-removal-of-execution-context-address-space.patch +++ b/build/patches/Revert-removal-of-execution-context-address-space.patch @@ -65,7 +65,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -522,6 +522,15 @@ void ExecutionContext::SetReferrerPolicy( +@@ -523,6 +523,15 @@ void ExecutionContext::SetReferrerPolicy( policy_container_->UpdateReferrerPolicy(referrer_policy); } @@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context #include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h" #include "third_party/blink/public/common/fingerprinting_protection/noise_token.h" #include "third_party/blink/public/common/tokens/tokens.h" -@@ -419,6 +420,9 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext, +@@ -420,6 +421,9 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext, const String& message = g_empty_string, const String& source_file = g_empty_string) const {} diff --git a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch index 8df30857..96835fac 100644 --- a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch +++ b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch @@ -196,7 +196,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p #include "third_party/blink/renderer/bindings/core/v8/binding_security.h" #include "third_party/blink/renderer/bindings/core/v8/capture_source_location.h" #include "third_party/blink/renderer/bindings/core/v8/isolated_world_csp.h" -@@ -510,7 +511,10 @@ bool LocalDOMWindow::CanExecuteScripts( +@@ -509,7 +510,10 @@ bool LocalDOMWindow::CanExecuteScripts( } return false; } diff --git a/build/patches/Viewport-Protection-flag.patch b/build/patches/Viewport-Protection-flag.patch index 2e92c90e..025916e2 100644 --- a/build/patches/Viewport-Protection-flag.patch +++ b/build/patches/Viewport-Protection-flag.patch @@ -411,7 +411,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -1615,7 +1615,12 @@ int LocalDOMWindow::outerHeight() const { +@@ -1614,7 +1614,12 @@ int LocalDOMWindow::outerHeight() const { if (frame->IsInFencedFrameTree()) { return innerHeight(); } @@ -425,7 +425,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p Page* page = frame->GetPage(); if (!page) return 0; -@@ -1640,7 +1645,12 @@ int LocalDOMWindow::outerWidth() const { +@@ -1639,7 +1644,12 @@ int LocalDOMWindow::outerWidth() const { if (frame->IsInFencedFrameTree()) { return innerWidth(); } @@ -439,7 +439,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p Page* page = frame->GetPage(); if (!page) return 0; -@@ -1836,7 +1846,8 @@ double LocalDOMWindow::devicePixelRatio() const { +@@ -1835,7 +1845,8 @@ double LocalDOMWindow::devicePixelRatio() const { if (!GetFrame()) return 0.0; @@ -449,7 +449,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p } ScriptPromise LocalDOMWindow::scrollBy(ScriptState* script_state, -@@ -2446,6 +2457,23 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2445,6 +2456,23 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, if (!completed_url.IsEmpty() || result.new_window) result.frame->Navigate(frame_request, WebFrameLoadType::kStandard); @@ -473,7 +473,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p // TODO(japhet): window-open-noopener.html?_top and several tests in // html/browsers/windows/browsing-context-names/ appear to require that // the special case target names (_top, _parent, _self) ignore opener -@@ -2497,6 +2525,15 @@ DOMWindow* LocalDOMWindow::openPictureInPictureWindow( +@@ -2496,6 +2524,15 @@ DOMWindow* LocalDOMWindow::openPictureInPictureWindow( DCHECK(result.new_window); result.frame->Navigate(frame_request, WebFrameLoadType::kStandard);