From e1b355f3e27c5dd1e0418403858860c00622dd17 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sat, 27 May 2023 18:02:36 +0200 Subject: [PATCH] patches for 114 --- .../00Add-a-flag-to-disable-GamePad-API.patch | 22 +- .../00Add-setting-to-clear-data-on-exit.patch | 22 +- ...d-setting-to-invert-tap-and-long-tap.patch | 40 ++-- ...ORS-Preflight-Cache-on-clearing-data.patch | 4 +- .../patches/00Disable-BackForwardCache.patch | 2 +- build/patches/00Disable-FedCm.patch | 4 +- ...-FirstPartySets-and-StorageAccessAPI.patch | 2 +- build/patches/00Disable-GSA-by-default.patch | 18 +- ...0Disable-GetInstalledRelatedApps-API.patch | 6 +- .../00Disable-PrivateStateTokens-API.patch | 2 +- build/patches/00Disable-WebGPU.patch | 4 +- ...devtools-remote-and-custom-protocols.patch | 4 +- ...e-privacy-issues-in-password-manager.patch | 4 +- ...isable-speechSynthesis-getVoices-API.patch | 6 +- .../00Disable-visited-pseudo-class.patch | 8 +- ...le-Document-Open-Inheritance-Removal.patch | 15 +- ...ct-the-entire-FrameTree-like-desktop.patch | 16 +- .../00Fonts-fingerprinting-mitigation.patch | 18 +- build/patches/00Internal-firewall.patch | 6 +- .../patches/00Keyboard-protection-flag.patch | 12 +- .../00Partition-HSTS-cache-by-NAK.patch | 34 +-- ...ning-all-cookies-by-top-frame-domain.patch | 27 ++- .../00Remove-ChromiumNetworkAdapter.patch | 23 +- ...th-header-upon-cross-origin-redirect.patch | 2 +- ...0Remove-detection-of-captive-portals.patch | 2 +- ...ttps-connection-from-chrome-discards.patch | 2 +- ...e-kAutomaticLazyFrameLoadingToEmbeds.patch | 2 +- .../00Viewport-Protection-Site-Setting.patch | 24 +- .../patches/00Viewport-Protection-flag.patch | 54 +++-- ...O-AImageReader-CFI-crash-mitigations.patch | 2 +- ...ADDTO-Add-AllowUserCertificates-flag.patch | 6 +- ...ADDTO-Add-a-proxy-configuration-page.patch | 4 +- ...N-ADDTO-Add-an-always-incognito-mode.patch | 4 +- ...O-Add-bookmark-import-export-actions.patch | 2 +- ...d-flag-to-configure-maximum-connecti.patch | 2 +- ...d-flag-to-disable-external-intent-re.patch | 2 +- ...Add-lifetime-options-for-permissions.patch | 6 +- .../00WIN-ADDTO-Add-webGL-site-setting.patch | 14 +- ...00WIN-ADDTO-Add-webRTC-site-settings.patch | 14 +- ...DDTO-Content-settings-infrastructure.patch | 2 +- ...TO-Experimental-user-scripts-support.patch | 58 ++--- build/patches/00WIN-ADDTO-Eyeo-Adblock.patch | 2 +- .../00WIN-ADDTO-JIT-site-settings.patch | 18 +- ...DDTO-Remove-binary-blob-integrations.patch | 8 +- ...TO-Restore-Search-Ready-Omnibox-flag.patch | 2 +- ...Revert-flags--remove-num-raster-thre.patch | 4 +- ...Revert-the-removal-to-block-autoplay.patch | 16 +- .../00WIN-ADDTO-Timezone-customization.patch | 14 +- ...penH264--enable-ARM-ARM64-optimizati.patch | 2 +- ...ngoogled-chr--Disable-profile-avatar.patch | 2 +- .../00WIN-Disable-TabHoverCard-images.patch | 2 +- build/patches/00WIN-Disable-first-run.patch | 2 +- build/patches/00WIN-Disable-sharing-hub.patch | 2 +- build/patches/00WIN-enable-pdf-plugin.patch | 2 +- ...um-data-to-enable-install-extensions.patch | 28 ++- ...message-for-unsupported-hardware-aes.patch | 24 +- build/patches/00v113-temp-fix-build.patch | 4 +- .../AImageReader-CFI-crash-mitigations.patch | 12 +- .../Add-AllowUserCertificates-flag.patch | 26 +- .../Add-IsCleartextPermitted-flag.patch | 6 +- .../Add-a-proxy-configuration-page.patch | 16 +- ...dd-custom-tab-intents-privacy-option.patch | 22 +- build/patches/Add-exit-menu-item.patch | 14 +- ...g-for-omnibox-autocomplete-filtering.patch | 16 +- .../Add-flag-for-save-data-header.patch | 8 +- ...nfigure-maximum-connections-per-host.patch | 14 +- ...ontrol-video-playback-resume-feature.patch | 8 +- ...-to-disable-external-intent-requests.patch | 6 +- .../Add-flag-to-disable-vibration.patch | 16 +- ...-switch-for-unsupported-clangd-flags.patch | 4 +- .../Add-menu-item-to-view-source.patch | 8 +- .../Add-option-to-use-home-page-as-NTP.patch | 18 +- build/patches/Add-site-engagement-flag.patch | 12 +- build/patches/Add-webGL-site-setting.patch | 18 +- build/patches/Add-webRTC-site-settings.patch | 8 +- ...ow-building-without-enable_reporting.patch | 20 +- ...ioBuffer-AnalyserNode-fp-mitigations.patch | 12 +- .../patches/Battery-API-return-nothing.patch | 2 +- ...Block-gateway-attacks-via-websockets.patch | 12 +- .../Block-qjz9zk-or-trk-requests.patch | 4 +- build/patches/Bromite-auto-updater.patch | 30 +-- .../Bromite-subresource-adblocker.patch | 40 ++-- build/patches/Client-hints-overrides.patch | 8 +- .../Content-settings-infrastructure.patch | 32 +-- ...ble-Accessibility-service-by-default.patch | 2 +- ...DRM-media-origin-IDs-preprovisioning.patch | 2 +- .../Disable-FLoC-and-privacy-sandbox.patch | 30 +-- build/patches/Disable-PrivacyGuide.patch | 4 +- .../Disable-StartSurface-feature.patch | 4 +- build/patches/Disable-TLS-resumption.patch | 22 +- build/patches/Disable-all-promo-dialogs.patch | 2 +- build/patches/Disable-crash-reporting.patch | 4 +- ...Disable-fetching-of-all-field-trials.patch | 50 ++-- build/patches/Disable-idle-detection.patch | 2 +- ...-lock-icon-in-address-bar-by-default.patch | 2 +- ...media-router-and-remoting-by-default.patch | 8 +- .../Disable-offline-pages-in-CCT.patch | 2 +- ...-omission-of-URL-elements-in-Omnibox.patch | 2 +- .../patches/Disable-plugins-enumeration.patch | 2 +- .../Disable-smart-selection-by-default.patch | 12 +- ...isable-some-signed-exchange-features.patch | 2 +- .../Disable-text-fragments-by-default.patch | 18 +- .../Disable-third-party-origin-trials.patch | 18 +- build/patches/Disable-update-scheduler.patch | 2 +- build/patches/Disable-various-metrics.patch | 12 +- .../Do-not-build-API-keys-infobar.patch | 2 +- .../Do-not-compile-QR-code-sharing.patch | 12 +- .../patches/Do-not-link-with-libatomic.patch | 2 +- .../Do-not-store-passwords-by-default.patch | 6 +- build/patches/DoH-improvements.patch | 2 +- .../Enable-Certificate-Transparency.patch | 18 +- build/patches/Enable-HEVC-by-default.patch | 2 +- ...-SPPI-for-devices-with-enough-memory.patch | 4 +- ...ctOriginIsolation-and-SitePerProcess.patch | 20 +- ...e-darken-websites-checkbox-in-themes.patch | 4 +- .../Enable-native-Android-autofill.patch | 58 ++--- ...-prefetch-privacy-changes-by-default.patch | 2 +- build/patches/Enable-share-intent.patch | 42 ++-- ...ble-third-party-storage-partitioning.patch | 2 +- .../Experimental-user-scripts-support.patch | 96 ++++---- .../Guard-for-user-agent-reduction.patch | 6 +- ...story-number-of-days-privacy-setting.patch | 46 ++-- ...number-of-autocomplete-matches-to-10.patch | 6 +- ...ripts-for-AMP-tracking-ads-and-video.patch | 10 +- .../Invalidate-components-public-key.patch | 2 +- build/patches/JIT-site-settings.patch | 18 +- .../Keep-empty-tabs-between-sessions.patch | 6 +- ...-allow-screenshots-in-Incognito-mode.patch | 2 +- build/patches/Logcat-crash-reports-UI.patch | 2 +- .../patches/Modify-default-preferences.patch | 18 +- .../Move-navigation-bar-to-bottom.patch | 222 +++++++++--------- ...nt-settings-back-to-privacy-settings.patch | 26 +- build/patches/Never-fetch-popular-sites.patch | 8 +- build/patches/OpenSearch-miscellaneous.patch | 6 +- .../patches/Override-Navigator-Language.patch | 6 +- .../Partition-Blink-memory-cache.patch | 24 +- .../Partition-blobs-by-top-frame-URL.patch | 4 +- ...-modal-dialog-flag-to-close-all-tabs.patch | 30 +-- ...e-introduce-override_build_timestamp.patch | 2 +- ...referrals-in-cross-origin-navigation.patch | 22 +- build/patches/Remove-help-menu-item.patch | 2 +- ...ndow-name-on-cross-origin-navigation.patch | 4 +- .../Restore-Search-Ready-Omnibox-flag.patch | 40 ++-- ...-button-in-top-toolbar-customization.patch | 14 +- .../Restore-offline-indicator-v2-flag.patch | 26 +- ...Delete-block-external-form-redirects.patch | 33 ++- ...evert-Permit-blocking-of-view-source.patch | 136 +---------- ...emove-disable-pull-to-refresh-effect.patch | 8 +- ...vert-flags-remove-num-raster-threads.patch | 18 +- ...l-of-execution-context-address-space.patch | 48 ++-- ...moval-of-an-option-to-block-autoplay.patch | 12 +- ...-Note-9-SDK27-crazylinker-workaround.patch | 4 +- ...tings-for-cookies-javascript-and-ads.patch | 6 +- build/patches/Site-setting-for-images.patch | 16 +- build/patches/Timezone-customization.patch | 42 ++-- .../Use-64-bit-WebView-processes.patch | 16 +- build/patches/Welcome-screen.patch | 42 ++-- build/patches/autofill-miscellaneous.patch | 22 +- ...build-remove-calling-untrusted-hooks.patch | 8 +- .../disable-WebView-variations-support.patch | 18 +- ...IPv6-connectivity-probes-to-RIPE-DNS.patch | 2 +- ...t_run-deactivate-autoupdate-globally.patch | 2 +- build/patches/kill-Auth.patch | 10 +- build/patches/kill-Vision.patch | 2 +- ...nH264-enable-ARM-ARM64-optimizations.patch | 2 +- .../sharing-hub-always-use-visible-URL.patch | 2 +- .../ungoogled-chromium-Disable-Gaia.patch | 4 +- ...gled-chromium-Disable-profile-avatar.patch | 4 +- ...romium-Disable-translate-integration.patch | 2 +- ...RTC-do-not-expose-local-IP-addresses.patch | 2 +- 170 files changed, 1204 insertions(+), 1308 deletions(-) diff --git a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch index c622efc9..a3d28874 100644 --- a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch +++ b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch @@ -6,14 +6,14 @@ Adds restrict-gamepad-access flag (default active) to disable GamePad API. --- chrome/browser/flag-metadata.json | 4 ++-- chrome/browser/flag_descriptions.cc | 2 +- - device/gamepad/public/cpp/gamepad_features.cc | 2 +- + device/gamepad/public/cpp/gamepad_features.cc | 4 ++-- .../blink/renderer/modules/gamepad/navigator_gamepad.cc | 6 ++++++ - 4 files changed, 10 insertions(+), 4 deletions(-) + 4 files changed, 11 insertions(+), 5 deletions(-) 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 -@@ -6370,9 +6370,9 @@ +@@ -6645,9 +6645,9 @@ "expiry_milestone": 120 }, { @@ -28,7 +28,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2782,7 +2782,7 @@ const char kReduceAcceptLanguageDescription[] = +@@ -2897,7 +2897,7 @@ const char kReduceAcceptLanguageDescription[] = const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = @@ -40,15 +40,17 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti 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 -@@ -28,7 +28,7 @@ BASE_FEATURE(kEnableWindowsGamingInputDataFetcher, +@@ -27,8 +27,8 @@ BASE_FEATURE(kEnableWindowsGamingInputDataFetcher, + base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kRestrictGamepadAccess, - "RestrictGamepadAccess", +- "RestrictGamepadAccess", - base::FEATURE_DISABLED_BY_DEFAULT); -+ base::FEATURE_ENABLED_BY_DEFAULT); ++ "RestrictGamepadAccess", // enabled ++ base::FEATURE_ENABLED_BY_DEFAULT); // in bromite - #if BUILDFLAG(IS_ANDROID) - // Enables gamepad vibration on Android 12+. + // Enables gamepad multitouch + BASE_FEATURE(kEnableGamepadMultitouch, diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc --- a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc +++ b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc @@ -63,7 +65,7 @@ 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. -@@ -405,6 +409,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() { +@@ -430,6 +434,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() { void NavigatorGamepad::DispatchGamepadEvent(const AtomicString& event_name, Gamepad* gamepad) { diff --git a/build/patches/00Add-setting-to-clear-data-on-exit.patch b/build/patches/00Add-setting-to-clear-data-on-exit.patch index 5df25e4e..da1e16a9 100644 --- a/build/patches/00Add-setting-to-clear-data-on-exit.patch +++ b/build/patches/00Add-setting-to-clear-data-on-exit.patch @@ -31,7 +31,7 @@ Subject: Add setting to clear data on exit 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 -@@ -288,6 +288,7 @@ chrome_java_sources = [ +@@ -291,6 +291,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAdvanced.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java", @@ -42,15 +42,15 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java 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 -@@ -136,6 +136,7 @@ import org.chromium.chrome.browser.profiles.Profile; - import org.chromium.chrome.browser.profiles.ProfileManager; +@@ -137,6 +137,7 @@ import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.quick_delete.QuickDeleteController; + import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl; import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate; +import org.chromium.chrome.browser.profiles.ProfileManagerUtils; import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler; import org.chromium.chrome.browser.read_later.ReadingListUtils; import org.chromium.chrome.browser.reengagement.ReengagementNotificationController; -@@ -1277,7 +1278,11 @@ public class ChromeTabbedActivity extends ChromeActivity Clear browsing data @@ -238,7 +238,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 -@@ -302,8 +302,26 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() { +@@ -286,8 +286,26 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() { void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy( bool keep_browser_alive) { @@ -317,7 +317,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 -@@ -488,6 +488,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -499,6 +499,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] = settings_api::PrefType::PREF_TYPE_NUMBER; @@ -374,7 +374,7 @@ diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/b 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 -@@ -1421,6 +1421,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, +@@ -1442,6 +1442,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, } } @@ -397,7 +397,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 -@@ -195,6 +195,8 @@ class ProfileManager : public Profile::Delegate { +@@ -198,6 +198,8 @@ class ProfileManager : public Profile::Delegate { // profiles. std::vector GetLoadedProfiles() const; @@ -474,7 +474,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 -@@ -1543,6 +1543,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1540,6 +1540,9 @@ Your Google account may have other forms of browsing history like searches and a Basic @@ -487,7 +487,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro 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 -@@ -1716,6 +1716,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1752,6 +1752,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"clearedData", IDS_SETTINGS_CLEARED_DATA}, {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, diff --git a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch index 653b4191..5a6ceecb 100644 --- a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch @@ -101,7 +101,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 -@@ -244,6 +244,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -243,6 +243,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { if (mParams.isAnchor()) { ModelList linkGroup = new ModelList(); @@ -111,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr if (FirstRunStatus.getFirstRunFlowComplete() && !isEmptyUrl(mParams.getUrl()) && UrlUtilities.isAcceptedScheme(mParams.getUrl())) { if (mMode == ContextMenuMode.NORMAL) { -@@ -602,6 +605,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -601,6 +604,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { ShareHelper.shareDirectly( params, ShareHelper.getLastShareComponentName(), getProfile(), false); }); @@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM 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 -@@ -7435,6 +7435,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7642,6 +7642,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMoveTopToolbarToBottomDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kMoveTopToolbarToBottom)}, @@ -168,7 +168,7 @@ diff --git a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/con diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1821,6 +1821,10 @@ const char kMoveTopToolbarToBottomName[] = "Move top toolbar to bottom"; +@@ -1882,6 +1882,10 @@ const char kMoveTopToolbarToBottomName[] = "Move top toolbar to bottom"; const char kMoveTopToolbarToBottomDescription[] = "Move the top toolbar to the bottom."; @@ -182,7 +182,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1024,6 +1024,9 @@ extern const char kImprovedKeyboardShortcutsDescription[]; +@@ -1061,6 +1061,9 @@ extern const char kImprovedKeyboardShortcutsDescription[]; extern const char kMoveTopToolbarToBottomName[]; extern const char kMoveTopToolbarToBottomDescription[]; @@ -195,8 +195,8 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -387,6 +387,8 @@ public abstract class ChromeFeatureList { - public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; +@@ -379,6 +379,8 @@ public abstract class ChromeFeatureList { + public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid"; public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM = "MoveTopToolbarToBottom"; + public static final String SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS = @@ -204,7 +204,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = "NotificationPermissionBottomSheet"; -@@ -656,6 +658,8 @@ public abstract class ChromeFeatureList { +@@ -641,6 +643,8 @@ public abstract class ChromeFeatureList { new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, true); public static final CachedFlag sMoveTopToolbarToBottom = new CachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false); @@ -311,7 +311,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c 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 -@@ -971,6 +971,10 @@ BASE_FEATURE(kScopeMemoryCachePerContext, +@@ -969,6 +969,10 @@ BASE_FEATURE(kScopeMemoryCachePerContext, "ScopeMemoryCachePerContext", base::FEATURE_DISABLED_BY_DEFAULT); @@ -325,7 +325,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 -@@ -421,6 +421,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kScopeMemoryCachePerContext); +@@ -408,6 +408,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kScopeMemoryCachePerContext); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kEnablePenetratingImageSelection); @@ -345,7 +345,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third #include "third_party/blink/renderer/core/page/page.h" #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -394,7 +395,7 @@ void HTMLAnchorElement::SendPings(const KURL& destination_url) const { +@@ -402,7 +403,7 @@ void HTMLAnchorElement::SendPings(const KURL& destination_url) const { } } @@ -354,8 +354,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third event.SetDefaultHandled(); LocalDOMWindow* window = GetDocument().domWindow(); -@@ -548,6 +549,15 @@ void HTMLAnchorElement::HandleClick(Event& event) { - } +@@ -543,6 +544,15 @@ void HTMLAnchorElement::HandleClick(Event& event) { + /*element=*/this)); } + if (!do_not_show_context_menu && @@ -400,7 +400,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_ #include "third_party/blink/renderer/core/frame/attribution_src_loader.h" #include "third_party/blink/renderer/core/frame/deprecation/deprecation.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h" -@@ -63,6 +64,7 @@ +@@ -62,6 +63,7 @@ #include "third_party/blink/renderer/core/media_type_names.h" #include "third_party/blink/renderer/core/page/chrome_client.h" #include "third_party/blink/renderer/core/page/page.h" @@ -408,7 +408,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/style/content_data.h" -@@ -718,6 +720,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate( +@@ -717,6 +719,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate( } } @@ -433,7 +433,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 -@@ -225,6 +225,8 @@ class CORE_EXPORT HTMLImageElement final +@@ -227,6 +227,8 @@ class CORE_EXPORT HTMLImageElement final void DidAddUserAgentShadowRoot(ShadowRoot&) override; void AdjustStyle(ComputedStyleBuilder&) override; @@ -445,7 +445,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_p diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/third_party/blink/renderer/core/page/context_menu_controller.cc --- a/third_party/blink/renderer/core/page/context_menu_controller.cc +++ b/third_party/blink/renderer/core/page/context_menu_controller.cc -@@ -170,14 +170,16 @@ void ContextMenuController::DocumentDetached(Document* document) { +@@ -171,14 +171,16 @@ void ContextMenuController::DocumentDetached(Document* document) { } } @@ -465,7 +465,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t mouse_event->SetDefaultHandled(); } -@@ -413,7 +415,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch( +@@ -414,7 +416,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch( bool ContextMenuController::ShowContextMenu(LocalFrame* frame, const PhysicalOffset& point, WebMenuSourceType source_type, @@ -475,7 +475,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, -@@ -436,6 +439,15 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, +@@ -437,6 +440,15 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, if (!result.InnerNodeOrImageMapImage()) return false; @@ -491,7 +491,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; -@@ -768,11 +780,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, +@@ -771,11 +783,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, data.form_renderer_id = GetFormRendererId(result); data.field_renderer_id = GetFieldRendererId(result); diff --git a/build/patches/00Clear-CORS-Preflight-Cache-on-clearing-data.patch b/build/patches/00Clear-CORS-Preflight-Cache-on-clearing-data.patch index c01bcc2d..6545999c 100644 --- a/build/patches/00Clear-CORS-Preflight-Cache-on-clearing-data.patch +++ b/build/patches/00Clear-CORS-Preflight-Cache-on-clearing-data.patch @@ -40,7 +40,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 -@@ -686,6 +686,10 @@ void PreflightController::PerformPreflightCheck( +@@ -677,6 +677,10 @@ void PreflightController::PerformPreflightCheck( (*emplaced_pair.first)->Request(loader_factory); } @@ -78,7 +78,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 -@@ -1018,6 +1018,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time, +@@ -1037,6 +1037,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time, base::BindOnce(&NetworkContext::OnHttpCacheCleared, base::Unretained(this), std::move(callback)))); diff --git a/build/patches/00Disable-BackForwardCache.patch b/build/patches/00Disable-BackForwardCache.patch index 9e245a62..d90cb4a7 100644 --- a/build/patches/00Disable-BackForwardCache.patch +++ b/build/patches/00Disable-BackForwardCache.patch @@ -9,7 +9,7 @@ Subject: Disable BackForwardCache 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 -@@ -84,9 +84,9 @@ BASE_FEATURE(kBackgroundFetch, +@@ -89,9 +89,9 @@ BASE_FEATURE(kBackgroundFetch, base::FEATURE_ENABLED_BY_DEFAULT); // Enable using the BackForwardCache. diff --git a/build/patches/00Disable-FedCm.patch b/build/patches/00Disable-FedCm.patch index 1871333b..dbdafe6a 100644 --- a/build/patches/00Disable-FedCm.patch +++ b/build/patches/00Disable-FedCm.patch @@ -10,7 +10,7 @@ Subject: Disable FedCm 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 -@@ -389,7 +389,7 @@ BASE_FEATURE(kExtraSafelistedRequestHeadersForOutOfBlinkCors, +@@ -394,7 +394,7 @@ BASE_FEATURE(kExtraSafelistedRequestHeadersForOutOfBlinkCors, // by the flag in RuntimeEnabledFeatures on the blink side. See also // the use of kSetOnlyIfOverridden in content/child/runtime_features.cc. // We enable it here by default to support use in origin trials. @@ -22,7 +22,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/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 -@@ -1473,7 +1473,7 @@ +@@ -1537,7 +1537,7 @@ { name: "FedCm", public: true, diff --git a/build/patches/00Disable-FirstPartySets-and-StorageAccessAPI.patch b/build/patches/00Disable-FirstPartySets-and-StorageAccessAPI.patch index ec61993a..1c329a1b 100644 --- a/build/patches/00Disable-FirstPartySets-and-StorageAccessAPI.patch +++ b/build/patches/00Disable-FirstPartySets-and-StorageAccessAPI.patch @@ -22,7 +22,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/pr 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 -@@ -465,9 +465,9 @@ BASE_FEATURE(kWebIdentityMDocs, +@@ -473,9 +473,9 @@ BASE_FEATURE(kWebIdentityMDocs, base::FEATURE_DISABLED_BY_DEFAULT); // Enables usage of First Party Sets to determine cookie availability. diff --git a/build/patches/00Disable-GSA-by-default.patch b/build/patches/00Disable-GSA-by-default.patch index 01daa804..bd33fcb4 100644 --- a/build/patches/00Disable-GSA-by-default.patch +++ b/build/patches/00Disable-GSA-by-default.patch @@ -12,7 +12,7 @@ Subject: Disable GSA by default diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java -@@ -43,7 +43,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity; +@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity; import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler; import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata; import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j import org.chromium.chrome.browser.offlinepages.OfflinePageUtils; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteControllerProvider; import org.chromium.chrome.browser.profiles.Profile; -@@ -264,8 +263,6 @@ public class IntentHandler { +@@ -265,8 +264,6 @@ public class IntentHandler { private static int sReferrerId; private static String sPendingIncognitoUrl; @@ -29,7 +29,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j private static final String PACKAGE_GMAIL = "com.google.android.gm"; private static final String PACKAGE_PLUS = "com.google.android.apps.plus"; private static final String PACKAGE_HANGOUTS = "com.google.android.talk"; -@@ -497,8 +494,6 @@ public class IntentHandler { +@@ -498,8 +495,6 @@ public class IntentHandler { return ExternalAppId.LINE; } else if (packageName.equals(PACKAGE_WHATSAPP)) { return ExternalAppId.WHATSAPP; @@ -46,10 +46,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.flags.ChromeFeatureList; -import org.chromium.chrome.browser.gsa.GSAState; - import org.chromium.chrome.browser.lens.LensController; import org.chromium.components.externalauth.ExternalAuthUtils; -@@ -63,12 +62,7 @@ public class LensUtils { + /** +@@ -62,12 +61,7 @@ public class LensUtils { if (context == null) { return ""; } @@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils } } -@@ -120,11 +114,7 @@ public class LensUtils { +@@ -119,11 +113,7 @@ public class LensUtils { * @return Whether the package is valid. */ public static boolean isValidAgsaPackage(final ExternalAuthUtils externalAuthUtils) { @@ -74,11 +74,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils + return false; } - /** + public static boolean isGoogleLensFeatureEnabled(boolean isIncognito) { 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 -@@ -696,8 +696,8 @@ BASE_FEATURE(kContextMenuGoogleLensSearchOptimizations, +@@ -725,8 +725,8 @@ BASE_FEATURE(kContextMenuGoogleLensSearchOptimizations, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kContextMenuSearchWithGoogleLens, @@ -89,7 +89,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse BASE_FEATURE(kContextMenuShopWithGoogleLens, "ContextMenuShopWithGoogleLens", -@@ -768,8 +768,8 @@ BASE_FEATURE(kOfflineIndicatorV2, +@@ -807,8 +807,8 @@ BASE_FEATURE(kOfflineIndicatorV2, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kExperimentsForAgsa, diff --git a/build/patches/00Disable-GetInstalledRelatedApps-API.patch b/build/patches/00Disable-GetInstalledRelatedApps-API.patch index 5a44505f..b1c9a106 100644 --- a/build/patches/00Disable-GetInstalledRelatedApps-API.patch +++ b/build/patches/00Disable-GetInstalledRelatedApps-API.patch @@ -34,8 +34,8 @@ diff --git a/content/browser/installedapp/installed_app_provider_impl_win.cc b/c 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 -@@ -575,12 +575,12 @@ BASE_FEATURE(kInnerFrameCompositorSurfaceEviction, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -583,12 +583,12 @@ BASE_FEATURE(kInnerFrameCompositorSurfaceEviction, + base::FEATURE_ENABLED_BY_DEFAULT); // guard this // Kill switch for the GetInstalledRelatedApps API. -BASE_FEATURE(kInstalledApp, "InstalledApp", base::FEATURE_ENABLED_BY_DEFAULT); @@ -52,7 +52,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/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 -@@ -1933,9 +1933,9 @@ +@@ -2017,9 +2017,9 @@ name: "FingerprintingCanvasImageDataNoise", }, { diff --git a/build/patches/00Disable-PrivateStateTokens-API.patch b/build/patches/00Disable-PrivateStateTokens-API.patch index 43b64147..71b3af30 100644 --- a/build/patches/00Disable-PrivateStateTokens-API.patch +++ b/build/patches/00Disable-PrivateStateTokens-API.patch @@ -9,7 +9,7 @@ Subject: Disable PrivateStateTokens API diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -158,12 +158,12 @@ BASE_FEATURE(kAttributionReportingTriggerAttestation, +@@ -171,12 +171,12 @@ BASE_FEATURE(kAttributionReportingCrossAppWeb, // set, and handling their responses, according to the protocol. // (See https://github.com/WICG/trust-token-api.) BASE_FEATURE(kPrivateStateTokens, diff --git a/build/patches/00Disable-WebGPU.patch b/build/patches/00Disable-WebGPU.patch index 0251504a..3296c2a5 100644 --- a/build/patches/00Disable-WebGPU.patch +++ b/build/patches/00Disable-WebGPU.patch @@ -10,7 +10,7 @@ Subject: Disable WebGPU 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 -@@ -271,7 +271,7 @@ BASE_FEATURE(kEnableDrDcVulkan, +@@ -268,7 +268,7 @@ BASE_FEATURE(kEnableDrDcVulkan, BASE_FEATURE(kWebGPUService, "WebGPUService", #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -22,7 +22,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc 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 -@@ -3771,7 +3771,7 @@ +@@ -3817,7 +3817,7 @@ // Note that this isn't enough to enable WebGPU and that access to // WebGPU is further gated on the "WebGPUService" feature exposing GPU // process access to WebGPU to the renderer process. diff --git a/build/patches/00Disable-devtools-remote-and-custom-protocols.patch b/build/patches/00Disable-devtools-remote-and-custom-protocols.patch index 2673cf0a..c94039e2 100644 --- a/build/patches/00Disable-devtools-remote-and-custom-protocols.patch +++ b/build/patches/00Disable-devtools-remote-and-custom-protocols.patch @@ -9,7 +9,7 @@ Subject: Disable devtools remote and custom protocols diff --git a/chrome/browser/ui/webui/devtools_ui_data_source.cc b/chrome/browser/ui/webui/devtools_ui_data_source.cc --- a/chrome/browser/ui/webui/devtools_ui_data_source.cc +++ b/chrome/browser/ui/webui/devtools_ui_data_source.cc -@@ -173,7 +173,7 @@ void DevToolsDataSource::StartDataRequest( +@@ -175,7 +175,7 @@ void DevToolsDataSource::StartDataRequest( // Serve request to devtools://remote from remote location. std::string remote_path_prefix(chrome::kChromeUIDevToolsRemotePath); remote_path_prefix += "/"; @@ -18,7 +18,7 @@ diff --git a/chrome/browser/ui/webui/devtools_ui_data_source.cc b/chrome/browser base::CompareCase::INSENSITIVE_ASCII)) { if (MaybeHandleCustomRequest(path.substr(remote_path_prefix.length()), &callback)) { -@@ -196,7 +196,7 @@ void DevToolsDataSource::StartDataRequest( +@@ -198,7 +198,7 @@ void DevToolsDataSource::StartDataRequest( // Serve request to devtools://custom from custom URL. std::string custom_path_prefix(chrome::kChromeUIDevToolsCustomPath); custom_path_prefix += "/"; diff --git a/build/patches/00Disable-privacy-issues-in-password-manager.patch b/build/patches/00Disable-privacy-issues-in-password-manager.patch index 36973c35..819dc858 100644 --- a/build/patches/00Disable-privacy-issues-in-password-manager.patch +++ b/build/patches/00Disable-privacy-issues-in-password-manager.patch @@ -77,7 +77,7 @@ diff --git a/components/password_manager/core/browser/affiliation/facet_manager. diff --git a/components/password_manager/core/common/password_manager_features.cc b/components/password_manager/core/common/password_manager_features.cc --- a/components/password_manager/core/common/password_manager_features.cc +++ b/components/password_manager/core/common/password_manager_features.cc -@@ -74,7 +74,7 @@ BASE_FEATURE(kFillingAcrossAffiliatedWebsites, +@@ -87,7 +87,7 @@ BASE_FEATURE(kFillingAcrossGroupedSites, // selection, rather than autofilling on page load, with highlighting of fields. BASE_FEATURE(kFillOnAccountSelect, "fill-on-account-select", @@ -86,7 +86,7 @@ diff --git a/components/password_manager/core/common/password_manager_features.c // Enables logging the content of chrome://password-manager-internals to the // terminal. -@@ -155,7 +155,7 @@ BASE_FEATURE(kSendPasswords, +@@ -170,7 +170,7 @@ BASE_FEATURE(kSendPasswords, // Enables password leak detection for unauthenticated users. BASE_FEATURE(kLeakDetectionUnauthenticated, "LeakDetectionUnauthenticated", diff --git a/build/patches/00Disable-speechSynthesis-getVoices-API.patch b/build/patches/00Disable-speechSynthesis-getVoices-API.patch index 09972462..20de1148 100644 --- a/build/patches/00Disable-speechSynthesis-getVoices-API.patch +++ b/build/patches/00Disable-speechSynthesis-getVoices-API.patch @@ -19,7 +19,7 @@ to enable it. 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 -@@ -7016,6 +7016,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7215,6 +7215,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kFileHandlingIconsDescription, kOsDesktop, FEATURE_VALUE_TYPE(blink::features::kFileHandlingIcons)}, @@ -74,7 +74,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h 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 -@@ -1516,6 +1516,10 @@ BASE_FEATURE(kStylusPointerAdjustment, +@@ -1538,6 +1538,10 @@ BASE_FEATURE(kStylusPointerAdjustment, "StylusPointerAdjustment", base::FEATURE_DISABLED_BY_DEFAULT); @@ -88,7 +88,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 -@@ -788,6 +788,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAndroidExtendedKeyboardShortcuts); +@@ -795,6 +795,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAndroidExtendedKeyboardShortcuts); // enabling functions like writing into a nearby input element. BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kStylusPointerAdjustment); diff --git a/build/patches/00Disable-visited-pseudo-class.patch b/build/patches/00Disable-visited-pseudo-class.patch index 9e7c5894..1be807f2 100644 --- a/build/patches/00Disable-visited-pseudo-class.patch +++ b/build/patches/00Disable-visited-pseudo-class.patch @@ -11,7 +11,7 @@ Disable support for pseduo css visited class diff --git a/components/visitedlink/browser/visitedlink_writer.cc b/components/visitedlink/browser/visitedlink_writer.cc --- a/components/visitedlink/browser/visitedlink_writer.cc +++ b/components/visitedlink/browser/visitedlink_writer.cc -@@ -221,7 +221,7 @@ VisitedLinkWriter::VisitedLinkWriter(content::BrowserContext* browser_context, +@@ -234,7 +234,7 @@ VisitedLinkWriter::VisitedLinkWriter(content::BrowserContext* browser_context, : browser_context_(browser_context), delegate_(delegate), listener_(std::make_unique(browser_context)), @@ -20,7 +20,7 @@ diff --git a/components/visitedlink/browser/visitedlink_writer.cc b/components/v VisitedLinkWriter::VisitedLinkWriter(Listener* listener, VisitedLinkDelegate* delegate, -@@ -231,10 +231,10 @@ VisitedLinkWriter::VisitedLinkWriter(Listener* listener, +@@ -244,10 +244,10 @@ VisitedLinkWriter::VisitedLinkWriter(Listener* listener, int32_t default_table_size) : delegate_(delegate), listener_(listener), @@ -33,7 +33,7 @@ diff --git a/components/visitedlink/browser/visitedlink_writer.cc b/components/v DCHECK(listener_); } -@@ -302,6 +302,7 @@ void VisitedLinkWriter::AddURL(const GURL& url, bool update_file) { +@@ -317,6 +317,7 @@ void VisitedLinkWriter::AddURL(const GURL& url, bool update_file) { } VisitedLinkWriter::Hash VisitedLinkWriter::TryToAddURL(const GURL& url) { @@ -41,7 +41,7 @@ diff --git a/components/visitedlink/browser/visitedlink_writer.cc b/components/v // Extra check that we are not incognito. This should not happen. // TODO(boliu): Move this check to HistoryService when IsOffTheRecord is // removed from BrowserContext. -@@ -1021,7 +1022,6 @@ bool VisitedLinkWriter::RebuildTableFromDelegate() { +@@ -1032,7 +1033,6 @@ bool VisitedLinkWriter::RebuildTableFromDelegate() { // TODO(brettw) make sure we have reasonable salt! table_builder_ = new TableBuilder(this, salt_); diff --git a/build/patches/00Enable-Document-Open-Inheritance-Removal.patch b/build/patches/00Enable-Document-Open-Inheritance-Removal.patch index d140baa8..5deae543 100644 --- a/build/patches/00Enable-Document-Open-Inheritance-Removal.patch +++ b/build/patches/00Enable-Document-Open-Inheritance-Removal.patch @@ -3,15 +3,15 @@ Date: Tue, 28 Mar 2023 15:43:18 +0000 Subject: Enable Document Open Inheritance Removal --- - .../blink/renderer/core/dom/document.cc | 46 ------------------- + .../blink/renderer/core/dom/document.cc | 51 ------------------- .../platform/runtime_enabled_features.json5 | 3 +- - 2 files changed, 1 insertion(+), 48 deletions(-) + 2 files changed, 1 insertion(+), 53 deletions(-) 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 -@@ -3341,52 +3341,6 @@ void Document::open(LocalDOMWindow* entered_window, - dom_window_->GetSecurityContext().GetSandboxFlags()) { +@@ -3361,57 +3361,6 @@ void Document::open(LocalDOMWindow* entered_window, + // https://chromestatus.com/metrics/feature/timeline/popularity/4375 CountUse(WebFeature::kDocumentOpenMutateSandbox); } - @@ -45,6 +45,11 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink - - dom_window_->GetSecurityContext().SetSecurityOrigin( - entered_window->GetMutableSecurityOrigin()); +- +- // The SecurityOrigin is now shared in between two different window. It +- // means mutating one can have side effect on the other. +- entered_window->GetMutableSecurityOrigin() +- ->set_aliased_by_document_open(); - } - - // Question: Should we remove the inheritance of the CookieURL via @@ -66,7 +71,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink 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 -@@ -1321,8 +1321,7 @@ +@@ -1382,8 +1382,7 @@ }, { name: "DocumentOpenSandboxInheritanceRemoval", diff --git a/build/patches/00Evict-the-entire-FrameTree-like-desktop.patch b/build/patches/00Evict-the-entire-FrameTree-like-desktop.patch index 90946d53..aab8719f 100644 --- a/build/patches/00Evict-the-entire-FrameTree-like-desktop.patch +++ b/build/patches/00Evict-the-entire-FrameTree-like-desktop.patch @@ -4,13 +4,13 @@ Subject: Evict the entire FrameTree like desktop --- components/viz/common/features.cc | 2 +- - content/public/common/content_features.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + content/public/common/content_features.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) 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 -@@ -226,7 +226,7 @@ BASE_FEATURE(kRendererAllocatesImages, +@@ -240,7 +240,7 @@ BASE_FEATURE(kRendererAllocatesImages, // evicts itself. This differs from Destkop platforms which evict the entire // FrameTree along with the topmost viz::Surface. When this feature is enabled, // Android will begin also evicting the entire FrameTree. @@ -22,12 +22,14 @@ diff --git a/components/viz/common/features.cc b/components/viz/common/features. 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 -@@ -572,7 +572,7 @@ BASE_FEATURE(kInMemoryCodeCache, +@@ -579,8 +579,8 @@ BASE_FEATURE(kInMemoryCodeCache, + // frames. Otherwise only toplevel frames and OOPIF are handled, and other // cases, e.g. PDF tiles are ignored. See https://crbug.com/1360351 for details. BASE_FEATURE(kInnerFrameCompositorSurfaceEviction, - "InnerFrameCompositorSurfaceEviction", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ base::FEATURE_ENABLED_BY_DEFAULT); +- "InnerFrameCompositorSurfaceEviction", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ "InnerFrameCompositorSurfaceEviction", // guard this ++ base::FEATURE_ENABLED_BY_DEFAULT); // guard this // Kill switch for the GetInstalledRelatedApps API. BASE_FEATURE(kInstalledApp, "InstalledApp", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/build/patches/00Fonts-fingerprinting-mitigation.patch b/build/patches/00Fonts-fingerprinting-mitigation.patch index f8e2dac3..784e1713 100644 --- a/build/patches/00Fonts-fingerprinting-mitigation.patch +++ b/build/patches/00Fonts-fingerprinting-mitigation.patch @@ -32,7 +32,7 @@ fonts-fingerprint-mitigation flag, which is active by default. 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 -@@ -9498,6 +9498,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9755,6 +9755,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClipboardUnsanitizedContentDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kClipboardUnsanitizedContent)}, @@ -47,7 +47,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -136,6 +136,11 @@ const char kClipboardUnsanitizedContentDescription[] = +@@ -146,6 +146,11 @@ const char kClipboardUnsanitizedContentDescription[] = "Allows reading/writing unsanitized content from/to the clipboard. " "Currently, it is only applicable to HTML format. See crbug.com/1268679."; @@ -62,7 +62,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -113,6 +113,9 @@ extern const char kClickToCallDescription[]; +@@ -119,6 +119,9 @@ extern const char kClickToCallDescription[]; extern const char kClipboardUnsanitizedContentName[]; extern const char kClipboardUnsanitizedContentDescription[]; @@ -82,9 +82,9 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c - base::FEATURE_ENABLED_BY_DEFAULT); + base::FEATURE_DISABLED_BY_DEFAULT); - // Launches the audio service on the browser startup. - BASE_FEATURE(kAudioServiceLaunchOnStartup, -@@ -497,7 +497,7 @@ const base::FeatureParam + // Enables FLEDGE and Attribution Reporting API integration. + BASE_FEATURE(kAttributionFencedFrameReportingBeacon, +@@ -505,7 +505,7 @@ const base::FeatureParam // enables a font indexer on Android which we need to test in the field first. BASE_FEATURE(kFontSrcLocalMatching, "FontSrcLocalMatching", @@ -146,7 +146,7 @@ diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h 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 -@@ -150,7 +150,7 @@ BASE_FEATURE(kExcludeLowEntropyImagesFromLCP, +@@ -151,7 +151,7 @@ BASE_FEATURE(kExcludeLowEntropyImagesFromLCP, const base::FeatureParam kMinimumEntropyForLCP{ &kExcludeLowEntropyImagesFromLCP, "min_bpp", 2}; @@ -155,7 +155,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea // Enable defer commits to avoid flash of unstyled content, for same origin // navigation only. -@@ -1528,6 +1528,10 @@ BASE_FEATURE(kClipboardUnsanitizedContent, +@@ -1550,6 +1550,10 @@ BASE_FEATURE(kClipboardUnsanitizedContent, "ClipboardUnsanitizedContent", base::FEATURE_DISABLED_BY_DEFAULT); @@ -169,7 +169,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 -@@ -805,6 +805,9 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kCheckHTMLParserBudgetLessOften); +@@ -812,6 +812,9 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kCheckHTMLParserBudgetLessOften); // it is only applicable to HTML format. See crbug.com/1268679. BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kClipboardUnsanitizedContent); diff --git a/build/patches/00Internal-firewall.patch b/build/patches/00Internal-firewall.patch index c79c933f..b9c0cdae 100644 --- a/build/patches/00Internal-firewall.patch +++ b/build/patches/00Internal-firewall.patch @@ -63,7 +63,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 -@@ -198,6 +198,7 @@ +@@ -199,6 +199,7 @@ #include "sandbox/policy/switches.h" #include "services/device/public/cpp/device_features.h" #include "services/device/public/cpp/serial/serial_switches.h" @@ -71,7 +71,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "services/media_session/public/cpp/features.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" -@@ -7636,6 +7637,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7855,6 +7856,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(page_info::kPageInfoHideSiteSettings)}, #endif // !BUILDFLAG(IS_ANDROID) @@ -232,7 +232,7 @@ diff --git a/components/webapps/browser/android/webapk/webapk_icon_hasher.cc b/c diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1082,6 +1082,7 @@ component("net") { +@@ -1085,6 +1085,7 @@ component("net") { "//build:chromeos_buildflags", "//net/data/ssl/chrome_root_store:gen_root_store_inc", "//net/http:transport_security_state_generated_files", diff --git a/build/patches/00Keyboard-protection-flag.patch b/build/patches/00Keyboard-protection-flag.patch index cdb5bb71..42a8df6b 100644 --- a/build/patches/00Keyboard-protection-flag.patch +++ b/build/patches/00Keyboard-protection-flag.patch @@ -21,7 +21,7 @@ keyboard events. 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 -@@ -4750,6 +4750,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4862,6 +4862,9 @@ const FeatureEntry kFeatureEntries[] = { {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, @@ -34,7 +34,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3057,6 +3057,12 @@ const char kSystemKeyboardLockDescription[] = +@@ -3171,6 +3171,12 @@ const char kSystemKeyboardLockDescription[] = "keyboard shortcuts and have the events routed directly to the website " "when in fullscreen mode."; @@ -50,7 +50,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1726,6 +1726,9 @@ extern const char kSuppressToolbarCapturesDescription[]; +@@ -1794,6 +1794,9 @@ extern const char kSuppressToolbarCapturesDescription[]; extern const char kSystemKeyboardLockName[]; extern const char kSystemKeyboardLockDescription[]; @@ -184,7 +184,7 @@ diff --git a/third_party/blink/renderer/core/events/keyboard_event.h b/third_par 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 -@@ -172,6 +172,14 @@ BASE_FEATURE(kSystemKeyboardLock, +@@ -167,6 +167,14 @@ BASE_FEATURE(kSystemKeyboardLock, "SystemKeyboardLock", base::FEATURE_ENABLED_BY_DEFAULT); @@ -202,8 +202,8 @@ 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 -@@ -30,6 +30,8 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsPercentBasedScrollingEnabled(); - COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kPointerLockOptions); +@@ -30,6 +30,8 @@ BASE_DECLARE_FEATURE(kWindowsScrollingPersonality); + COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsPercentBasedScrollingEnabled(); COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kSystemCaptionStyle); COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kSystemKeyboardLock); +COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kSystemKeyboardProtection); diff --git a/build/patches/00Partition-HSTS-cache-by-NAK.patch b/build/patches/00Partition-HSTS-cache-by-NAK.patch index 3eb104ff..ee831315 100644 --- a/build/patches/00Partition-HSTS-cache-by-NAK.patch +++ b/build/patches/00Partition-HSTS-cache-by-NAK.patch @@ -21,7 +21,7 @@ Subject: Partition HSTS cache by NAK diff --git a/chrome/browser/ssl/https_only_mode_upgrade_interceptor.cc b/chrome/browser/ssl/https_only_mode_upgrade_interceptor.cc --- a/chrome/browser/ssl/https_only_mode_upgrade_interceptor.cc +++ b/chrome/browser/ssl/https_only_mode_upgrade_interceptor.cc -@@ -132,6 +132,7 @@ void HttpsOnlyModeUpgradeInterceptor::MaybeCreateLoader( +@@ -131,6 +131,7 @@ void HttpsOnlyModeUpgradeInterceptor::MaybeCreateLoader( network::mojom::NetworkContext* network_context = profile->GetDefaultStoragePartition()->GetNetworkContext(); network_context->IsHSTSActiveForHost( @@ -32,7 +32,7 @@ diff --git a/chrome/browser/ssl/https_only_mode_upgrade_interceptor.cc b/chrome/ diff --git a/chrome/browser/ssl/https_upgrades_interceptor.cc b/chrome/browser/ssl/https_upgrades_interceptor.cc --- a/chrome/browser/ssl/https_upgrades_interceptor.cc +++ b/chrome/browser/ssl/https_upgrades_interceptor.cc -@@ -279,6 +279,7 @@ void HttpsUpgradesInterceptor::MaybeCreateLoader( +@@ -306,6 +306,7 @@ void HttpsUpgradesInterceptor::MaybeCreateLoader( network::mojom::NetworkContext* network_context = profile->GetDefaultStoragePartition()->GetNetworkContext(); network_context->IsHSTSActiveForHost( @@ -43,7 +43,7 @@ diff --git a/chrome/browser/ssl/https_upgrades_interceptor.cc b/chrome/browser/s diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc -@@ -318,7 +318,10 @@ void NetInternalsMessageHandler::OnDomainSecurityPolicyDelete( +@@ -315,7 +315,10 @@ void NetInternalsMessageHandler::OnDomainSecurityPolicyDelete( // There cannot be a unicode entry in the HSTS set. return; } @@ -54,7 +54,7 @@ diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/ *domain, base::BindOnce(&IgnoreBoolCallback)); } -@@ -328,7 +331,10 @@ void NetInternalsMessageHandler::OnHSTSQuery(const base::Value::List& list) { +@@ -325,7 +328,10 @@ void NetInternalsMessageHandler::OnHSTSQuery(const base::Value::List& list) { DCHECK(callback_id && domain); AllowJavascript(); @@ -65,7 +65,7 @@ diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/ *domain, base::BindOnce(&NetInternalsMessageHandler::ResolveCallbackWithResult, weak_factory_.GetWeakPtr(), *callback_id)); -@@ -354,7 +360,10 @@ void NetInternalsMessageHandler::OnHSTSAdd(const base::Value::List& list) { +@@ -351,7 +357,10 @@ void NetInternalsMessageHandler::OnHSTSAdd(const base::Value::List& list) { const bool sts_include_subdomains = list[1].GetBool(); base::Time expiry = base::Time::Now() + base::Days(1000); @@ -467,7 +467,7 @@ diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc -@@ -1355,7 +1355,7 @@ ssl_verify_result_t SSLClientSocketImpl::HandleVerifyResult() { +@@ -1341,7 +1341,7 @@ ssl_verify_result_t SSLClientSocketImpl::HandleVerifyResult() { IsCertStatusError(server_cert_verify_result_.cert_status) && result != ERR_CERT_KNOWN_INTERCEPTION_BLOCKED && context_->transport_security_state()->ShouldSSLErrorsBeFatal( @@ -533,7 +533,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque 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 -@@ -1767,17 +1767,19 @@ void NetworkContext::SetCorsOriginAccessListsForOrigin( +@@ -1786,17 +1786,19 @@ void NetworkContext::SetCorsOriginAccessListsForOrigin( std::move(callback).Run(); } @@ -556,7 +556,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont IsHSTSActiveForHostCallback callback) { net::TransportSecurityState* security_state = url_request_context_->transport_security_state(); -@@ -1787,10 +1789,10 @@ void NetworkContext::IsHSTSActiveForHost(const std::string& host, +@@ -1806,10 +1808,10 @@ void NetworkContext::IsHSTSActiveForHost(const std::string& host, return; } @@ -569,7 +569,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont GetHSTSStateCallback callback) { base::Value::Dict result; -@@ -1826,10 +1828,10 @@ void NetworkContext::GetHSTSState(const std::string& domain, +@@ -1845,10 +1847,10 @@ void NetworkContext::GetHSTSState(const std::string& domain, net::TransportSecurityState::STSState dynamic_sts_state; net::TransportSecurityState::PKPState dynamic_pkp_state; bool found_sts_dynamic = transport_security_state->GetDynamicSTSState( @@ -582,7 +582,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont if (found_sts_dynamic) { result.Set("dynamic_upgrade_mode", static_cast(dynamic_sts_state.upgrade_mode)); -@@ -1865,6 +1867,7 @@ void NetworkContext::GetHSTSState(const std::string& domain, +@@ -1884,6 +1886,7 @@ void NetworkContext::GetHSTSState(const std::string& domain, } void NetworkContext::DeleteDynamicDataForHost( @@ -590,7 +590,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont const std::string& host, DeleteDynamicDataForHostCallback callback) { net::TransportSecurityState* transport_security_state = -@@ -1875,7 +1878,7 @@ void NetworkContext::DeleteDynamicDataForHost( +@@ -1894,7 +1897,7 @@ void NetworkContext::DeleteDynamicDataForHost( } std::move(callback).Run( @@ -599,7 +599,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont } void NetworkContext::EnableStaticKeyPinningForTesting( -@@ -1916,7 +1919,7 @@ void NetworkContext::PreconnectSockets( +@@ -1935,7 +1938,7 @@ void NetworkContext::PreconnectSockets( DCHECK(!require_network_isolation_key_ || !network_anonymization_key.IsEmpty()); @@ -608,7 +608,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont // |PreconnectSockets| may receive arguments from the renderer, which is not // guaranteed to validate them. -@@ -2703,12 +2706,15 @@ void NetworkContext::OnConnectionError() { +@@ -2722,12 +2725,15 @@ void NetworkContext::OnConnectionError() { std::move(on_connection_close_callback_).Run(this); } @@ -628,7 +628,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 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 -@@ -414,15 +414,17 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -415,15 +415,17 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const std::string& ocsp_result, const std::string& sct_list, VerifyCertForSignedExchangeCallback callback) override; @@ -649,7 +649,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte const std::string& host, DeleteDynamicDataForHostCallback callback) override; void SetCorsOriginAccessListsForOrigin( -@@ -671,7 +673,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -676,7 +678,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext mojo::PendingRemote cookie_observer, net::FirstPartySetMetadata first_party_set_metadata); @@ -662,7 +662,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte 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 -@@ -1375,16 +1375,16 @@ interface NetworkContext { +@@ -1403,16 +1403,16 @@ interface NetworkContext { // Adds explicitly-specified data as if it was processed from an // HSTS header. Used by tests and implementation of chrome://net-internals. @@ -682,7 +682,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw => (mojo_base.mojom.DictionaryValue state); // Sets allowed and blocked origins respectively for the URLLoaderFactory -@@ -1403,7 +1403,7 @@ interface NetworkContext { +@@ -1431,7 +1431,7 @@ interface NetworkContext { // Deletes any dynamic data stored for |host| from the transport // security state. Returns true iff an entry was deleted. // See net::TransportSecurityState::DeleteDynamicDataForHost for more detail. diff --git a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch index 06928d89..52cbab7e 100644 --- a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch +++ b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch @@ -8,7 +8,7 @@ Disabling the flag via the ui restores the normal mode, where samesite=none first-party cookies are sent in third-party contexts. --- net/base/features.cc | 8 ++++---- - net/cookies/canonical_cookie.cc | 11 +---------- + net/cookies/canonical_cookie.cc | 12 +----------- net/cookies/cookie_deletion_info.cc | 3 ++- net/cookies/parsed_cookie.h | 7 ++++++- net/extras/sqlite/sqlite_persistent_cookie_store.cc | 10 ++++++++++ @@ -17,23 +17,23 @@ samesite=none first-party cookies are sent in third-party contexts. .../renderer/modules/cookie_store/cookie_init.idl | 2 +- .../renderer/modules/cookie_store/cookie_store.cc | 12 ++++++++++++ .../cookie_store/cookie_store_delete_options.idl | 2 +- - 10 files changed, 50 insertions(+), 20 deletions(-) + 10 files changed, 50 insertions(+), 21 deletions(-) diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -252,8 +252,8 @@ BASE_FEATURE(kSamePartyAttributeEnabled, +@@ -243,8 +243,8 @@ BASE_FEATURE(kSamePartyAttributeEnabled, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kPartitionedCookies, - "PartitionedCookies", -- base::FEATURE_DISABLED_BY_DEFAULT); +- base::FEATURE_ENABLED_BY_DEFAULT); + "PartitionedCookies", // guard this + base::FEATURE_ENABLED_BY_DEFAULT); // guard this BASE_FEATURE(kNoncedPartitionedCookies, "NoncedPartitionedCookies", -@@ -268,8 +268,8 @@ BASE_FEATURE(kStaticKeyPinningEnforcement, +@@ -259,8 +259,8 @@ BASE_FEATURE(kStaticKeyPinningEnforcement, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kCookieDomainRejectNonASCII, @@ -47,7 +47,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc -@@ -1469,8 +1469,6 @@ bool CanonicalCookie::IsCanonicalForFromStorage() const { +@@ -1446,8 +1446,6 @@ bool CanonicalCookie::IsCanonicalForFromStorage() const { if (IsPartitioned()) { if (CookiePartitionKey::HasNonce(partition_key_)) return true; @@ -56,7 +56,7 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc } return true; -@@ -1713,14 +1711,7 @@ bool CanonicalCookie::IsCookiePartitionedValid(const GURL& url, +@@ -1690,15 +1688,7 @@ bool CanonicalCookie::IsCookiePartitionedValid(const GURL& url, bool secure, bool is_partitioned, bool partition_has_nonce) { @@ -64,7 +64,8 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc - return true; - if (partition_has_nonce) - return true; -- bool result = url.SchemeIsCryptographic() && secure; +- CookieAccessScheme scheme = cookie_util::ProvisionalAccessScheme(url); +- bool result = (scheme != CookieAccessScheme::kNonCryptographic) && secure; - DLOG_IF(WARNING, !result) - << "CanonicalCookie has invalid Partitioned attribute"; - return result; @@ -112,7 +113,7 @@ diff --git a/net/cookies/parsed_cookie.h b/net/cookies/parsed_cookie.h diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sqlite/sqlite_persistent_cookie_store.cc --- a/net/extras/sqlite/sqlite_persistent_cookie_store.cc +++ b/net/extras/sqlite/sqlite_persistent_cookie_store.cc -@@ -862,6 +862,16 @@ bool SQLitePersistentCookieStore::Backend::DoInitializeDatabase() { +@@ -864,6 +864,16 @@ bool SQLitePersistentCookieStore::Backend::DoInitializeDatabase() { if (!restore_old_session_cookies_) DeleteSessionCookiesOnStartup(); @@ -164,7 +165,7 @@ diff --git a/services/network/cookie_settings.cc b/services/network/cookie_setti diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc --- a/services/network/restricted_cookie_manager.cc +++ b/services/network/restricted_cookie_manager.cc -@@ -770,6 +770,9 @@ void RestrictedCookieManager::SetCookieFromString( +@@ -773,6 +773,9 @@ void RestrictedCookieManager::SetCookieFromString( std::move(callback).Run(site_for_cookies_ok, top_frame_origin_ok); callback = base::DoNothing(); @@ -187,7 +188,7 @@ diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_init.idl b/t diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc --- a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc +++ b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc -@@ -316,6 +316,10 @@ ScriptPromise CookieStore::set(ScriptState* script_state, +@@ -317,6 +317,10 @@ ScriptPromise CookieStore::set(ScriptState* script_state, CookieInit* set_options = CookieInit::Create(); set_options->setName(name); set_options->setValue(value); @@ -198,7 +199,7 @@ diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/t return set(script_state, set_options, exception_state); } -@@ -338,6 +342,10 @@ ScriptPromise CookieStore::Delete(ScriptState* script_state, +@@ -339,6 +343,10 @@ ScriptPromise CookieStore::Delete(ScriptState* script_state, set_options->setName(name); set_options->setValue("deleted"); set_options->setExpires(0); @@ -209,7 +210,7 @@ diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/t return DoWrite(script_state, set_options, exception_state); } -@@ -352,6 +360,10 @@ ScriptPromise CookieStore::Delete(ScriptState* script_state, +@@ -353,6 +361,10 @@ ScriptPromise CookieStore::Delete(ScriptState* script_state, set_options->setPath(options->path()); set_options->setSameSite("strict"); set_options->setPartitioned(options->partitioned()); diff --git a/build/patches/00Remove-ChromiumNetworkAdapter.patch b/build/patches/00Remove-ChromiumNetworkAdapter.patch index 9d7d5f6c..cd095984 100644 --- a/build/patches/00Remove-ChromiumNetworkAdapter.patch +++ b/build/patches/00Remove-ChromiumNetworkAdapter.patch @@ -10,14 +10,14 @@ without asking the native code .../ConnectivityDetector.java | 54 ------------------- .../chrome/browser/omaha/OmahaBase.java | 3 +- .../util/HttpURLConnectionFactoryImpl.java | 7 +-- - .../firstrun/VariationsSeedFetcher.java | 27 +--------- + .../firstrun/VariationsSeedFetcher.java | 26 +-------- .../chromium/net/ChromiumNetworkAdapter.java | 12 ----- - 7 files changed, 4 insertions(+), 174 deletions(-) + 7 files changed, 4 insertions(+), 173 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java -@@ -969,44 +969,6 @@ public class OMADownloadHandler extends BroadcastReceiver { +@@ -970,44 +970,6 @@ public class OMADownloadHandler extends BroadcastReceiver { protected Boolean doInBackground() { HttpURLConnection urlConnection = null; boolean success = false; @@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivit diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java -@@ -471,8 +471,7 @@ public class OmahaBase { +@@ -461,8 +461,7 @@ public class OmahaBase { + "}"); try { URL url = new URL(getRequestGenerator().getServerUrl()); @@ -205,15 +205,14 @@ diff --git a/components/minidump_uploader/android/java/src/org/chromium/componen diff --git a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java --- a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java +++ b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java -@@ -181,15 +181,6 @@ public class VariationsSeedFetcher { +@@ -184,14 +184,6 @@ public class VariationsSeedFetcher { sInstance = fetcher; } - @VisibleForTesting -- protected HttpURLConnection getServerConnection( -- @VariationsPlatform int platform, String restrictMode, String milestone, String channel) +- protected HttpURLConnection getServerConnection(SeedFetchParameters params) - throws MalformedURLException, IOException { -- String urlString = getConnectionString(platform, restrictMode, milestone, channel); +- String urlString = getConnectionString(params); - URL url = new URL(urlString); - return (HttpURLConnection) ChromiumNetworkAdapter.openConnection(url, TRAFFIC_ANNOTATION); - } @@ -221,16 +220,16 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari @VisibleForTesting protected List getAvailableInstanceManipulations() { List compressions = new ArrayList(); -@@ -391,24 +382,8 @@ public class VariationsSeedFetcher { +@@ -486,24 +478,8 @@ public class VariationsSeedFetcher { HttpURLConnection connection = null; try { long startTimeMillis = SystemClock.elapsedRealtime(); -- connection = getServerConnection(platform, restrictMode, milestone, channel); +- connection = getServerConnection(params); - connection.setReadTimeout(READ_TIMEOUT); - connection.setConnectTimeout(REQUEST_TIMEOUT); - connection.setDoInput(true); -- if (curSeedInfo != null) { -- VariationsSeed currentVariationsSeed = curSeedInfo.getParsedVariationsSeed(); +- if (currInfo != null) { +- VariationsSeed currentVariationsSeed = currInfo.getParsedVariationsSeed(); - if (currentVariationsSeed != null) { - String serialNumber = currentVariationsSeed.getSerialNumber(); - if (!serialNumber.isEmpty()) { diff --git a/build/patches/00Remove-auth-header-upon-cross-origin-redirect.patch b/build/patches/00Remove-auth-header-upon-cross-origin-redirect.patch index 53d1d389..39c9adb6 100644 --- a/build/patches/00Remove-auth-header-upon-cross-origin-redirect.patch +++ b/build/patches/00Remove-auth-header-upon-cross-origin-redirect.patch @@ -10,7 +10,7 @@ Subject: Remove auth header upon cross origin redirect diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc b/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc --- a/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc +++ b/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc -@@ -831,6 +831,9 @@ bool ResourceLoader::WillFollowRedirect( +@@ -835,6 +835,9 @@ bool ResourceLoader::WillFollowRedirect( new_url)) { fetcher_->GetUseCounter().CountUse( mojom::WebFeature::kAuthorizationCrossOrigin); diff --git a/build/patches/00Remove-detection-of-captive-portals.patch b/build/patches/00Remove-detection-of-captive-portals.patch index e4ed545b..9e3837de 100644 --- a/build/patches/00Remove-detection-of-captive-portals.patch +++ b/build/patches/00Remove-detection-of-captive-portals.patch @@ -9,7 +9,7 @@ Subject: Remove detection of captive portals 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 -@@ -390,7 +390,7 @@ void ProfileNetworkContextService::UpdateAdditionalCertificates() { +@@ -389,7 +389,7 @@ void ProfileNetworkContextService::UpdateAdditionalCertificates() { void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/build/patches/00Remove-https-connection-from-chrome-discards.patch b/build/patches/00Remove-https-connection-from-chrome-discards.patch index af9ebacb..3f1b4ca9 100644 --- a/build/patches/00Remove-https-connection-from-chrome-discards.patch +++ b/build/patches/00Remove-https-connection-from-chrome-discards.patch @@ -9,7 +9,7 @@ Subject: Remove https connection from chrome://discards diff --git a/chrome/browser/resources/discards/graph_doc_template.html b/chrome/browser/resources/discards/graph_doc_template.html --- a/chrome/browser/resources/discards/graph_doc_template.html +++ b/chrome/browser/resources/discards/graph_doc_template.html -@@ -78,10 +78,6 @@ URL. As result, this document needs to be self-contained, hence inline scripts. +@@ -82,10 +82,6 @@ URL. As result, this document needs to be self-contained, hence inline scripts. } diff --git a/build/patches/00Temp-Disable-kAutomaticLazyFrameLoadingToEmbeds.patch b/build/patches/00Temp-Disable-kAutomaticLazyFrameLoadingToEmbeds.patch index 23b37939..dfa87c2d 100644 --- a/build/patches/00Temp-Disable-kAutomaticLazyFrameLoadingToEmbeds.patch +++ b/build/patches/00Temp-Disable-kAutomaticLazyFrameLoadingToEmbeds.patch @@ -9,7 +9,7 @@ Subject: Temp Disable kAutomaticLazyFrameLoadingToEmbeds 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 -@@ -64,7 +64,7 @@ const base::FeatureParam kSkipFrameCountForLazyAds( +@@ -65,7 +65,7 @@ const base::FeatureParam kSkipFrameCountForLazyAds( // Vitals. BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbeds, "AutomaticLazyFrameLoadingToEmbeds", // must be enabled diff --git a/build/patches/00Viewport-Protection-Site-Setting.patch b/build/patches/00Viewport-Protection-Site-Setting.patch index 496bc8c2..3b0b4c57 100644 --- a/build/patches/00Viewport-Protection-Site-Setting.patch +++ b/build/patches/00Viewport-Protection-Site-Setting.patch @@ -45,7 +45,7 @@ Subject: Viewport Protection Site 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 -@@ -4367,6 +4367,25 @@ +@@ -4424,6 +4424,25 @@ Not allowed to use WebRTC @@ -74,7 +74,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resources/settings/icons.html --- a/chrome/browser/resources/settings/icons.html +++ b/chrome/browser/resources/settings/icons.html -@@ -199,6 +199,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. +@@ -201,6 +201,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. @@ -86,7 +86,7 @@ diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resou diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -1205,4 +1205,26 @@ +@@ -1214,4 +1214,26 @@ @@ -116,7 +116,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts -@@ -119,6 +119,7 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -127,6 +127,7 @@ function addPrivacyChildRoutes(r: Partial) { r.SITE_SETTINGS_TIMEZONE_OVERRIDE = r.SITE_SETTINGS.createChild('timezone-override'); r.SITE_SETTINGS_WEBGL = r.SITE_SETTINGS.createChild('webgl'); r.SITE_SETTINGS_WEBRTC = r.SITE_SETTINGS.createChild('webrtc'); @@ -127,7 +127,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts -@@ -106,6 +106,7 @@ export interface SettingsRoutes { +@@ -109,6 +109,7 @@ export interface SettingsRoutes { SITE_SETTINGS_TIMEZONE_OVERRIDE: Route; SITE_SETTINGS_WEBGL: Route; SITE_SETTINGS_WEBRTC: Route; @@ -222,7 +222,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -353,6 +353,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -384,6 +384,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( case ContentSettingsType::WEBRTC: icon = &vector_icons::kProtectedContentIcon; break; @@ -235,7 +235,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom 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 -@@ -2497,6 +2497,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, +@@ -2555,6 +2555,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, {"siteSettingsWebRTCAllowedExceptions",IDS_SETTINGS_SITE_SETTINGS_WEBRTC_ALLOWED_EXCEPTIONS}, {"siteSettingsWebRTCBlockedExceptions", IDS_SETTINGS_SITE_SETTINGS_WEBRTC_BLOCKED_EXCEPTIONS}, {"siteSettingsWebRTCMidSentence", IDS_SITE_SETTINGS_WEBRTC_TITLE}, @@ -437,7 +437,7 @@ new file mode 100644 diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -341,6 +341,7 @@ +@@ -339,6 +339,7 @@ @@ -490,7 +490,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -220,7 +220,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -221,7 +221,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::TIMEZONE_OVERRIDE || content_type == ContentSettingsType::WEBGL || @@ -500,7 +500,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -234,6 +235,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -235,6 +236,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(autoplay_rules, outermost_main_frame_url); FilterRulesForType(webgl_rules, outermost_main_frame_url); FilterRulesForType(webrtc_rules, outermost_main_frame_url); @@ -601,7 +601,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h 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 -@@ -221,7 +221,7 @@ BASE_FEATURE(kPath2DPaintCache, +@@ -222,7 +222,7 @@ BASE_FEATURE(kPath2DPaintCache, BASE_FEATURE(kViewportProtection, "ViewportProtection", @@ -625,7 +625,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_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 -@@ -2306,6 +2306,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2322,6 +2322,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, // var w = window.open() // var not_emulated_screen_info = w.screen bool protection_enabled = base::FeatureList::IsEnabled(features::kViewportProtection); diff --git a/build/patches/00Viewport-Protection-flag.patch b/build/patches/00Viewport-Protection-flag.patch index 82bb09da..3a9bdf8c 100644 --- a/build/patches/00Viewport-Protection-flag.patch +++ b/build/patches/00Viewport-Protection-flag.patch @@ -28,13 +28,13 @@ The feature is controlled by a feature flag (default enabled) .../blink/renderer/core/input/touch.cc | 17 ++++- third_party/blink/renderer/core/page/page.cc | 76 +++++++++++++++++++ third_party/blink/renderer/core/page/page.h | 7 ++ - .../platform/runtime_enabled_features.json5 | 2 +- - 22 files changed, 241 insertions(+), 18 deletions(-) + .../platform/runtime_enabled_features.json5 | 4 +- + 22 files changed, 242 insertions(+), 19 deletions(-) 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 -@@ -7572,6 +7572,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7786,6 +7786,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(paint_preview::kPaintPreviewDemo)}, #endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) && BUILDFLAG(IS_ANDROID) @@ -49,7 +49,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6801,6 +6801,12 @@ const char kPaintPreviewDemoDescription[] = +@@ -7100,6 +7100,12 @@ const char kPaintPreviewDemoDescription[] = "previews."; #endif // ENABLE_PAINT_PREVIEW && BUILDFLAG(IS_ANDROID) @@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3956,6 +3956,9 @@ extern const char kPaintPreviewDemoName[]; +@@ -4121,6 +4121,9 @@ extern const char kPaintPreviewDemoName[]; extern const char kPaintPreviewDemoDescription[]; #endif // ENABLE_PAINT_PREVIEW && BUILDFLAG(IS_ANDROID) @@ -78,7 +78,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -219,6 +219,10 @@ BASE_FEATURE(kPath2DPaintCache, +@@ -220,6 +220,10 @@ BASE_FEATURE(kPath2DPaintCache, "Path2DPaintCache", base::FEATURE_DISABLED_BY_DEFAULT); @@ -92,7 +92,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 -@@ -912,6 +912,9 @@ BLINK_COMMON_EXPORT extern const base::FeatureParam< +@@ -919,6 +919,9 @@ BLINK_COMMON_EXPORT extern const base::FeatureParam< // base url inheritance behavior from https://crbug.com/1356658. BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kNewBaseUrlInheritanceBehavior); @@ -140,7 +140,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 -@@ -1695,7 +1695,12 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const { +@@ -1692,7 +1692,12 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const { ComputedStyleBuilder builder = CreateComputedStyleBuilder(); builder.SetRtlOrdering(GetDocument().VisuallyOrdered() ? EOrder::kVisual : EOrder::kLogical); @@ -238,7 +238,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 -@@ -1522,6 +1522,11 @@ int LocalDOMWindow::outerHeight() const { +@@ -1530,6 +1530,11 @@ int LocalDOMWindow::outerHeight() const { if (!page) return 0; @@ -250,7 +250,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p ChromeClient& chrome_client = page->GetChromeClient(); if (page->GetSettings().GetReportScreenSizeInPhysicalPixelsQuirk()) { return static_cast( -@@ -1547,6 +1552,11 @@ int LocalDOMWindow::outerWidth() const { +@@ -1555,6 +1560,11 @@ int LocalDOMWindow::outerWidth() const { if (!page) return 0; @@ -262,7 +262,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p ChromeClient& chrome_client = page->GetChromeClient(); if (page->GetSettings().GetReportScreenSizeInPhysicalPixelsQuirk()) { return static_cast( -@@ -1735,7 +1745,8 @@ double LocalDOMWindow::devicePixelRatio() const { +@@ -1743,7 +1753,8 @@ double LocalDOMWindow::devicePixelRatio() const { if (!GetFrame()) return 0.0; @@ -272,7 +272,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p } void LocalDOMWindow::scrollBy(double x, double y) const { -@@ -2285,6 +2296,21 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2301,6 +2312,21 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, if (!completed_url.IsEmpty() || result.new_window) result.frame->Navigate(frame_request, WebFrameLoadType::kStandard); @@ -297,7 +297,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 -@@ -1368,6 +1368,10 @@ gfx::SizeF LocalFrame::ResizePageRectsKeepingRatio( +@@ -1364,6 +1364,10 @@ gfx::SizeF LocalFrame::ResizePageRectsKeepingRatio( return gfx::SizeF(result_width, result_height); } @@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ void LocalFrame::SetPageZoomFactor(float factor) { SetPageAndTextZoomFactors(factor, text_zoom_factor_); } -@@ -1507,12 +1511,16 @@ device::mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() { +@@ -1503,12 +1507,16 @@ device::mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() { return mojo_handler_->GetDevicePosture(); } @@ -330,7 +330,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 -@@ -400,13 +400,14 @@ class CORE_EXPORT LocalFrame final +@@ -403,13 +403,14 @@ class CORE_EXPORT LocalFrame final void SetInViewSourceMode(bool = true); void SetPageZoomFactor(float); @@ -347,7 +347,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. -@@ -1008,6 +1009,7 @@ class CORE_EXPORT LocalFrame final +@@ -1015,6 +1016,7 @@ class CORE_EXPORT LocalFrame final unsigned hidden_ : 1; float page_zoom_factor_; @@ -453,7 +453,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 -@@ -1695,6 +1695,14 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( +@@ -1694,6 +1694,14 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( if (auto* device_emulator = DeviceEmulator()) { device_emulator->UpdateVisualProperties(visual_properties); @@ -471,7 +471,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_remote_frame_impl.cc b/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc --- a/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc -@@ -362,7 +362,8 @@ void WebRemoteFrameImpl::InitializeFrameVisualProperties( +@@ -363,7 +363,8 @@ void WebRemoteFrameImpl::InitializeFrameVisualProperties( visual_properties.page_scale_factor = ancestor_widget->PageScaleInMainFrame(); visual_properties.is_pinch_gesture_active = ancestor_widget->PinchGestureActiveInMainFrame(); @@ -626,9 +626,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 -@@ -418,6 +418,9 @@ class CORE_EXPORT Page final : public GarbageCollected, - - V8CompileHints& GetV8CompileHints() { return *v8_compile_hints_; } +@@ -420,6 +420,9 @@ class CORE_EXPORT Page final : public GarbageCollected, + return *v8_compile_hints_; + } + void CalculateEmulatedScreenSetting(LocalFrame* frame, bool force = false); + bool IsScreenEmulated() { return is_screen_emulated; } @@ -636,7 +636,7 @@ diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/ren private: friend class ScopedPagePauser; -@@ -560,6 +563,10 @@ class CORE_EXPORT Page final : public GarbageCollected, +@@ -563,6 +566,10 @@ class CORE_EXPORT Page final : public GarbageCollected, // browser side FrameTree has the FrameTree::Type of kFencedFrame. bool is_fenced_frame_tree_ = false; @@ -650,12 +650,14 @@ diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/ren 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 -@@ -1752,7 +1752,7 @@ +@@ -1823,8 +1823,8 @@ + // as a speculative site compatibility measure, because web authors may // assume that screen dimensions match window.innerWidth/innerHeight while // a page is fullscreen, but that is not always true. crbug.com/1367416 - name: "FullscreenScreenSizeMatchesDisplay", -- status: "experimental", -+ status: "stable", +- name: "FullscreenScreenSizeMatchesDisplay", +- status: "stable", ++ name: "FullscreenScreenSizeMatchesDisplay", // always enabled ++ status: "stable", // in bromite }, { name: "GamepadButtonAxisEvents", diff --git a/build/patches/00WIN-ADDTO-AImageReader-CFI-crash-mitigations.patch b/build/patches/00WIN-ADDTO-AImageReader-CFI-crash-mitigations.patch index 9bc7903c..18d357fe 100644 --- a/build/patches/00WIN-ADDTO-AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/00WIN-ADDTO-AImageReader-CFI-crash-mitigations.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO AImageReader CFI crash mitigations diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc -@@ -616,10 +616,12 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -614,10 +614,12 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } #endif // BUILDFLAG(IS_WIN) diff --git a/build/patches/00WIN-ADDTO-Add-AllowUserCertificates-flag.patch b/build/patches/00WIN-ADDTO-Add-AllowUserCertificates-flag.patch index a7fd1c6d..57f87635 100644 --- a/build/patches/00WIN-ADDTO-Add-AllowUserCertificates-flag.patch +++ b/build/patches/00WIN-ADDTO-Add-AllowUserCertificates-flag.patch @@ -9,9 +9,9 @@ Subject: WIN ADDTO Add AllowUserCertificates flag 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 -@@ -8713,10 +8713,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)}, - #endif // BUILDFLAG(IS_WIN) +@@ -8981,10 +8981,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kHttpsUpgradesDescription, kOsDesktop | kOsAndroid, + FEATURE_VALUE_TYPE(features::kHttpsUpgrades)}, +#if BUILDFLAG(IS_ANDROID) {"allow-user-certificates", diff --git a/build/patches/00WIN-ADDTO-Add-a-proxy-configuration-page.patch b/build/patches/00WIN-ADDTO-Add-a-proxy-configuration-page.patch index 44781e0e..a144218e 100644 --- a/build/patches/00WIN-ADDTO-Add-a-proxy-configuration-page.patch +++ b/build/patches/00WIN-ADDTO-Add-a-proxy-configuration-page.patch @@ -10,7 +10,7 @@ Subject: WIN ADDTO Add a proxy configuration page 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 -@@ -289,10 +289,8 @@ +@@ -295,10 +295,8 @@ @@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc -@@ -383,7 +383,7 @@ absl::optional CreateProxyConfigDict( +@@ -388,7 +388,7 @@ absl::optional CreateProxyConfigDict( return absl::nullopt; } return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string, diff --git a/build/patches/00WIN-ADDTO-Add-an-always-incognito-mode.patch b/build/patches/00WIN-ADDTO-Add-an-always-incognito-mode.patch index 3f66b5be..193233dc 100644 --- a/build/patches/00WIN-ADDTO-Add-an-always-incognito-mode.patch +++ b/build/patches/00WIN-ADDTO-Add-an-always-incognito-mode.patch @@ -26,7 +26,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc --- a/chrome/browser/content_settings/host_content_settings_map_factory.cc +++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc -@@ -117,6 +117,7 @@ scoped_refptr +@@ -118,6 +118,7 @@ scoped_refptr bool always_incognito_enabled = false; bool force_save_site_settings = false; @@ -34,7 +34,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c PrefService* prefService = original_profile->GetPrefs(); if (prefService->GetBoolean(prefs::kAlwaysIncognitoEnabled)) { always_incognito_enabled = true; -@@ -126,6 +127,7 @@ scoped_refptr +@@ -127,6 +128,7 @@ scoped_refptr profile = original_profile; force_save_site_settings = true; } diff --git a/build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch b/build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch index d4f838d6..377f54d4 100644 --- a/build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch +++ b/build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch @@ -12,7 +12,7 @@ Subject: WIN ADDTO Add bookmark import/export actions 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 -@@ -8925,11 +8925,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9202,11 +9202,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)}, #endif diff --git a/build/patches/00WIN-ADDTO-Add-flag-to-configure-maximum-connecti.patch b/build/patches/00WIN-ADDTO-Add-flag-to-configure-maximum-connecti.patch index a11eba4a..d9d7e9be 100644 --- a/build/patches/00WIN-ADDTO-Add-flag-to-configure-maximum-connecti.patch +++ b/build/patches/00WIN-ADDTO-Add-flag-to-configure-maximum-connecti.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO Add flag to configure maximum connecti 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 -@@ -1180,10 +1180,12 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { +@@ -1172,10 +1172,12 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { switches::kForceDisplayColorProfile, "hdr10"}, }; diff --git a/build/patches/00WIN-ADDTO-Add-flag-to-disable-external-intent-re.patch b/build/patches/00WIN-ADDTO-Add-flag-to-disable-external-intent-re.patch index 624a0152..87854bd2 100644 --- a/build/patches/00WIN-ADDTO-Add-flag-to-disable-external-intent-re.patch +++ b/build/patches/00WIN-ADDTO-Add-flag-to-disable-external-intent-re.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO Add flag to disable external intent re 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 -@@ -3532,9 +3532,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3629,9 +3629,11 @@ const FeatureEntry kFeatureEntries[] = { {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, flag_descriptions::kUiPartialSwapDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, diff --git a/build/patches/00WIN-ADDTO-Add-lifetime-options-for-permissions.patch b/build/patches/00WIN-ADDTO-Add-lifetime-options-for-permissions.patch index 8e1c3af3..81402282 100644 --- a/build/patches/00WIN-ADDTO-Add-lifetime-options-for-permissions.patch +++ b/build/patches/00WIN-ADDTO-Add-lifetime-options-for-permissions.patch @@ -9,14 +9,14 @@ Subject: WIN ADDTO Add lifetime options for permissions diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc -@@ -408,7 +408,7 @@ void PermissionPromptBubbleView::AcceptPermission() { +@@ -422,7 +422,7 @@ void PermissionPromptBubbleView::AcceptPermission() { void PermissionPromptBubbleView::AcceptPermissionThisTime() { RecordDecision(permissions::PermissionAction::GRANTED_ONCE); - if (delegate_) + if (delegate_) { - delegate_->AcceptThisTime(); + delegate_->AcceptThisTime(content_settings::LifetimeMode::Always); + } } - void PermissionPromptBubbleView::DenyPermission() { -- 2.25.1 diff --git a/build/patches/00WIN-ADDTO-Add-webGL-site-setting.patch b/build/patches/00WIN-ADDTO-Add-webGL-site-setting.patch index 1c1cf62d..e2b0ce57 100644 --- a/build/patches/00WIN-ADDTO-Add-webGL-site-setting.patch +++ b/build/patches/00WIN-ADDTO-Add-webGL-site-setting.patch @@ -23,7 +23,7 @@ Subject: WIN ADDTO Add webGL site 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 -@@ -4329,6 +4329,25 @@ +@@ -4386,6 +4386,25 @@ Random Timezone override @@ -52,7 +52,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resources/settings/icons.html --- a/chrome/browser/resources/settings/icons.html +++ b/chrome/browser/resources/settings/icons.html -@@ -195,6 +195,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. +@@ -197,6 +197,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. @@ -64,7 +64,7 @@ diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resou diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -1161,4 +1161,26 @@ +@@ -1170,4 +1170,26 @@ @@ -94,7 +94,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts -@@ -117,6 +117,7 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -125,6 +125,7 @@ function addPrivacyChildRoutes(r: Partial) { r.SITE_SETTINGS_AUTOPLAY = r.SITE_SETTINGS.createChild('autoplay'); r.SITE_SETTINGS_JAVASCRIPT_JIT = r.SITE_SETTINGS.createChild('javascript-jit'); r.SITE_SETTINGS_TIMEZONE_OVERRIDE = r.SITE_SETTINGS.createChild('timezone-override'); @@ -105,7 +105,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts -@@ -104,6 +104,7 @@ export interface SettingsRoutes { +@@ -107,6 +107,7 @@ export interface SettingsRoutes { SITE_SETTINGS_AUTOPLAY: Route; SITE_SETTINGS_JAVASCRIPT_JIT: Route; SITE_SETTINGS_TIMEZONE_OVERRIDE: Route; @@ -200,7 +200,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -347,6 +347,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -378,6 +378,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( case ContentSettingsType::TIMEZONE_OVERRIDE: icon = &vector_icons::kAccountCircleIcon; break; @@ -213,7 +213,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom 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 -@@ -2483,6 +2483,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, +@@ -2541,6 +2541,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, {"siteSettingsTimezoneOverrideAllowedExceptions",IDS_SETTINGS_SITE_SETTINGS_TIMEZONE_OVERRIDE_ALLOWED_EXCEPTIONS}, {"siteSettingsTimezoneOverrideBlockedExceptions", IDS_SETTINGS_SITE_SETTINGS_TIMEZONE_OVERRIDE_BLOCKED_EXCEPTIONS}, {"siteSettingsTimezoneOverrideMidSentence", IDS_SITE_SETTINGS_TIMEZONE_OVERRIDE_TITLE}, diff --git a/build/patches/00WIN-ADDTO-Add-webRTC-site-settings.patch b/build/patches/00WIN-ADDTO-Add-webRTC-site-settings.patch index 2db48128..e8beb1c1 100644 --- a/build/patches/00WIN-ADDTO-Add-webRTC-site-settings.patch +++ b/build/patches/00WIN-ADDTO-Add-webRTC-site-settings.patch @@ -22,7 +22,7 @@ Subject: WIN ADDTO Add webRTC site settings 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 -@@ -4348,6 +4348,25 @@ +@@ -4405,6 +4405,25 @@ Not allowed to use webgl @@ -51,7 +51,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resources/settings/icons.html --- a/chrome/browser/resources/settings/icons.html +++ b/chrome/browser/resources/settings/icons.html -@@ -197,6 +197,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. +@@ -199,6 +199,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. @@ -63,7 +63,7 @@ diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resou diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -1183,4 +1183,26 @@ +@@ -1192,4 +1192,26 @@ @@ -93,7 +93,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts -@@ -118,6 +118,7 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -126,6 +126,7 @@ function addPrivacyChildRoutes(r: Partial) { r.SITE_SETTINGS_JAVASCRIPT_JIT = r.SITE_SETTINGS.createChild('javascript-jit'); r.SITE_SETTINGS_TIMEZONE_OVERRIDE = r.SITE_SETTINGS.createChild('timezone-override'); r.SITE_SETTINGS_WEBGL = r.SITE_SETTINGS.createChild('webgl'); @@ -104,7 +104,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts -@@ -105,6 +105,7 @@ export interface SettingsRoutes { +@@ -108,6 +108,7 @@ export interface SettingsRoutes { SITE_SETTINGS_JAVASCRIPT_JIT: Route; SITE_SETTINGS_TIMEZONE_OVERRIDE: Route; SITE_SETTINGS_WEBGL: Route; @@ -199,7 +199,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -350,6 +350,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -381,6 +381,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( case ContentSettingsType::WEBGL: icon = &vector_icons::kProtectedContentIcon; break; @@ -212,7 +212,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom 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 -@@ -2490,6 +2490,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, +@@ -2548,6 +2548,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, {"siteSettingsWebglAllowedExceptions",IDS_SETTINGS_SITE_SETTINGS_WEBGL_ALLOWED_EXCEPTIONS}, {"siteSettingsWebglBlockedExceptions", IDS_SETTINGS_SITE_SETTINGS_WEBGL_BLOCKED_EXCEPTIONS}, {"siteSettingsWebglMidSentence", IDS_SITE_SETTINGS_WEBGL_TITLE}, diff --git a/build/patches/00WIN-ADDTO-Content-settings-infrastructure.patch b/build/patches/00WIN-ADDTO-Content-settings-infrastructure.patch index ab399340..afb9f16e 100644 --- a/build/patches/00WIN-ADDTO-Content-settings-infrastructure.patch +++ b/build/patches/00WIN-ADDTO-Content-settings-infrastructure.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO Content settings infrastructure diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -142,6 +142,7 @@ ContentSetting IntToContentSetting(int content_setting) { +@@ -143,6 +143,7 @@ ContentSetting IntToContentSetting(int content_setting) { int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, size_t* num_values) { *num_values = std::size(kHistogramValue); diff --git a/build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch b/build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch index 7b5d4253..ed11eec5 100644 --- a/build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch +++ b/build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch @@ -20,7 +20,7 @@ Subject: WIN ADDTO Experimental user scripts support diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3500,11 +3500,13 @@ static_library("browser") { +@@ -3502,11 +3502,13 @@ static_library("browser") { ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ] } @@ -42,8 +42,8 @@ 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 -@@ -7679,9 +7679,11 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryNudgeSessionReset)}, +@@ -7882,9 +7882,11 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryReorder)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_ANDROID) @@ -57,7 +57,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -1459,7 +1459,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1463,7 +1463,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, translate::TranslatePrefs::RegisterProfilePrefs(registry); omnibox::RegisterProfilePrefs(registry); ZeroSuggestProvider::RegisterProfilePrefs(registry); @@ -87,8 +87,8 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn 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 -@@ -441,7 +441,9 @@ - #include "components/services/screen_ai/public/cpp/screen_ai_service_router_factory.h" +@@ -448,7 +448,9 @@ + #include "chrome/browser/net/nss_service_factory.h" #endif +#if BUILDFLAG(IS_ANDROID) @@ -97,7 +97,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc namespace chrome { -@@ -1022,7 +1024,9 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1042,7 +1044,9 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); @@ -110,7 +110,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc 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 -@@ -110,7 +110,9 @@ +@@ -112,7 +112,9 @@ #include "ui/accessibility/accessibility_features.h" #endif @@ -120,7 +120,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile #if BUILDFLAG(ENABLE_SESSION_SERVICE) #include "chrome/browser/sessions/app_session_service_factory.h" -@@ -1468,11 +1470,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, +@@ -1489,11 +1491,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, #endif @@ -137,7 +137,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profiles/renderer_updater.cc --- a/chrome/browser/profiles/renderer_updater.cc +++ b/chrome/browser/profiles/renderer_updater.cc -@@ -56,7 +56,9 @@ RendererUpdater::RendererUpdater(Profile* profile) +@@ -78,7 +78,9 @@ RendererUpdater::RendererUpdater(Profile* profile) force_youtube_restrict_.Init(policy::policy_prefs::kForceYouTubeRestrict, pref_service); allowed_domains_for_apps_.Init(prefs::kAllowedDomainsForApps, pref_service); @@ -147,7 +147,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil pref_change_registrar_.Init(pref_service); pref_change_registrar_.Add( -@@ -71,10 +73,12 @@ RendererUpdater::RendererUpdater(Profile* profile) +@@ -93,10 +95,12 @@ RendererUpdater::RendererUpdater(Profile* profile) prefs::kAllowedDomainsForApps, base::BindRepeating(&RendererUpdater::UpdateAllRenderers, base::Unretained(this))); @@ -160,8 +160,8 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil } RendererUpdater::~RendererUpdater() { -@@ -196,5 +200,10 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() - return chrome::mojom::DynamicParams::New( +@@ -250,5 +254,10 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() + #endif force_google_safesearch_.GetValue(), force_youtube_restrict_.GetValue(), allowed_domains_for_apps_.GetValue(), - activate_userscripts_.GetValue()); @@ -175,7 +175,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profiles/renderer_updater.h --- a/chrome/browser/profiles/renderer_updater.h +++ b/chrome/browser/profiles/renderer_updater.h -@@ -93,7 +93,9 @@ class RendererUpdater : public KeyedService, +@@ -108,7 +108,9 @@ class RendererUpdater : public KeyedService, // Prefs that we sync to the renderers. BooleanPrefMember force_google_safesearch_; @@ -188,7 +188,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profile diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -871,8 +871,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -830,8 +830,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUIVersionHost) return &NewWebUI; @@ -202,7 +202,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -140,7 +140,6 @@ static_library("renderer") { +@@ -143,7 +143,6 @@ static_library("renderer") { "//components/content_capture/common", "//components/content_capture/renderer", "//components/content_settings/common:mojom", @@ -210,7 +210,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn "//components/content_settings/renderer", "//components/continuous_search/renderer", "//components/dom_distiller/content/renderer", -@@ -217,6 +216,12 @@ static_library("renderer") { +@@ -220,6 +219,12 @@ static_library("renderer") { "//v8", ] @@ -226,7 +226,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -252,8 +252,10 @@ +@@ -251,8 +251,10 @@ #include "chrome/renderer/media/chrome_key_systems.h" #endif @@ -237,7 +237,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer using autofill::AutofillAgent; using autofill::PasswordAutofillAgent; -@@ -454,11 +456,13 @@ void ChromeContentRendererClient::RenderThreadStarted() { +@@ -430,11 +432,13 @@ void ChromeContentRendererClient::RenderThreadStarted() { WebString::FromASCII(extensions::kExtensionScheme)); #endif @@ -251,7 +251,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_SPELLCHECK) if (!spellcheck_) -@@ -628,12 +632,14 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -604,12 +608,14 @@ void ChromeContentRendererClient::RenderFrameCreated( render_frame, registry); #endif @@ -266,7 +266,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_PPAPI) new PepperHelper(render_frame); -@@ -1637,6 +1643,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( +@@ -1613,6 +1619,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentStart( render_frame); // |render_frame| might be dead by now. @@ -276,7 +276,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer static_assert(false, "Compiler error: extensions cannot be enabled with user scripts"); #endif user_scripts::UserScriptsRendererClient* userscript_client = -@@ -1645,6 +1654,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( +@@ -1621,6 +1630,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( userscript_client->RunScriptsAtDocumentStart( render_frame); } @@ -284,7 +284,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentEnd( -@@ -1653,6 +1663,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( +@@ -1629,6 +1639,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentEnd( render_frame); // |render_frame| might be dead by now. @@ -294,7 +294,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer static_assert(false, "Compiler error: extensions cannot be enabled with user scripts"); #endif user_scripts::UserScriptsRendererClient* userscript_client = -@@ -1661,6 +1674,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( +@@ -1637,6 +1650,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( userscript_client->RunScriptsAtDocumentEnd( render_frame); } @@ -302,7 +302,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentIdle( -@@ -1669,6 +1683,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( +@@ -1645,6 +1659,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentIdle( render_frame); // |render_frame| might be dead by now. @@ -312,7 +312,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer static_assert(false, "Compiler error: extensions cannot be enabled with user scripts"); #endif user_scripts::UserScriptsRendererClient* userscript_client = -@@ -1677,6 +1694,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( +@@ -1653,6 +1670,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( userscript_client->RunScriptsAtDocumentIdle( render_frame); } @@ -323,10 +323,10 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc --- a/chrome/renderer/chrome_render_thread_observer.cc +++ b/chrome/renderer/chrome_render_thread_observer.cc -@@ -183,7 +183,9 @@ void ChromeRenderThreadObserver::SetInitialConfiguration( - void ChromeRenderThreadObserver::SetConfiguration( +@@ -187,7 +187,9 @@ void ChromeRenderThreadObserver::SetConfiguration( chrome::mojom::DynamicParamsPtr params) { - *GetDynamicConfigParams() = std::move(*params); + base::AutoLock lock(dynamic_params_lock_); + dynamic_params_ = std::move(params); +#if BUILDFLAG(IS_ANDROID) user_scripts::UserScriptsRendererClient::GetInstance()->ConfigurationUpdated(); +#endif diff --git a/build/patches/00WIN-ADDTO-Eyeo-Adblock.patch b/build/patches/00WIN-ADDTO-Eyeo-Adblock.patch index a9c94e4d..ab354186 100644 --- a/build/patches/00WIN-ADDTO-Eyeo-Adblock.patch +++ b/build/patches/00WIN-ADDTO-Eyeo-Adblock.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO Eyeo Adblock diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2469,10 +2469,6 @@ if (!is_android) { +@@ -2479,10 +2479,6 @@ if (!is_android) { sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ] } diff --git a/build/patches/00WIN-ADDTO-JIT-site-settings.patch b/build/patches/00WIN-ADDTO-JIT-site-settings.patch index 6d47fc84..6f2975d6 100644 --- a/build/patches/00WIN-ADDTO-JIT-site-settings.patch +++ b/build/patches/00WIN-ADDTO-JIT-site-settings.patch @@ -23,7 +23,7 @@ Subject: WIN ADDTO JIT site settings 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 -@@ -4291,6 +4291,25 @@ +@@ -4348,6 +4348,25 @@ Not allowed to autoplay @@ -52,7 +52,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resources/settings/icons.html --- a/chrome/browser/resources/settings/icons.html +++ b/chrome/browser/resources/settings/icons.html -@@ -191,6 +191,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. +@@ -193,6 +193,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. @@ -64,7 +64,7 @@ diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resou diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -1117,4 +1117,26 @@ +@@ -1126,4 +1126,26 @@ @@ -94,7 +94,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts -@@ -115,6 +115,7 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -123,6 +123,7 @@ function addPrivacyChildRoutes(r: Partial) { r.SITE_SETTINGS_FILE_SYSTEM_WRITE = r.SITE_SETTINGS.createChild('filesystem'); r.SITE_SETTINGS_LOCAL_FONTS = r.SITE_SETTINGS.createChild('localFonts'); r.SITE_SETTINGS_AUTOPLAY = r.SITE_SETTINGS.createChild('autoplay'); @@ -105,7 +105,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts -@@ -102,6 +102,7 @@ export interface SettingsRoutes { +@@ -105,6 +105,7 @@ export interface SettingsRoutes { SYSTEM: Route; TRIGGERED_RESET_DIALOG: Route; SITE_SETTINGS_AUTOPLAY: Route; @@ -200,7 +200,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -341,6 +341,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -372,6 +372,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( case ContentSettingsType::AUTOPLAY: icon = &vector_icons::kProtectedContentIcon; break; @@ -213,7 +213,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom 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 -@@ -2469,6 +2469,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, +@@ -2527,6 +2527,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, {"siteSettingsAutoplayAllowedExceptions",IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY_ALLOWED_EXCEPTIONS}, {"siteSettingsAutoplayBlockedExceptions", IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY_BLOCKED_EXCEPTIONS}, {"siteSettingsAutoplayMidSentence", IDS_SITE_SETTINGS_TYPE_AUTOPLAY}, @@ -244,9 +244,9 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b {ContentSettingsType::FEDERATED_IDENTITY_SHARING, nullptr}, - {ContentSettingsType::JAVASCRIPT_JIT, nullptr}, {ContentSettingsType::HTTP_ALLOWED, nullptr}, + {ContentSettingsType::HTTPS_ENFORCED, nullptr}, {ContentSettingsType::FORMFILL_METADATA, nullptr}, - {ContentSettingsType::FEDERATED_IDENTITY_ACTIVE_SESSION, nullptr}, -@@ -465,6 +465,7 @@ const std::vector& GetVisiblePermissionCategories() { +@@ -536,6 +536,7 @@ const std::vector& GetVisiblePermissionCategories() { } base_types->push_back(ContentSettingsType::AUTOPLAY); diff --git a/build/patches/00WIN-ADDTO-Remove-binary-blob-integrations.patch b/build/patches/00WIN-ADDTO-Remove-binary-blob-integrations.patch index abf16f11..531f4b47 100644 --- a/build/patches/00WIN-ADDTO-Remove-binary-blob-integrations.patch +++ b/build/patches/00WIN-ADDTO-Remove-binary-blob-integrations.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO Remove binary blob integrations diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc --- a/components/gcm_driver/gcm_client_impl.cc +++ b/components/gcm_driver/gcm_client_impl.cc -@@ -463,7 +463,7 @@ void GCMClientImpl::StartGCM() { +@@ -450,7 +450,7 @@ void GCMClientImpl::StartGCM() { void GCMClientImpl::InitializeMCSClient() { DCHECK(network_connection_tracker_); @@ -18,7 +18,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc std::vector endpoints; endpoints.push_back(gservices_settings_.GetMCSMainEndpoint()); GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint(); -@@ -658,7 +658,7 @@ void GCMClientImpl::AddHeartbeatInterval(const std::string& scope, +@@ -644,7 +644,7 @@ void GCMClientImpl::AddHeartbeatInterval(const std::string& scope, int interval_ms) { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); DCHECK(mcs_client_); @@ -27,7 +27,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc mcs_client_->AddHeartbeatInterval(scope, interval_ms); } -@@ -670,7 +670,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) { +@@ -656,7 +656,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) { void GCMClientImpl::StartCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -36,7 +36,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc // Make sure no checkin is in progress. if (checkin_request_) -@@ -753,7 +753,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) { +@@ -739,7 +739,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) { void GCMClientImpl::SchedulePeriodicCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); diff --git a/build/patches/00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch b/build/patches/00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch index 79e13fc0..c6d6e010 100644 --- a/build/patches/00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO Restore Search Ready Omnibox flag 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 -@@ -8904,9 +8904,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9176,9 +9176,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDesksTemplatesDescription, kOsCrOS, FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)}, #endif diff --git a/build/patches/00WIN-ADDTO-Revert-flags--remove-num-raster-thre.patch b/build/patches/00WIN-ADDTO-Revert-flags--remove-num-raster-thre.patch index 2179fb07..ccf4a89f 100644 --- a/build/patches/00WIN-ADDTO-Revert-flags--remove-num-raster-thre.patch +++ b/build/patches/00WIN-ADDTO-Revert-flags--remove-num-raster-thre.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO Revert flags: remove num-raster-thre 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 -@@ -379,6 +379,7 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = { +@@ -381,6 +381,7 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = { "single-fullscreen,single-on-top,underlay"}, }; @@ -17,7 +17,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kNumRasterThreadsChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, {flag_descriptions::kNumRasterThreadsOne, blink::switches::kNumRasterThreads, "1"}, -@@ -387,6 +388,7 @@ const FeatureEntry::Choice kNumRasterThreadsChoices[] = { +@@ -389,6 +390,7 @@ const FeatureEntry::Choice kNumRasterThreadsChoices[] = { "3"}, {flag_descriptions::kNumRasterThreadsFour, blink::switches::kNumRasterThreads, "4"}}; diff --git a/build/patches/00WIN-ADDTO-Revert-the-removal-to-block-autoplay.patch b/build/patches/00WIN-ADDTO-Revert-the-removal-to-block-autoplay.patch index b626ac17..5a191272 100644 --- a/build/patches/00WIN-ADDTO-Revert-the-removal-to-block-autoplay.patch +++ b/build/patches/00WIN-ADDTO-Revert-the-removal-to-block-autoplay.patch @@ -22,7 +22,7 @@ Subject: WIN ADDTO Revert the removal to block autoplay 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 -@@ -4272,6 +4272,25 @@ +@@ -4329,6 +4329,25 @@ Control how your browsing history is used to personalize Search and more @@ -51,7 +51,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resources/settings/icons.html --- a/chrome/browser/resources/settings/icons.html +++ b/chrome/browser/resources/settings/icons.html -@@ -189,6 +189,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. +@@ -191,6 +191,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. @@ -63,7 +63,7 @@ diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resou diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -1095,4 +1095,26 @@ +@@ -1104,4 +1104,26 @@ @@ -93,7 +93,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts -@@ -114,6 +114,7 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -122,6 +122,7 @@ function addPrivacyChildRoutes(r: Partial) { r.SITE_SETTINGS.createChild('windowManagement'); r.SITE_SETTINGS_FILE_SYSTEM_WRITE = r.SITE_SETTINGS.createChild('filesystem'); r.SITE_SETTINGS_LOCAL_FONTS = r.SITE_SETTINGS.createChild('localFonts'); @@ -104,7 +104,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts -@@ -101,6 +101,7 @@ export interface SettingsRoutes { +@@ -104,6 +104,7 @@ export interface SettingsRoutes { SYNC_ADVANCED: Route; SYSTEM: Route; TRIGGERED_RESET_DIALOG: Route; @@ -199,7 +199,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -338,6 +338,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -369,6 +369,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( case ContentSettingsType::IDLE_DETECTION: icon = &vector_icons::kDevicesIcon; break; @@ -212,7 +212,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom 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 -@@ -2462,6 +2462,13 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) { +@@ -2520,6 +2520,13 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) { void AddSiteSettingsStrings(content::WebUIDataSource* html_source, Profile* profile) { static constexpr webui::LocalizedString kLocalizedStrings[] = { @@ -245,7 +245,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b {ContentSettingsType::IMPORTANT_SITE_INFO, nullptr}, {ContentSettingsType::PERMISSION_AUTOBLOCKER_DATA, nullptr}, {ContentSettingsType::ADS_DATA, nullptr}, -@@ -464,6 +464,8 @@ const std::vector& GetVisiblePermissionCategories() { +@@ -535,6 +535,8 @@ const std::vector& GetVisiblePermissionCategories() { base_types->push_back(ContentSettingsType::PRIVATE_NETWORK_GUARD); } diff --git a/build/patches/00WIN-ADDTO-Timezone-customization.patch b/build/patches/00WIN-ADDTO-Timezone-customization.patch index 7fd180da..6a1342a9 100644 --- a/build/patches/00WIN-ADDTO-Timezone-customization.patch +++ b/build/patches/00WIN-ADDTO-Timezone-customization.patch @@ -23,7 +23,7 @@ Subject: WIN ADDTO Timezone customization 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 -@@ -4310,6 +4310,25 @@ +@@ -4367,6 +4367,25 @@ Not allowed to Javascript JIT @@ -52,7 +52,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resources/settings/icons.html --- a/chrome/browser/resources/settings/icons.html +++ b/chrome/browser/resources/settings/icons.html -@@ -193,6 +193,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. +@@ -195,6 +195,8 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. @@ -64,7 +64,7 @@ diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resou diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -1139,4 +1139,26 @@ +@@ -1148,4 +1148,26 @@ @@ -94,7 +94,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts -@@ -116,6 +116,7 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -124,6 +124,7 @@ function addPrivacyChildRoutes(r: Partial) { r.SITE_SETTINGS_LOCAL_FONTS = r.SITE_SETTINGS.createChild('localFonts'); r.SITE_SETTINGS_AUTOPLAY = r.SITE_SETTINGS.createChild('autoplay'); r.SITE_SETTINGS_JAVASCRIPT_JIT = r.SITE_SETTINGS.createChild('javascript-jit'); @@ -105,7 +105,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts -@@ -103,6 +103,7 @@ export interface SettingsRoutes { +@@ -106,6 +106,7 @@ export interface SettingsRoutes { TRIGGERED_RESET_DIALOG: Route; SITE_SETTINGS_AUTOPLAY: Route; SITE_SETTINGS_JAVASCRIPT_JIT: Route; @@ -200,7 +200,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -344,6 +344,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -375,6 +375,9 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( case ContentSettingsType::JAVASCRIPT_JIT: icon = &vector_icons::kCodeIcon; break; @@ -213,7 +213,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom 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 -@@ -2476,6 +2476,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, +@@ -2534,6 +2534,13 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, {"siteSettingsJavascriptJITAllowedExceptions",IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_JIT_ALLOWED_EXCEPTIONS}, {"siteSettingsJavascriptJITBlockedExceptions", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_JIT_BLOCKED_EXCEPTIONS}, {"siteSettingsJavascriptJITMidSentence", IDS_SITE_SETTINGS_TYPE_JAVASCRIPT_JIT}, diff --git a/build/patches/00WIN-ADDTO-openH264--enable-ARM-ARM64-optimizati.patch b/build/patches/00WIN-ADDTO-openH264--enable-ARM-ARM64-optimizati.patch index c87462b0..f8e2264f 100644 --- a/build/patches/00WIN-ADDTO-openH264--enable-ARM-ARM64-optimizati.patch +++ b/build/patches/00WIN-ADDTO-openH264--enable-ARM-ARM64-optimizati.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO openH264: enable ARM/ARM64 optimizati diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc --- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc +++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -@@ -204,9 +204,9 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) { +@@ -207,9 +207,9 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) { init_params.iRCMode = RC_OFF_MODE; } diff --git a/build/patches/00WIN-ADDTO-ungoogled-chr--Disable-profile-avatar.patch b/build/patches/00WIN-ADDTO-ungoogled-chr--Disable-profile-avatar.patch index fa59759a..93e30df2 100644 --- a/build/patches/00WIN-ADDTO-ungoogled-chr--Disable-profile-avatar.patch +++ b/build/patches/00WIN-ADDTO-ungoogled-chr--Disable-profile-avatar.patch @@ -9,7 +9,7 @@ Subject: WIN ADDTO ungoogled-chr: Disable profile avatar diff --git a/chrome/browser/profiles/profile_attributes_storage.cc b/chrome/browser/profiles/profile_attributes_storage.cc --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc -@@ -826,7 +826,7 @@ void ProfileAttributesStorage::DownloadHighResAvatarIfNeeded( +@@ -845,7 +845,7 @@ void ProfileAttributesStorage::DownloadHighResAvatarIfNeeded( void ProfileAttributesStorage::DownloadHighResAvatar( size_t icon_index, const base::FilePath& profile_path) { diff --git a/build/patches/00WIN-Disable-TabHoverCard-images.patch b/build/patches/00WIN-Disable-TabHoverCard-images.patch index c97dc5f2..79a30c5a 100644 --- a/build/patches/00WIN-Disable-TabHoverCard-images.patch +++ b/build/patches/00WIN-Disable-TabHoverCard-images.patch @@ -9,7 +9,7 @@ Subject: WIN Disable TabHoverCard images 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 -@@ -199,11 +199,7 @@ BASE_FEATURE(kTabGroupsSaveSyncIntegration, +@@ -220,11 +220,7 @@ BASE_FEATURE(kTabGroupsSaveSyncIntegration, // https://crbug.com/928954 BASE_FEATURE(kTabHoverCardImages, "TabHoverCardImages", diff --git a/build/patches/00WIN-Disable-first-run.patch b/build/patches/00WIN-Disable-first-run.patch index 702d6205..2c76031f 100644 --- a/build/patches/00WIN-Disable-first-run.patch +++ b/build/patches/00WIN-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 -@@ -206,7 +206,7 @@ bool IsFirstRunMarkedFinishedInPrefs() { +@@ -177,7 +177,7 @@ bool IsFirstRunMarkedFinishedInPrefs() { // static void FirstRunService::RegisterLocalStatePrefs(PrefRegistrySimple* registry) { diff --git a/build/patches/00WIN-Disable-sharing-hub.patch b/build/patches/00WIN-Disable-sharing-hub.patch index dd9778d0..12b1ab80 100644 --- a/build/patches/00WIN-Disable-sharing-hub.patch +++ b/build/patches/00WIN-Disable-sharing-hub.patch @@ -23,7 +23,7 @@ diff --git a/chrome/browser/sharing_hub/sharing_hub_features.cc b/chrome/browser diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -1550,12 +1550,12 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() { +@@ -1605,12 +1605,12 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() { command_updater_.UpdateCommandEnabled(IDC_CHROME_TIPS, show_main_ui); command_updater_.UpdateCommandEnabled(IDC_CHROME_WHATS_NEW, show_main_ui); #endif diff --git a/build/patches/00WIN-enable-pdf-plugin.patch b/build/patches/00WIN-enable-pdf-plugin.patch index ff0e3128..d6bf41da 100644 --- a/build/patches/00WIN-enable-pdf-plugin.patch +++ b/build/patches/00WIN-enable-pdf-plugin.patch @@ -9,7 +9,7 @@ Subject: WIN enable pdf plugin 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 -@@ -1998,7 +1998,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -1994,7 +1994,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { } PluginData* LocalFrame::GetPluginData() const { diff --git a/build/patches/00WIN-minimum-data-to-enable-install-extensions.patch b/build/patches/00WIN-minimum-data-to-enable-install-extensions.patch index 59c50c8e..1ec2acac 100644 --- a/build/patches/00WIN-minimum-data-to-enable-install-extensions.patch +++ b/build/patches/00WIN-minimum-data-to-enable-install-extensions.patch @@ -5,11 +5,11 @@ Subject: WIN minimum data to enable install extensions The amount of information sent is minimized without disabling the ability to install extensions (which is under user control) --- - chrome/browser/extensions/webstore_install_helper.cc | 2 +- - chrome/browser/extensions/webstore_installer.cc | 2 +- - .../update_client/chrome_update_query_params_delegate.cc | 5 ++--- - components/update_client/update_query_params.cc | 5 ++--- - 4 files changed, 6 insertions(+), 8 deletions(-) + .../browser/extensions/webstore_install_helper.cc | 2 +- + chrome/browser/extensions/webstore_installer.cc | 2 +- + .../chrome_update_query_params_delegate.cc | 5 ++--- + components/update_client/update_query_params.cc | 13 ++----------- + 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc --- a/chrome/browser/extensions/webstore_install_helper.cc @@ -26,7 +26,7 @@ diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/brows diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc -@@ -644,7 +644,7 @@ void WebstoreInstaller::StartDownload(const std::string& extension_id, +@@ -640,7 +640,7 @@ void WebstoreInstaller::StartDownload(const std::string& extension_id, download_url_, render_process_host_id, render_frame_host->GetRoutingID(), traffic_annotation)); params->set_file_path(file); @@ -53,17 +53,27 @@ diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.cc diff --git a/components/update_client/update_query_params.cc b/components/update_client/update_query_params.cc --- a/components/update_client/update_query_params.cc +++ b/components/update_client/update_query_params.cc -@@ -86,9 +86,8 @@ UpdateQueryParamsDelegate* g_delegate = nullptr; +@@ -86,19 +86,10 @@ UpdateQueryParamsDelegate* g_delegate = nullptr; + // static std::string UpdateQueryParams::Get(ProdId prod) { +-#if BUILDFLAG(ENABLE_PUFFIN_PATCHES) return base::StringPrintf( -- "os=%s&arch=%s&os_arch=%s&nacl_arch=%s&prod=%s%s&acceptformat=crx3", kOs, -- kArch, base::SysInfo().OperatingSystemArchitecture().c_str(), +- "os=%s&arch=%s&os_arch=%s&nacl_arch=%s&prod=%s%s&acceptformat=crx3,puff", +- kOs, kArch, base::SysInfo().OperatingSystemArchitecture().c_str(), - GetNaclArch(), GetProdIdString(prod), + "prod=%s%s&acceptformat=crx3", + GetProdIdString(prod), g_delegate ? g_delegate->GetExtraParams().c_str() : ""); +-#else +- return base::StringPrintf( +- "os=%s&arch=%s&os_arch=%s&nacl_arch=%s&prod=%s%s&acceptformat=crx3", kOs, +- kArch, base::SysInfo().OperatingSystemArchitecture().c_str(), +- GetNaclArch(), GetProdIdString(prod), +- g_delegate ? g_delegate->GetExtraParams().c_str() : ""); +-#endif } + // static -- 2.25.1 diff --git a/build/patches/00Warning-message-for-unsupported-hardware-aes.patch b/build/patches/00Warning-message-for-unsupported-hardware-aes.patch index 08e49c41..2ef0a133 100644 --- a/build/patches/00Warning-message-for-unsupported-hardware-aes.patch +++ b/build/patches/00Warning-message-for-unsupported-hardware-aes.patch @@ -50,7 +50,7 @@ diff --git a/base/base_switches.h b/base/base_switches.h diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -447,6 +447,7 @@ if (is_win) { +@@ -443,6 +443,7 @@ if (is_win) { "//components/policy:generated", "//content/public/app", "//crypto", @@ -58,7 +58,7 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn "//headless:headless_non_renderer", "//headless:headless_shell_browser_lib", "//net:net_resources", -@@ -1681,6 +1682,8 @@ if (is_android) { +@@ -1679,6 +1680,8 @@ if (is_android) { "//chrome/common/profiler", "//chrome/gpu", "//chrome/renderer", @@ -70,7 +70,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 -@@ -102,6 +102,9 @@ +@@ -103,6 +103,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/scoped_startup_resource_bundle.h" #include "ui/base/ui_base_switches.h" @@ -80,7 +80,7 @@ diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegat #if BUILDFLAG(IS_WIN) #include -@@ -1054,6 +1057,13 @@ absl::optional ChromeMainDelegate::BasicStartupComplete() { +@@ -1068,6 +1071,13 @@ absl::optional ChromeMainDelegate::BasicStartupComplete() { return chrome::RESULT_CODE_INVALID_SANDBOX_STATE; #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 -@@ -6394,6 +6394,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6458,6 +6458,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/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7449,6 +7449,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7656,6 +7656,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDevicePostureDescription, kOsAll, FEATURE_VALUE_TYPE(features::kDevicePosture)}, @@ -125,7 +125,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -786,6 +786,10 @@ const char kDevicePostureName[] = "Device Posture API"; +@@ -811,6 +811,10 @@ const char kDevicePostureName[] = "Device Posture API"; const char kDevicePostureDescription[] = "Enables Device Posture API (foldable devices)"; @@ -139,7 +139,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -577,6 +577,9 @@ extern const char kDeviceForceScheduledRebootDescription[]; +@@ -599,6 +599,9 @@ extern const char kDeviceForceScheduledRebootDescription[]; extern const char kDevicePostureName[]; extern const char kDevicePostureDescription[]; @@ -152,7 +152,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -216,6 +216,15 @@ void ShowBadFlagsPrompt(content::WebContents* web_contents) { +@@ -221,6 +221,15 @@ void ShowBadFlagsPrompt(content::WebContents* web_contents) { return; } } @@ -171,7 +171,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 -@@ -3530,6 +3530,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3563,6 +3563,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kLacrosUseChromeosProtectedAv1, #endif switches::kDesktopModeViewportMetaEnabled, @@ -182,7 +182,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content 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 -@@ -790,6 +790,11 @@ BASE_FEATURE(kNoStatePrefetchHoldback, +@@ -793,6 +793,11 @@ BASE_FEATURE(kNoStatePrefetchHoldback, "NoStatePrefetchHoldback", base::FEATURE_DISABLED_BY_DEFAULT); @@ -197,7 +197,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 -@@ -174,6 +174,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kNetworkServiceInProcess); +@@ -175,6 +175,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kNetworkServiceInProcess); CONTENT_EXPORT BASE_DECLARE_FEATURE(kNotificationContentImage); CONTENT_EXPORT BASE_DECLARE_FEATURE(kNotificationTriggers); CONTENT_EXPORT BASE_DECLARE_FEATURE(kNoStatePrefetchHoldback); diff --git a/build/patches/00v113-temp-fix-build.patch b/build/patches/00v113-temp-fix-build.patch index 606f667d..631318a4 100644 --- a/build/patches/00v113-temp-fix-build.patch +++ b/build/patches/00v113-temp-fix-build.patch @@ -10,7 +10,7 @@ Subject: v113 temp fix build diff --git a/android_webview/system_webview_bundle.gni b/android_webview/system_webview_bundle.gni --- a/android_webview/system_webview_bundle.gni +++ b/android_webview/system_webview_bundle.gni -@@ -78,6 +78,10 @@ template("system_webview_bundle") { +@@ -84,6 +84,10 @@ template("system_webview_bundle") { custom_assertion_handler = crash_reporting_assertion_handler } } @@ -24,7 +24,7 @@ diff --git a/android_webview/system_webview_bundle.gni b/android_webview/system_ 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 -@@ -202,6 +202,7 @@ static_library("safe_browsing") { +@@ -208,6 +208,7 @@ static_library("safe_browsing") { "//components/version_info", "//content/public/browser", "//services/preferences/public/mojom:mojom", diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index 880b66ea..f1930b55 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -84,7 +84,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i 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 -@@ -2608,9 +2608,9 @@ +@@ -2688,9 +2688,9 @@ "expiry_milestone": 115 }, { @@ -152,7 +152,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc --- a/gpu/config/gpu_util.cc +++ b/gpu/config/gpu_util.cc -@@ -121,6 +121,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( +@@ -122,6 +122,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( #if !BUILDFLAG(IS_ANDROID) return kGpuFeatureStatusDisabled; #else @@ -162,7 +162,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; -@@ -342,6 +345,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { +@@ -353,6 +356,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] = kGpuFeatureStatusBlocklisted; } @@ -188,7 +188,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc -@@ -616,6 +616,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -614,6 +614,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } #endif // BUILDFLAG(IS_WIN) @@ -231,7 +231,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ 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 -@@ -881,6 +881,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment, +@@ -902,6 +902,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment, // Allows automatically disabling hardware secure Content Decryption Module // (CDM) after failures or crashes to fallback to software secure CDMs. If this // feature is disabled, the fallback will never happen and users could be stuck @@ -246,7 +246,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 -@@ -297,6 +297,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); +@@ -301,6 +301,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index cd235b6b..5d6d0f0c 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -19,7 +19,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 -@@ -230,6 +230,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -229,6 +229,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.common.ContentSwitches; @@ -27,7 +27,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; -@@ -973,6 +974,8 @@ public abstract class ChromeActivity +@@ -971,6 +972,8 @@ public abstract class ChromeActivity super.onStartWithNative(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -39,20 +39,20 @@ 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/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java -@@ -69,6 +69,7 @@ public class ChromeCachedFlags { +@@ -70,6 +70,7 @@ public class ChromeCachedFlags { // clang-format off List featuresToCache = List.of(ChromeFeatureList.sAppMenuMobileSiteOption, ChromeFeatureList.sBackGestureActivityTabProvider, + ChromeFeatureList.sAllowUserCertificates, ChromeFeatureList.sBackGestureRefactorAndroid, ChromeFeatureList.sBaselineGm3SurfaceColors, - ChromeFeatureList.sCctAutoTranslate, + ChromeFeatureList.sBottomSheetGtsSupport, 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 -@@ -8654,6 +8654,10 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)}, - #endif // BUILDFLAG(IS_WIN) +@@ -8922,6 +8922,10 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kHttpsUpgradesDescription, kOsDesktop | kOsAndroid, + FEATURE_VALUE_TYPE(features::kHttpsUpgrades)}, + {"allow-user-certificates", + flag_descriptions::kAllowUserCertificatesName, @@ -92,15 +92,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -147,6 +147,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &feed::kFeedShowSignInCommand, +@@ -151,6 +151,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedBoCSigninInterstitial, + &feed::kFeedUserInteractionReliabilityReport, &feed::kInterestFeedContentSuggestions, + &kAllowUserCertificates, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, &feed::kInterestFeedV2Hearts, -@@ -467,6 +468,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents, +@@ -481,6 +482,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents, "AllowNewIncognitoTabIntents", base::FEATURE_ENABLED_BY_DEFAULT); @@ -114,10 +114,10 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -20,6 +20,7 @@ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2); - BASE_DECLARE_FEATURE(kAddEduAccountFromAccountSettingsForSupervisedUsers); +@@ -21,6 +21,7 @@ BASE_DECLARE_FEATURE(kAddEduAccountFromAccountSettingsForSupervisedUsers); BASE_DECLARE_FEATURE(kAddToHomescreenIPH); BASE_DECLARE_FEATURE(kAllowNewIncognitoTabIntents); + BASE_DECLARE_FEATURE(kAndroidAppIntegration); +BASE_DECLARE_FEATURE(kAllowUserCertificates); BASE_DECLARE_FEATURE(kAndroidScrollOptimizations); BASE_DECLARE_FEATURE(kAndroidWidgetFullscreenToast); @@ -133,7 +133,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE = "AdaptiveButtonInTopToolbarTranslate"; -@@ -586,6 +587,8 @@ public abstract class ChromeFeatureList { +@@ -566,6 +567,8 @@ public abstract class ChromeFeatureList { public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; /* Alphabetical: */ diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index d59b1b5d..d66955d5 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -8856,6 +8856,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9133,6 +9133,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRequestDesktopSiteExceptionsName, flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1773,6 +1773,10 @@ const char kHttpsUpgradesDescription[] = +@@ -1834,6 +1834,10 @@ const char kHttpsUpgradesDescription[] = "Enable automatically upgrading all top-level navigations to HTTPS with " "fast fallback to HTTP."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -988,6 +988,9 @@ extern const char kHideNonDisplayableAccountEmailDescription[]; +@@ -1025,6 +1025,9 @@ extern const char kHideNonDisplayableAccountEmailDescription[]; extern const char kHttpsOnlyModeName[]; extern const char kHttpsOnlyModeDescription[]; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 437234db..fa651256 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -76,7 +76,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 -@@ -77,6 +77,7 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -83,6 +83,7 @@ public class PrivacySettings extends PreferenceFragmentCompat private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; @@ -99,7 +99,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 -@@ -288,11 +288,15 @@ +@@ -294,11 +294,15 @@ @@ -200,7 +200,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #if BUILDFLAG(ENABLE_BACKGROUND_MODE) #include "chrome/browser/background/background_mode_manager.h" #endif -@@ -1139,6 +1141,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1144,6 +1146,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { component_updater::RegisterPrefs(registry); domain_reliability::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -655,7 +655,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 -@@ -283,6 +283,8 @@ static_library("ui") { +@@ -287,6 +287,8 @@ static_library("ui") { "webui/metrics_internals/metrics_internals_ui.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -667,7 +667,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_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -58,6 +58,7 @@ +@@ -59,6 +59,7 @@ #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h" #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" #include "chrome/browser/ui/webui/policy/policy_ui.h" @@ -675,7 +675,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "chrome/browser/ui/webui/predictors/predictors_ui.h" #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h" #include "chrome/browser/ui/webui/signin_internals_ui.h" -@@ -831,6 +832,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -790,6 +791,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -1130,7 +1130,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons const char kChromeUIChromeURLsHost[] = "chrome-urls"; const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/"; const char kChromeUIComponentsHost[] = "components"; -@@ -465,6 +467,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -466,6 +468,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { kChromeUILockScreenNetworkHost, kChromeUILockScreenStartReauthHost, kChromeUIMobileSetupHost, @@ -1138,7 +1138,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, kChromeUINotificationTesterHost, -@@ -749,6 +752,7 @@ const char* const kChromeHostURLs[] = { +@@ -754,6 +757,7 @@ const char* const kChromeHostURLs[] = { #if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index a90aa5e9..e6f783a6 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -126,9 +126,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco 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 -@@ -98,6 +98,9 @@ public class PrivacySettings extends PreferenceFragmentCompat - private IncognitoLockSettings mIncognitoLockSettings; +@@ -105,6 +105,9 @@ public class PrivacySettings extends PreferenceFragmentCompat private HelpAndFeedbackLauncher mHelpAndFeedbackLauncher; + private Profile mProfile; + private ChromeSwitchPreference allowCustomTabIntentsPref; + private ChromeSwitchPreference openExternalLinksPref; @@ -136,7 +136,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -236,6 +239,9 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -246,6 +249,9 @@ public class PrivacySettings extends PreferenceFragmentCompat new SpanApplier.SpanInfo("", "", servicesLink)); } @@ -146,7 +146,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(); -@@ -252,6 +258,14 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -260,6 +266,14 @@ public class PrivacySettings extends PreferenceFragmentCompat } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); @@ -161,8 +161,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -274,6 +288,16 @@ public class PrivacySettings extends PreferenceFragmentCompat - canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); +@@ -283,6 +297,16 @@ public class PrivacySettings extends PreferenceFragmentCompat + UserPrefs.get(mProfile).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } + allowCustomTabIntentsPref = @@ -177,11 +177,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting + Preference doNotTrackPref = findPreference(PREF_DO_NOT_TRACK); if (doNotTrackPref != null) { - doNotTrackPref.setSummary(prefService.getBoolean(Pref.ENABLE_DO_NOT_TRACK) + doNotTrackPref.setSummary(UserPrefs.get(mProfile).getBoolean(Pref.ENABLE_DO_NOT_TRACK) 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 -@@ -566,12 +566,12 @@ BASE_FEATURE(kCCTIncognitoAvailableToThirdParty, +@@ -595,12 +595,12 @@ BASE_FEATURE(kCCTIncognitoAvailableToThirdParty, base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite BASE_FEATURE(kCCTIntentFeatureOverrides, @@ -195,8 +195,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse - base::FEATURE_ENABLED_BY_DEFAULT); + base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kCCTPostMessageOrigin, - "CCTPostMessageOrigin", + BASE_FEATURE(kCCTPrefetchDelayShowOnStart, + "CCTPrefetchDelayShowOnStart", diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java @@ -216,7 +216,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso 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 -@@ -5006,6 +5006,20 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Resume diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 363731df..23620653 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -187,6 +190,9 @@ found in the LICENSE file. +@@ -184,6 +187,9 @@ found in the LICENSE file. @@ -59,16 +59,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife 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 -@@ -221,6 +221,8 @@ import java.util.List; - import java.util.Locale; +@@ -224,6 +224,8 @@ import java.util.Locale; import java.util.Set; + import java.util.concurrent.atomic.AtomicBoolean; +import org.chromium.chrome.browser.ApplicationLifetime; + /** * 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. -@@ -2163,6 +2165,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2402,6 +2403,11 @@ public abstract class ChromeActivity return true; } @@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife 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 -@@ -3679,6 +3679,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

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 c15b8c28..131a79ab 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -564,6 +564,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { +@@ -566,6 +566,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -40,7 +40,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = { {"mode", "always-none"}}; const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = { -@@ -4285,7 +4301,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4390,7 +4406,11 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsLinux | kOsWin, FEATURE_VALUE_TYPE(features::kSystemNotifications)}, #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -65,10 +65,10 @@ 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" -@@ -349,6 +351,15 @@ AutocompleteController::AutocompleteController( - is_cros_launcher_(is_cros_launcher), - search_service_worker_signal_sent_(false), - template_url_service_(provider_client_->GetTemplateURLService()) { +@@ -354,6 +356,15 @@ AutocompleteController::AutocompleteController( + template_url_service_(provider_client_->GetTemplateURLService()), + triggered_feature_service_( + provider_client_->GetOmniboxTriggeredFeatureService()) { + if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering")) { + const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"); + provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH | @@ -84,7 +84,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc -@@ -474,6 +474,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, +@@ -478,6 +478,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY) matches_.push_back(what_you_typed_match); @@ -105,7 +105,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" -@@ -655,6 +656,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -649,6 +650,9 @@ void SearchProvider::Run(bool query_is_private) { } void SearchProvider::DoHistoryQuery(bool minimal_changes) { diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 8eb54213..f1733baa 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -4908,7 +4908,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5023,7 +5023,10 @@ const FeatureEntry kFeatureEntries[] = { {"force-text-direction", flag_descriptions::kForceTextDirectionName, flag_descriptions::kForceTextDirectionDescription, kOsAll, MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1240,6 +1240,10 @@ const char kDeprecateAltBasedSixPackDescription[] = +@@ -1291,6 +1291,10 @@ const char kDeprecateAltBasedSixPackDescription[] = "Show deprecation notifications and disable functionality for Alt based " "six pack deprecations. The Search based versions continue to work."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -653,6 +653,9 @@ extern const char kDeprecateAltClickDescription[]; +@@ -675,6 +675,9 @@ extern const char kDeprecateAltClickDescription[]; extern const char kDeprecateAltBasedSixPackName[]; extern const char kDeprecateAltBasedSixPackDescription[]; @@ -99,7 +99,7 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h --- a/services/network/public/cpp/features.h +++ b/services/network/public/cpp/features.h -@@ -82,6 +82,8 @@ BASE_DECLARE_FEATURE(kCorsNonWildcardRequestHeadersSupport); +@@ -86,6 +86,8 @@ BASE_DECLARE_FEATURE(kCorsNonWildcardRequestHeadersSupport); COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kBatchSimpleURLLoader); 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 62de18a9..da6f5097 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 @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1156,6 +1156,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { +@@ -1148,6 +1148,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { switches::kForceDisplayColorProfile, "hdr10"}, }; @@ -33,10 +33,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kMemlogModeChoices[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode, -@@ -4786,6 +4791,9 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kVideoTutorialsInstantFetchName, - flag_descriptions::kVideoTutorialsInstantFetchDescription, kOsAndroid, - SINGLE_VALUE_TYPE(video_tutorials::switches::kVideoTutorialsInstantFetch)}, +@@ -4894,6 +4899,9 @@ const FeatureEntry kFeatureEntries[] = { + {"video-tutorials", flag_descriptions::kVideoTutorialsName, + flag_descriptions::kVideoTutorialsDescription, kOsAndroid, + FEATURE_VALUE_TYPE(video_tutorials::features::kVideoTutorials)}, + {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName, + flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll, + MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)}, @@ -46,7 +46,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1952,6 +1952,10 @@ const char kUnthrottledNestedTimeoutDescription[] = +@@ -2025,6 +2025,10 @@ const char kUnthrottledNestedTimeoutDescription[] = "websites abusing the API will still eventually have their setTimeouts " "clamped."; @@ -60,7 +60,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1096,6 +1096,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -1139,6 +1139,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kUnthrottledNestedTimeoutName[]; extern const char kUnthrottledNestedTimeoutDescription[]; diff --git a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch index 0b03ecf9..c1952c54 100644 --- a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch +++ b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -3595,6 +3595,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3692,6 +3692,10 @@ const FeatureEntry kFeatureEntries[] = { chrome::android::kContextualSearchSuppressShortView, kContextualSearchSuppressShortViewVariations, "ContextualSearchSuppressShortView")}, @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1308,6 +1308,11 @@ const char kEnableManagedConfigurationWebApiDescription[] = +@@ -1359,6 +1359,11 @@ const char kEnableManagedConfigurationWebApiDescription[] = "Allows website to access a managed configuration provided by the device " "administrator for the origin."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -713,6 +713,9 @@ extern const char kEnablePenetratingImageSelectionDescription[]; +@@ -744,6 +744,9 @@ extern const char kEnablePenetratingImageSelectionDescription[]; extern const char kEnablePerfettoSystemTracingName[]; extern const char kEnablePerfettoSystemTracingDescription[]; @@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -338,12 +338,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad, +@@ -348,12 +348,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad, // Let videos be resumed via remote controls (for example, the notification) // when in background. BASE_FEATURE(kResumeBackgroundVideo, 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 8226a7a3..8e7f9103 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -3532,6 +3532,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3629,6 +3629,9 @@ const FeatureEntry kFeatureEntries[] = { {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, flag_descriptions::kUiPartialSwapDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, @@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3960,6 +3960,12 @@ const char kPolicyLogsPageAndroidDescription[] = +@@ -4079,6 +4079,12 @@ const char kPolicyLogsPageAndroidDescription[] = "Enable the new chrome://policy-logs page containing logs for debugging " "policy related issues on Android."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2288,6 +2288,9 @@ extern const char kQueryTilesNTPDescription[]; +@@ -2388,6 +2388,9 @@ extern const char kQueryTilesNTPDescription[]; extern const char kQueryTilesOnStartName[]; extern const char kQueryTilesOnStartDescription[]; extern const char kQueryTilesSingleTierName[]; diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index b216e04f..934a07b4 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -7461,6 +7461,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7668,6 +7668,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -28,12 +28,12 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + FEATURE_VALUE_TYPE(features::kVibration)}, + #if BUILDFLAG(IS_CHROMEOS_ASH) - {"exo-gamepad-vibration", flag_descriptions::kExoGamepadVibrationName, - flag_descriptions::kExoGamepadVibrationDescription, kOsCrOS, + {"exo-consumed-by-ime-by-flag", + flag_descriptions::kExoConsumedByImeByFlagName, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6439,6 +6439,9 @@ const char kLacrosScreenCoordinatesEnabledDescription[] = +@@ -6730,6 +6730,9 @@ const char kLacrosScreenCoordinatesEnabledDescription[] = "moveBy, moveTo or session restore."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3946,6 +3946,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; +@@ -4111,6 +4111,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; extern const char kWebUITabStripTabDragIntegrationDescription[]; #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) @@ -69,7 +69,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. 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 -@@ -144,6 +144,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls, +@@ -149,6 +149,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls, #endif ); @@ -84,7 +84,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 -@@ -341,6 +341,8 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWarmUpNetworkProcess); +@@ -347,6 +347,8 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWarmUpNetworkProcess); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebNfc); #endif // BUILDFLAG(IS_ANDROID) @@ -141,7 +141,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 -@@ -2348,6 +2348,10 @@ +@@ -2419,6 +2419,10 @@ status: {"Android": "stable"}, base_feature: "none", }, 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 609dbf11..592a4f5b 100644 --- a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch +++ b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1649,6 +1649,11 @@ config("default_warnings") { +@@ -1658,6 +1658,11 @@ config("default_warnings") { # TODO(crbug.com/1412713) Evaluate and possibly enable. "-Wno-deprecated-this-capture", ] @@ -31,7 +31,7 @@ diff --git a/build_overrides/build.gni b/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -58,6 +58,9 @@ declare_args() { # Allows third-party repositories to use C++17 for MSVC builds - # TODO(crbug.com/1380553) Remove once ANGLE's MSVC C++20 build passes + # TODO(https://crbug.com/pdfium/1932) Remove once pdfium builds on MSVC C++20 msvc_use_cxx17 = false + + # Allows clangd builds by suppressing unsupported parameters diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index fb915b49..ca384595 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re 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 -@@ -2211,6 +2211,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2528,6 +2528,11 @@ public abstract class ChromeActivity return doOpenWebApk(currentTab); } @@ -69,7 +69,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 -@@ -549,6 +549,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -544,6 +544,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate isChromeScheme, isFileScheme, isContentScheme, isIncognito, url)); updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme); @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App updateAutoDarkMenuItem(menu, currentTab, isChromeScheme); -@@ -1172,6 +1173,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1117,6 +1118,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } } 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 ed07b7db..aa520b29 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 @@ -110,15 +110,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 -@@ -20,6 +20,7 @@ import org.chromium.chrome.browser.ServiceTabLauncher; - import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFactory; - import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask; +@@ -26,6 +26,7 @@ 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.incognito.IncognitoUtils; +import org.chromium.chrome.browser.homepage.HomepageManager; import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin; import org.chromium.chrome.browser.ntp.NewTabPageUtils; - import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper; -@@ -372,6 +373,12 @@ public class ChromeTabCreator extends TabCreator { + import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge; +@@ -472,6 +473,12 @@ public class ChromeTabCreator extends TabCreator { * @return the created tab. */ public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) { @@ -134,7 +134,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 -@@ -399,6 +399,7 @@ public final class ChromePreferenceKeys { +@@ -398,6 +398,7 @@ public final class ChromePreferenceKeys { public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL = "Chrome.Homepage.PartnerCustomizedDefaultGurl"; @@ -156,7 +156,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 -@@ -1448,6 +1448,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1445,6 +1445,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour @@ -181,7 +181,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -72,6 +72,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; +@@ -86,6 +86,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; // A boolean specifying whether the New Tab page is the home page or not. const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage"; @@ -195,7 +195,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc 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 -@@ -366,6 +366,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[]; +@@ -371,6 +371,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[]; extern const char kUsedPolicyCertificates[]; #endif // BUILDFLAG(IS_CHROMEOS) extern const char kShowHomeButton[]; diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index cc421cbc..31be4612 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -143,6 +143,7 @@ +@@ -144,6 +144,7 @@ #include "components/segmentation_platform/public/features.h" #include "components/send_tab_to_self/features.h" #include "components/services/heap_profiling/public/cpp/switches.h" @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/shared_highlighting/core/common/shared_highlighting_features.h" #include "components/signin/core/browser/dice_account_reconcilor_delegate.h" #include "components/signin/public/base/signin_buildflags.h" -@@ -8907,6 +8908,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9179,6 +9180,11 @@ const FeatureEntry kFeatureEntries[] = { kLargeFaviconFromGoogleVariations, "LargeFaviconFromGoogle")}, @@ -39,12 +39,12 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + FEATURE_VALUE_TYPE(site_engagement::features::kSiteEngagement)}, + #if BUILDFLAG(IS_ANDROID) - {"request-desktop-site-exceptions", - flag_descriptions::kRequestDesktopSiteExceptionsName, + {"force-off-text-autosizing", + flag_descriptions::kForceOffTextAutosizingName, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3522,6 +3522,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = +@@ -3633,6 +3633,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = "Skips starting the service worker and run the fetch handler if the fetch " "handler is recognized as skippable."; @@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2040,6 +2040,9 @@ extern const char kReduceAcceptLanguageDescription[]; +@@ -2108,6 +2108,9 @@ extern const char kReduceAcceptLanguageDescription[]; extern const char kSkipServiceWorkerFetchHandlerName[]; extern const char kSkipServiceWorkerFetchHandlerDescription[]; diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 74a7d1f4..d9530074 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -211,7 +211,7 @@ new file mode 100644 diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -338,6 +338,7 @@ +@@ -336,6 +336,7 @@ @@ -257,7 +257,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -217,7 +217,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -218,7 +218,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::AUTOPLAY || content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || @@ -267,7 +267,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -229,6 +230,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -230,6 +231,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url); FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url); @@ -407,9 +407,9 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context + return false; +} + - ExecutionContext::ExecutionContext(v8::Isolate* isolate, Agent* agent) - : isolate_(isolate), - security_context_(this), + ExecutionContext::ExecutionContext(v8::Isolate* isolate, + Agent* agent, + bool is_window) 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 @@ -435,7 +435,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 -@@ -247,6 +247,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( +@@ -248,6 +248,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( } } @@ -449,7 +449,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_); -@@ -493,25 +500,6 @@ static String ExtractWebGLContextCreationError( +@@ -494,25 +501,6 @@ static String ExtractWebGLContextCreationError( const Platform::GraphicsInfo& info) { StringBuilder builder; builder.Append("Could not create a WebGL context"); @@ -475,7 +475,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('.'); -@@ -580,6 +568,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( +@@ -581,6 +569,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( const CanvasContextCreationAttributesCore& attributes, Platform::ContextType context_type, Platform::GraphicsInfo* graphics_info) { diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index 65af1707..63d8a2d2 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -207,7 +207,7 @@ new file mode 100644 diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -339,6 +339,7 @@ +@@ -337,6 +337,7 @@ @@ -253,7 +253,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -218,7 +218,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -219,7 +219,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::TIMEZONE_OVERRIDE || @@ -263,7 +263,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -231,6 +232,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -232,6 +233,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url); FilterRulesForType(webgl_rules, outermost_main_frame_url); @@ -384,7 +384,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" -@@ -751,6 +752,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -750,6 +751,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( // origin. WebRTCIPHandlingPolicy policy = GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy); diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 4dedaca2..5f1dea19 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -199,7 +199,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 -@@ -12830,12 +12830,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -12973,12 +12973,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( base::Value::Dict body; if (!reason.empty()) body.Set("reason", reason); @@ -245,7 +245,7 @@ diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -222,7 +222,7 @@ extern const base::FeatureParam kTimeoutTcpConnectAttemptMax( +@@ -213,7 +213,7 @@ extern const base::FeatureParam kTimeoutTcpConnectAttemptMax( #if BUILDFLAG(ENABLE_REPORTING) BASE_FEATURE(kDocumentReporting, "DocumentReporting", @@ -273,7 +273,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 -@@ -468,10 +468,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -469,10 +469,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const absl::optional& reporting_source, const net::NetworkAnonymizationKey& network_anonymization_key, const absl::optional& user_agent, @@ -306,7 +306,7 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c 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 -@@ -1319,7 +1319,6 @@ mojom("mojom") { +@@ -1373,7 +1373,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -317,7 +317,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 -@@ -1059,6 +1059,7 @@ interface NetworkContext { +@@ -1087,6 +1087,7 @@ interface NetworkContext { // provided |network_isolation_key|. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -325,7 +325,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1072,6 +1073,7 @@ interface NetworkContext { +@@ -1100,6 +1101,7 @@ interface NetworkContext { // Note that this queued report will never be delivered if no reporting // endpoint matching is registered for with the provided // |network_isolation_key|. @@ -336,7 +336,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw 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 -@@ -41,6 +41,7 @@ +@@ -42,6 +42,7 @@ #include "build/build_config.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "mojo/public/cpp/system/message_pipe.h" @@ -344,7 +344,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" -@@ -2433,9 +2434,11 @@ void LocalFrame::MainFrameInteractive() { +@@ -2429,9 +2430,11 @@ void LocalFrame::MainFrameInteractive() { } } @@ -370,7 +370,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h" #include "services/metrics/public/cpp/ukm_source_id.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" -@@ -611,9 +611,9 @@ class CORE_EXPORT LocalFrame final +@@ -614,9 +614,9 @@ class CORE_EXPORT LocalFrame final } SmoothScrollSequencer& GetSmoothScrollSequencer(); @@ -483,7 +483,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p diff --git a/third_party/blink/renderer/core/frame/reporting_observer.cc b/third_party/blink/renderer/core/frame/reporting_observer.cc --- a/third_party/blink/renderer/core/frame/reporting_observer.cc +++ b/third_party/blink/renderer/core/frame/reporting_observer.cc -@@ -61,8 +61,7 @@ void ReportingObserver::QueueReport(Report* report) { +@@ -62,8 +62,7 @@ void ReportingObserver::QueueReport(Report* report) { } bool ReportingObserver::ObservedType(const String& type) { diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index aabdf4ae..93a1bcb4 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -3571,6 +3571,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3668,6 +3668,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kKioskEnableAppServiceDescription, kOsCrOS, FEATURE_VALUE_TYPE(features::kKioskEnableAppService)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3436,6 +3436,11 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] = +@@ -3545,6 +3545,11 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] = "When enabled, WebRTC will only use the Video Encode Accelerator for " "video resolutions inside those published as supported."; @@ -52,7 +52,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1976,6 +1976,9 @@ extern const char kWebrtcSrtpAesGcmDescription[]; +@@ -2044,6 +2044,9 @@ extern const char kWebrtcSrtpAesGcmDescription[]; extern const char kWebrtcUseMinMaxVEADimensionsName[]; extern const char kWebrtcUseMinMaxVEADimensionsDescription[]; @@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -664,6 +664,10 @@ BASE_FEATURE(kWebRtcUseMinMaxVEADimensions, +@@ -658,6 +658,10 @@ BASE_FEATURE(kWebRtcUseMinMaxVEADimensions, #endif ); @@ -79,7 +79,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 -@@ -273,6 +273,8 @@ BLINK_COMMON_EXPORT bool IsPlzDedicatedWorkerEnabled(); +@@ -254,6 +254,8 @@ BLINK_COMMON_EXPORT bool IsPlzDedicatedWorkerEnabled(); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebRtcUseMinMaxVEADimensions); @@ -157,7 +157,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b #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" -@@ -720,6 +721,17 @@ Document* BaseAudioContext::GetDocument() const { +@@ -721,6 +722,17 @@ Document* BaseAudioContext::GetDocument() const { return window ? window->document() : nullptr; } diff --git a/build/patches/Battery-API-return-nothing.patch b/build/patches/Battery-API-return-nothing.patch index 21282ee5..0aac3bc2 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 -@@ -77,46 +77,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) { +@@ -78,46 +78,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) { } bool BatteryManager::charging() { diff --git a/build/patches/Block-gateway-attacks-via-websockets.patch b/build/patches/Block-gateway-attacks-via-websockets.patch index bd194255..b0e8b404 100644 --- a/build/patches/Block-gateway-attacks-via-websockets.patch +++ b/build/patches/Block-gateway-attacks-via-websockets.patch @@ -23,8 +23,8 @@ 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.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 -@@ -745,4 +745,20 @@ void ExecutionContext::WriteIntoTrace( - proto->set_type(GetContextType(*this)); +@@ -781,4 +781,20 @@ void ExecutionContext::WriteIntoTrace( + proto->set_world_type(GetWorldType(*this)); } +String ExecutionContext::addressSpaceForBindings() const { @@ -47,7 +47,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 -@@ -410,6 +410,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable, +@@ -413,6 +413,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable, void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space); HeapObserverSet& ContextLifecycleObserverSet(); @@ -69,7 +69,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third 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 -@@ -584,6 +584,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const { +@@ -574,6 +574,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const { return should_block_request; } @@ -99,7 +99,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h -@@ -176,6 +176,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, +@@ -173,6 +173,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override; std::unique_ptr CreateWebSocketHandshakeThrottle() override; @@ -207,7 +207,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc --- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc +++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc -@@ -278,6 +278,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) { +@@ -275,6 +275,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) { return false; } diff --git a/build/patches/Block-qjz9zk-or-trk-requests.patch b/build/patches/Block-qjz9zk-or-trk-requests.patch index 60d413a5..ef2070ce 100644 --- a/build/patches/Block-qjz9zk-or-trk-requests.patch +++ b/build/patches/Block-qjz9zk-or-trk-requests.patch @@ -108,7 +108,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur 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 -@@ -786,6 +786,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() +@@ -787,6 +787,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() RegisterPseudoScheme(url::kJavaScriptScheme); RegisterPseudoScheme(kViewSourceScheme); RegisterPseudoScheme(kGoogleChromeScheme); @@ -119,7 +119,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1045,6 +1045,8 @@ component("net") { +@@ -1048,6 +1048,8 @@ component("net") { "url_request/url_request_http_job.cc", "url_request/url_request_http_job.h", "url_request/url_request_interceptor.cc", diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index 42621efe..b741d9e9 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -50,7 +50,7 @@ diff --git a/build/android/java/templates/BuildConfig.template b/build/android/j diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -2300,6 +2300,9 @@ if (enable_java_templates && is_android) { +@@ -2304,6 +2304,9 @@ if (enable_java_templates && is_android) { if (defined(testonly) && testonly) { defines += [ "_IS_FOR_TEST" ] } @@ -63,7 +63,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 -@@ -847,6 +847,9 @@ chrome_java_sources = [ +@@ -851,6 +851,9 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java", "java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java", "java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java", @@ -179,7 +179,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase } /** -@@ -577,6 +583,10 @@ public class OmahaBase { +@@ -567,6 +573,10 @@ public class OmahaBase { /** Sends the request to the server and returns the response. */ static String sendRequestToServer(HttpURLConnection urlConnection, String request) throws RequestFailureException { @@ -190,7 +190,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase try { OutputStream out = new BufferedOutputStream(urlConnection.getOutputStream()); OutputStreamWriter writer = new OutputStreamWriter(out); -@@ -647,4 +657,47 @@ public class OmahaBase { +@@ -637,4 +647,47 @@ public class OmahaBase { // updateStatus is only used for the on-demand check. null); } @@ -318,7 +318,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMen import androidx.annotation.VisibleForTesting; import org.chromium.base.BuildInfo; -@@ -135,8 +136,21 @@ public class UpdateMenuItemHelper { +@@ -137,8 +138,21 @@ public class UpdateMenuItemHelper { Log.e(TAG, "Failed to launch Activity for: %s", mStatus.updateUrl); } break; @@ -340,7 +340,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMen default: return; } -@@ -182,7 +196,7 @@ public class UpdateMenuItemHelper { +@@ -184,7 +198,7 @@ public class UpdateMenuItemHelper { mMenuUiState = new MenuUiState(); switch (mStatus.updateState) { @@ -349,7 +349,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMen // The badge is hidden if the update menu item has been clicked until there is an // even newer version of Chrome available. showBadge |= !TextUtils.equals( -@@ -237,6 +251,72 @@ public class UpdateMenuItemHelper { +@@ -239,6 +253,72 @@ public class UpdateMenuItemHelper { mMenuUiState.itemState.icon = R.drawable.ic_error_24dp_filled; mMenuUiState.itemState.enabled = false; break; @@ -727,7 +727,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java -@@ -49,7 +49,8 @@ public class VersionNumberGetter { +@@ -51,7 +51,8 @@ public class VersionNumberGetter { private static VersionNumberGetter sInstanceForTests; /** If false, OmahaClient will never report that a newer version is available. */ @@ -1281,15 +1281,15 @@ 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 -@@ -250,6 +250,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kNotificationPermissionVariant, +@@ -262,6 +262,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kNotificationPermissionBottomSheet, &kPageAnnotationsService, + &kPreconnectOnTabCreation, + &kInlineUpdateFlow, &kBookmarksImprovedSaveFlow, &kBookmarksRefresh, &kOmahaMinSdkVersionAndroid, -@@ -694,6 +695,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens, +@@ -723,6 +724,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens, "ContextMenuTranslateWithGoogleLens", base::FEATURE_DISABLED_BY_DEFAULT); @@ -1303,7 +1303,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -101,6 +101,7 @@ BASE_DECLARE_FEATURE(kFoldableJankFix); +@@ -107,6 +107,7 @@ BASE_DECLARE_FEATURE(kFoldableJankFix); BASE_DECLARE_FEATURE(kGridTabSwitcherForTablets); BASE_DECLARE_FEATURE(kHideNonDisplayableAccountEmail); BASE_DECLARE_FEATURE(kIncognitoReauthenticationForAndroid); @@ -1314,7 +1314,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -351,6 +351,7 @@ public abstract class ChromeFeatureList { +@@ -350,6 +350,7 @@ public abstract class ChromeFeatureList { "IncognitoReauthenticationForAndroid"; public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot"; public static final String INFOBAR_SCROLL_OPTIMIZATION = "InfobarScrollOptimization"; @@ -1338,7 +1338,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -3665,7 +3671,10 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -1350,7 +1350,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Newer version is available -@@ -3676,6 +3685,18 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Android version is unsupported diff --git a/build/patches/Bromite-subresource-adblocker.patch b/build/patches/Bromite-subresource-adblocker.patch index 9c65820a..356a8eb0 100644 --- a/build/patches/Bromite-subresource-adblocker.patch +++ b/build/patches/Bromite-subresource-adblocker.patch @@ -63,7 +63,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 -@@ -243,6 +243,7 @@ if (current_toolchain == default_toolchain) { +@@ -216,6 +216,7 @@ if (current_toolchain == default_toolchain) { "//chrome/android/modules/image_editor/provider:java", "//chrome/android/modules/stack_unwinder/provider:java", "//chrome/android/webapk/libs/client:client_java", @@ -74,18 +74,18 @@ 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 -@@ -451,6 +451,7 @@ chrome_java_resources = [ +@@ -456,6 +456,7 @@ chrome_java_resources = [ "java/res/layout/account_chooser_dialog_title.xml", "java/res/layout/account_divider_preference.xml", "java/res/layout/account_management_account_row.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_unmask_prompt.xml", -@@ -635,6 +636,7 @@ chrome_java_resources = [ - "java/res/xml/about_chrome_preferences.xml", + "java/res/layout/autofill_card_name_and_number.xml", +@@ -647,6 +648,7 @@ chrome_java_resources = [ "java/res/xml/account_management_preferences.xml", "java/res/xml/account_management_preferences_legacy.xml", + "java/res/xml/ad_services_config.xml", + "java/res/xml/adblock_preferences.xml", "java/res/xml/bookmark_widget_info.xml", "java/res/xml/clear_browsing_data_preferences_tab.xml", @@ -93,7 +93,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 -@@ -941,6 +941,8 @@ chrome_java_sources = [ +@@ -943,6 +943,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java", "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java", @@ -436,7 +436,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod 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 -@@ -13152,6 +13152,16 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -13292,6 +13292,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Never show this again. @@ -507,7 +507,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 -@@ -1144,6 +1144,26 @@ BrowserProcessImpl::component_updater() { +@@ -1117,6 +1117,26 @@ BrowserProcessImpl::component_updater() { return component_updater_.get(); } @@ -556,7 +556,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 -@@ -416,6 +416,9 @@ StartupProfileInfo CreateInitialProfile( +@@ -417,6 +417,9 @@ StartupProfileInfo CreateInitialProfile( // missing code in the above test. CHECK(profile_info.profile) << "Cannot get default profile."; @@ -629,7 +629,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows #if !BUILDFLAG(IS_ANDROID) // QuicAllowed was not part of Android policy. const base::Value* value = -@@ -515,6 +517,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { +@@ -529,6 +531,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { StubResolverConfigReader::RegisterPrefs(registry); @@ -641,17 +641,17 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc --- a/chrome/browser/sessions/session_restore_android.cc +++ b/chrome/browser/sessions/session_restore_android.cc -@@ -42,7 +42,9 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab( - TabAndroid* current_tab = TabAndroid::FromWebContents(web_contents); +@@ -56,7 +56,9 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab( DCHECK(current_tab); + // If swapped, return the current tab's most up-to-date web contents. if (disposition == WindowOpenDisposition::CURRENT_TAB) { - current_tab->SwapWebContents(std::move(new_web_contents), false, false); + int active_tab_index = tab_model->GetActiveIndex(); + tab_model->CreateTab(current_tab, new_web_contents.release()); + tab_model->CloseTabAt(active_tab_index); - } else { - DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB || - disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB); + return current_tab->web_contents(); + } + DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_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 @@ -679,7 +679,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -2298,6 +2298,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; +@@ -2343,6 +2343,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; // capture devices without prompt. const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; @@ -692,7 +692,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc 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 -@@ -36,6 +36,7 @@ extern const char kDownloadDuplicateFilePromptEnabled[]; +@@ -38,6 +38,7 @@ extern const char kDownloadDuplicateFilePromptEnabled[]; extern const char kForceEphemeralProfiles[]; extern const char kHomePageIsNewTabPage[]; extern const char kHomePage[]; @@ -1864,7 +1864,7 @@ diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/comp 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 -@@ -42,8 +42,8 @@ BASE_FEATURE(kAutofillDetectRemovedFormControls, +@@ -43,8 +43,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKeyAfterFill, // Apply lazy-loading to ad frames which have embeds likely impacting Core Web // Vitals. BASE_FEATURE(kAutomaticLazyFrameLoadingToAds, @@ -1875,7 +1875,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea // The timeout value that forces loading iframes that are lazy loaded by // LazyAds. After this timeout, the frame loading is triggered even when the -@@ -63,8 +63,8 @@ const base::FeatureParam kSkipFrameCountForLazyAds( +@@ -64,8 +64,8 @@ const base::FeatureParam kSkipFrameCountForLazyAds( // Apply lazy-loading to frames which have embeds likely impacting Core Web // Vitals. BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbeds, @@ -1886,7 +1886,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea // The timeout value that forces loading iframes that are lazy loaded by // LazyEmbeds. After this timeout, the frame loading is triggered even when the -@@ -86,8 +86,8 @@ const base::FeatureParam kSkipFrameCountForLazyEmbeds( +@@ -87,8 +87,8 @@ const base::FeatureParam kSkipFrameCountForLazyEmbeds( // to gather Blink.AutomaticLazyLoadFrame.LazyEmbedFrameCount UKM data even when // kAutomaticLazyFrameLoadingToEmbeds is disabled. BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbedUrls, diff --git a/build/patches/Client-hints-overrides.patch b/build/patches/Client-hints-overrides.patch index 0d270908..28d0a003 100644 --- a/build/patches/Client-hints-overrides.patch +++ b/build/patches/Client-hints-overrides.patch @@ -48,7 +48,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc --- a/content/browser/loader/navigation_url_loader_impl.cc +++ b/content/browser/loader/navigation_url_loader_impl.cc -@@ -1044,6 +1044,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( +@@ -1041,6 +1041,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( return; } @@ -63,7 +63,7 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow 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 -@@ -266,8 +266,8 @@ BASE_FEATURE(kCrashReporting, +@@ -271,8 +271,8 @@ BASE_FEATURE(kCrashReporting, // Enables support for the `Critical-CH` response header. // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch BASE_FEATURE(kCriticalClientHint, @@ -88,7 +88,7 @@ diff --git a/services/network/public/cpp/client_hints.cc b/services/network/publ diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -197,7 +197,7 @@ BASE_FEATURE(kWebSocketReassembleShortMessages, +@@ -210,7 +210,7 @@ BASE_FEATURE(kWebSocketReassembleShortMessages, // Enable support for ACCEPT_CH H2/3 frame as part of Client Hint Reliability. // See: // https://tools.ietf.org/html/draft-davidben-http-client-hint-reliability-02#section-4.3 @@ -139,7 +139,7 @@ diff --git a/third_party/blink/common/client_hints/enabled_client_hints.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 -@@ -3457,8 +3457,8 @@ +@@ -3513,8 +3513,8 @@ public: true, }, { diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index 54fc3bd7..c4146564 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -668,7 +668,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 -@@ -309,6 +309,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -311,6 +311,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @ContentSettingValues Integer contentSetting = website.site().getContentSetting( browserContextHandle, mCategory.getContentSettingsType()); @@ -679,7 +679,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (contentSetting != null) { if (mCategory.getContentSettingsType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) { return ContentSettingValues.ALLOW != contentSetting; -@@ -471,6 +475,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -473,6 +477,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment ? new HashSet<>(getArguments().getStringArrayList(EXTRA_SELECTED_DOMAINS)) : null; @@ -687,7 +687,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"); -@@ -583,6 +588,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -585,6 +590,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment BrowserContextHandle browserContextHandle = getSiteSettingsDelegate().getBrowserContextHandle(); PrefService prefService = UserPrefs.get(browserContextHandle); @@ -699,7 +699,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (BINARY_TOGGLE_KEY.equals(preference.getKey())) { assert !mCategory.isManaged(); boolean toggleValue = (boolean) newValue; -@@ -829,6 +839,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -831,6 +841,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment : R.string.website_settings_category_timezone_override_allowed; break; } @@ -708,7 +708,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c assert resource > 0; return getString(resource); } -@@ -962,6 +974,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -964,6 +976,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment default: break; } @@ -717,7 +717,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (allowSpecifyingExceptions) { getPreferenceScreen().addPreference(new AddExceptionPreference(getStyledContext(), ADD_EXCEPTION_KEY, getAddExceptionDialogMessage(), mCategory, this)); -@@ -1135,6 +1149,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1137,6 +1151,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case GlobalToggleLayout.TRI_STATE_TOGGLE: TriStateSiteSettingsPreference triStateToggle = getPreferenceScreen().findPreference(TRI_STATE_TOGGLE_KEY); @@ -726,7 +726,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK); case GlobalToggleLayout.FOUR_STATE_COOKIE_TOGGLE: FourStateCookieSettingsPreference fourStateCookieToggle = -@@ -1243,6 +1259,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1248,6 +1264,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment screen.removePreference(antiAbuseThingsToConsiderHeader); screen.removePreference(antiAbuseThingsToConsiderSectionOne); } @@ -734,7 +734,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) { screen.removePreference(triStateToggle); -@@ -1402,7 +1419,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1407,7 +1424,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment getSiteSettingsDelegate().getBrowserContextHandle(), contentType); int[] descriptionIds = ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType); @@ -743,7 +743,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } private void configureTimeOverrideStateToggle( -@@ -1515,6 +1532,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1520,6 +1537,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @ContentSettingValues Integer value = site.getContentSetting(browserContextHandle, contentSettingsType); @@ -788,7 +788,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c Preference preference = new ChromeSwitchPreference(getStyledContext()); preference.setKey(getPreferenceKey(type)); -@@ -955,16 +957,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -956,16 +958,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment private void setupContentSettingsPreference(Preference preference, @ContentSettingValues @Nullable Integer value, boolean isEmbargoed) { @@ -816,7 +816,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c switchPreference.setOnPreferenceChangeListener(this); @ContentSettingsType int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey()); -@@ -1217,7 +1225,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1218,7 +1226,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment } mSite.setContentSetting(browserContextHandle, type, permission); @@ -1051,7 +1051,7 @@ diff --git a/components/content_settings/core/browser/website_settings_info.cc b diff --git a/components/content_settings/core/browser/website_settings_info.h b/components/content_settings/core/browser/website_settings_info.h --- a/components/content_settings/core/browser/website_settings_info.h +++ b/components/content_settings/core/browser/website_settings_info.h -@@ -88,7 +88,10 @@ class WebsiteSettingsInfo { +@@ -95,7 +95,10 @@ class WebsiteSettingsInfo { SyncStatus sync_status, LossyStatus lossy_status, ScopingType scoping_type, @@ -1063,7 +1063,7 @@ diff --git a/components/content_settings/core/browser/website_settings_info.h b/ WebsiteSettingsInfo(const WebsiteSettingsInfo&) = delete; WebsiteSettingsInfo& operator=(const WebsiteSettingsInfo&) = delete; -@@ -113,6 +116,10 @@ class WebsiteSettingsInfo { +@@ -120,6 +123,10 @@ class WebsiteSettingsInfo { ScopingType scoping_type() const { return scoping_type_; } IncognitoBehavior incognito_behavior() const { return incognito_behavior_; } @@ -1074,7 +1074,7 @@ diff --git a/components/content_settings/core/browser/website_settings_info.h b/ private: const ContentSettingsType type_; const std::string name_; -@@ -124,6 +131,9 @@ class WebsiteSettingsInfo { +@@ -131,6 +138,9 @@ class WebsiteSettingsInfo { const LossyStatus lossy_status_; const ScopingType scoping_type_; const IncognitoBehavior incognito_behavior_; @@ -1204,7 +1204,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. const bool is_incognito = web_contents->GetBrowserContext()->IsOffTheRecord(); #if BUILDFLAG(IS_ANDROID) // Special geolocation DSE settings apply only on Android, so make sure it -@@ -1198,7 +1208,18 @@ void PageInfo::PresentSitePermissions() { +@@ -1195,7 +1205,18 @@ void PageInfo::PresentSitePermissions() { PermissionInfo permission_info; HostContentSettingsMap* content_settings = GetContentSettings(); DCHECK(web_contents_); @@ -1261,7 +1261,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in NOTREACHED(); return std::u16string(); } -@@ -979,6 +992,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) { +@@ -975,6 +988,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) { if (info.type == type) return true; } diff --git a/build/patches/Disable-Accessibility-service-by-default.patch b/build/patches/Disable-Accessibility-service-by-default.patch index fd280353..7ac0364f 100644 --- a/build/patches/Disable-Accessibility-service-by-default.patch +++ b/build/patches/Disable-Accessibility-service-by-default.patch @@ -58,7 +58,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c 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 -@@ -934,6 +934,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa +@@ -936,6 +936,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa structure.setChildCount(0); return; } diff --git a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch index ee7b99ad..b93c35b1 100644 --- a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch +++ b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -976,8 +976,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense, +@@ -997,8 +997,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense, // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs // which will trigger provisioning process after MediaDrmBridge is created. BASE_FEATURE(kMediaDrmPreprovisioning, diff --git a/build/patches/Disable-FLoC-and-privacy-sandbox.patch b/build/patches/Disable-FLoC-and-privacy-sandbox.patch index 88455ef8..e5be7556 100644 --- a/build/patches/Disable-FLoC-and-privacy-sandbox.patch +++ b/build/patches/Disable-FLoC-and-privacy-sandbox.patch @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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 -@@ -3324,6 +3324,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed( +@@ -3402,6 +3402,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed( const url::Origin* source_origin, const url::Origin* destination_origin, const url::Origin* reporting_origin) { @@ -34,10 +34,10 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc --- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc -@@ -16,6 +16,7 @@ - namespace { +@@ -42,6 +42,7 @@ bool PrivacySandboxRestrictedByAccountCapability(Profile* profile) { + } - bool PrivacySandboxRestrictedByAcccountCapability(Profile* profile) { + bool PrivacySandboxRestrictedNoticeRequired(Profile* profile) { + if ((true)) return true; auto* identity_manager = IdentityManagerFactory::GetForProfile(profile); @@ -45,7 +45,7 @@ diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc -@@ -551,18 +551,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id, +@@ -668,18 +668,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id, if (!visit_id) return; @@ -79,7 +79,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components const char kPrivacySandboxSettings4ConsentRequiredName[] = "consent-required"; const char kPrivacySandboxSettings4NoticeRequiredName[] = "notice-required"; -@@ -45,8 +45,8 @@ const base::FeatureParam kPrivacySandboxSettings4ShowSampleDataForTesting{ +@@ -61,8 +61,8 @@ const base::FeatureParam kPrivacySandboxSettings4ShowSampleDataForTesting{ kPrivacySandboxSettings4ShowSampleDataForTestingName, false}; BASE_FEATURE(kPrivacySandboxSettings3, @@ -90,7 +90,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components const base::FeatureParam kPrivacySandboxSettings3ConsentRequired{ &kPrivacySandboxSettings3, "consent-required", false}; const base::FeatureParam kPrivacySandboxSettings3NoticeRequired{ -@@ -69,7 +69,7 @@ BASE_FEATURE(kOverridePrivacySandboxSettingsLocalTesting, +@@ -85,7 +85,7 @@ BASE_FEATURE(kOverridePrivacySandboxSettingsLocalTesting, BASE_FEATURE(kDisablePrivacySandboxPrompts, "DisablePrivacySandboxPrompts", @@ -114,8 +114,8 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/pr diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc --- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc +++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc -@@ -115,7 +115,8 @@ PrivacySandboxSettingsImpl::GetM1TopicAllowedStatus() const { - return control_status; +@@ -144,7 +144,8 @@ PrivacySandboxSettingsImpl::GetFinchDisabledTopics() { + return finch_disabled_topics_; } -bool PrivacySandboxSettingsImpl::IsTopicsAllowed() const { @@ -124,7 +124,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo // M1 specific if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings4)) { Status status = GetM1TopicAllowedStatus(); -@@ -158,7 +159,8 @@ bool PrivacySandboxSettingsImpl::IsTopicsAllowedForContext( +@@ -187,7 +188,8 @@ bool PrivacySandboxSettingsImpl::IsTopicsAllowedForContext( IsPrivacySandboxEnabledForContext(top_frame_origin, url); } @@ -134,7 +134,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo const auto& blocked_topics = pref_service_->GetList(prefs::kPrivacySandboxBlockedTopics); -@@ -257,17 +259,7 @@ bool PrivacySandboxSettingsImpl::IsAttributionReportingEverAllowed() const { +@@ -296,17 +298,7 @@ bool PrivacySandboxSettingsImpl::IsAttributionReportingEverAllowed() const { bool PrivacySandboxSettingsImpl::IsAttributionReportingAllowed( const url::Origin& top_frame_origin, const url::Origin& reporting_origin) const { @@ -153,7 +153,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo } bool PrivacySandboxSettingsImpl::MaySendAttributionReport( -@@ -373,7 +365,8 @@ void PrivacySandboxSettingsImpl::ClearFledgeJoiningAllowedSettings( +@@ -412,7 +404,8 @@ void PrivacySandboxSettingsImpl::ClearFledgeJoiningAllowedSettings( } bool PrivacySandboxSettingsImpl::IsFledgeJoiningAllowed( @@ -163,7 +163,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo ScopedDictPrefUpdate scoped_pref_update( pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked); auto& pref_data = scoped_pref_update.Get(); -@@ -464,7 +457,9 @@ bool PrivacySandboxSettingsImpl::IsPrivateAggregationAllowed( +@@ -503,7 +496,9 @@ bool PrivacySandboxSettingsImpl::IsPrivateAggregationAllowed( reporting_origin.GetURL()); } @@ -174,7 +174,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo PrivacySandboxSettingsImpl::Status status = GetPrivacySandboxAllowedStatus(); if (!IsAllowed(status)) { return false; -@@ -502,7 +497,8 @@ void PrivacySandboxSettingsImpl::SetTopicsBlockedForTesting() { +@@ -541,7 +536,8 @@ void PrivacySandboxSettingsImpl::SetTopicsBlockedForTesting() { pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, false); } @@ -184,7 +184,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, enabled); } -@@ -552,7 +548,10 @@ bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabledForContext( +@@ -599,7 +595,10 @@ bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabledForContext( net::CookieSettingOverrides()); } diff --git a/build/patches/Disable-PrivacyGuide.patch b/build/patches/Disable-PrivacyGuide.patch index ab81a5e7..e2e6c041 100644 --- a/build/patches/Disable-PrivacyGuide.patch +++ b/build/patches/Disable-PrivacyGuide.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -460,8 +460,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP, +@@ -471,8 +471,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP, // Enables or disables the Happiness Tracking System for Desktop Privacy Guide. BASE_FEATURE(kHappinessTrackingSurveysForDesktopPrivacyGuide, @@ -21,7 +21,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc const base::FeatureParam kHappinessTrackingSurveysForDesktopPrivacyGuideTime{ &kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time", -@@ -922,8 +922,8 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect, +@@ -930,8 +930,8 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kPrivacyGuideAndroid, diff --git a/build/patches/Disable-StartSurface-feature.patch b/build/patches/Disable-StartSurface-feature.patch index ed2e4dc6..a6ba7f36 100644 --- a/build/patches/Disable-StartSurface-feature.patch +++ b/build/patches/Disable-StartSurface-feature.patch @@ -12,8 +12,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 -@@ -1105,8 +1105,8 @@ BASE_FEATURE(kResizeOnlyActiveTab, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -1159,8 +1159,8 @@ BASE_FEATURE(kResizeOnlyActiveTab, + BASE_FEATURE(kSpareTab, "SpareTab", base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kStartSurfaceAndroid, - "StartSurfaceAndroid", diff --git a/build/patches/Disable-TLS-resumption.patch b/build/patches/Disable-TLS-resumption.patch index 275aaf19..27b7f4fc 100644 --- a/build/patches/Disable-TLS-resumption.patch +++ b/build/patches/Disable-TLS-resumption.patch @@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -4943,6 +4943,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5058,6 +5058,12 @@ const FeatureEntry kFeatureEntries[] = { {"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName, flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll, FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)}, @@ -55,7 +55,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1017,6 +1017,14 @@ const char kAccessibilityAcceleratorNotificationsTimeoutDescription[] = +@@ -1056,6 +1056,14 @@ const char kAccessibilityAcceleratorNotificationsTimeoutDescription[] = "shortcut (docked magnifier, screen magnifier and high contrast) to time " "out instead of remaining pinned."; @@ -73,7 +73,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -580,6 +580,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[]; +@@ -602,6 +602,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[]; extern const char kEnableTLS13EarlyDataName[]; extern const char kEnableTLS13EarlyDataDescription[]; @@ -123,7 +123,7 @@ diff --git a/net/base/features.h b/net/base/features.h diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc -@@ -211,6 +211,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params, +@@ -213,6 +213,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params, next_protos_.push_back(kProtoHTTP11); @@ -134,7 +134,7 @@ diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc -@@ -72,6 +72,7 @@ +@@ -73,6 +73,7 @@ #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h" #include "third_party/boringssl/src/include/openssl/aead.h" @@ -142,7 +142,7 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc #include "url/gurl.h" #include "url/scheme_host_port.h" #include "url/url_constants.h" -@@ -220,6 +221,38 @@ std::set HostsFromOrigins(std::set origins) { +@@ -221,6 +222,38 @@ std::set HostsFromOrigins(std::set origins) { } // namespace @@ -181,7 +181,7 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc // Refcounted class that owns quic::QuicCryptoClientConfig and tracks how many // consumers are using it currently. When the last reference is freed, the // QuicCryptoClientConfigHandle informs the owning QuicStreamFactory, moves it -@@ -2614,7 +2647,7 @@ QuicStreamFactory::CreateCryptoConfigHandle( +@@ -2625,7 +2658,7 @@ QuicStreamFactory::CreateCryptoConfigHandle( sct_auditing_delegate_, HostsFromOrigins(params_.origins_to_force_quic_on), actual_network_anonymization_key), @@ -193,7 +193,7 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc -@@ -392,7 +392,33 @@ SSLClientSocketImpl::SSLClientSocketImpl( +@@ -380,7 +380,33 @@ SSLClientSocketImpl::SSLClientSocketImpl( CHECK(context_); } @@ -227,7 +227,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket Disconnect(); } -@@ -793,6 +819,8 @@ int SSLClientSocketImpl::Init() { +@@ -779,6 +805,8 @@ int SSLClientSocketImpl::Init() { } if (session) SSL_set_session(ssl_.get(), session.get()); @@ -236,7 +236,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket } transport_adapter_ = std::make_unique( -@@ -1084,6 +1112,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) { +@@ -1070,6 +1098,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) { : SSLHandshakeDetails::kTLS13Full; } } @@ -272,7 +272,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details); // Measure TLS connections that implement the renegotiation_info extension. -@@ -1765,6 +1822,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const { +@@ -1750,6 +1807,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const { } bool SSLClientSocketImpl::IsCachingEnabled() const { diff --git a/build/patches/Disable-all-promo-dialogs.patch b/build/patches/Disable-all-promo-dialogs.patch index 9a3e2e4e..ee25c0f3 100644 --- a/build/patches/Disable-all-promo-dialogs.patch +++ b/build/patches/Disable-all-promo-dialogs.patch @@ -10,7 +10,7 @@ Subject: Disable all promo dialogs 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 -@@ -946,6 +946,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -939,6 +939,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { } private boolean maybeShowPromo() { diff --git a/build/patches/Disable-crash-reporting.patch b/build/patches/Disable-crash-reporting.patch index 9ade249f..8674d509 100644 --- a/build/patches/Disable-crash-reporting.patch +++ b/build/patches/Disable-crash-reporting.patch @@ -10,7 +10,7 @@ Subject: Disable crash reporting 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 -@@ -2606,6 +2606,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2650,6 +2650,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::NumberToString(pid)); } #endif @@ -21,7 +21,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch 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 -@@ -260,8 +260,8 @@ BASE_FEATURE(kCooperativeScheduling, +@@ -265,8 +265,8 @@ BASE_FEATURE(kCooperativeScheduling, // Enables crash reporting via Reporting API. // https://www.w3.org/TR/reporting/#crash-report BASE_FEATURE(kCrashReporting, diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index 4df54353..d99e528e 100644 --- a/build/patches/Disable-fetching-of-all-field-trials.patch +++ b/build/patches/Disable-fetching-of-all-field-trials.patch @@ -11,20 +11,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../services/VariationsSeedServer.java | 2 -- .../metrics/chrome_browser_sampling_trials.cc | 4 +++ .../net/system_network_context_manager.cc | 1 - - components/ukm/ukm_recorder_impl.cc | 3 +++ + components/ukm/ukm_recorder_impl.cc | 3 ++ .../firstrun/VariationsSeedBridge.java | 2 +- - .../firstrun/VariationsSeedFetcher.java | 26 ++++--------------- + .../firstrun/VariationsSeedFetcher.java | 32 +++---------------- components/variations/net/BUILD.gn | 2 -- .../variations/net/omnibox_http_headers.cc | 4 +-- - .../variations/net/variations_http_headers.cc | 3 +++ - .../service/variations_field_trial_creator.cc | 3 ++- - .../variations/service/variations_service.cc | 15 +++-------- + .../variations/net/variations_http_headers.cc | 3 ++ + .../service/variations_field_trial_creator.cc | 3 +- + .../variations/service/variations_service.cc | 15 ++------- .../browser/loader/url_loader_throttles.cc | 2 -- .../origin_trials/origin_trials_utils.cc | 2 +- content/public/common/content_features.cc | 4 +-- - .../variations_render_thread_observer.cc | 9 ------- - .../renderer/core/loader/document_loader.cc | 7 ----- - 17 files changed, 26 insertions(+), 65 deletions(-) + .../variations_render_thread_observer.cc | 9 ------ + .../renderer/core/loader/document_loader.cc | 7 ---- + 17 files changed, 26 insertions(+), 71 deletions(-) diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn --- a/android_webview/nonembedded/BUILD.gn @@ -37,9 +37,9 @@ diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/ "java/src/org/chromium/android_webview/services/ComponentUpdaterResetSafeModeAction.java", "java/src/org/chromium/android_webview/services/ComponentUpdaterSafeModeUtils.java", "java/src/org/chromium/android_webview/services/ComponentsProviderPathUtil.java", -@@ -118,7 +117,6 @@ android_library("services_java") { - "java/src/org/chromium/android_webview/services/SafeModeContentProvider.java", +@@ -120,7 +119,6 @@ android_library("services_java") { "java/src/org/chromium/android_webview/services/SafeModeService.java", + "java/src/org/chromium/android_webview/services/SafeModeVariationsSeedContentProvider.java", "java/src/org/chromium/android_webview/services/StartupFeatureMetadataHolder.java", - "java/src/org/chromium/android_webview/services/VariationsSeedHolder.java", "java/src/org/chromium/android_webview/services/VariationsSeedServer.java", @@ -81,7 +81,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b 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 -@@ -722,7 +722,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( +@@ -733,7 +733,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( network::mojom::NetworkContextParams* network_context_params) { @@ -92,7 +92,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc --- a/components/ukm/ukm_recorder_impl.cc +++ b/components/ukm/ukm_recorder_impl.cc -@@ -222,6 +222,9 @@ bool HasUnknownMetrics(const builders::DecodeMap& decode_map, +@@ -167,6 +167,9 @@ bool HasUnknownMetrics(const builders::DecodeMap& decode_map, UkmRecorderImpl::UkmRecorderImpl() : sampling_seed_(static_cast(base::RandUint64())) { @@ -117,7 +117,7 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari diff --git a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java --- a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java +++ b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java -@@ -335,29 +335,13 @@ public class VariationsSeedFetcher { +@@ -431,35 +431,13 @@ public class VariationsSeedFetcher { */ public void fetchSeed(String restrictMode, String milestone, String channel) { assert !ThreadUtils.runningOnUiThread(); @@ -136,8 +136,14 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari + synchronized (sLock) { + VariationsSeedBridge.clearFirstRunPrefs(); -- SeedFetchInfo fetchInfo = downloadContent( -- VariationsPlatform.ANDROID, restrictMode, milestone, channel, null); +- SeedFetchParameters params = +- SeedFetchParameters.Builder.newBuilder() +- .setPlatform(VariationsSeedFetcher.VariationsPlatform.ANDROID) +- .setRestrictMode(null) +- .setMilestone(milestone) +- .setChannel(channel) +- .build(); +- SeedFetchInfo fetchInfo = downloadContent(params, null); - if (fetchInfo.seedInfo != null) { - SeedInfo info = fetchInfo.seedInfo; - VariationsSeedBridge.setVariationsFirstRunSeed(info.seedData, info.signature, @@ -151,15 +157,15 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari } private void recordFetchResultOrCode(int resultOrCode) { -@@ -401,7 +385,7 @@ public class VariationsSeedFetcher { +@@ -503,7 +481,7 @@ public class VariationsSeedFetcher { * @param curSeedInfo optional currently saved seed info to set the `If-None-Match` header. * @return the object holds the request result and seed data with its related header fields. */ -- public SeedFetchInfo downloadContent(@VariationsPlatform int platform, String restrictMode, -+ private SeedFetchInfo downloadContent(@VariationsPlatform int platform, String restrictMode, - String milestone, String channel, @Nullable SeedInfo curSeedInfo) { +- public SeedFetchInfo downloadContent(SeedFetchParameters params, SeedInfo currInfo) { ++ private SeedFetchInfo downloadContent(SeedFetchParameters params, SeedInfo currInfo) { SeedFetchInfo fetchInfo = new SeedFetchInfo(); HttpURLConnection connection = null; + try { diff --git a/components/variations/net/BUILD.gn b/components/variations/net/BUILD.gn --- a/components/variations/net/BUILD.gn +++ b/components/variations/net/BUILD.gn @@ -215,7 +221,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc --- a/components/variations/service/variations_service.cc +++ b/components/variations/service/variations_service.cc -@@ -219,17 +219,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers, +@@ -220,17 +220,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers, // Variations seed fetching is only enabled in official Chrome builds, if a URL // is specified on the command line, and for testing. bool IsFetchingEnabled() { @@ -235,7 +241,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va } // Returns the already downloaded first run seed, and clear the seed from the -@@ -590,7 +581,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) { +@@ -591,7 +582,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) { // debugger or if the machine was suspended) and OnURLFetchComplete() hasn't // had a chance to run yet from the previous request. In this case, don't // start a new request and just let the previous one finish. @@ -271,7 +277,7 @@ diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/brow 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 -@@ -823,8 +823,8 @@ BASE_FEATURE(kPepperCrossOriginRedirectRestriction, +@@ -826,8 +826,8 @@ BASE_FEATURE(kPepperCrossOriginRedirectRestriction, // things before receiving the response, for instance it can affect the next // navigation's network request. BASE_FEATURE(kPersistentOriginTrials, diff --git a/build/patches/Disable-idle-detection.patch b/build/patches/Disable-idle-detection.patch index d315eb49..b44e2965 100644 --- a/build/patches/Disable-idle-detection.patch +++ b/build/patches/Disable-idle-detection.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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 -@@ -559,7 +559,7 @@ BASE_FEATURE(kHandleRendererThreadTypeChangesInBrowser, +@@ -567,7 +567,7 @@ BASE_FEATURE(kHandleRendererThreadTypeChangesInBrowser, // This is intended as a kill switch for the Idle Detection feature. To enable // this feature, the experimental web platform features flag should be set, // or the site should obtain an Origin Trial token. diff --git a/build/patches/Disable-lock-icon-in-address-bar-by-default.patch b/build/patches/Disable-lock-icon-in-address-bar-by-default.patch index 01bcbb76..dceca004 100644 --- a/build/patches/Disable-lock-icon-in-address-bar-by-default.patch +++ b/build/patches/Disable-lock-icon-in-address-bar-by-default.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -578,8 +578,8 @@ BASE_FEATURE(kSiteSearchStarterPack, +@@ -642,8 +642,8 @@ BASE_FEATURE(kSiteSearchStarterPack, // Experiment to introduce new security indicators for HTTPS. BASE_FEATURE(kUpdatedConnectionSecurityIndicators, diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch index 18b09d49..b4ed53bb 100644 --- a/build/patches/Disable-media-router-and-remoting-by-default.patch +++ b/build/patches/Disable-media-router-and-remoting-by-default.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc --- a/chrome/browser/media/router/media_router_feature.cc +++ b/chrome/browser/media/router/media_router_feature.cc -@@ -72,26 +72,15 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop, +@@ -79,26 +79,15 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop, #endif // BUILDFLAG(IS_CHROMEOS) #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse #if !BUILDFLAG(IS_ANDROID) if (!base::FeatureList::IsEnabled(kMediaRouter)) return false; -@@ -128,7 +117,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) { +@@ -135,7 +124,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) { return allowed; } return true; @@ -54,7 +54,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse #if !BUILDFLAG(IS_ANDROID) void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { -@@ -140,7 +129,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -147,7 +136,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "", PrefRegistry::PUBLIC); registry->RegisterBooleanPref( @@ -66,7 +66,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.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 -@@ -417,7 +417,7 @@ void ProfileImpl::RegisterProfilePrefs( +@@ -420,7 +420,7 @@ void ProfileImpl::RegisterProfilePrefs( #endif registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false); diff --git a/build/patches/Disable-offline-pages-in-CCT.patch b/build/patches/Disable-offline-pages-in-CCT.patch index eff4c059..78b6cc65 100644 --- a/build/patches/Disable-offline-pages-in-CCT.patch +++ b/build/patches/Disable-offline-pages-in-CCT.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc --- a/components/offline_pages/core/offline_page_feature.cc +++ b/components/offline_pages/core/offline_page_feature.cc -@@ -41,8 +41,8 @@ BASE_FEATURE(kOfflinePagesDescriptivePendingStatusFeature, +@@ -37,8 +37,8 @@ BASE_FEATURE(kOfflinePagesDescriptivePendingStatusFeature, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kOfflinePagesInDownloadHomeOpenInCctFeature, diff --git a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch index 9d2a2afd..9c6b78d1 100644 --- a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch +++ b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc -@@ -281,5 +281,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() { +@@ -289,5 +289,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() { // static void ChromeLocationBarModelDelegate::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { diff --git a/build/patches/Disable-plugins-enumeration.patch b/build/patches/Disable-plugins-enumeration.patch index c9fdbf0e..6df95c35 100644 --- a/build/patches/Disable-plugins-enumeration.patch +++ b/build/patches/Disable-plugins-enumeration.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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 -@@ -1997,9 +1997,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -1993,9 +1993,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { } PluginData* LocalFrame::GetPluginData() const { diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index c7ef907f..7ab9b1ae 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -42,7 +42,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc 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 -@@ -192,6 +192,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -200,6 +200,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kCCTClientDataHeader, &kCCTFeatureUsage, &kCCTIncognito, @@ -50,9 +50,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCCTIncognitoAvailableToThirdParty, &kCCTIntentFeatureOverrides, &kCCTNewDownloadTab, -@@ -1026,6 +1027,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn, +@@ -1075,6 +1076,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn, "DiscoverFeedMultiColumn", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); +BASE_FEATURE(kChromeSmartSelection, + "ChromeSmartSelection", @@ -64,7 +64,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -70,6 +70,7 @@ BASE_DECLARE_FEATURE(kCCTToolbarCustomizations); +@@ -73,6 +73,7 @@ BASE_DECLARE_FEATURE(kCCTToolbarCustomizations); BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls); BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting); BASE_DECLARE_FEATURE(kChromeNewDownloadTab); @@ -86,7 +86,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 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 -@@ -831,7 +831,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper +@@ -835,7 +835,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper menu.removeItem(R.id.select_action_menu_share); } @@ -98,7 +98,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json -@@ -3060,6 +3060,21 @@ +@@ -3237,6 +3237,21 @@ ] } ], diff --git a/build/patches/Disable-some-signed-exchange-features.patch b/build/patches/Disable-some-signed-exchange-features.patch index 083b8a3c..06ad9b4f 100644 --- a/build/patches/Disable-some-signed-exchange-features.patch +++ b/build/patches/Disable-some-signed-exchange-features.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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 -@@ -1138,14 +1138,14 @@ BASE_FEATURE(kShouldAllowFirstPartyStorageKeyOverrideFromEmbedder, +@@ -1165,14 +1165,14 @@ BASE_FEATURE(kShouldAllowFirstPartyStorageKeyOverrideFromEmbedder, // Signed Exchange Reporting for distributors // https://www.chromestatus.com/feature/5687904902840320 BASE_FEATURE(kSignedExchangeReportingForDistributors, diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch index fd6df9b2..c814d57c 100644 --- a/build/patches/Disable-text-fragments-by-default.patch +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -6352,6 +6352,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6550,6 +6550,11 @@ const FeatureEntry kFeatureEntries[] = { "")}, #endif @@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -2831,6 +2831,11 @@ +@@ -2918,6 +2918,11 @@ "owners": [ "robsc", "napper", "alanlxl" ], "expiry_milestone": 130 }, @@ -52,7 +52,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1332,6 +1332,10 @@ extern const char kDropInputEventsBeforeFirstPaintDescription[] = +@@ -1383,6 +1383,10 @@ extern const char kDropInputEventsBeforeFirstPaintDescription[] = "intentionally interact with elements on that page. By dropping the events " "we prevent accidental interaction with a page the user has not seen yet."; @@ -66,7 +66,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -742,6 +742,9 @@ extern const char kReduceHorizontalFlingVelocityDescription[]; +@@ -773,6 +773,9 @@ extern const char kReduceHorizontalFlingVelocityDescription[]; extern const char kRetailCouponsName[]; extern const char kRetailCouponsDescription[]; @@ -91,7 +91,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre 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 -@@ -290,6 +290,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() { +@@ -291,6 +291,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() { raw_ref(autofill::features::kAutofillSharedAutofill)}, {wf::EnableTouchDragAndContextMenu, raw_ref(features::kTouchDragAndContextMenu)}, @@ -103,7 +103,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. 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 -@@ -520,6 +520,11 @@ BASE_FEATURE(kDroppedTouchSequenceIncludesTouchEnd, +@@ -514,6 +514,11 @@ BASE_FEATURE(kDroppedTouchSequenceIncludesTouchEnd, "DroppedTouchSequenceIncludesTouchEnd", base::FEATURE_DISABLED_BY_DEFAULT); @@ -118,7 +118,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 -@@ -247,6 +247,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV); +@@ -228,6 +228,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeLossyWebPImagesToYUV); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebFontsCacheAwareTimeoutAdaption); @@ -129,7 +129,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ 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 -@@ -4302,9 +4302,14 @@ void Document::SetURL(const KURL& url) { +@@ -4331,9 +4331,14 @@ void Document::SetURL(const KURL& url) { TRACE_EVENT1("navigation", "Document::SetURL", "url", new_url.GetString().Utf8()); @@ -147,7 +147,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink 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 -@@ -3320,10 +3320,9 @@ +@@ -3374,10 +3374,9 @@ }, { name: "TextFragmentIdentifiers", diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch index a5d7e112..97ede956 100644 --- a/build/patches/Disable-third-party-origin-trials.patch +++ b/build/patches/Disable-third-party-origin-trials.patch @@ -44,7 +44,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl. diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.h b/components/embedder_support/origin_trials/origin_trial_policy_impl.h --- a/components/embedder_support/origin_trials/origin_trial_policy_impl.h +++ b/components/embedder_support/origin_trials/origin_trial_policy_impl.h -@@ -34,11 +34,11 @@ class OriginTrialPolicyImpl : public blink::OriginTrialPolicy { +@@ -34,13 +34,13 @@ class OriginTrialPolicyImpl : public blink::OriginTrialPolicy { bool IsTokenDisabled(base::StringPiece token_signature) const override; bool IsOriginSecure(const GURL& url) const override; @@ -53,6 +53,8 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl. bool SetDisabledFeatures(const std::string& disabled_feature_list); bool SetDisabledTokens(const std::string& disabled_token_list); + const std::set* GetDisabledTokensForTesting() const override; + - private: std::vector public_keys_; std::set disabled_features_; @@ -60,7 +62,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 -@@ -7984,7 +7984,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() { +@@ -8138,7 +8138,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() { void NavigationRequest::ForceEnableOriginTrials( const std::vector& trials) { DCHECK(!HasCommitted()); @@ -71,7 +73,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows 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 -@@ -475,10 +475,6 @@ void FillNavigationParamsRequest( +@@ -474,10 +474,6 @@ void FillNavigationParamsRequest( common_params.initiator_origin.value(); } @@ -82,7 +84,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra navigation_params->was_discarded = commit_params.was_discarded; navigation_params->document_ukm_source_id = commit_params.document_ukm_source_id; -@@ -506,12 +502,6 @@ void FillNavigationParamsRequest( +@@ -505,12 +501,6 @@ void FillNavigationParamsRequest( navigation_params->had_transient_user_activation = common_params.has_user_gesture; @@ -95,7 +97,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra if (!commit_params.early_hints_preloaded_resources.empty()) { navigation_params->early_hints_preloaded_resources = WebVector(); for (const auto& resource : commit_params.early_hints_preloaded_resources) { -@@ -572,11 +562,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( +@@ -580,11 +570,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( info->url_request.GetURLRequestExtraData().get()); DCHECK(url_request_extra_data); @@ -107,14 +109,14 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra blink::NavigationDownloadPolicy download_policy; download_policy.ApplyDownloadFramePolicy( info->is_opener_navigation, info->url_request.HasUserGesture(), -@@ -598,7 +583,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( +@@ -607,7 +592,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( info->url_request.HasUserGesture(), info->url_request.HasTextFragmentToken(), info->should_check_main_world_content_security_policy, - initiator_origin_trial_features, info->href_translate.Latin1(), + /*initiator_origin_trial_features*/std::vector(), info->href_translate.Latin1(), is_history_navigation_in_new_child_frame, info->input_start, - request_destination, info->has_storage_access); + request_destination); } diff --git a/content/shell/common/shell_origin_trial_policy.cc b/content/shell/common/shell_origin_trial_policy.cc --- a/content/shell/common/shell_origin_trial_policy.cc @@ -192,7 +194,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p return result; } -@@ -2751,10 +2738,6 @@ void DocumentLoader::CreateParserPostCommit() { +@@ -2774,10 +2761,6 @@ void DocumentLoader::CreateParserPostCommit() { OriginTrialFeature::kTouchEventFeatureDetection); } diff --git a/build/patches/Disable-update-scheduler.patch b/build/patches/Disable-update-scheduler.patch index 2978b059..ae17c6d2 100644 --- a/build/patches/Disable-update-scheduler.patch +++ b/build/patches/Disable-update-scheduler.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/background_task_scheduler/ChromeBackgroundTaskFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java -@@ -66,7 +66,7 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory { +@@ -63,7 +63,7 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory { case TaskIds.WEBAPK_UPDATE_JOB_ID: return new WebApkUpdateTask(); case TaskIds.COMPONENT_UPDATE_JOB_ID: diff --git a/build/patches/Disable-various-metrics.patch b/build/patches/Disable-various-metrics.patch index 4b48deaf..f669cbd5 100644 --- a/build/patches/Disable-various-metrics.patch +++ b/build/patches/Disable-various-metrics.patch @@ -89,7 +89,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br 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 -@@ -1057,7 +1057,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -1030,7 +1030,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { #endif // BUILDFLAG(IS_CHROMEOS_ASH) registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, @@ -101,7 +101,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro 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 -@@ -72,7 +72,6 @@ +@@ -75,7 +75,6 @@ #include "chrome/browser/hid/chrome_hid_delegate.h" #include "chrome/browser/interstitials/enterprise_util.h" #include "chrome/browser/lifetime/browser_shutdown.h" @@ -109,7 +109,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/media/audio_service_util.h" #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h" -@@ -4886,16 +4885,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4956,16 +4955,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( content::NavigationHandle* handle) { std::vector> throttles; @@ -126,7 +126,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if BUILDFLAG(ENABLE_SUPERVISED_USERS) MaybeAddThrottle( SupervisedUserNavigationThrottle::MaybeCreateThrottleFor(handle), -@@ -4974,10 +4963,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -5044,10 +5033,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles); } @@ -204,7 +204,7 @@ diff --git a/services/metrics/public/cpp/ukm_recorder.cc b/services/metrics/publ -BASE_FEATURE(kUkmFeature, "Ukm", base::FEATURE_ENABLED_BY_DEFAULT); +BASE_FEATURE(kUkmFeature, "Ukm", base::FEATURE_DISABLED_BY_DEFAULT); // disabled in Bromite - UkmRecorder::UkmRecorder() = default; - + BASE_FEATURE(kUkmReduceAddEntryIPC, + "UkmReduceAddEntryIPC", -- 2.25.1 diff --git a/build/patches/Do-not-build-API-keys-infobar.patch b/build/patches/Do-not-build-API-keys-infobar.patch index 98ba1fc8..2c6c28aa 100644 --- a/build/patches/Do-not-build-API-keys-infobar.patch +++ b/build/patches/Do-not-build-API-keys-infobar.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/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1286,8 +1286,6 @@ static_library("ui") { +@@ -1293,8 +1293,6 @@ static_library("ui") { "singleton_tabs.h", "startup/automation_infobar_delegate.cc", "startup/automation_infobar_delegate.h", diff --git a/build/patches/Do-not-compile-QR-code-sharing.patch b/build/patches/Do-not-compile-QR-code-sharing.patch index 628b9e09..352f898f 100644 --- a/build/patches/Do-not-compile-QR-code-sharing.patch +++ b/build/patches/Do-not-compile-QR-code-sharing.patch @@ -13,7 +13,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/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 -@@ -101,7 +101,6 @@ import org.chromium.chrome.browser.share.ShareButtonController; +@@ -102,7 +102,6 @@ import org.chromium.chrome.browser.share.ShareButtonController; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin; import org.chromium.chrome.browser.share.ShareUtils; @@ -21,7 +21,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager; import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler; import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController; -@@ -511,10 +510,6 @@ public class RootUiCoordinator +@@ -513,10 +512,6 @@ public class RootUiCoordinator } public void onAttachFragment(Fragment fragment) { @@ -35,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java -@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.preferences.Pref; +@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ChromeShareExtras.DetailedContentType; import org.chromium.chrome.browser.share.ShareContentTypeHelper.ContentType; @@ -43,17 +43,17 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge; import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator; import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback; -@@ -279,9 +278,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -283,9 +282,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { } private void maybeAddQrCodeFirstPartyOption() { -- if (!mIsIncognito) { +- if (!mIsIncognito && !TextUtils.isEmpty(mUrl)) { - mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption()); - } } private void maybeAddScreenshotFirstPartyOption() { -@@ -393,20 +389,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -426,20 +422,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { .build(); } diff --git a/build/patches/Do-not-link-with-libatomic.patch b/build/patches/Do-not-link-with-libatomic.patch index a753716d..858209d5 100644 --- a/build/patches/Do-not-link-with-libatomic.patch +++ b/build/patches/Do-not-link-with-libatomic.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1107,7 +1107,7 @@ component("base") { +@@ -1102,7 +1102,7 @@ component("base") { # more robust check for this. if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) && host_toolchain != "//build/toolchain/cros:host") { diff --git a/build/patches/Do-not-store-passwords-by-default.patch b/build/patches/Do-not-store-passwords-by-default.patch index bccb1234..62b3c3b1 100644 --- a/build/patches/Do-not-store-passwords-by-default.patch +++ b/build/patches/Do-not-store-passwords-by-default.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -256,14 +256,14 @@ base::CallbackListSubscription AddSyncEnabledOrDisabledCallback( +@@ -257,14 +257,14 @@ base::CallbackListSubscription AddSyncEnabledOrDisabledCallback( void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -27,9 +27,9 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(), PrefRegistry::NO_REGISTRATION_FLAGS); -@@ -305,9 +305,9 @@ void PasswordManager::RegisterProfilePrefs( - prefs::kPasswordDismissCompromisedAlertEnabled, true, +@@ -307,9 +307,9 @@ void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + registry->RegisterBooleanPref(prefs::kPasswordsPrefWithNewLabelUsed, false); #if BUILDFLAG(IS_ANDROID) - registry->RegisterBooleanPref(prefs::kOfferToSavePasswordsEnabledGMS, true); + registry->RegisterBooleanPref(prefs::kOfferToSavePasswordsEnabledGMS, false); diff --git a/build/patches/DoH-improvements.patch b/build/patches/DoH-improvements.patch index a595fd02..8157090d 100644 --- a/build/patches/DoH-improvements.patch +++ b/build/patches/DoH-improvements.patch @@ -82,7 +82,7 @@ diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -2961,6 +2961,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) { +@@ -3192,6 +3192,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) { bool changed = dns_client_->SetConfigOverrides(std::move(overrides)); if (changed) { diff --git a/build/patches/Enable-Certificate-Transparency.patch b/build/patches/Enable-Certificate-Transparency.patch index 4373ab7b..0abaaee9 100644 --- a/build/patches/Enable-Certificate-Transparency.patch +++ b/build/patches/Enable-Certificate-Transparency.patch @@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -8859,6 +8859,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9131,6 +9131,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebMidiDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebMidi)}, #if BUILDFLAG(IS_ANDROID) @@ -39,7 +39,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 -@@ -173,8 +173,8 @@ BASE_FEATURE(kWebUsbDeviceDetection, +@@ -176,8 +176,8 @@ BASE_FEATURE(kWebUsbDeviceDetection, #if BUILDFLAG(IS_ANDROID) // Enables Certificate Transparency on Android. BASE_FEATURE(kCertificateTransparencyAndroid, @@ -53,7 +53,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6828,6 +6828,10 @@ const char kAutofillCreditCardUploadDescription[] = +@@ -7127,6 +7127,10 @@ const char kAutofillCreditCardUploadDescription[] = #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) @@ -67,7 +67,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3977,6 +3977,9 @@ extern const char kAutofillCreditCardUploadDescription[]; +@@ -4142,6 +4142,9 @@ extern const char kAutofillCreditCardUploadDescription[]; #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) @@ -80,7 +80,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -918,7 +918,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( +@@ -929,7 +929,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { if (certificate_transparency_enabled_for_testing_.has_value()) return certificate_transparency_enabled_for_testing_.value(); @@ -88,7 +88,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows // TODO(carlosil): Figure out if we can/should remove the OFFICIAL_BUILD and // GOOGLE_CHROME_BRANDING checks now that enforcement does not rely on build // dates, and allow embedders to enforce. -@@ -932,9 +931,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { +@@ -943,9 +942,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { #else return true; #endif // BUILDFLAG(IS_ANDROID) @@ -97,7 +97,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows -#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) && defined(OFFICIAL_BUILD) } - network::mojom::NetworkContextParamsPtr + #if BUILDFLAG(CHROME_ROOT_STORE_OPTIONAL) diff --git a/chrome/browser/ssl/sct_reporting_service.cc b/chrome/browser/ssl/sct_reporting_service.cc --- a/chrome/browser/ssl/sct_reporting_service.cc +++ b/chrome/browser/ssl/sct_reporting_service.cc @@ -116,7 +116,7 @@ diff --git a/chrome/browser/ssl/sct_reporting_service.cc b/chrome/browser/ssl/sc 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 -@@ -989,11 +989,7 @@ BASE_FEATURE(kSchedulerConfiguration, +@@ -997,11 +997,7 @@ BASE_FEATURE(kSchedulerConfiguration, // Controls whether SCT audit reports are queued and the rate at which they // should be sampled. Default sampling rate is 1/10,000 certificates. @@ -167,7 +167,7 @@ diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.cc 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 -@@ -2566,7 +2566,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2579,7 +2579,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( // TransportSecurityState. Since no requests have been made yet, safe to do // this even after the call to Build(). diff --git a/build/patches/Enable-HEVC-by-default.patch b/build/patches/Enable-HEVC-by-default.patch index 1e59c8ae..28d48a53 100644 --- a/build/patches/Enable-HEVC-by-default.patch +++ b/build/patches/Enable-HEVC-by-default.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -318,8 +318,8 @@ BASE_FEATURE(kEnableTabMuting, +@@ -328,8 +328,8 @@ BASE_FEATURE(kEnableTabMuting, #if BUILDFLAG(ENABLE_PLATFORM_HEVC) // Enables HEVC hardware accelerated decoding. BASE_FEATURE(kPlatformHEVCDecoderSupport, diff --git a/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch b/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch index 04ea0aff..f00b0397 100644 --- a/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch +++ b/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1040,12 +1040,8 @@ BASE_FEATURE(kSecurityKeyAttestationPrompt, +@@ -1048,12 +1048,8 @@ BASE_FEATURE(kSecurityKeyAttestationPrompt, // TODO(alexmos): Move this and the other site isolation features below to // browser_features, as they are only used on the browser side. BASE_FEATURE(kSitePerProcess, @@ -29,7 +29,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc diff --git a/components/site_isolation/features.cc b/components/site_isolation/features.cc --- a/components/site_isolation/features.cc +++ b/components/site_isolation/features.cc -@@ -64,8 +64,8 @@ BASE_FEATURE(kSiteIsolationForOAuthSites, +@@ -60,8 +60,8 @@ BASE_FEATURE(kSiteIsolationForOAuthSites, // kSitePerProcess won't be checked at all, and field trials won't activate // either the control or the experiment group. BASE_FEATURE(kSiteIsolationMemoryThresholds, diff --git a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch index fdd0a592..2816b553 100644 --- a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch +++ b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch @@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -4450,9 +4450,6 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4555,9 +4555,6 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid, FEATURE_VALUE_TYPE( site_isolation::features::kSiteIsolationForPasswordSites)}, @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -1553,7 +1553,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1595,7 +1595,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath()); registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0); registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); @@ -40,7 +40,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch registry->RegisterBooleanPref(prefs::kTabFreezingEnabled, true); registry->RegisterIntegerPref(prefs::kSCTAuditingHashdanceReportCount, 0); registry->RegisterBooleanPref( -@@ -1581,7 +1581,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( +@@ -1623,7 +1623,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( // user policy in addition to the same named ones in Local State (which are // used for mapping the command-line flags). registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); @@ -52,26 +52,26 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/components/site_isolation/site_isolation_policy.cc b/components/site_isolation/site_isolation_policy.cc --- a/components/site_isolation/site_isolation_policy.cc +++ b/components/site_isolation/site_isolation_policy.cc -@@ -169,6 +169,7 @@ bool SiteIsolationPolicy::IsIsolationForOAuthSitesEnabled() { +@@ -164,6 +164,7 @@ bool SiteIsolationPolicy::IsIsolationForOAuthSitesEnabled() { // static bool SiteIsolationPolicy::IsEnterprisePolicyApplicable() { + if ((true)) return true; #if BUILDFLAG(IS_ANDROID) // https://crbug.com/844118: Limiting policy to devices with > 1GB RAM. - // Using 1077 rather than 1024 because 1) it helps ensure that devices with -@@ -184,6 +185,7 @@ bool SiteIsolationPolicy::IsEnterprisePolicyApplicable() { + // Using 1077 rather than 1024 because it helps ensure that devices with +@@ -179,6 +180,7 @@ bool SiteIsolationPolicy::IsEnterprisePolicyApplicable() { // static bool SiteIsolationPolicy::ShouldDisableSiteIsolationDueToMemoryThreshold( content::SiteIsolationMode site_isolation_mode) { + if ((true)) return false; - static const bool cache_memory_threshold_decision = - ShouldCacheMemoryThresholdDecision(); - if (!g_disallow_memory_threshold_caching && cache_memory_threshold_decision) { + if (!g_disallow_memory_threshold_caching_for_testing) { + return CachedDisableSiteIsolation(site_isolation_mode); + } 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 -@@ -1241,8 +1241,8 @@ BASE_FEATURE(kStopVideoCaptureOnScreenLock, +@@ -1263,8 +1263,8 @@ BASE_FEATURE(kStopVideoCaptureOnScreenLock, // Controls whether site isolation should use origins instead of scheme and // eTLD+1. BASE_FEATURE(kStrictOriginIsolation, diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index 0c696373..e25f1f63 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -13,7 +13,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 -@@ -1332,9 +1332,9 @@ +@@ -1373,9 +1373,9 @@ "expiry_milestone": 115 }, { @@ -25,7 +25,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js + "expiry_milestone": -1 }, { - "name": "dcheck-is-fatal", + "name": "data-retention-policies-disable-sync-types-needed", diff --git a/components/content_settings/core/common/features.cc b/components/content_settings/core/common/features.cc --- a/components/content_settings/core/common/features.cc +++ b/components/content_settings/core/common/features.cc diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index fead46ca..2dac9e25 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -42,7 +42,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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 -@@ -213,7 +213,8 @@ AwBrowserPermissionRequestDelegate* AwBrowserPermissionRequestDelegate::FromID( +@@ -212,7 +212,8 @@ AwBrowserPermissionRequestDelegate* AwBrowserPermissionRequestDelegate::FromID( AwSafeBrowsingUIManager::UIManagerClient* AwSafeBrowsingUIManager::UIManagerClient::FromWebContents( WebContents* web_contents) { @@ -55,7 +55,7 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -342,6 +342,7 @@ if (current_toolchain == default_toolchain) { +@@ -317,6 +317,7 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/ui/android/favicon:java", "//chrome/browser/ui/android/layouts:java", "//chrome/browser/ui/android/layouts/glue:java", @@ -219,7 +219,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav /** * Creates an instance of a {@link TabImpl}. * -@@ -777,6 +790,11 @@ public class TabImpl implements Tab { +@@ -796,6 +809,11 @@ public class TabImpl implements Tab { for (TabObserver observer : mObservers) observer.onDestroyed(this); mObservers.clear(); @@ -231,7 +231,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav mUserDataHost.destroy(); mTabViewManager.destroy(); hideNativePage(false, null); -@@ -1356,6 +1374,16 @@ public class TabImpl implements Tab { +@@ -1393,6 +1411,16 @@ public class TabImpl implements Tab { return tabsPtrArray; } @@ -248,7 +248,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav /** * Initializes the {@link WebContents}. Completes the browser content components initialization * around a native WebContents pointer. -@@ -1405,6 +1433,27 @@ public class TabImpl implements Tab { +@@ -1442,6 +1470,27 @@ public class TabImpl implements Tab { mDelegateFactory.createContextMenuPopulatorFactory(this), this)); mWebContents.notifyRendererPreferenceUpdate(); @@ -276,7 +276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav TabHelpers.initWebContentsHelpers(this); notifyContentChanged(); } finally { -@@ -1747,6 +1796,7 @@ public class TabImpl implements Tab { +@@ -1784,6 +1833,7 @@ public class TabImpl implements Tab { void setActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url, String title); void loadOriginalImage(long nativeTabAndroid); boolean handleNonNavigationAboutURL(GURL url); @@ -376,7 +376,7 @@ diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_a 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 -@@ -622,6 +622,12 @@ CHAR_LIMIT guidelines: +@@ -616,6 +616,12 @@ CHAR_LIMIT guidelines: Save passwords @@ -392,7 +392,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro 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 -@@ -1184,7 +1184,13 @@ ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents) +@@ -1159,7 +1159,13 @@ ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents) web_contents, base::BindRepeating(&BrowserDriverInitHook, this, @@ -410,7 +410,7 @@ diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/brows 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 -@@ -162,6 +162,9 @@ +@@ -164,6 +164,9 @@ #include "chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h" #include "chrome/browser/video_tutorials/video_tutorial_tab_helper.h" #include "content/public/common/content_features.h" @@ -419,7 +419,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc +#include "components/android_autofill/browser/autofill_provider_android.h" #else #include "chrome/browser/banners/app_banner_manager_desktop.h" - #include "chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper.h" + #include "chrome/browser/companion/core/features.h" diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/components/android_autofill/browser/android_autofill_manager.cc --- a/components/android_autofill/browser/android_autofill_manager.cc +++ b/components/android_autofill/browser/android_autofill_manager.cc @@ -435,7 +435,7 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/c diff --git a/components/android_autofill/browser/android_autofill_manager.h b/components/android_autofill/browser/android_autofill_manager.h --- a/components/android_autofill/browser/android_autofill_manager.h +++ b/components/android_autofill/browser/android_autofill_manager.h -@@ -86,12 +86,12 @@ class AndroidAutofillManager : public AutofillManager { +@@ -85,12 +85,12 @@ class AndroidAutofillManager : public AutofillManager { const FieldTypeGroup field_type_group, const url::Origin& triggered_origin); @@ -571,7 +571,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -597,6 +625,8 @@ void ContentAutofillDriver::DidNavigateFrame( +@@ -575,6 +603,8 @@ void ContentAutofillDriver::Reset() { submitted_forms_.clear(); autofill_router_->UnregisterDriver(this); autofill_manager_->Reset(); @@ -583,7 +583,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h --- a/components/autofill/content/browser/content_autofill_driver.h +++ b/components/autofill/content/browser/content_autofill_driver.h -@@ -126,10 +126,13 @@ class ContentAutofillDriver : public AutofillDriver, +@@ -125,10 +125,13 @@ class ContentAutofillDriver : public AutofillDriver, ContentAutofillDriver& operator=(const ContentAutofillDriver&) = delete; ~ContentAutofillDriver() override; @@ -598,7 +598,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com content::RenderFrameHost* render_frame_host() { return render_frame_host_; } -@@ -345,6 +348,10 @@ class ContentAutofillDriver : public AutofillDriver, +@@ -343,6 +346,10 @@ class ContentAutofillDriver : public AutofillDriver, // code. std::unique_ptr autofill_manager_ = nullptr; @@ -653,7 +653,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory 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 -@@ -807,7 +807,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange( +@@ -778,7 +778,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange( void PasswordAutofillAgent::TrackAutofilledElement( const blink::WebFormControlElement& element) { @@ -668,9 +668,9 @@ diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/c 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 -@@ -106,6 +106,10 @@ const char kAutofillWalletImportEnabled[] = "autofill.wallet_import_enabled"; - const char kAutocompleteLastVersionRetentionPolicy[] = - "autocomplete.retention_policy_last_version"; +@@ -120,6 +120,10 @@ const char kAutofillPaymentMethodsMandatoryReauthPromoShownCounter[] = + "autofill.payment_methods_mandatory_reauth_promo_counter"; + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) +// Boolean that is true to enable native Android Autofill +const char kAutofillAndroidEnabled[] = "autofill.android_autofill_enabled"; @@ -679,7 +679,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Synced prefs. Used for cross-device choices, e.g., credit card Autofill. registry->RegisterBooleanPref( -@@ -135,6 +139,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -149,6 +153,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { prefs::kAutofillCreditCardFidoAuthOfferCheckboxState, true); #endif registry->RegisterBooleanPref(prefs::kAutofillWalletImportEnabled, true); @@ -697,15 +697,15 @@ diff --git a/components/autofill/core/common/autofill_prefs.h b/components/autof extern const char kAutocompleteLastVersionRetentionPolicy[]; +extern const char kAutofillAndroidEnabled[]; +extern const char kAutofillAndroidIncognitoEnabled[]; - - namespace sync_transport_opt_in { - enum Flags { + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) + extern const char kAutofillPaymentMethodsMandatoryReauth[]; + extern const char kAutofillPaymentMethodsMandatoryReauthPromoShownCounter[]; 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 -@@ -37,6 +37,11 @@ import org.chromium.ui.accessibility.AccessibilityState; - import org.chromium.ui.base.EventForwarder; +@@ -38,6 +38,11 @@ import org.chromium.ui.base.EventForwarder; import org.chromium.ui.base.EventOffsetHandler; + import org.chromium.ui.dragdrop.DragEventDispatchHelper.DragEventDispatchDestination; +import org.chromium.base.Log; +import android.util.SparseArray; @@ -715,7 +715,7 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component /** * The containing view for {@link WebContents} that exists in the Android UI hierarchy and exposes * the various {@link View} functionality to it. -@@ -86,6 +91,8 @@ public class ContentView extends FrameLayout +@@ -89,6 +94,8 @@ public class ContentView extends FrameLayout */ public static ContentView createContentView(Context context, @Nullable EventOffsetHandler eventOffsetHandler, @Nullable WebContents webContents) { @@ -724,9 +724,9 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component return new ContentView(context, eventOffsetHandler, webContents); } -@@ -586,4 +593,43 @@ public class ContentView extends FrameLayout - private boolean webContentsAttached() { - return hasValidWebContents() && mWebContents.getTopLevelNativeWindow() != null; +@@ -619,4 +626,43 @@ public class ContentView extends FrameLayout + mDragDropEventOffsetHandler.onPostDispatchDragEvent(event.getAction()); + return ret; } + + /** @@ -782,7 +782,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b /** * Class to acquire, position, and remove anchor views from the implementing View. */ -@@ -612,4 +616,8 @@ public class ViewAndroidDelegate { +@@ -620,4 +624,8 @@ public class ViewAndroidDelegate { public static void setDragAndDropDelegateForTest(DragAndDropDelegate testDelegate) { sDragAndDropTestDelegate = testDelegate; } diff --git a/build/patches/Enable-prefetch-privacy-changes-by-default.patch b/build/patches/Enable-prefetch-privacy-changes-by-default.patch index 3a1cb833..9794fdea 100644 --- a/build/patches/Enable-prefetch-privacy-changes-by-default.patch +++ b/build/patches/Enable-prefetch-privacy-changes-by-default.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -533,8 +533,8 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissal, +@@ -527,8 +527,8 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissal, // Prefetch request properties are updated to be privacy-preserving. See // crbug.com/988956. BASE_FEATURE(kPrefetchPrivacyChanges, diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index 37b6b962..087d1c65 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -32,7 +32,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 -@@ -589,6 +589,7 @@ chrome_java_resources = [ +@@ -597,6 +597,7 @@ chrome_java_resources = [ "java/res/layout/signin_activity.xml", "java/res/layout/status_indicator_container.xml", "java/res/layout/suggestions_tile_view_condensed.xml", @@ -43,7 +43,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 -@@ -1016,6 +1016,7 @@ chrome_java_sources = [ +@@ -1020,6 +1020,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/signin/SyncConsentActivity.java", "java/src/org/chromium/chrome/browser/signin/SyncConsentActivityLauncherImpl.java", "java/src/org/chromium/chrome/browser/signin/SyncConsentFragment.java", @@ -54,8 +54,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java 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 -@@ -802,6 +802,24 @@ by a child template that "extends" this file. - android:process=":browser_restart_process"> +@@ -373,6 +373,24 @@ by a child template that "extends" this file. + + + + - <resetlink>reset sync

<resetlink>reset sync

diff --git a/build/patches/Enable-third-party-storage-partitioning.patch b/build/patches/Enable-third-party-storage-partitioning.patch index f86880e1..a37605aa 100644 --- a/build/patches/Enable-third-party-storage-partitioning.patch +++ b/build/patches/Enable-third-party-storage-partitioning.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -274,8 +274,8 @@ BASE_FEATURE(kBlockSetCookieHeader, +@@ -265,8 +265,8 @@ BASE_FEATURE(kBlockSetCookieHeader, // Enables partitioning of third party storage (IndexedDB, CacheStorage, etc.) // by the top level site to reduce fingerprinting. BASE_FEATURE(kThirdPartyStoragePartitioning, diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index af28a759..6931bd1a 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -225,7 +225,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 -@@ -179,6 +179,9 @@ if (current_toolchain == default_toolchain) { +@@ -169,6 +169,9 @@ if (current_toolchain == default_toolchain) { "//third_party/androidx:androidx_gridlayout_gridlayout_java", "//third_party/androidx:androidx_preference_preference_java", ] @@ -234,8 +234,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn + deps += [ "//components/user_scripts/android:java_resources" ] } - if (enable_vr) { -@@ -491,6 +494,7 @@ if (current_toolchain == default_toolchain) { + android_library("app_hooks_java") { +@@ -468,6 +471,7 @@ if (current_toolchain == default_toolchain) { "//components/ukm/android:java", "//components/url_formatter/android:url_formatter_java", "//components/user_prefs/android:java", @@ -312,8 +312,8 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni # Only used for testing, should not be shipped to end users. if (enable_offline_pages_harness) { -@@ -53,3 +54,5 @@ if (enable_arcore) { - "java/src/org/chromium/chrome/browser/vr/ArCompositorDelegateProviderImpl.java", +@@ -60,3 +61,5 @@ if (enable_cardboard) { + "java/src/org/chromium/chrome/browser/vr/VrCompositorDelegateProviderImpl.java", ] } + @@ -321,7 +321,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3465,6 +3465,11 @@ static_library("browser") { +@@ -3467,6 +3467,11 @@ static_library("browser") { ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ] } @@ -336,7 +336,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 -@@ -160,6 +160,7 @@ +@@ -161,6 +161,7 @@ #include "components/ui_devtools/switches.h" #include "components/variations/service/google_groups_updater_service.h" #include "components/variations/variations_switches.h" @@ -344,8 +344,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/version_info/version_info.h" #include "components/viz/common/features.h" #include "components/viz/common/switches.h" -@@ -7666,6 +7667,10 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryNudgeSessionReset)}, +@@ -7869,6 +7870,10 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryReorder)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) + {"enable-userscripts-log", flag_descriptions::kEnableLoggingUserScriptsName, @@ -358,9 +358,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6663,6 +6663,11 @@ const char kLocalWebApprovalsDescription[] = - "refresh needs to also be enabled."; - #endif +@@ -6962,6 +6962,11 @@ const char kUseOutOfProcessVideoDecodingDescription[] = + "enabled in ash-chrome)."; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +const char kEnableLoggingUserScriptsName[] = "Enable logging user scripts component"; +const char kEnableLoggingUserScriptsDescription[] = @@ -373,7 +373,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3846,6 +3846,9 @@ extern const char kQuickCommandsDescription[]; +@@ -4001,6 +4001,9 @@ extern const char kQuickCommandsDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // defined (OS_FUCHSIA) @@ -386,15 +386,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -257,6 +257,7 @@ +@@ -256,6 +256,7 @@ #include "components/ntp_tiles/popular_sites_impl.h" #include "components/permissions/contexts/geolocation_permission_context_android.h" #include "components/query_tiles/tile_service_prefs.h" +#include "components/user_scripts/browser/user_script_prefs.h" #else // BUILDFLAG(IS_ANDROID) #include "chrome/browser/cart/cart_service.h" - #include "chrome/browser/device_api/device_service_impl.h" -@@ -1458,6 +1459,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, + #include "chrome/browser/companion/core/promo_handler.h" +@@ -1462,6 +1463,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, translate::TranslatePrefs::RegisterProfilePrefs(registry); omnibox::RegisterProfilePrefs(registry); ZeroSuggestProvider::RegisterProfilePrefs(registry); @@ -416,8 +416,8 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn 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 -@@ -426,6 +426,8 @@ - #include "components/services/screen_ai/public/cpp/screen_ai_service_router_factory.h" +@@ -433,6 +433,8 @@ + #include "chrome/browser/net/nss_service_factory.h" #endif +#include "components/user_scripts/browser/userscripts_browser_client.h" @@ -425,7 +425,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc namespace chrome { void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) { -@@ -997,6 +999,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1013,6 +1015,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); @@ -436,7 +436,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc 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 -@@ -110,6 +110,8 @@ +@@ -112,6 +112,8 @@ #include "ui/accessibility/accessibility_features.h" #endif @@ -445,7 +445,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile #if BUILDFLAG(ENABLE_SESSION_SERVICE) #include "chrome/browser/sessions/app_session_service_factory.h" #include "chrome/browser/sessions/session_service_factory.h" -@@ -1465,6 +1467,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, +@@ -1486,6 +1488,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, #endif #endif @@ -462,16 +462,16 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profiles/renderer_updater.cc --- a/chrome/browser/profiles/renderer_updater.cc +++ b/chrome/browser/profiles/renderer_updater.cc -@@ -32,6 +32,8 @@ - #include "chrome/browser/ash/login/signin/oauth2_login_manager_factory.h" - #endif +@@ -39,6 +39,8 @@ + #include "chrome/browser/signin/bound_session_credentials/bound_session_cookie_refresh_service_factory.h" + #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) +#include "components/user_scripts/browser/user_script_prefs.h" + RendererUpdater::RendererUpdater(Profile* profile) : profile_(profile), is_off_the_record_(profile_->IsOffTheRecord()), -@@ -54,6 +56,7 @@ RendererUpdater::RendererUpdater(Profile* profile) +@@ -76,6 +78,7 @@ RendererUpdater::RendererUpdater(Profile* profile) force_youtube_restrict_.Init(policy::policy_prefs::kForceYouTubeRestrict, pref_service); allowed_domains_for_apps_.Init(prefs::kAllowedDomainsForApps, pref_service); @@ -479,7 +479,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil pref_change_registrar_.Init(pref_service); pref_change_registrar_.Add( -@@ -68,6 +71,10 @@ RendererUpdater::RendererUpdater(Profile* profile) +@@ -90,6 +93,10 @@ RendererUpdater::RendererUpdater(Profile* profile) prefs::kAllowedDomainsForApps, base::BindRepeating(&RendererUpdater::UpdateAllRenderers, base::Unretained(this))); @@ -490,9 +490,9 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil } RendererUpdater::~RendererUpdater() { -@@ -188,5 +195,6 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() - const { - return chrome::mojom::DynamicParams::New( +@@ -242,5 +249,6 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() + GetBoundSessionParams(), + #endif force_google_safesearch_.GetValue(), force_youtube_restrict_.GetValue(), - allowed_domains_for_apps_.GetValue()); + allowed_domains_for_apps_.GetValue(), @@ -501,7 +501,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profiles/renderer_updater.h --- a/chrome/browser/profiles/renderer_updater.h +++ b/chrome/browser/profiles/renderer_updater.h -@@ -93,6 +93,7 @@ class RendererUpdater : public KeyedService, +@@ -108,6 +108,7 @@ class RendererUpdater : public KeyedService, // Prefs that we sync to the renderers. BooleanPrefMember force_google_safesearch_; @@ -512,7 +512,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profile diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -97,6 +97,7 @@ +@@ -100,6 +100,7 @@ #include "components/signin/public/base/signin_buildflags.h" #include "components/site_engagement/content/site_engagement_service.h" #include "components/supervised_user/core/common/buildflags.h" @@ -520,7 +520,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/content_client.h" -@@ -870,6 +871,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -829,6 +830,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUIVersionHost) return &NewWebUI; @@ -532,7 +532,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni --- a/chrome/chrome_paks.gni +++ b/chrome/chrome_paks.gni -@@ -116,6 +116,7 @@ template("chrome_extra_paks") { +@@ -118,6 +118,7 @@ template("chrome_extra_paks") { "$root_gen_dir/skia/skia_resources.pak", "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak", "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak", @@ -551,18 +551,18 @@ diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni diff --git a/chrome/common/renderer_configuration.mojom b/chrome/common/renderer_configuration.mojom --- a/chrome/common/renderer_configuration.mojom +++ b/chrome/common/renderer_configuration.mojom -@@ -12,6 +12,7 @@ struct DynamicParams { +@@ -29,6 +29,7 @@ struct DynamicParams { bool force_safe_search = true; int32 youtube_restrict = 0; string allowed_domains_for_apps; + bool allow_userscript = false; }; - interface ChromeOSListener { + // Allows the renderer to notify the browser process that requests in renderer diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -140,6 +140,7 @@ static_library("renderer") { +@@ -143,6 +143,7 @@ static_library("renderer") { "//components/content_capture/common", "//components/content_capture/renderer", "//components/content_settings/common:mojom", @@ -573,7 +573,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -252,6 +252,9 @@ +@@ -251,6 +251,9 @@ #include "chrome/renderer/media/chrome_key_systems.h" #endif @@ -583,7 +583,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer using autofill::AutofillAgent; using autofill::PasswordAutofillAgent; using autofill::PasswordGenerationAgent; -@@ -451,6 +454,12 @@ void ChromeContentRendererClient::RenderThreadStarted() { +@@ -427,6 +430,12 @@ void ChromeContentRendererClient::RenderThreadStarted() { WebString::FromASCII(extensions::kExtensionScheme)); #endif @@ -596,7 +596,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_SPELLCHECK) if (!spellcheck_) InitSpellCheck(); -@@ -619,6 +628,13 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -595,6 +604,13 @@ void ChromeContentRendererClient::RenderFrameCreated( render_frame, registry); #endif @@ -610,7 +610,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_PPAPI) new PepperHelper(render_frame); #endif -@@ -1621,7 +1637,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( +@@ -1597,7 +1613,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentStart( render_frame); // |render_frame| might be dead by now. @@ -625,7 +625,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentEnd( -@@ -1630,7 +1653,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( +@@ -1606,7 +1629,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentEnd( render_frame); // |render_frame| might be dead by now. @@ -640,7 +640,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentIdle( -@@ -1639,7 +1669,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( +@@ -1615,7 +1645,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentIdle( render_frame); // |render_frame| might be dead by now. @@ -658,7 +658,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc --- a/chrome/renderer/chrome_render_thread_observer.cc +++ b/chrome/renderer/chrome_render_thread_observer.cc -@@ -53,6 +53,8 @@ +@@ -54,6 +54,8 @@ #include "third_party/blink/public/web/web_security_policy.h" #include "third_party/blink/public/web/web_view.h" @@ -667,10 +667,10 @@ diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chrome/renderer/ash_merge_session_loader_throttle.h" #endif -@@ -181,6 +183,7 @@ void ChromeRenderThreadObserver::SetInitialConfiguration( - void ChromeRenderThreadObserver::SetConfiguration( +@@ -185,6 +187,7 @@ void ChromeRenderThreadObserver::SetConfiguration( chrome::mojom::DynamicParamsPtr params) { - *GetDynamicConfigParams() = std::move(*params); + base::AutoLock lock(dynamic_params_lock_); + dynamic_params_ = std::move(params); + user_scripts::UserScriptsRendererClient::GetInstance()->ConfigurationUpdated(); } @@ -678,7 +678,7 @@ diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/ diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -337,6 +337,7 @@ +@@ -335,6 +335,7 @@ @@ -10433,7 +10433,7 @@ new file mode 100755 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec -@@ -833,6 +833,12 @@ +@@ -845,6 +845,12 @@ "components/autofill/core/browser/autofill_address_rewriter_resources.grd":{ "includes": [3720] }, diff --git a/build/patches/Guard-for-user-agent-reduction.patch b/build/patches/Guard-for-user-agent-reduction.patch index 2b2efd3b..e8cd1592 100644 --- a/build/patches/Guard-for-user-agent-reduction.patch +++ b/build/patches/Guard-for-user-agent-reduction.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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 -@@ -1617,7 +1617,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( +@@ -1659,7 +1659,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( registry->RegisterIntegerPref( prefs::kUserAgentReduction, static_cast( @@ -55,7 +55,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc 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 -@@ -1243,8 +1243,8 @@ BASE_FEATURE(kDurableClientHintsCache, +@@ -1251,8 +1251,8 @@ BASE_FEATURE(kDurableClientHintsCache, const base::FeatureParam kUserAgentFrozenBuildVersion{ &kReduceUserAgentMinorVersion, "build_version", "0"}; @@ -69,7 +69,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea 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 -@@ -3458,7 +3458,8 @@ +@@ -3514,7 +3514,8 @@ status: "stable", }, { diff --git a/build/patches/History-number-of-days-privacy-setting.patch b/build/patches/History-number-of-days-privacy-setting.patch index 4962d5aa..8798121b 100644 --- a/build/patches/History-number-of-days-privacy-setting.patch +++ b/build/patches/History-number-of-days-privacy-setting.patch @@ -48,7 +48,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 -@@ -44,6 +44,7 @@ import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings; +@@ -49,6 +49,7 @@ import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings; import org.chromium.chrome.browser.sync.settings.ManageSyncSettings; import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; @@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.components.browser_ui.settings.SettingsLauncher; import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.components.browser_ui.site_settings.ContentSettingsResources; -@@ -62,6 +63,9 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; +@@ -67,6 +68,9 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate; @@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting /** * Fragment to keep track of the all the privacy related preferences. */ -@@ -101,6 +105,8 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -108,6 +112,8 @@ public class PrivacySettings extends PreferenceFragmentCompat private ChromeSwitchPreference allowCustomTabIntentsPref; private ChromeSwitchPreference openExternalLinksPref; @@ -75,7 +75,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -204,6 +210,40 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -214,6 +220,40 @@ public class PrivacySettings extends PreferenceFragmentCompat Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK); syncAndServicesLink.setSummary(buildSyncAndServicesLink()); @@ -116,8 +116,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting Preference thirdPartyCookies = findPreference(PREF_THIRD_PARTY_COOKIES); if (thirdPartyCookies != null) { thirdPartyCookies.getExtras().putString( -@@ -363,6 +403,29 @@ public class PrivacySettings extends PreferenceFragmentCompat - } +@@ -401,6 +441,29 @@ public class PrivacySettings extends PreferenceFragmentCompat + privacyGuide.setTitle(privacyGuidePrefTitle); } + class TimeFrequencySpinnerOption { @@ -161,7 +161,7 @@ diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/ 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 -@@ -370,6 +370,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -373,6 +373,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, void ProfileImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false); @@ -172,7 +172,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p 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 -@@ -1327,6 +1327,18 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1324,6 +1324,18 @@ Your Google account may have other forms of browsing history like searches and a Browsing history @@ -295,7 +295,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium diff --git a/components/history/core/browser/expire_history_backend.cc b/components/history/core/browser/expire_history_backend.cc --- a/components/history/core/browser/expire_history_backend.cc +++ b/components/history/core/browser/expire_history_backend.cc -@@ -391,7 +391,7 @@ const ExpiringVisitsReader* +@@ -379,7 +379,7 @@ const ExpiringVisitsReader* void ExpireHistoryBackend::StartExpiringOldStuff( base::TimeDelta expiration_threshold) { @@ -304,7 +304,7 @@ diff --git a/components/history/core/browser/expire_history_backend.cc b/compone // Remove all readers, just in case this was method was called before. readers_.clear(); -@@ -407,6 +407,11 @@ void ExpireHistoryBackend::StartExpiringOldStuff( +@@ -395,6 +395,11 @@ void ExpireHistoryBackend::StartExpiringOldStuff( ScheduleExpire(); } @@ -316,7 +316,7 @@ diff --git a/components/history/core/browser/expire_history_backend.cc b/compone void ExpireHistoryBackend::DeleteFaviconsIfPossible(DeleteEffects* effects) { if (!favicon_db_) return; -@@ -609,6 +614,12 @@ void ExpireHistoryBackend::DoExpireIteration() { +@@ -597,6 +602,12 @@ void ExpireHistoryBackend::DoExpireIteration() { return; } @@ -344,7 +344,7 @@ diff --git a/components/history/core/browser/expire_history_backend.h b/componen diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc -@@ -159,7 +159,7 @@ const int kMaxRedirectCount = 32; +@@ -163,7 +163,7 @@ const int kMaxRedirectCount = 32; // The number of days old a history entry can be before it is considered "old" // and is deleted. @@ -353,8 +353,8 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his // The maximum number of days for which domain visit metrics are computed // each time HistoryBackend::GetDomainDiversity() is called. -@@ -1181,6 +1181,19 @@ void HistoryBackend::InitImpl( - LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time); +@@ -1296,6 +1296,19 @@ void HistoryBackend::InitImpl( + expirer_.StartExpiringOldStuff(base::Days(kExpireDaysThreshold)); } +void HistoryBackend::SetExpireDaysThreshold(int days) { @@ -388,7 +388,7 @@ diff --git a/components/history/core/browser/history_backend.h b/components/hist diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc --- a/components/history/core/browser/history_service.cc +++ b/components/history/core/browser/history_service.cc -@@ -35,6 +35,9 @@ +@@ -36,6 +36,9 @@ #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" @@ -396,9 +396,9 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his +#include "components/prefs/pref_change_registrar.h" +#include "components/history/core/common/pref_names.h" #include "components/history/core/browser/download_row.h" + #include "components/history/core/browser/features.h" #include "components/history/core/browser/history_backend.h" - #include "components/history/core/browser/history_backend_client.h" -@@ -1196,6 +1199,9 @@ void HistoryService::Cleanup() { +@@ -1303,6 +1306,9 @@ void HistoryService::Cleanup() { return; } @@ -408,7 +408,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his NotifyHistoryServiceBeingDeleted(); weak_ptr_factory_.InvalidateWeakPtrs(); -@@ -1263,6 +1269,33 @@ bool HistoryService::Init( +@@ -1376,6 +1382,33 @@ bool HistoryService::Init( return true; } @@ -445,7 +445,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his diff --git a/components/history/core/browser/history_service.h b/components/history/core/browser/history_service.h --- a/components/history/core/browser/history_service.h +++ b/components/history/core/browser/history_service.h -@@ -31,6 +31,8 @@ +@@ -34,6 +34,8 @@ #include "build/build_config.h" #include "components/favicon_base/favicon_callback.h" #include "components/favicon_base/favicon_usage_data.h" @@ -454,7 +454,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist #include "components/history/core/browser/history_types.h" #include "components/history/core/browser/keyword_id.h" #include "components/history/core/browser/url_row.h" -@@ -107,6 +109,8 @@ class HistoryService : public KeyedService { +@@ -114,6 +116,8 @@ class HistoryService : public KeyedService, return Init(false, history_database_params); } @@ -463,9 +463,9 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist // Triggers the backend to load if it hasn't already, and then returns whether // it's finished loading. // Note: Virtual needed for mocking. -@@ -1070,6 +1074,10 @@ class HistoryService : public KeyedService { - - base::OnceClosure origin_queried_closure_for_testing_; +@@ -1117,6 +1121,10 @@ class HistoryService : public KeyedService, + raw_ptr local_device_info_provider_ = + nullptr; + void OnUserPrefChanged(); + PrefService* active_user_pref_service_ = nullptr; diff --git a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch index 9a9be356..4594f280 100644 --- a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch +++ b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc --- a/components/omnibox/browser/autocomplete_result.cc +++ b/components/omnibox/browser/autocomplete_result.cc -@@ -81,10 +81,11 @@ constexpr size_t kMaxPedalMatchIndex = +@@ -83,10 +83,11 @@ constexpr size_t kMaxPedalMatchIndex = // static size_t AutocompleteResult::GetMaxMatches(bool is_zero_suggest) { @@ -30,7 +30,7 @@ diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omni diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc --- a/components/omnibox/browser/omnibox_field_trial.cc +++ b/components/omnibox/browser/omnibox_field_trial.cc -@@ -283,9 +283,9 @@ void OmniboxFieldTrial::GetDemotionsByType( +@@ -284,9 +284,9 @@ void OmniboxFieldTrial::GetDemotionsByType( size_t OmniboxFieldTrial::GetProviderMaxMatches( AutocompleteProvider::Type provider) { @@ -42,7 +42,7 @@ diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omni omnibox::kUIExperimentMaxAutocompleteMatches, OmniboxFieldTrial::kUIMaxAutocompleteMatchesByProviderParam); -@@ -310,7 +310,7 @@ size_t OmniboxFieldTrial::GetProviderMaxMatches( +@@ -311,7 +311,7 @@ size_t OmniboxFieldTrial::GetProviderMaxMatches( return v; } } diff --git a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch index ae2ec7a3..88a1bb87 100644 --- a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch +++ b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.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/dom/build.gni b/third_party/blink/renderer/core/dom/build.gni --- a/third_party/blink/renderer/core/dom/build.gni +++ b/third_party/blink/renderer/core/dom/build.gni -@@ -171,6 +171,8 @@ blink_core_sources_dom = [ +@@ -170,6 +170,8 @@ blink_core_sources_dom = [ "has_invalidation_flags.h", "icon_url.cc", "icon_url.h", @@ -35,7 +35,7 @@ diff --git a/third_party/blink/renderer/core/dom/build.gni b/third_party/blink/r 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 -@@ -287,6 +287,7 @@ +@@ -288,6 +288,7 @@ #include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h" #include "third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h" #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h" @@ -52,7 +52,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #ifndef NDEBUG using WeakDocumentSet = blink::HeapHashSet>; static WeakDocumentSet& LiveDocumentSet(); -@@ -7376,6 +7379,64 @@ void Document::OnPrepareToStopParsing() { +@@ -7420,6 +7423,64 @@ void Document::OnPrepareToStopParsing() { MilestoneForDelayedAsyncScript::kFinishedParsing); } @@ -117,7 +117,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink void Document::FinishedParsing() { DCHECK(!GetScriptableDocumentParser() || !parser_->IsParsing()); DCHECK(!GetScriptableDocumentParser() || ready_state_ != kLoading); -@@ -7432,6 +7493,10 @@ void Document::FinishedParsing() { +@@ -7476,6 +7537,10 @@ void Document::FinishedParsing() { frame->Loader().FinishedParsing(); @@ -131,7 +131,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -2002,6 +2002,9 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -2000,6 +2000,9 @@ class CORE_EXPORT Document : public ContainerNode, void AXContextModeChanged(); void ClearAXObjectCache(); diff --git a/build/patches/Invalidate-components-public-key.patch b/build/patches/Invalidate-components-public-key.patch index 114ee034..b10311d1 100644 --- a/build/patches/Invalidate-components-public-key.patch +++ b/build/patches/Invalidate-components-public-key.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.cc b/chrome/browser/component_updater/pki_metadata_component_installer.cc --- a/chrome/browser/component_updater/pki_metadata_component_installer.cc +++ b/chrome/browser/component_updater/pki_metadata_component_installer.cc -@@ -74,7 +74,8 @@ const char kGoogleOperatorName[] = "Google"; +@@ -72,7 +72,8 @@ const char kGoogleOperatorName[] = "Google"; // The extension id is: efniojlnjndmcbiieegkicadnoecjjef const uint8_t kPKIMetadataPublicKeySHA256[32] = { 0x45, 0xd8, 0xe9, 0xbd, 0x9d, 0x3c, 0x21, 0x88, 0x44, 0x6a, 0x82, diff --git a/build/patches/JIT-site-settings.patch b/build/patches/JIT-site-settings.patch index 5402f5bc..19aca20e 100644 --- a/build/patches/JIT-site-settings.patch +++ b/build/patches/JIT-site-settings.patch @@ -42,7 +42,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -185,6 +185,7 @@ android_resources("java_resources") { +@@ -187,6 +187,7 @@ android_resources("java_resources") { "java/res/drawable-hdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-hdpi/permission_background_sync.png", "java/res/drawable-hdpi/permission_javascript.png", @@ -50,7 +50,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-hdpi/permission_popups.png", "java/res/drawable-hdpi/permission_protected_media.png", "java/res/drawable-hdpi/settings_sensors.png", -@@ -192,6 +193,7 @@ android_resources("java_resources") { +@@ -194,6 +195,7 @@ android_resources("java_resources") { "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-mdpi/permission_background_sync.png", "java/res/drawable-mdpi/permission_javascript.png", @@ -58,7 +58,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-hdpi/settings_autoplay.png", "java/res/drawable-xhdpi/settings_autoplay.png", "java/res/drawable-xxhdpi/settings_autoplay.png", -@@ -204,6 +206,7 @@ android_resources("java_resources") { +@@ -206,6 +208,7 @@ android_resources("java_resources") { "java/res/drawable-xhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xhdpi/permission_background_sync.png", "java/res/drawable-xhdpi/permission_javascript.png", @@ -66,7 +66,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-xhdpi/permission_popups.png", "java/res/drawable-xhdpi/permission_protected_media.png", "java/res/drawable-xhdpi/settings_sensors.png", -@@ -211,6 +214,7 @@ android_resources("java_resources") { +@@ -213,6 +216,7 @@ android_resources("java_resources") { "java/res/drawable-xxhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xxhdpi/permission_background_sync.png", "java/res/drawable-xxhdpi/permission_javascript.png", @@ -74,7 +74,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-xxhdpi/permission_popups.png", "java/res/drawable-xxhdpi/permission_protected_media.png", "java/res/drawable-xxhdpi/settings_sensors.png", -@@ -218,6 +222,7 @@ android_resources("java_resources") { +@@ -220,6 +224,7 @@ android_resources("java_resources") { "java/res/drawable-xxxhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xxxhdpi/permission_background_sync.png", "java/res/drawable-xxxhdpi/permission_javascript.png", @@ -214,7 +214,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 -@@ -777,6 +777,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -779,6 +779,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment ? R.string.website_settings_add_site_description_sound_block : R.string.website_settings_add_site_description_sound_allow; break; @@ -227,7 +227,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c case SiteSettingsCategory.Type.COOKIES: resource = getCookieSettingsState() == CookieSettingsState.ALLOW ? R.string.website_settings_add_site_description_cookies_block -@@ -941,6 +947,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -943,6 +949,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case SiteSettingsCategory.Type.AUTOPLAY: allowSpecifyingExceptions = true; break; @@ -258,7 +258,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.NOTIFICATIONS) { setUpNotificationsPreference(preference, mSite.isEmbargoed(type)); } else if (type == ContentSettingsType.REQUEST_DESKTOP_SITE) { -@@ -1071,6 +1075,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1072,6 +1076,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */); } @@ -377,7 +377,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen Location -@@ -654,6 +657,20 @@ +@@ -658,6 +661,20 @@ Block JavaScript for a specific site. diff --git a/build/patches/Keep-empty-tabs-between-sessions.patch b/build/patches/Keep-empty-tabs-between-sessions.patch index 00844819..f74e4441 100644 --- a/build/patches/Keep-empty-tabs-between-sessions.patch +++ b/build/patches/Keep-empty-tabs-between-sessions.patch @@ -12,11 +12,11 @@ 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/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java -@@ -796,14 +796,6 @@ public class TabPersistentStore { +@@ -805,14 +805,6 @@ public class TabPersistentStore { mTabsToMigrate.add(tab); } } else { -- if (UrlUtilities.isNTPUrl(tabToRestore.url) && !setAsActive +- if (!mSkipSavingNonActiveNtps && UrlUtilities.isNTPUrl(tabToRestore.url) && !setAsActive - && !tabToRestore.fromMerge) { - Log.i(TAG, "Skipping restore of non-selected NTP."); - RecordHistogram.recordEnumeratedHistogram("Tabs.TabRestoreMethod", @@ -30,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java -@@ -605,9 +605,6 @@ public class CriticalPersistedTabData extends PersistedTabData { +@@ -609,9 +609,6 @@ public class CriticalPersistedTabData extends PersistedTabData { if (getUrl() == null || getUrl().isEmpty()) { return false; } diff --git a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch index 6924a1fe..8ebb135b 100644 --- a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -15,7 +15,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 -@@ -4399,9 +4399,9 @@ +@@ -4553,9 +4553,9 @@ "expiry_milestone": 115 }, { diff --git a/build/patches/Logcat-crash-reports-UI.patch b/build/patches/Logcat-crash-reports-UI.patch index 46d532bc..31f5cdff 100644 --- a/build/patches/Logcat-crash-reports-UI.patch +++ b/build/patches/Logcat-crash-reports-UI.patch @@ -160,7 +160,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ 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 -@@ -647,6 +647,7 @@ static_library("ui") { +@@ -652,6 +652,7 @@ static_library("ui") { "//third_party/re2", "//third_party/webrtc_overrides:webrtc_component", "//third_party/zlib", diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index e362c294..ce522123 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -30,15 +30,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -74,6 +74,7 @@ +@@ -76,6 +76,7 @@ #include "components/autofill/core/common/autofill_payments_features.h" #include "components/autofill/core/common/autofill_switches.h" #include "components/autofill/core/common/autofill_util.h" +#include "components/bookmarks/browser/features.h" #include "components/browser_sync/browser_sync_switches.h" - #include "components/browser_ui/settings/android/features.h" #include "components/browser_ui/site_settings/android/features.h" -@@ -5997,6 +5998,11 @@ const FeatureEntry kFeatureEntries[] = { + #include "components/browsing_data/core/features.h" +@@ -6190,6 +6191,11 @@ const FeatureEntry kFeatureEntries[] = { reading_list::switches::kReadLaterReminderNotification)}, #endif @@ -53,7 +53,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc -@@ -371,7 +371,7 @@ BackgroundModeManager::~BackgroundModeManager() { +@@ -363,7 +363,7 @@ BackgroundModeManager::~BackgroundModeManager() { // static void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { @@ -65,7 +65,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/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 -@@ -1577,7 +1577,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1619,7 +1619,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -77,7 +77,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3037,6 +3037,10 @@ const char kTabGroupsContinuationAndroidName[] = "Tab Groups Continuation"; +@@ -3146,6 +3146,10 @@ const char kTabGroupsContinuationAndroidName[] = "Tab Groups Continuation"; const char kTabGroupsContinuationAndroidDescription[] = "Allows users to access continuation features in Tab Group on phones."; @@ -91,7 +91,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1725,6 +1725,9 @@ extern const char kCommerceMerchantViewerAndroidDescription[]; +@@ -1790,6 +1790,9 @@ extern const char kCommerceMerchantViewerAndroidDescription[]; extern const char kTabGroupsContinuationAndroidName[]; extern const char kTabGroupsContinuationAndroidDescription[]; @@ -294,7 +294,7 @@ diff --git a/components/payments/core/payment_prefs.cc b/components/payments/cor diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc -@@ -218,9 +218,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -229,9 +229,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( prefs::kSafeBrowsingSawInterstitialScoutReporting, false); registry->RegisterBooleanPref( @@ -324,7 +324,7 @@ diff --git a/components/signin/internal/identity_manager/primary_account_manager 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 -@@ -1619,8 +1619,8 @@ BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread, +@@ -1641,8 +1641,8 @@ BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread, // the attribute. Note: At present, only iframes with origin-restricted // sandboxes are isolated. BASE_FEATURE(kIsolateSandboxedIframes, diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index c7bdd584..4f5fa82c 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -118,7 +118,7 @@ diff --git a/cc/base/features.h b/cc/base/features.h diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_controls_offset_manager.cc --- a/cc/input/browser_controls_offset_manager.cc +++ b/cc/input/browser_controls_offset_manager.cc -@@ -18,6 +18,7 @@ +@@ -17,6 +17,7 @@ #include "ui/gfx/animation/tween.h" #include "ui/gfx/geometry/transform.h" #include "ui/gfx/geometry/vector2d_f.h" @@ -126,7 +126,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont namespace cc { namespace { -@@ -486,6 +487,11 @@ gfx::Vector2dF BrowserControlsOffsetManager::ScrollBy( +@@ -484,6 +485,11 @@ gfx::Vector2dF BrowserControlsOffsetManager::ScrollBy( // content. If the top controls have no height, the content should scroll // immediately. gfx::Vector2dF applied_delta(0.f, old_top_offset - ContentTopOffset()); @@ -141,7 +141,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 -@@ -4274,6 +4274,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { +@@ -4305,6 +4305,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { if (scroll_delta.IsZero()) return false; @@ -154,7 +154,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java --- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java +++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java -@@ -99,6 +99,9 @@ import org.chromium.ui.util.ColorUtils; +@@ -104,6 +104,9 @@ import org.chromium.ui.util.ColorUtils; import java.util.List; @@ -164,7 +164,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/ /** The mediator implements the logic to interact with the surfaces and caller. */ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.OnClickListener, StartSurface.OnTabSelectingListener, BackPressHandler, -@@ -1254,6 +1257,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. +@@ -1311,6 +1314,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. } private void setTopMargin(int topMargin) { @@ -176,7 +176,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java -@@ -48,6 +48,7 @@ import org.chromium.components.feature_engagement.FeatureConstants; +@@ -44,6 +44,7 @@ import org.chromium.components.feature_engagement.FeatureConstants; import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; @@ -184,7 +184,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import java.util.List; -@@ -143,7 +144,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T +@@ -139,7 +140,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T @Override public void initializeWithNative(Activity activity, BottomControlsCoordinator.BottomControlsVisibilityController visibilityController, @@ -192,9 +192,9 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser + Callback onModelTokenChange, + TopUiThemeColorProvider topUiThemeColorProvider, ObservableSupplier tabSupplier) { try (TraceEvent e = TraceEvent.scoped("TabGroupUiCoordinator.initializeWithNative")) { - if (UmaSessionStats.isMetricsServiceAvailable()) { - UmaSessionStats.registerSyntheticFieldTrial( -@@ -186,7 +188,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T + mTabStripCoordinator = new TabListCoordinator(TabListCoordinator.TabListMode.STRIP, + mContext, mTabModelSelector, null, null, false, null, null, +@@ -176,7 +178,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T mMediator = new TabGroupUiMediator(mActivity, visibilityController, this, mModel, mTabModelSelector, mTabCreatorManager, mLayoutStateProviderSupplier, mIncognitoStateProvider, mTabGridDialogControllerSupplier, @@ -492,7 +492,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. * @param mode Modes of showing the list of tabs. Can be used in GRID or STRIP. -@@ -252,6 +324,12 @@ public class TabListCoordinator +@@ -249,6 +321,12 @@ public class TabListCoordinator if (mMode == TabListMode.GRID) { GridLayoutManager gridLayoutManager = new GridLayoutManager(context, GRID_LAYOUT_SPAN_COUNT_COMPACT); @@ -505,7 +505,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mRecyclerView.setLayoutManager(gridLayoutManager); mMediator.registerOrientationListener(gridLayoutManager); mMediator.updateSpanCount(gridLayoutManager, -@@ -498,6 +576,9 @@ public class TabListCoordinator +@@ -505,6 +583,9 @@ public class TabListCoordinator } registerLayoutChangeListener(); mRecyclerView.prepareTabSwitcherView(); @@ -518,7 +518,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/TabListRecyclerView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java -@@ -38,6 +38,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; +@@ -40,6 +40,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import org.chromium.base.Log; @@ -526,7 +526,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.tab_ui.R; -@@ -67,6 +68,8 @@ class TabListRecyclerView +@@ -69,6 +70,8 @@ class TabListRecyclerView public static final long BASE_ANIMATION_DURATION_MS = 218; public static final long FINAL_FADE_IN_DURATION_MS = 50; @@ -535,7 +535,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** * Field trial parameter for downsampling scaling factor. */ -@@ -247,6 +250,7 @@ class TabListRecyclerView +@@ -250,6 +253,7 @@ class TabListRecyclerView ? FINAL_FADE_IN_DURATION_MS : BASE_ANIMATION_DURATION_MS; @@ -543,7 +543,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser setAlpha(0); setVisibility(View.VISIBLE); mFadeInAnimator = ObjectAnimator.ofFloat(this, View.ALPHA, 1); -@@ -282,6 +286,11 @@ class TabListRecyclerView +@@ -299,6 +303,11 @@ class TabListRecyclerView } void setShadowVisibility(boolean shouldShowShadow) { @@ -555,7 +555,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser if (mShadowImageView == null) { Context context = getContext(); mShadowImageView = new ImageView(context); -@@ -294,7 +303,10 @@ class TabListRecyclerView +@@ -311,7 +320,10 @@ class TabListRecyclerView if (getParent() instanceof FrameLayout) { // Add shadow for grid tab switcher. FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( @@ -567,7 +567,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mShadowImageView.setLayoutParams(params); mShadowImageView.setTranslationY(mShadowTopOffset); FrameLayout parent = (FrameLayout) getParent(); -@@ -321,6 +333,10 @@ class TabListRecyclerView +@@ -339,6 +351,10 @@ class TabListRecyclerView void setShadowTopOffset(int shadowTopOffset) { mShadowTopOffset = shadowTopOffset; @@ -578,7 +578,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser if (mShadowImageView != null && getParent() instanceof FrameLayout) { // Since the shadow has no functionality, other than just existing visually, we can use -@@ -517,6 +533,7 @@ class TabListRecyclerView +@@ -535,6 +551,7 @@ class TabListRecyclerView mListener.finishedHiding(); } }); @@ -620,7 +620,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser if (backPressManager != null && BackPressManager.isEnabled()) { assert !mIsStartSurfaceEnabled || mIsStartSurfaceRefactorEnabled; backPressManager.addHandler(this, BackPressHandler.Type.TAB_SWITCHER); -@@ -629,6 +641,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -624,6 +636,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView final int contentOffset = mBrowserControlsStateProvider.getContentOffset(); mContainerViewModel.set(TOP_MARGIN, contentOffset); @@ -710,7 +710,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 -@@ -253,6 +253,9 @@ import java.util.ArrayList; +@@ -252,6 +252,9 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; @@ -720,7 +720,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv /** * A {@link AsyncInitializationActivity} that builds and manages a {@link CompositorViewHolder} * and associated classes. -@@ -769,6 +772,16 @@ public abstract class ChromeActivity +@@ -767,6 +770,16 @@ public abstract class ChromeActivity int toolbarLayoutId = getToolbarLayoutId(); if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) { controlContainer.initWithToolbar(toolbarLayoutId); @@ -740,7 +740,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/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java -@@ -101,6 +101,7 @@ public class ChromeCachedFlags { +@@ -104,6 +104,7 @@ public class ChromeCachedFlags { ChromeFeatureList.sInstanceSwitcher, ChromeFeatureList.sInstantStart, ChromeFeatureList.sInterestFeedV2, @@ -751,7 +751,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java -@@ -87,6 +87,8 @@ import org.chromium.ui.base.WindowAndroid; +@@ -89,6 +89,8 @@ import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.mojom.VirtualKeyboardMode; import org.chromium.ui.resources.ResourceManager; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; @@ -760,18 +760,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp import java.util.ArrayList; import java.util.HashSet; -@@ -324,6 +326,10 @@ public class CompositorViewHolder extends FrameLayout - WebContents webContents = mTabVisible.getWebContents(); - if (webContents == null) return; - EventForwarder forwarder = webContents.getEventForwarder(); +@@ -329,6 +331,10 @@ public class CompositorViewHolder extends FrameLayout + @Override + public void setCurrentTouchEventOffsets(float top) { + EventForwarder forwarder = getEventForwarder(); + if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) { + // no need to adjust the touch offsets, since the content view is never moved + top = 0; + } - forwarder.setCurrentTouchEventOffsets(0, top); + if (forwarder != null) forwarder.setCurrentTouchEventOffsets(0, top); } - }); -@@ -881,6 +887,9 @@ public class CompositorViewHolder extends FrameLayout + +@@ -903,6 +909,9 @@ public class CompositorViewHolder extends FrameLayout int keyboardInset = mApplicationBottomInsetSupplier != null ? mApplicationBottomInsetSupplier.get().webContentsHeightInset : 0; @@ -784,7 +784,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/layouts/LayoutManagerChrome.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java -@@ -46,6 +46,8 @@ import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.Sw +@@ -44,6 +44,8 @@ import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.Sw import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; @@ -793,7 +793,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo import java.util.List; -@@ -258,7 +260,10 @@ public class LayoutManagerChrome +@@ -254,7 +256,10 @@ public class LayoutManagerChrome @Override public SwipeHandler createToolbarSwipeHandler(boolean supportSwipeDown) { @@ -805,7 +805,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } @Override -@@ -508,9 +513,11 @@ public class LayoutManagerChrome +@@ -504,9 +509,11 @@ public class LayoutManagerChrome private static final float SWIPE_RANGE_DEG = 25; private final boolean mSupportSwipeDown; @@ -818,7 +818,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } @Override -@@ -542,6 +549,9 @@ public class LayoutManagerChrome +@@ -538,6 +545,9 @@ public class LayoutManagerChrome && mScrollDirection == ScrollDirection.DOWN) { RecordUserAction.record("MobileToolbarSwipeOpenStackView"); showLayout(LayoutType.TAB_SWITCHER, true); @@ -828,7 +828,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } else if (mScrollDirection == ScrollDirection.LEFT || mScrollDirection == ScrollDirection.RIGHT) { startShowing(mToolbarSwipeLayout, true); -@@ -588,6 +598,8 @@ public class LayoutManagerChrome +@@ -584,6 +594,8 @@ public class LayoutManagerChrome direction = ScrollDirection.RIGHT; } else if (swipeAngle < 270 + SWIPE_RANGE_DEG && swipeAngle > 270 - SWIPE_RANGE_DEG) { direction = ScrollDirection.DOWN; @@ -837,19 +837,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } return direction; -@@ -601,7 +613,7 @@ public class LayoutManagerChrome +@@ -597,7 +609,7 @@ public class LayoutManagerChrome return false; } - if (direction == ScrollDirection.DOWN) { + if (direction == ScrollDirection.DOWN || direction == ScrollDirection.UP) { boolean isAccessibility = ChromeAccessibilityUtil.get().isAccessibilityEnabled(); - return (mOverviewLayout != null || mTabSwitcherLayout != null) && !isAccessibility; + return isTabSwitcherReady() && !isAccessibility; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java -@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer; +@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer; import org.chromium.chrome.features.start_surface.StartSurface; import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; @@ -857,16 +857,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo import java.util.concurrent.Callable; -@@ -86,7 +87,8 @@ public class LayoutManagerChromeTablet extends LayoutManagerChrome { +@@ -83,7 +84,8 @@ public class LayoutManagerChromeTablet extends LayoutManagerChrome { mStartSurfaceSupplier = startSurfaceSupplier; mTabSwitcherSupplier = tabSwitcherSupplier; - mTabStripLayoutHelperManager = new StripLayoutHelperManager(host.getContext(), this, + mTabStripLayoutHelperManager = new StripLayoutHelperManager(host.getContext(), host, this, - mHost.getLayoutRenderHost(), () -> mLayerTitleCache, lifecycleDispatcher); + mHost.getLayoutRenderHost(), () -> mLayerTitleCache, lifecycleDispatcher, + /*browserControlsManagerSupplier*/ () -> getBrowserControlsManager()); - mJankTracker = jankTracker; mScrimCoordinator = scrimCoordinator; mCreateStartSurfaceCallable = delayedStartSurfaceCallable; + addSceneOverlay(mTabStripLayoutHelperManager); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java @@ -909,7 +909,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/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 -@@ -505,7 +505,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate +@@ -498,7 +498,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate // position 0 is on the left. Account for that in the offset calculation. boolean isRtl = LocalizationUtils.isLayoutRtl(); boolean useUnadjustedScrollOffset = isRtl != isLeft; @@ -931,7 +931,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over import java.util.List; -@@ -127,9 +130,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -128,9 +131,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa private final String mDefaultTitle; private final Supplier mLayerTitleCacheSupplier; @@ -945,7 +945,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over if (mModelSelectorButton.onDown(x, y)) return; getActiveStripLayoutHelper().onDown(time(), x, y, fromMouse, buttons); } -@@ -147,12 +154,14 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -148,12 +155,14 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa @Override public void drag(float x, float y, float dx, float dy, float tx, float ty) { @@ -960,7 +960,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over long time = time(); if (mModelSelectorButton.click(x, y)) { mModelSelectorButton.handleClick(time); -@@ -163,11 +172,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -164,11 +173,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa @Override public void fling(float x, float y, float velocityX, float velocityY) { @@ -974,26 +974,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over getActiveStripLayoutHelper().onLongPress(time(), x, y); } -@@ -229,7 +240,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa - */ - public StripLayoutHelperManager(Context context, LayoutUpdateHost updateHost, - LayoutRenderHost renderHost, Supplier layerTitleCacheSupplier, +@@ -225,7 +236,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa + public StripLayoutHelperManager(Context context, LayoutManagerHost managerHost, + LayoutUpdateHost updateHost, LayoutRenderHost renderHost, + Supplier layerTitleCacheSupplier, - ActivityLifecycleDispatcher lifecycleDispatcher) { + ActivityLifecycleDispatcher lifecycleDispatcher, + Supplier browserControlsManagerSupplier) { mUpdateHost = updateHost; mLayerTitleCacheSupplier = layerTitleCacheSupplier; mTabStripTreeProvider = new TabStripSceneLayer(context); -@@ -313,6 +325,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa - new StripLayoutHelper(context, updateHost, renderHost, false, mModelSelectorButton); - mIncognitoHelper = - new StripLayoutHelper(context, updateHost, renderHost, true, mModelSelectorButton); +@@ -314,6 +326,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa + context, managerHost, updateHost, renderHost, false, mModelSelectorButton); + mIncognitoHelper = new StripLayoutHelper( + context, managerHost, updateHost, renderHost, true, mModelSelectorButton); + mBrowserControlsManagerSupplier = browserControlsManagerSupplier; + mDpToPx = context.getResources().getDisplayMetrics().density; onContextChanged(context); } -@@ -398,9 +412,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -399,9 +413,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa Tab selectedTab = mTabModelSelector.getCurrentModel().getTabAt( mTabModelSelector.getCurrentModel().index()); int selectedTabId = selectedTab == null ? TabModel.INVALID_TAB_INDEX : selectedTab.getId(); @@ -1008,7 +1008,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over return mTabStripTreeProvider; } -@@ -436,7 +454,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -437,7 +455,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa mIncognitoHelper.onSizeChanged( mWidth, mHeight, orientationChanged, LayoutManagerImpl.time()); @@ -1154,7 +1154,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/findinpage/Find diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java -@@ -49,6 +49,9 @@ import org.chromium.ui.util.TokenHolder; +@@ -48,6 +48,9 @@ import org.chromium.ui.util.TokenHolder; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -1164,7 +1164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow /** * A class that manages browser control visibility and positioning. */ -@@ -389,6 +392,14 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon +@@ -388,6 +391,14 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon return mTopControlContainerHeight; } @@ -1179,7 +1179,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow @Override public int getTopControlsMinHeight() { return mTopControlsMinHeight; -@@ -455,6 +466,8 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon +@@ -454,6 +465,8 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon @Override public float getTopVisibleContentOffset() { @@ -1244,7 +1244,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr 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 -@@ -99,6 +99,8 @@ import org.chromium.content_public.browser.NavigationEntry; +@@ -100,6 +100,8 @@ import org.chromium.content_public.browser.NavigationEntry; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.mojom.WindowOpenDisposition; @@ -1253,7 +1253,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. import java.util.List; -@@ -562,10 +564,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -556,10 +558,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide // + topControlsDistanceToRest| will give the margin for the current animation frame. final int topControlsDistanceToRest = mBrowserControlsStateProvider.getContentOffset() - mBrowserControlsStateProvider.getTopControlsHeight(); @@ -1271,7 +1271,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. if (topMargin != layoutParams.topMargin || bottomMargin != layoutParams.bottomMargin) { layoutParams.topMargin = topMargin; -@@ -585,7 +592,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -579,7 +586,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide * strip. */ private int getToolbarExtraYOffset() { @@ -1382,9 +1382,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se // clang-format off - mLocationBarCoordinator = new LocationBarCoordinator(mSearchBox, mAnchorView, + mLocationBarCoordinator = new LocationBarCoordinator(mSearchBox, mAnchorView, mAnchorView, - mProfileSupplier, PrivacyPreferencesManagerImpl.getInstance(), - mSearchBoxDataProvider, null, new WindowDelegate(getWindow()), getWindowAndroid(), - /*activityTabSupplier=*/() -> null, getModalDialogManagerSupplier(), + mProfileSupplier, PrivacyPreferencesManagerImpl.getInstance(), + mSearchBoxDataProvider, null, new WindowDelegate(getWindow()), getWindowAndroid(), + /*activityTabSupplier=*/() -> null, getModalDialogManagerSupplier(), 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 @@ -1473,7 +1473,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel, mActionModeController.getActionModeCallback(), new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider, -@@ -883,11 +886,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -901,11 +904,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve // the height won't be measured by the background image. if (mControlContainer.getBackground() == null) { setControlContainerTopMargin(getToolbarExtraYOffset()); @@ -1487,7 +1487,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener); mLayoutChangeListener = null; } -@@ -1309,13 +1314,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -1327,13 +1332,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve return ((LocationBarCoordinator) mLocationBar).getUrlBarTextWithoutAutocomplete(); } @@ -1509,13 +1509,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar - View root = ((ViewStub) mActivity.findViewById(R.id.bottom_controls_stub)).inflate(); + mBottomRoot = ((ViewStub) mActivity.findViewById(R.id.bottom_controls_stub)).inflate(); + MoveBottomBarOverTopBar(); - mTabGroupUi = TabManagementModuleProvider.getDelegate().createTabGroupUi(mActivity, + mTabGroupUi = TabManagementDelegateProvider.getDelegate().createTabGroupUi(mActivity, - root.findViewById(R.id.bottom_container_slot), mIncognitoStateProvider, + mBottomRoot.findViewById(R.id.bottom_container_slot), mIncognitoStateProvider, mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController, mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector, mTabContentManager, mCompositorViewHolder, -@@ -1323,8 +1340,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -1341,8 +1358,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve mLayoutStateProviderSupplier, mSnackbarManager); var bottomControlsCoordinator = new BottomControlsCoordinator(mActivity, mWindowAndroid, mLayoutManager, mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer, @@ -1527,7 +1527,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mBottomControlsCoordinatorSupplier.set(bottomControlsCoordinator); bottomControlsCoordinator.getHandleBackPressChangedSupplier().addObserver( (x) -> { onBackPressStateChanged(); }); -@@ -2137,6 +2155,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -2155,6 +2173,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve private void setControlContainerTopMargin(int margin) { final ViewGroup.MarginLayoutParams layoutParams = ((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams()); @@ -1617,7 +1617,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu 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 -@@ -7422,6 +7422,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7629,6 +7629,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)}, @@ -1640,7 +1640,7 @@ diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer using base::android::JavaParamRef; using base::android::JavaRef; -@@ -93,8 +94,10 @@ void TabStripSceneLayer::SetContentTree( +@@ -85,8 +86,10 @@ void TabStripSceneLayer::SetContentTree( content_tree_ = content_tree; if (content_tree) { layer()->InsertChild(content_tree->layer(), 0); @@ -1653,7 +1653,7 @@ diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer } } } -@@ -127,13 +130,18 @@ void TabStripSceneLayer::UpdateTabStripLayer(JNIEnv* env, +@@ -119,13 +122,18 @@ void TabStripSceneLayer::UpdateTabStripLayer(JNIEnv* env, jboolean should_readd_background, jint background_color) { gfx::RectF content(0, y_offset, width, height); @@ -1716,7 +1716,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1808,6 +1808,10 @@ const char kImprovedKeyboardShortcutsDescription[] = +@@ -1869,6 +1869,10 @@ const char kImprovedKeyboardShortcutsDescription[] = "Ensure keyboard shortcuts work consistently with international keyboard " "layouts and deprecate legacy shortcuts."; @@ -1730,7 +1730,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1015,6 +1015,9 @@ extern const char kIgnoreSyncEncryptionKeysLongMissingDescription[]; +@@ -1052,6 +1052,9 @@ extern const char kIgnoreSyncEncryptionKeysLongMissingDescription[]; extern const char kImprovedKeyboardShortcutsName[]; extern const char kImprovedKeyboardShortcutsDescription[]; @@ -1783,7 +1783,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse #include "base/metrics/field_trial_params.h" #include "base/no_destructor.h" #include "base/strings/string_piece_forward.h" -@@ -251,6 +252,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -262,6 +263,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kInstantStart, &kLensCameraAssistedSearch, &kLensOnQuickActionSearchWidget, @@ -1829,16 +1829,16 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 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 -@@ -385,6 +385,8 @@ public abstract class ChromeFeatureList { - public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid"; +@@ -377,6 +377,8 @@ public abstract class ChromeFeatureList { + "MessagesForAndroidPermissionUpdate"; public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; - public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; + public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid"; + public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM = + "MoveTopToolbarToBottom"; public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = "NotificationPermissionBottomSheet"; -@@ -652,6 +654,8 @@ public abstract class ChromeFeatureList { +@@ -637,6 +639,8 @@ public abstract class ChromeFeatureList { public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true); public static final CachedFlag sLensCameraAssistedSearch = new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, true); @@ -1850,7 +1850,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/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 -@@ -1750,7 +1750,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1757,7 +1757,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #if BUILDFLAG(IS_ANDROID) registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault, @@ -1974,7 +1974,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow private LocationBarMediator mLocationBarMediator; private View mUrlBar; private View mDeleteButton; -@@ -144,7 +145,7 @@ public class LocationBarCoordinator +@@ -143,7 +144,7 @@ public class LocationBarCoordinator * @param reportExceptionCallback A {@link Callback} to report exceptions. * @param backPressManager The {@link BackPressManager} for intercepting back press. */ @@ -2078,15 +2078,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import java.util.ArrayList; import java.util.List; -@@ -75,6 +77,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC - private @Nullable OmniboxSuggestionsDropdown mDropdown; - private @NonNull ObserverList mScrollListenerList = - new ObserverList<>(); +@@ -81,6 +83,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC + private OneshotSupplierImpl mAdapterSupplier = + new OneshotSupplierImpl<>(); + private PreWarmingRecycledViewPool mRecycledViewPool; + private final @NonNull OmniboxSuggestionsDropdownEmbedder mDropdownEmbedder; public AutocompleteCoordinator(@NonNull ViewGroup parent, @NonNull AutocompleteControllerProvider controllerProvider, -@@ -98,6 +101,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC +@@ -105,6 +108,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC PropertyModel listModel = new PropertyModel(SuggestionListProperties.ALL_KEYS); ModelList listItems = new ModelList(); @@ -2094,16 +2094,16 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow listModel.set(SuggestionListProperties.EMBEDDER, dropdownEmbedder); listModel.set(SuggestionListProperties.VISIBLE, false); listModel.set(SuggestionListProperties.SUGGESTION_MODELS, listItems); -@@ -154,7 +158,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC +@@ -165,7 +169,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC public void inflate() { OmniboxSuggestionsDropdown dropdown; try (StrictModeContext ignored = StrictModeContext.allowDiskReads()) { -- dropdown = new OmniboxSuggestionsDropdown(context); -+ dropdown = new OmniboxSuggestionsDropdown(context, mDropdownEmbedder); +- dropdown = new OmniboxSuggestionsDropdown(context, mRecycledViewPool); ++ dropdown = new OmniboxSuggestionsDropdown(context, mRecycledViewPool, mDropdownEmbedder); } - // Start with visibility GONE to ensure that show() is called. -@@ -232,6 +236,16 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC + dropdown.getViewGroup().setClipToPadding(false); +@@ -174,6 +178,16 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC ViewGroup container = (ViewGroup) ((ViewStub) mParent.getRootView().findViewById( R.id.omnibox_results_container_stub)) .inflate(); @@ -2123,7 +2123,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 -@@ -56,6 +56,9 @@ import org.chromium.ui.modelutil.PropertyModel; +@@ -55,6 +55,9 @@ import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.mojom.WindowOpenDisposition; import org.chromium.url.GURL; @@ -2133,7 +2133,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; -@@ -1029,7 +1032,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, +@@ -967,7 +970,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, @Override public void onSuggestionDropdownScroll() { mSuggestionsListScrolled = true; @@ -2156,15 +2156,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.omnibox.OmniboxFeatures; import org.chromium.chrome.browser.omnibox.R; import org.chromium.chrome.browser.ui.theme.BrandedColorScheme; -@@ -130,6 +132,7 @@ class DropdownItemViewInfoListManager { - GroupSection previousSection = null; +@@ -128,6 +130,7 @@ class DropdownItemViewInfoListManager { GroupSection currentSection; + boolean useModernVisuals = OmniboxFeatures.shouldShowModernizeVisualUpdate(mContext); + boolean toolbarToBottom = ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled(); for (int i = 0; i < mSourceViewInfoList.size(); i++) { final DropdownItemViewInfo item = mSourceViewInfoList.get(i); final PropertyModel model = item.model; -@@ -145,18 +148,22 @@ class DropdownItemViewInfoListManager { +@@ -143,11 +146,13 @@ class DropdownItemViewInfoListManager { var topMargin = applyRounding ? groupTopMargin : suggestionVerticalMargin; var bottomMargin = applyRounding ? groupBottomMargin : suggestionVerticalMargin; @@ -2174,11 +2174,13 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow + DropdownCommonProperties.BG_TOP_CORNER_ROUNDED, applyRounding); // Do not have margin for the first suggestion, otherwise the first suggestion will // have a big gap with the Omnibox. -- model.set(DropdownCommonProperties.TOP_MARGIN, -+ model.set(toolbarToBottom ? DropdownCommonProperties.BOTTOM_MARGIN : DropdownCommonProperties.TOP_MARGIN, - previousItem == null - ? getSuggestionListTopMargin(item.processor.getViewTypeId()) - : topMargin); + if (useModernVisuals) { +- model.set(DropdownCommonProperties.TOP_MARGIN, ++ model.set(toolbarToBottom ? DropdownCommonProperties.BOTTOM_MARGIN : DropdownCommonProperties.TOP_MARGIN, + previousItem == null + ? getSuggestionListTopMargin(item.processor.getViewTypeId()) + : topMargin); +@@ -155,8 +160,10 @@ class DropdownItemViewInfoListManager { if (previousItem != null) { previousItem.model.set( @@ -2194,7 +2196,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/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java -@@ -41,6 +41,9 @@ import org.chromium.ui.base.ViewUtils; +@@ -40,6 +40,9 @@ import org.chromium.ui.base.ViewUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -2204,17 +2206,17 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** A widget for showing a list of omnibox suggestions. */ public class OmniboxSuggestionsDropdown extends RecyclerView { private static final long DEFERRED_INITIAL_SHRINKING_LAYOUT_FROM_IME_DURATION_MS = 300; -@@ -248,7 +251,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { +@@ -209,7 +212,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { * Constructs a new list designed for containing omnibox suggestions. * @param context Context used for contained views. */ -- public OmniboxSuggestionsDropdown(@NonNull Context context) { -+ public OmniboxSuggestionsDropdown(@NonNull Context context, +- public OmniboxSuggestionsDropdown(@NonNull Context context, RecycledViewPool recycledViewPool) { ++ public OmniboxSuggestionsDropdown(@NonNull Context context, RecycledViewPool recycledViewPool + @NonNull OmniboxSuggestionsDropdownEmbedder embedder) { super(context, null, android.R.attr.dropDownListViewStyle); setFocusable(true); setFocusableInTouchMode(true); -@@ -258,13 +262,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { +@@ -219,13 +223,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { setItemAnimator(null); mLayoutScrollListener = new SuggestionLayoutScrollListener(context); @@ -2241,7 +2243,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow ViewCompat.setPaddingRelative(this, 0, 0, 0, paddingBottom); mStandardBgColor = shouldShowModernizeVisualUpdate -@@ -425,11 +441,15 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { +@@ -363,11 +379,15 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { try (TraceEvent tracing = TraceEvent.scoped("OmniboxSuggestionsList.Measure"); TimingMetric metric = SuggestionsMetrics.recordSuggestionListMeasureTime()) { OmniboxAlignment omniboxAlignment = mEmbedder.getCurrentAlignment(); @@ -2528,7 +2530,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 -@@ -60,6 +60,11 @@ import java.lang.annotation.Retention; +@@ -61,6 +61,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.function.BooleanSupplier; @@ -2540,7 +2542,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..). */ -@@ -116,6 +121,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con +@@ -119,6 +124,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con @Override public void initWithToolbar(int toolbarLayoutId) { try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) { diff --git a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch index a001e9f4..4bc4dcb8 100644 --- a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch +++ b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch @@ -7,9 +7,9 @@ Search suggestions, autofill assistant and contextual search License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../java/res/xml/privacy_preferences.xml | 13 ++++++++ - .../privacy/settings/PrivacySettings.java | 33 ++++++++++++++++++- + .../privacy/settings/PrivacySettings.java | 33 +++++++++++++++++++ .../strings/android_chrome_strings.grd | 4 +++ - 3 files changed, 49 insertions(+), 1 deletion(-) + 3 files changed, 50 insertions(+) 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 @@ -37,7 +37,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 -@@ -52,6 +52,13 @@ import org.chromium.components.user_prefs.UserPrefs; +@@ -57,6 +57,13 @@ import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.text.NoUnderlineClickableSpan; import org.chromium.ui.text.SpanApplier; @@ -51,7 +51,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting /** * Fragment to keep track of the all the privacy related preferences. */ -@@ -71,6 +78,17 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -77,6 +84,17 @@ public class PrivacySettings extends PreferenceFragmentCompat private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; private static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies"; @@ -68,8 +68,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting + private ManagedPreferenceDelegate mManagedPreferenceDelegate; private IncognitoLockSettings mIncognitoLockSettings; private HelpAndFeedbackLauncher mHelpAndFeedbackLauncher; - -@@ -128,6 +146,16 @@ public class PrivacySettings extends PreferenceFragmentCompat + private Profile mProfile; +@@ -139,6 +157,16 @@ public class PrivacySettings extends PreferenceFragmentCompat setHasOptionsMenu(true); @@ -86,25 +86,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting ChromeSwitchPreference canMakePaymentPref = (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); canMakePaymentPref.setOnPreferenceChangeListener(this); -@@ -211,6 +239,9 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -219,6 +247,9 @@ public class PrivacySettings extends PreferenceFragmentCompat + UserPrefs.get(mProfile).setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { - UserPrefs.get(Profile.getLastUsedRegularProfile()) - .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); + UserPrefs.get(mProfile).setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); + } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { + UserPrefs.get(Profile.getLastUsedRegularProfile()) + .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); } return true; } -@@ -225,7 +256,7 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -233,6 +264,8 @@ public class PrivacySettings extends PreferenceFragmentCompat * Updates the preferences. */ public void updatePreferences() { -- PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile()); -+ mSearchSuggestions.setChecked(prefService.getBoolean(Pref.SEARCH_SUGGEST_ENABLED)); - ++ mSearchSuggestions.setChecked(UserPrefs.get(mProfile).getBoolean(Pref.SEARCH_SUGGEST_ENABLED)); ++ ChromeSwitchPreference canMakePaymentPref = (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); + if (canMakePaymentPref != null) { 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 diff --git a/build/patches/Never-fetch-popular-sites.patch b/build/patches/Never-fetch-popular-sites.patch index eb1282ba..7405616e 100644 --- a/build/patches/Never-fetch-popular-sites.patch +++ b/build/patches/Never-fetch-popular-sites.patch @@ -15,10 +15,10 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p const char kPopularSitesDefaultVersion[] = "5"; const int kSitesExplorationStartVersion = 6; -const int kPopularSitesRedownloadIntervalHours = 24; - const char kIOSDefaultPopularSitesExperimentIncludeApps[] = + #if BUILDFLAG(IS_IOS) + const char kIOSDefaultPopularSitesLocaleUS[] = "https://www.gstatic.com/chrome/ntp/ios/" - "suggested_sites_US_2023q1_mvt_experiment_with_popular_sites.json"; -@@ -375,7 +374,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, +@@ -326,7 +325,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, DCHECK(!callback_); callback_ = std::move(callback); @@ -32,7 +32,7 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref)); const base::TimeDelta time_since_last_download = base::Time::Now() - last_download_time; -@@ -392,7 +396,7 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, +@@ -343,7 +347,7 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, (time_since_last_download > redownload_interval) || url_changed) { FetchPopularSites(); return true; diff --git a/build/patches/OpenSearch-miscellaneous.patch b/build/patches/OpenSearch-miscellaneous.patch index a9ac0e2c..643a1c07 100644 --- a/build/patches/OpenSearch-miscellaneous.patch +++ b/build/patches/OpenSearch-miscellaneous.patch @@ -188,7 +188,7 @@ diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/c #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" -@@ -254,6 +255,7 @@ void ChromeRenderFrameObserver::DidFinishLoad() { +@@ -255,6 +256,7 @@ void ChromeRenderFrameObserver::DidFinishLoad() { GURL osdd_url = frame->GetDocument().OpenSearchDescriptionURL(); if (!osdd_url.is_empty()) { @@ -249,7 +249,7 @@ diff --git a/components/search_engines/template_url_parser.cc b/components/searc diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -287,7 +287,10 @@ class TemplateURLService : public WebDataServiceConsumer, +@@ -290,7 +290,10 @@ class TemplateURLService : public WebDataServiceConsumer, void UpdateProviderFavicons(const GURL& potential_search_url, const GURL& favicon_url); @@ -261,7 +261,7 @@ diff --git a/components/search_engines/template_url_service.h b/components/searc // regardless of |url| if the default search provider is managed by policy or // controlled by an extension. bool CanMakeDefault(const TemplateURL* url) const; -@@ -653,9 +656,6 @@ class TemplateURLService : public WebDataServiceConsumer, +@@ -656,9 +659,6 @@ class TemplateURLService : public WebDataServiceConsumer, // SetKeywordSearchTermsForURL is invoked. void UpdateKeywordSearchTermsForURL(const URLVisitedDetails& details); diff --git a/build/patches/Override-Navigator-Language.patch b/build/patches/Override-Navigator-Language.patch index 3541cdd5..c9633c1e 100644 --- a/build/patches/Override-Navigator-Language.patch +++ b/build/patches/Override-Navigator-Language.patch @@ -52,15 +52,15 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse 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 -@@ -68,6 +68,7 @@ - #include "components/attribution_reporting/os_support.mojom.h" +@@ -67,6 +67,7 @@ + #include "cc/base/switches.h" #include "components/discardable_memory/public/mojom/discardable_shared_memory_manager.mojom.h" #include "components/discardable_memory/service/discardable_shared_memory_manager.h" +#include "components/language/core/browser/language_prefs.h" #include "components/metrics/single_sample_metrics.h" #include "components/services/storage/privileged/mojom/indexed_db_control.mojom.h" #include "components/services/storage/public/cpp/buckets/bucket_id.h" -@@ -3263,8 +3264,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3295,8 +3296,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine( PropagateBrowserCommandLineToRenderer(browser_command_line, command_line); // Pass on the browser locale. diff --git a/build/patches/Partition-Blink-memory-cache.patch b/build/patches/Partition-Blink-memory-cache.patch index f496e13c..6bdedc79 100644 --- a/build/patches/Partition-Blink-memory-cache.patch +++ b/build/patches/Partition-Blink-memory-cache.patch @@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc --- a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc +++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc -@@ -2259,7 +2259,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document, +@@ -2284,7 +2284,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document, Resource* cached_resource = document->Fetcher()->CachedResource(url); if (!cached_resource) { cached_resource = MemoryCache::Get()->ResourceForURL( @@ -47,11 +47,11 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.c + url, document->Fetcher()->GetCacheIdentifier(url, document->TopFrameOrigin())); } if (cached_resource && InspectorPageAgent::CachedResourceContent( - cached_resource, content, base64_encoded)) + cached_resource, content, base64_encoded)) { diff --git a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc --- a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc +++ b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc -@@ -167,9 +167,9 @@ Resource* CachedResource(LocalFrame* frame, +@@ -165,9 +165,9 @@ Resource* CachedResource(LocalFrame* frame, if (!document) return nullptr; Resource* cached_resource = document->Fetcher()->CachedResource(url); @@ -66,7 +66,7 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc b diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_party/blink/renderer/core/loader/image_loader.cc --- a/third_party/blink/renderer/core/loader/image_loader.cc +++ b/third_party/blink/renderer/core/loader/image_loader.cc -@@ -706,7 +706,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const { +@@ -732,7 +732,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const { // content when style recalc is over and DOM mutation is allowed again. if (!url.IsNull()) { Resource* resource = MemoryCache::Get()->ResourceForURL( @@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_part diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc --- a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc +++ b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc -@@ -205,7 +205,7 @@ void MemoryCache::RemoveInternal(ResourceMap* resource_map, +@@ -204,7 +204,7 @@ void MemoryCache::RemoveInternal(ResourceMap* resource_map, } bool MemoryCache::Contains(const Resource* resource) const { @@ -88,7 +88,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/ return false; const auto resource_maps_it = -@@ -221,12 +221,9 @@ bool MemoryCache::Contains(const Resource* resource) const { +@@ -220,12 +220,9 @@ bool MemoryCache::Contains(const Resource* resource) const { return resource == resources_it->value->GetResource(); } @@ -127,7 +127,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h b/t diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc --- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc +++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc -@@ -737,7 +737,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData( +@@ -801,7 +801,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData( if (!archive_ && factory.GetType() == ResourceType::kRaw) return nullptr; @@ -137,7 +137,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c // Most off-main-thread resource fetches use Resource::kRaw and don't reach // this point, but off-main-thread module fetches might. if (IsMainThread()) { -@@ -1222,7 +1223,9 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, +@@ -1287,7 +1288,9 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, resource = nullptr; } else { resource = MemoryCache::Get()->ResourceForURL( @@ -148,7 +148,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c } if (resource) { policy = DetermineRevalidationPolicy(resource_type, params, *resource, -@@ -1465,7 +1468,8 @@ Resource* ResourceFetcher::CreateResourceForLoading( +@@ -1534,7 +1537,8 @@ Resource* ResourceFetcher::CreateResourceForLoading( const FetchParameters& params, const ResourceFactory& factory) { const String cache_identifier = @@ -158,7 +158,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c if (!base::FeatureList::IsEnabled( blink::features::kScopeMemoryCachePerContext)) { DCHECK(!IsMainThread() || params.IsStaleRevalidation() || -@@ -2440,10 +2444,13 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() { +@@ -2518,10 +2522,13 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() { to_be_removed.clear(); } @@ -174,7 +174,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c } // Requests that can be satisfied via `archive_` (i.e. MHTML) or -@@ -2456,7 +2463,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url) const { +@@ -2534,7 +2541,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url) const { if (bundle) return bundle->GetCacheIdentifier(); @@ -186,7 +186,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 -@@ -257,7 +257,8 @@ class PLATFORM_EXPORT ResourceFetcher +@@ -258,7 +258,8 @@ class PLATFORM_EXPORT ResourceFetcher uint32_t inflight_keepalive_bytes); blink::mojom::ControllerServiceWorkerMode IsControlledByServiceWorker() const; diff --git a/build/patches/Partition-blobs-by-top-frame-URL.patch b/build/patches/Partition-blobs-by-top-frame-URL.patch index eb4656cf..f9f36b56 100644 --- a/build/patches/Partition-blobs-by-top-frame-URL.patch +++ b/build/patches/Partition-blobs-by-top-frame-URL.patch @@ -197,7 +197,7 @@ diff --git a/third_party/blink/renderer/core/fileapi/public_url_manager.cc b/thi } // namespace // Execution context names corresponding to the entries from -@@ -297,6 +312,7 @@ void PublicURLManager::Resolve( +@@ -300,6 +315,7 @@ void PublicURLManager::Resolve( GetBlobURLStore().ResolveAsURLLoaderFactory( url, std::move(factory_receiver), @@ -205,7 +205,7 @@ diff --git a/third_party/blink/renderer/core/fileapi/public_url_manager.cc b/thi WTF::BindOnce(metrics_callback, WrapPersistent(GetExecutionContext()))); } -@@ -320,6 +336,7 @@ void PublicURLManager::Resolve( +@@ -323,6 +339,7 @@ void PublicURLManager::Resolve( GetBlobURLStore().ResolveForNavigation( url, std::move(token_receiver), diff --git a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch index 85ac2db9..79dffb0d 100644 --- a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch +++ b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch @@ -27,7 +27,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.flags.ChromeFeatureList; - import org.chromium.chrome.tab_ui.R; + import org.chromium.chrome.R; import org.chromium.ui.modaldialog.DialogDismissalCause; import org.chromium.ui.modaldialog.ModalDialogManager; @@ -30,6 +31,11 @@ public class CloseAllTabsDialog { @@ -131,7 +131,7 @@ diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browse 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 -@@ -8922,6 +8922,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9202,6 +9202,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWaylandScreenCoordinatesEnabled)}, #endif @@ -148,7 +148,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3707,6 +3707,11 @@ const char kChromeSharingHubLaunchAdjacentDescription[] = +@@ -3823,6 +3823,11 @@ const char kChromeSharingHubLaunchAdjacentDescription[] = "In multi-window mode, launches share hub actions in an adjacent window. " "For internal debugging."; @@ -176,17 +176,17 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -177,6 +177,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -183,6 +183,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kBackGestureActivityTabProvider, &kBackGestureRefactorActivityAndroid, &kBackGestureRefactorAndroid, + &kCloseAllTabsModalDialog, &kBackgroundThreadPool, &kBaselineGM3SurfaceColors, - &kCastDeviceFilter, -@@ -514,6 +515,10 @@ BASE_FEATURE(kBaselineGM3SurfaceColors, - "BaselineGM3SurfaceColors", - base::FEATURE_DISABLED_BY_DEFAULT); + &kBottomSheetGtsSupport, +@@ -539,6 +540,10 @@ BASE_FEATURE(kBottomSheetGtsSupport, + "BottomSheetGtsSupport", + base::FEATURE_ENABLED_BY_DEFAULT); +BASE_FEATURE(kCloseAllTabsModalDialog, + "CloseAllTabsModalDialog", @@ -195,7 +195,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse // Used in downstream code. BASE_FEATURE(kCastDeviceFilter, "CastDeviceFilter", -@@ -524,8 +529,8 @@ BASE_FEATURE(kClearOmniboxFocusAfterNavigation, +@@ -549,8 +554,8 @@ BASE_FEATURE(kClearOmniboxFocusAfterNavigation, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kCloseTabSuggestions, @@ -204,19 +204,19 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse + "CloseTabSuggestions", // must be enabled + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - BASE_FEATURE(kCriticalPersistedTabData, - "CriticalPersistedTabData", + BASE_FEATURE(kCloseTabSaveTabList, + "CloseTabSaveTabList", 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 -@@ -37,6 +37,7 @@ BASE_DECLARE_FEATURE(kBackGestureRefactorAndroid); - BASE_DECLARE_FEATURE(kBackgroundThreadPool); +@@ -39,6 +39,7 @@ BASE_DECLARE_FEATURE(kBackgroundThreadPool); BASE_DECLARE_FEATURE(kBaselineGM3SurfaceColors); + BASE_DECLARE_FEATURE(kBottomSheetGtsSupport); BASE_DECLARE_FEATURE(kClearOmniboxFocusAfterNavigation); +BASE_DECLARE_FEATURE(kCloseAllTabsModalDialog); BASE_DECLARE_FEATURE(kCloseTabSuggestions); - BASE_DECLARE_FEATURE(kCriticalPersistedTabData); - BASE_DECLARE_FEATURE(kCommerceCoupons); + BASE_DECLARE_FEATURE(kCloseTabSaveTabList); + BASE_DECLARE_FEATURE(kCreateNewTabInitializeRenderer); 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 diff --git a/build/patches/Re-introduce-override_build_timestamp.patch b/build/patches/Re-introduce-override_build_timestamp.patch index 73c85694..35cc9996 100644 --- a/build/patches/Re-introduce-override_build_timestamp.patch +++ b/build/patches/Re-introduce-override_build_timestamp.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4027,8 +4027,13 @@ action("build_date") { +@@ -4041,8 +4041,13 @@ action("build_date") { args = [ rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir), diff --git a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch index d5603b5a..a8522159 100644 --- a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch +++ b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch @@ -38,7 +38,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 -@@ -654,6 +654,8 @@ chrome_java_resources = [ +@@ -666,6 +666,8 @@ chrome_java_resources = [ "java/res/xml/incognito_preferences.xml", "java/res/xml/privacy_preferences.xml", "java/res/xml/privacy_preferences_v2.xml", @@ -50,7 +50,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 -@@ -959,6 +959,8 @@ chrome_java_sources = [ +@@ -961,6 +961,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java", @@ -164,7 +164,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 -@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; +@@ -32,6 +32,7 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthSettingSwitchPreference; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsFragment; @@ -172,7 +172,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings; import org.chromium.chrome.browser.privacy_guide.PrivacyGuideInteractions; import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxBridge; -@@ -79,6 +80,7 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -85,6 +86,7 @@ public class PrivacySettings extends PreferenceFragmentCompat private static final String PREF_DO_NOT_TRACK = "do_not_track"; private static final String PREF_SAFE_BROWSING = "safe_browsing"; private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; @@ -180,7 +180,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; private static final String PREF_PROXY_OPTIONS = "proxy"; -@@ -345,6 +347,10 @@ public class PrivacySettings extends PreferenceFragmentCompat +@@ -354,6 +356,10 @@ public class PrivacySettings extends PreferenceFragmentCompat : R.string.text_off); } @@ -382,7 +382,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows pref_change_registrar_.Add( prefs::kExplicitlyAllowedNetworkPorts, base::BindRepeating( -@@ -561,6 +564,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -575,6 +578,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { // the system NetworkContext, and the per-profile pref values are used for // the profile NetworkContexts. registry->RegisterBooleanPref(prefs::kEnableReferrers, true); @@ -404,7 +404,7 @@ diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/render 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 -@@ -939,6 +939,30 @@ CHAR_LIMIT guidelines: +@@ -933,6 +933,30 @@ CHAR_LIMIT guidelines: For example, some websites may respond to this request by showing you ads that aren’t based on other websites you’ve visited. Many websites will still collect and use your browsing data — for example to improve security, to provide content, ads and recommendations, and to generate reporting statistics. @@ -462,7 +462,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -1298,6 +1298,9 @@ const char kEnableHyperlinkAuditing[] = "enable_a_ping"; +@@ -1331,6 +1331,9 @@ const char kEnableHyperlinkAuditing[] = "enable_a_ping"; // Whether to enable sending referrers. const char kEnableReferrers[] = "enable_referrers"; @@ -475,7 +475,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc 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 -@@ -408,6 +408,7 @@ extern const char kPinnedTabs[]; +@@ -414,6 +414,7 @@ extern const char kPinnedTabs[]; extern const char kDisable3DAPIs[]; extern const char kEnableHyperlinkAuditing[]; extern const char kEnableReferrers[]; @@ -486,7 +486,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h 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 -@@ -430,6 +430,14 @@ void AddAdditionalRequestHeaders( +@@ -412,6 +412,14 @@ void AddAdditionalRequestHeaders( blink::mojom::Referrer(GURL(), network::mojom::ReferrerPolicy::kNever); } @@ -504,7 +504,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h --- a/services/network/public/cpp/resource_request.h +++ b/services/network/public/cpp/resource_request.h -@@ -133,7 +133,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest { +@@ -134,7 +134,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest { std::vector navigation_redirect_chain; GURL referrer; diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index 75e8def2..47597708 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -40,7 +40,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 -@@ -2412,16 +2412,6 @@ public abstract class ChromeActivity +@@ -2415,16 +2415,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); 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 b47c3d9e..b4263587 100644 --- a/build/patches/Remove-window-name-on-cross-origin-navigation.patch +++ b/build/patches/Remove-window-name-on-cross-origin-navigation.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -2533,7 +2533,7 @@ void DocumentLoader::CommitNavigation() { +@@ -2557,7 +2557,7 @@ 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. @@ -22,7 +22,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p frame_->Tree().ExperimentalSetNulledName(); } -@@ -2544,6 +2544,7 @@ void DocumentLoader::CommitNavigation() { +@@ -2568,6 +2568,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-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 50b19829..a78df864 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -8812,6 +8812,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9084,6 +9084,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDesksTemplatesDescription, kOsCrOS, FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)}, #endif @@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -2905,6 +2905,11 @@ +@@ -2992,6 +2992,11 @@ // Added feature, for testing. expiry deep in future. "expiry_milestone": 116 }, @@ -50,7 +50,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -4103,6 +4103,11 @@ const char kSendTabToSelfV2Description[] = +@@ -4227,6 +4227,11 @@ const char kSendTabToSelfV2Description[] = "Enables new received tab " "UI shown next to the profile icon instead of using system notifications."; @@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2359,6 +2359,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[]; +@@ -2459,6 +2459,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[]; extern const char kSendTabToSelfV2Name[]; extern const char kSendTabToSelfV2Description[]; @@ -78,15 +78,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -266,6 +266,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kReaderModeInCCT, +@@ -280,6 +280,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kRecordSuppressionMetrics, + &kReduceToolbarUpdatesForSameDocNavigations, &kReengagementNotification, + &kSearchReadyOmniboxFeature, &kRelatedSearches, &kReportParentalControlSitesChild, &kRequestDesktopSiteDefaults, -@@ -829,6 +830,10 @@ BASE_FEATURE(kOpaqueOriginForIncomingIntents, +@@ -886,6 +887,10 @@ BASE_FEATURE(kOpaqueOriginForIncomingIntents, "OpaqueOriginForIncomingIntents", base::FEATURE_ENABLED_BY_DEFAULT); @@ -94,13 +94,13 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse + "SearchReadyOmnibox", + base::FEATURE_DISABLED_BY_DEFAULT); + - BASE_FEATURE(kOptimizeGeolocationHeaderGeneration, - "OptimizeGeolocationHeaderGeneration", + BASE_FEATURE(kPartnerHomepageInitialLoadImprovement, + "PartnerHomepageInitialLoadImprovement", base::FEATURE_ENABLED_BY_DEFAULT); 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 -@@ -148,6 +148,7 @@ BASE_DECLARE_FEATURE(kRequestDesktopSiteOptInSynthetic); +@@ -157,6 +157,7 @@ BASE_DECLARE_FEATURE(kRequestDesktopSiteOptInSynthetic); BASE_DECLARE_FEATURE(kRequestDesktopSiteDefaultsDowngrade); BASE_DECLARE_FEATURE(kRequestDesktopSiteDefaultsLogging); BASE_DECLARE_FEATURE(kRequestDesktopSitePerSiteIph); @@ -111,12 +111,12 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -378,6 +378,7 @@ public abstract class ChromeFeatureList { - "MessagesForAndroidStackingAnimation"; - public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError"; - public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid"; +@@ -370,6 +370,7 @@ public abstract class ChromeFeatureList { + "MessagesForAndroidInfrastructure"; + public static final String MESSAGES_FOR_ANDROID_PERMISSION_UPDATE = + "MessagesForAndroidPermissionUpdate"; + public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; - public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; + public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid"; public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java @@ -130,15 +130,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.base.supplier.Supplier; import org.chromium.chrome.browser.omnibox.OmniboxFeatures; import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider; -@@ -62,6 +63,7 @@ class DropdownItemViewInfoListBuilder { - private @NonNull BookmarkState mBookmarkState; +@@ -65,6 +66,7 @@ class DropdownItemViewInfoListBuilder { @Px private int mDropdownHeight; + private OpenHistoryClustersDelegate mOpenHistoryClustersDelegate; + private EditUrlSuggestionProcessor mEditUrlSuggestionProcessor; DropdownItemViewInfoListBuilder(@NonNull Supplier tabSupplier, BookmarkState bookmarkState, - @NonNull ActionChipsDelegate actionChipsDelegate) { -@@ -98,8 +100,10 @@ class DropdownItemViewInfoListBuilder { + @NonNull ActionChipsDelegate actionChipsDelegate, +@@ -103,8 +105,10 @@ class DropdownItemViewInfoListBuilder { mDividerLineProcessor = new DividerLineProcessor(context); } mHeaderProcessor = new HeaderProcessor(context); @@ -151,7 +151,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow registerSuggestionProcessor(new AnswerSuggestionProcessor( context, host, mActionChipsDelegate, textProvider, imageFetcherSupplier)); registerSuggestionProcessor( -@@ -230,6 +234,9 @@ class DropdownItemViewInfoListBuilder { +@@ -237,6 +241,9 @@ class DropdownItemViewInfoListBuilder { /** Signals that native initialization has completed. */ void onNativeInitialized() { mHeaderProcessor.onNativeInitialized(); 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 19cbd3a1..032d312b 100644 --- a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch +++ b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch @@ -20,15 +20,15 @@ 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/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 -@@ -46,6 +46,7 @@ import org.chromium.chrome.browser.sync.SyncService; +@@ -45,6 +45,7 @@ import org.chromium.chrome.browser.signin.services.SigninManager; + import org.chromium.chrome.browser.sync.SyncService; import org.chromium.chrome.browser.sync.settings.ManageSyncSettings; - import org.chromium.chrome.browser.sync.settings.SignInPreference; import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils; +import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarFeatures; import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarStatePredictor; import org.chromium.chrome.browser.tracing.settings.DeveloperSettings; import org.chromium.components.browser_ui.settings.ChromeBasePreference; -@@ -217,7 +218,9 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -211,7 +212,9 @@ public class MainSettings extends PreferenceFragmentCompat new AdaptiveToolbarStatePredictor(null).recomputeUiState(uiState -> { // We don't show the toolbar shortcut settings page if disabled from finch. @@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareButt 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 -@@ -614,18 +614,12 @@ const FeatureEntry::FeatureParam kAdaptiveButtonCustomization_Share[] = { +@@ -616,18 +616,12 @@ const FeatureEntry::FeatureParam kAdaptiveButtonCustomization_Share[] = { {"default_segment", "share"}, {"show_ui_only_after_ready", "false"}, {"ignore_segmentation_results", "true"}}; @@ -111,7 +111,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -49,9 +49,10 @@ +@@ -54,9 +54,10 @@ "expiry_milestone": 120 }, { @@ -169,7 +169,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow private static final String VARIATION_PARAM_SHOW_UI_ONLY_AFTER_READY = "show_ui_only_after_ready"; @VisibleForTesting -@@ -90,6 +101,21 @@ public class AdaptiveToolbarFeatures { +@@ -95,6 +106,21 @@ public class AdaptiveToolbarFeatures { } } @@ -191,7 +191,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** * Returns whether the adaptive toolbar is enabled with segmentation and customization. * -@@ -185,12 +211,49 @@ public class AdaptiveToolbarFeatures { +@@ -205,12 +231,49 @@ public class AdaptiveToolbarFeatures { ChromeFeatureList.CONTEXTUAL_PAGE_ACTIONS, "enable_ui", true); } diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index 70d4c1f7..51c2dfd3 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -89,7 +89,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 -@@ -835,7 +835,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -828,7 +828,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { private void initStatusIndicatorCoordinator(LayoutManagerImpl layoutManager) { // TODO(crbug.com/1035584): Disable on tablets for now as we need to do one or two extra // things for tablets. @@ -99,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab return; } -@@ -857,6 +858,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -850,6 +851,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mStatusIndicatorCoordinator.addObserver(mStatusIndicatorObserver); mStatusIndicatorCoordinator.addObserver(mStatusBarColorController); @@ -114,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab 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 -@@ -4781,6 +4781,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4893,6 +4893,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOfflinePagesLivePageSharingName, flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, @@ -127,7 +127,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -5241,6 +5241,11 @@ +@@ -5425,6 +5425,11 @@ "owners": [ "//components/search/OWNERS" ], "expiry_milestone": 118 }, @@ -142,7 +142,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3932,6 +3932,10 @@ const char kNotificationPermissionRationaleBottomSheetDescription[] = +@@ -4051,6 +4051,10 @@ const char kNotificationPermissionRationaleBottomSheetDescription[] = "flow. " "Only works with builds targeting Android T+."; @@ -156,7 +156,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2263,6 +2263,9 @@ extern const char kNetworkServiceInProcessDescription[]; +@@ -2355,6 +2355,9 @@ extern const char kNetworkServiceInProcessDescription[]; extern const char kNotificationPermissionRationaleName[]; extern const char kNotificationPermissionRationaleDescription[]; @@ -169,17 +169,17 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -253,6 +253,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -264,6 +264,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kLensOnQuickActionSearchWidget, &kNotificationPermissionVariant, &kNotificationPermissionBottomSheet, + &kOfflineIndicatorV2, &kPageAnnotationsService, + &kPreconnectOnTabCreation, &kInlineUpdateFlow, - &kBookmarksImprovedSaveFlow, -@@ -760,6 +761,10 @@ BASE_FEATURE(kDownloadHomeForExternalApp, - "DownloadHomeForExternalApp", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -799,6 +800,10 @@ BASE_FEATURE(kDrawEdgeToEdge, + + BASE_FEATURE(kEmptyStates, "EmptyStates", base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kOfflineIndicatorV2, + "OfflineIndicatorV2", @@ -191,7 +191,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -114,6 +114,7 @@ BASE_DECLARE_FEATURE(kLanguagesPreference); +@@ -120,6 +120,7 @@ BASE_DECLARE_FEATURE(kLanguagesPreference); BASE_DECLARE_FEATURE(kLensCameraAssistedSearch); BASE_DECLARE_FEATURE(kLensOnQuickActionSearchWidget); BASE_DECLARE_FEATURE(kLocationBarModelOptimizations); @@ -202,7 +202,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -388,6 +388,7 @@ public abstract class ChromeFeatureList { +@@ -380,6 +380,7 @@ public abstract class ChromeFeatureList { public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = "NotificationPermissionBottomSheet"; diff --git a/build/patches/Revert-Delete-block-external-form-redirects.patch b/build/patches/Revert-Delete-block-external-form-redirects.patch index 01c84aa8..f861cca3 100644 --- a/build/patches/Revert-Delete-block-external-form-redirects.patch +++ b/build/patches/Revert-Delete-block-external-form-redirects.patch @@ -20,15 +20,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -240,6 +240,7 @@ +@@ -241,6 +241,7 @@ #include "chrome/browser/push_messaging/push_messaging_features.h" #include "components/browser_ui/photo_picker/android/features.h" #include "components/content_creation/notes/core/note_features.h" +#include "components/external_intents/android/external_intents_features.h" #include "components/translate/content/android/translate_message.h" + #include "ui/android/ui_android_features.h" #else // BUILDFLAG(IS_ANDROID) - #include "chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.h" -@@ -7542,6 +7543,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7756,6 +7757,12 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) && BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -764,6 +764,11 @@ +@@ -784,6 +784,11 @@ "owners": [ "jdeblasio", "trusty-transport@chromium.org" ], "expiry_milestone": 118 }, @@ -55,11 +55,11 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js + }, { "name": "block-insecure-private-network-requests", - "owners": [ "titouan", "chrome-security-owp-team@google.com" ], + "owners": [ "titouan", "lyf", "chrome-security-owp-team@google.com" ], diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3852,6 +3852,12 @@ const char kInstantStartName[] = "Instant start"; +@@ -3971,6 +3971,12 @@ const char kInstantStartName[] = "Instant start"; const char kInstantStartDescription[] = "Show start surface before native library is loaded."; @@ -75,7 +75,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2215,6 +2215,9 @@ extern const char kInstanceSwitcherDescription[]; +@@ -2307,6 +2307,9 @@ extern const char kInstanceSwitcherDescription[]; extern const char kInstantStartName[]; extern const char kInstantStartDescription[]; @@ -88,19 +88,18 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -18,10 +18,10 @@ namespace { +@@ -18,9 +18,9 @@ namespace { // Array of features exposed through the Java ExternalIntentsFeatures API. const base::Feature* kFeaturesExposedToJava[] = { + &kIntentBlockExternalFormRedirectsNoGesture, - &kExternalNavigationDebugLogs, &kExternalNavigationSubframeRedirects, - &kBlockSubframeIntentToSelf, &kBlockFrameRenavigations, + &kExternalNavigationDebugLogs, &kBlockFrameRenavigations, &kDoNotRequireSpecializedCCTHandler, &kBlockIntentsToSelf}; - } // namespace // Alphabetical: -@@ -50,6 +50,10 @@ BASE_FEATURE(kBlockIntentsToSelf, +@@ -41,6 +41,10 @@ BASE_FEATURE(kBlockIntentsToSelf, "BlockIntentsToSelf", base::FEATURE_ENABLED_BY_DEFAULT); @@ -120,8 +119,8 @@ diff --git a/components/external_intents/android/external_intents_features.h b/c +BASE_DECLARE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture); BASE_DECLARE_FEATURE(kExternalNavigationDebugLogs); - BASE_DECLARE_FEATURE(kExternalNavigationSubframeRedirects); - BASE_DECLARE_FEATURE(kBlockSubframeIntentToSelf); + BASE_DECLARE_FEATURE(kBlockFrameRenavigations); + BASE_DECLARE_FEATURE(kDoNotRequireSpecializedCCTHandler); 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 @@ -136,12 +135,12 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component + new ExternalIntentsFeatures(0, INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME); + public static final String EXTERNAL_NAVIGATION_DEBUG_LOGS_NAME = "ExternalNavigationDebugLogs"; - public static final String EXTERNAL_NAVIGATION_SUBFRAME_REDIRECTS_NAME = - "ExternalNavigationSubframeRedirects"; + public static final String BLOCK_FRAME_RENAVIGATIONS_NAME = "BlockFrameRenavigations2"; + public static final String DO_NOT_REQUIRE_SPECIALIZED_CCT_HANDLER_NAME = 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 -@@ -1492,6 +1492,12 @@ public class ExternalNavigationHandler { +@@ -1504,6 +1504,12 @@ public class ExternalNavigationHandler { } } @@ -154,7 +153,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal( ExternalNavigationParams params, Intent targetIntent, GURL browserFallbackUrl, MutableBoolean canLaunchExternalFallbackResult) { -@@ -1542,6 +1548,21 @@ public class ExternalNavigationHandler { +@@ -1558,6 +1564,21 @@ public class ExternalNavigationHandler { return OverrideUrlLoadingResult.forNoOverride(); } diff --git a/build/patches/Revert-Permit-blocking-of-view-source.patch b/build/patches/Revert-Permit-blocking-of-view-source.patch index ab08ed6f..36bc4c1c 100644 --- a/build/patches/Revert-Permit-blocking-of-view-source.patch +++ b/build/patches/Revert-Permit-blocking-of-view-source.patch @@ -6,140 +6,10 @@ This reverts commit e72fc9b64116bf259e516096fcc60b58ae8ae1b3. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../test/url_blocklist_policy_browsertest.cc | 78 ------------------- - .../policy/url_blocking_policy_test_utils.cc | 11 --- - .../policy/url_blocking_policy_test_utils.h | 3 - - .../policy_blocklist_navigation_throttle.cc | 19 ----- - .../policy_blocklist_navigation_throttle.h | 4 - - 5 files changed, 115 deletions(-) + .../policy_blocklist_navigation_throttle.cc | 19 ------------------- + .../policy_blocklist_navigation_throttle.h | 4 ---- + 2 files changed, 23 deletions(-) -diff --git a/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc b/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc ---- a/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc -+++ b/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc -@@ -60,14 +60,6 @@ void CheckCanOpenURL(Browser* browser, const std::string& spec) { - EXPECT_NE(blocked_page_title, contents->GetTitle()); - } - --void CheckCanOpenViewSourceURL(Browser* browser, const std::string& spec) { -- GURL view_source_url("view-source:" + spec); -- ASSERT_TRUE(ui_test_utils::NavigateToURL(browser, view_source_url)); -- content::WebContents* contents = -- browser->tab_strip_model()->GetActiveWebContents(); -- EXPECT_EQ(view_source_url, contents->GetLastCommittedURL()); --} -- - // Handler for embedded http-server, returns a small page with javascript - // variable and a link to increment it. It's for JavascriptBlocklistable test. - std::unique_ptr JSIncrementerPageHandler( -@@ -148,76 +140,6 @@ IN_PROC_BROWSER_TEST_F(UrlBlockingPolicyTest, URLBlocklist) { - CheckCanOpenURL(browser(), kURLS[4]); - } - --IN_PROC_BROWSER_TEST_F(UrlBlockingPolicyTest, URLBlocklistViewSource) { -- // Checks that blocklisted urls are blocked when accessed by via view-source:, -- // and that blocklisting view-source:* blocks all view-source urls. -- -- ASSERT_TRUE(embedded_test_server()->Start()); -- -- const std::string kURL_A = -- embedded_test_server()->GetURL("aaa.com", "/empty.html").spec(); -- const std::string kURL_B = -- embedded_test_server()->GetURL("bbb.com", "/empty.html").spec(); -- -- // Ensure that no urls are blocked by default. -- CheckCanOpenURL(browser(), kURL_A); -- CheckCanOpenURL(browser(), kURL_B); -- CheckCanOpenViewSourceURL(browser(), kURL_A); -- CheckCanOpenViewSourceURL(browser(), kURL_B); -- -- // Block bbb.com urls. -- base::Value::List blocklist; -- blocklist.Append("bbb.com"); -- PolicyMap policies; -- policies.Set(key::kURLBlocklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, -- POLICY_SOURCE_CLOUD, base::Value(blocklist.Clone()), nullptr); -- UpdateProviderPolicy(policies); -- FlushBlocklistPolicy(); -- -- // Verify that blocking bbb.com also blocks view-source:bbb.com. -- CheckURLIsBlocked(browser(), kURL_B); -- CheckViewSourceURLIsBlocked(browser(), kURL_B); -- -- // Block all view-source urls. -- blocklist.Append("view-source:*"); -- policies.Set(key::kURLBlocklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, -- POLICY_SOURCE_CLOUD, base::Value(blocklist.Clone()), nullptr); -- UpdateProviderPolicy(policies); -- FlushBlocklistPolicy(); -- -- // Verify that blocking view-source:* blocks view-source:aaa.com but does not -- // block http://aaa.com. -- CheckViewSourceURLIsBlocked(browser(), kURL_A); -- CheckCanOpenURL(browser(), kURL_A); --} -- --IN_PROC_BROWSER_TEST_F(UrlBlockingPolicyTest, URLBlocklistNonStandardScheme) { -- // Checks that non-standard schemes can be blocklisted, and that the blocking -- // page mentions the URL's scheme. -- const std::string kURL = "mailto:nobody"; -- -- // Block mailto: urls. -- base::Value::List blocklist; -- blocklist.Append("mailto:*"); -- PolicyMap policies; -- policies.Set(key::kURLBlocklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, -- POLICY_SOURCE_CLOUD, base::Value(blocklist.Clone()), nullptr); -- UpdateProviderPolicy(policies); -- FlushBlocklistPolicy(); -- -- // Ensure the URL is blocked. -- CheckURLIsBlocked(browser(), kURL); -- -- // Ensure the blocking page mentions the scheme. -- content::WebContents* contents = -- browser()->tab_strip_model()->GetActiveWebContents(); -- std::string result; -- ASSERT_TRUE(content::ExecuteScriptAndExtractString( -- contents, "domAutomationController.send(document.body.textContent);", -- &result)); -- EXPECT_THAT(result, testing::HasSubstr("mailto")); --} -- - IN_PROC_BROWSER_TEST_F(UrlBlockingPolicyTest, URLBlocklistIncognito) { - // Checks that URLs can be blocklisted, and that exceptions can be made to - // the blocklist. -diff --git a/chrome/browser/policy/url_blocking_policy_test_utils.cc b/chrome/browser/policy/url_blocking_policy_test_utils.cc ---- a/chrome/browser/policy/url_blocking_policy_test_utils.cc -+++ b/chrome/browser/policy/url_blocking_policy_test_utils.cc -@@ -56,15 +56,4 @@ void UrlBlockingPolicyTest::CheckURLIsBlocked(Browser* browser, - CheckURLIsBlockedInWebContents(contents, url); - } - --void UrlBlockingPolicyTest::CheckViewSourceURLIsBlocked( -- Browser* browser, -- const std::string& spec) { -- GURL url(spec); -- GURL view_source_url("view-source:" + spec); -- ASSERT_TRUE(ui_test_utils::NavigateToURL(browser, view_source_url)); -- content::WebContents* contents = -- browser->tab_strip_model()->GetActiveWebContents(); -- CheckURLIsBlockedInWebContents(contents, url); --} -- - } // namespace policy -diff --git a/chrome/browser/policy/url_blocking_policy_test_utils.h b/chrome/browser/policy/url_blocking_policy_test_utils.h ---- a/chrome/browser/policy/url_blocking_policy_test_utils.h -+++ b/chrome/browser/policy/url_blocking_policy_test_utils.h -@@ -29,9 +29,6 @@ class UrlBlockingPolicyTest : public PolicyTest { - - // Verifies that access to the given url |spec| is blocked. - void CheckURLIsBlocked(Browser* browser, const std::string& spec); -- -- // Verifies that access to |view-source:spec| is blocked. -- void CheckViewSourceURLIsBlocked(Browser* browser, const std::string& spec); - }; - - } // namespace policy diff --git a/components/policy/content/policy_blocklist_navigation_throttle.cc b/components/policy/content/policy_blocklist_navigation_throttle.cc --- a/components/policy/content/policy_blocklist_navigation_throttle.cc +++ b/components/policy/content/policy_blocklist_navigation_throttle.cc 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 87a9c3aa..5ce73526 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 @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -4254,6 +4254,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4359,6 +4359,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableVulkanDescription, kOsWin | kOsLinux | kOsAndroid, FEATURE_VALUE_TYPE(features::kVulkan)}, #if BUILDFLAG(IS_ANDROID) @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -1512,6 +1512,10 @@ +@@ -1575,6 +1575,10 @@ "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ], "expiry_milestone": 122 }, @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3978,6 +3978,10 @@ const char kReadLaterDescription[] = +@@ -4097,6 +4097,10 @@ const char kReadLaterDescription[] = "Allow users to save tabs for later. Enables a new button and menu for " "accessing tabs saved for later."; @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2287,6 +2287,9 @@ extern const char kQueryTilesSegmentationDescription[]; +@@ -2387,6 +2387,9 @@ extern const char kQueryTilesSegmentationDescription[]; extern const char kQueryTilesSwapTrendingName[]; extern const char kQueryTilesSwapTrendingDescription[]; diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch index b2aa1f4a..1540c8fe 100644 --- a/build/patches/Revert-flags-remove-num-raster-threads.patch +++ b/build/patches/Revert-flags-remove-num-raster-threads.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -376,6 +376,15 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = { +@@ -378,6 +378,15 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = { "single-fullscreen,single-on-top,underlay"}, }; @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, {flag_descriptions::kTouchSelectionStrategyCharacter, -@@ -4449,6 +4458,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4554,6 +4563,9 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(mojo::core::kMojoLinuxChannelSharedMem)}, #endif #if BUILDFLAG(IS_ANDROID) @@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -4913,6 +4913,10 @@ +@@ -5097,6 +5097,10 @@ "owners": [ "lazzzis", "aishwaryarj"], "expiry_milestone": 118 }, @@ -58,9 +58,9 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2039,6 +2039,14 @@ const char kOmitCorsClientCertDescription[] = - "credential mode disallows. Without this flag enabled, Chrome will always " - "try sending client certificates regardless of the credential mode."; +@@ -2112,6 +2112,14 @@ const char kOmniboxActionsInSuggestDescription[] = + "Actions in Suggest permits optional Action Chips to be attached to " + "Entity suggestions."; +const char kNumRasterThreadsName[] = "Number of raster threads"; +const char kNumRasterThreadsDescription[] = @@ -76,9 +76,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1154,6 +1154,13 @@ extern const char kOriginAgentClusterDefaultDescription[]; - extern const char kOmitCorsClientCertName[]; - extern const char kOmitCorsClientCertDescription[]; +@@ -1197,6 +1197,13 @@ extern const char kOmitCorsClientCertDescription[]; + extern const char kOmniboxActionsInSuggestName[]; + extern const char kOmniboxActionsInSuggestDescription[]; +extern const char kNumRasterThreadsName[]; +extern const char kNumRasterThreadsDescription[]; 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 bdb5635a..99fc763f 100644 --- a/build/patches/Revert-removal-of-execution-context-address-space.patch +++ b/build/patches/Revert-removal-of-execution-context-address-space.patch @@ -58,7 +58,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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 -@@ -173,7 +173,7 @@ BASE_FEATURE(kBlockInsecurePrivateNetworkRequestsFromPrivate, +@@ -178,7 +178,7 @@ BASE_FEATURE(kBlockInsecurePrivateNetworkRequestsFromPrivate, // - kBlockInsecurePrivateNetworkRequests BASE_FEATURE(kBlockInsecurePrivateNetworkRequestsFromUnknown, "BlockInsecurePrivateNetworkRequestsFromUnknown", @@ -70,7 +70,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c 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 -@@ -575,6 +575,15 @@ void ExecutionContext::SetReferrerPolicy( +@@ -583,6 +583,15 @@ void ExecutionContext::SetReferrerPolicy( policy_container_->UpdateReferrerPolicy(referrer_policy); } @@ -97,7 +97,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/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/tokens/tokens.h" -@@ -405,6 +406,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable, +@@ -408,6 +409,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable, const String& message = g_empty_string, const String& source_file = g_empty_string) const {} @@ -110,7 +110,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc --- a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc +++ b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc -@@ -278,6 +278,7 @@ void WebSharedWorkerImpl::StartWorkerContext( +@@ -273,6 +273,7 @@ void WebSharedWorkerImpl::StartWorkerContext( MakeGarbageCollected(), std::make_unique( std::move(content_settings)), @@ -175,7 +175,7 @@ diff --git a/third_party/blink/renderer/core/frame/policy_container.h b/third_pa diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc --- a/third_party/blink/renderer/core/frame/web_frame_test.cc +++ b/third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -8064,6 +8064,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { +@@ -8063,6 +8063,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { EXPECT_EQ(client.StopLoadingCount(), 2); } @@ -273,7 +273,7 @@ diff --git a/third_party/blink/renderer/core/loader/modulescript/worker_module_s diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third_party/blink/renderer/core/workers/dedicated_worker.cc --- a/third_party/blink/renderer/core/workers/dedicated_worker.cc +++ b/third_party/blink/renderer/core/workers/dedicated_worker.cc -@@ -275,12 +275,12 @@ void DedicatedWorker::OnHostCreated( +@@ -276,12 +276,12 @@ void DedicatedWorker::OnHostCreated( if (options_->type() == script_type_names::kModule) { // Specify empty source code etc. here because scripts will be fetched on // the worker thread. @@ -292,7 +292,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third return; } NOTREACHED() << "Invalid type: " << IDLEnumAsString(options_->type()); -@@ -328,6 +328,7 @@ void DedicatedWorker::OnScriptLoadStarted( +@@ -329,6 +329,7 @@ void DedicatedWorker::OnScriptLoadStarted( ContinueStart(script_request_url_, std::move(worker_main_script_load_params), network::mojom::ReferrerPolicy::kDefault, Vector(), @@ -300,7 +300,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third String() /* source_code */, RejectCoepUnsafeNone(false), std::move(back_forward_cache_controller_host)); } -@@ -391,6 +392,7 @@ void DedicatedWorker::OnFinished( +@@ -392,6 +393,7 @@ void DedicatedWorker::OnFinished( ? mojo::Clone(classic_script_loader_->GetContentSecurityPolicy() ->GetParsedPolicies()) : Vector(), @@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third classic_script_loader_->SourceText(), RejectCoepUnsafeNone(false), std::move(back_forward_cache_controller_host)); probe::ScriptImported(GetExecutionContext(), -@@ -407,6 +409,7 @@ void DedicatedWorker::ContinueStart( +@@ -408,6 +410,7 @@ void DedicatedWorker::ContinueStart( network::mojom::ReferrerPolicy referrer_policy, Vector response_content_security_policies, @@ -316,7 +316,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third const String& source_code, RejectCoepUnsafeNone reject_coep_unsafe_none, mojo::PendingRemote -@@ -414,7 +417,8 @@ void DedicatedWorker::ContinueStart( +@@ -415,7 +418,8 @@ void DedicatedWorker::ContinueStart( context_proxy_->StartWorkerGlobalScope( CreateGlobalScopeCreationParams( script_url, referrer_policy, @@ -326,7 +326,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third std::move(worker_main_script_load_params), options_, script_url, *outside_fetch_client_settings_object_, v8_stack_trace_id_, source_code, reject_coep_unsafe_none, token_, -@@ -451,7 +455,8 @@ DedicatedWorker::CreateGlobalScopeCreationParams( +@@ -452,7 +456,8 @@ DedicatedWorker::CreateGlobalScopeCreationParams( const KURL& script_url, network::mojom::ReferrerPolicy referrer_policy, Vector @@ -336,7 +336,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third base::UnguessableToken parent_devtools_token; std::unique_ptr settings; ExecutionContext* execution_context = GetExecutionContext(); -@@ -500,6 +505,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams( +@@ -501,6 +506,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams( execution_context->GetSecurityOrigin(), execution_context->IsSecureContext(), execution_context->GetHttpsState(), MakeGarbageCollected(), CreateWebContentSettingsClient(), @@ -549,7 +549,7 @@ diff --git a/third_party/blink/renderer/core/workers/main_thread_worklet_test.cc diff --git a/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc b/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc --- a/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc +++ b/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc -@@ -111,6 +111,7 @@ const AtomicString& SharedWorkerGlobalScope::InterfaceName() const { +@@ -76,6 +76,7 @@ const AtomicString& SharedWorkerGlobalScope::InterfaceName() const { void SharedWorkerGlobalScope::Initialize( const KURL& response_url, network::mojom::ReferrerPolicy response_referrer_policy, @@ -557,7 +557,7 @@ diff --git a/third_party/blink/renderer/core/workers/shared_worker_global_scope. Vector response_csp, const Vector* response_origin_trial_tokens) { // Step 12.3. "Set worker global scope's url to response's url." -@@ -124,6 +125,9 @@ void SharedWorkerGlobalScope::Initialize( +@@ -89,6 +90,9 @@ void SharedWorkerGlobalScope::Initialize( // parsing the `Referrer-Policy` header of response." SetReferrerPolicy(response_referrer_policy); @@ -567,7 +567,7 @@ diff --git a/third_party/blink/renderer/core/workers/shared_worker_global_scope. // Step 12.6. "Execute the Initialize a global object's CSP list algorithm // on worker global scope and response. [CSP]" // SharedWorkerGlobalScope inherits the outside's CSP instead of the response -@@ -133,6 +137,8 @@ void SharedWorkerGlobalScope::Initialize( +@@ -98,6 +102,8 @@ void SharedWorkerGlobalScope::Initialize( // https://fetch.spec.whatwg.org/#local-scheme // // https://w3c.github.io/webappsec-csp/#initialize-global-object-csp @@ -576,7 +576,7 @@ diff --git a/third_party/blink/renderer/core/workers/shared_worker_global_scope. Vector csp_headers = response_url.ProtocolIsAbout() || response_url.ProtocolIsData() || response_url.ProtocolIs("blob") -@@ -280,6 +286,7 @@ void SharedWorkerGlobalScope::DidFetchClassicScript( +@@ -245,6 +251,7 @@ void SharedWorkerGlobalScope::DidFetchClassicScript( // Step 12.3-12.6 are implemented in Initialize(). Initialize(classic_script_loader->ResponseURL(), response_referrer_policy, @@ -587,7 +587,7 @@ diff --git a/third_party/blink/renderer/core/workers/shared_worker_global_scope. diff --git a/third_party/blink/renderer/core/workers/shared_worker_global_scope.h b/third_party/blink/renderer/core/workers/shared_worker_global_scope.h --- a/third_party/blink/renderer/core/workers/shared_worker_global_scope.h +++ b/third_party/blink/renderer/core/workers/shared_worker_global_scope.h -@@ -65,6 +65,7 @@ class CORE_EXPORT SharedWorkerGlobalScope final : public WorkerGlobalScope { +@@ -64,6 +64,7 @@ class CORE_EXPORT SharedWorkerGlobalScope final : public WorkerGlobalScope { void Initialize( const KURL& response_url, network::mojom::ReferrerPolicy response_referrer_policy, @@ -786,7 +786,7 @@ diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_imp diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc --- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc +++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc -@@ -453,6 +453,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript( +@@ -454,6 +454,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript( // is set, and with the following callback steps given evaluationStatus:" RunClassicScript( classic_script_loader->ResponseURL(), referrer_policy, @@ -794,7 +794,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl classic_script_loader->GetContentSecurityPolicy() ? mojo::Clone(classic_script_loader->GetContentSecurityPolicy() ->GetParsedPolicies()) -@@ -466,6 +467,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript( +@@ -467,6 +468,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript( void ServiceWorkerGlobalScope::Initialize( const KURL& response_url, network::mojom::ReferrerPolicy response_referrer_policy, @@ -802,7 +802,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl Vector response_csp, const Vector* response_origin_trial_tokens) { // Step 4.5. "Set workerGlobalScope's url to serviceWorker's script url." -@@ -479,6 +481,9 @@ void ServiceWorkerGlobalScope::Initialize( +@@ -480,6 +482,9 @@ void ServiceWorkerGlobalScope::Initialize( // script resource's referrer policy." SetReferrerPolicy(response_referrer_policy); @@ -812,7 +812,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl // This is quoted from the "Content Security Policy" algorithm in the service // workers spec: // "Whenever a user agent invokes Run Service Worker algorithm with a service -@@ -489,6 +494,9 @@ void ServiceWorkerGlobalScope::Initialize( +@@ -490,6 +495,9 @@ void ServiceWorkerGlobalScope::Initialize( // - If serviceWorker's script resource was delivered with a // Content-Security-Policy-Report-Only HTTP header containing the value // policy, the user agent must monitor policy for serviceWorker." @@ -822,7 +822,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl InitContentSecurityPolicyFromVector(std::move(response_csp)); BindContentSecurityPolicyToExecutionContext(); -@@ -529,26 +537,27 @@ void ServiceWorkerGlobalScope::LoadAndRunInstalledClassicScript( +@@ -530,26 +538,27 @@ void ServiceWorkerGlobalScope::LoadAndRunInstalledClassicScript( kDoNotSupportReferrerPolicyLegacyKeywords, &referrer_policy); } @@ -861,7 +861,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h --- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h +++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h -@@ -120,6 +120,7 @@ class MODULES_EXPORT ServiceWorkerGlobalScope final +@@ -123,6 +123,7 @@ class MODULES_EXPORT ServiceWorkerGlobalScope final void Initialize( const KURL& response_url, network::mojom::ReferrerPolicy response_referrer_policy, @@ -869,7 +869,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl Vector response_csp, const Vector* response_origin_trial_tokens) override; // Fetches and runs the top-level classic worker script. -@@ -370,6 +371,7 @@ class MODULES_EXPORT ServiceWorkerGlobalScope final +@@ -373,6 +374,7 @@ class MODULES_EXPORT ServiceWorkerGlobalScope final void RunClassicScript( const KURL& response_url, network::mojom::ReferrerPolicy response_referrer_policy, diff --git a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch index af13f5ee..644e6699 100644 --- a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch +++ b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch @@ -46,7 +46,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -192,6 +192,11 @@ android_resources("java_resources") { +@@ -194,6 +194,11 @@ android_resources("java_resources") { "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-mdpi/permission_background_sync.png", "java/res/drawable-mdpi/permission_javascript.png", @@ -198,7 +198,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 -@@ -759,6 +759,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -761,6 +761,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case SiteSettingsCategory.Type.BACKGROUND_SYNC: resource = R.string.website_settings_add_site_description_background_sync; break; @@ -211,7 +211,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c case SiteSettingsCategory.Type.JAVASCRIPT: resource = WebsitePreferenceBridge.isCategoryEnabled( browserContextHandle, ContentSettingsType.JAVASCRIPT) -@@ -932,6 +938,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -934,6 +940,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case SiteSettingsCategory.Type.TIMEZONE_OVERRIDE: allowSpecifyingExceptions = true; break; @@ -242,7 +242,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.SOUND) { setUpSoundPreference(preference); } else if (type == ContentSettingsType.JAVASCRIPT) { -@@ -1031,6 +1035,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1032,6 +1036,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */); } @@ -397,7 +397,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -214,6 +214,7 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -215,6 +215,7 @@ bool RendererContentSettingRules::IsRendererContentSetting( return content_type == ContentSettingsType::IMAGES || content_type == ContentSettingsType::JAVASCRIPT || content_type == ContentSettingsType::POPUPS || @@ -405,7 +405,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::TIMEZONE_OVERRIDE; -@@ -227,6 +228,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -228,6 +229,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(mixed_content_rules, outermost_main_frame_url); FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url); FilterRulesForType(timezone_override_rules, outermost_main_frame_url); diff --git a/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch b/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch index cb85ee93..ec0ba7b1 100644 --- a/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch +++ b/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java --- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java +++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java -@@ -36,6 +36,7 @@ import org.chromium.build.annotations.MainDex; +@@ -35,6 +35,7 @@ import org.chromium.build.annotations.MainDex; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -19,7 +19,7 @@ diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoade import javax.annotation.concurrent.GuardedBy; -@@ -279,7 +280,21 @@ public class LibraryLoader { +@@ -274,7 +275,21 @@ public class LibraryLoader { */ public void initInAppZygote() { assert !mInitDone; 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 8abf8749..1e16e2bb 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 @@ -22,7 +22,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.IMAGES) { -@@ -881,16 +883,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -882,16 +884,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment private void setUpAdsInformationalBanner() { // Add the informational banner which shows at the top of the UI if ad blocking is // activated on this site. @@ -39,7 +39,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } private SiteSettingsCategory getWarningCategory() { -@@ -1076,17 +1070,35 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1077,17 +1071,35 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment @Nullable Integer currentValue = mSite.getContentSetting(browserContextHandle, ContentSettingsType.JAVASCRIPT); @@ -81,7 +81,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c private void setUpJavascriptJitPreference(Preference preference) { BrowserContextHandle browserContextHandle = getSiteSettingsDelegate().getBrowserContextHandle(); -@@ -1119,22 +1131,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1120,22 +1132,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setupContentSettingsPreference(preference, null, false); return; } diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch index 7ba67066..1f16fdce 100644 --- a/build/patches/Site-setting-for-images.patch +++ b/build/patches/Site-setting-for-images.patch @@ -37,7 +37,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -184,6 +184,7 @@ android_resources("java_resources") { +@@ -186,6 +186,7 @@ android_resources("java_resources") { sources = [ "java/res/drawable-hdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-hdpi/permission_background_sync.png", @@ -45,7 +45,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-hdpi/permission_javascript.png", "java/res/drawable-hdpi/permission_javascript_jit.png", "java/res/drawable-hdpi/permission_popups.png", -@@ -192,6 +193,7 @@ android_resources("java_resources") { +@@ -194,6 +195,7 @@ android_resources("java_resources") { "java/res/drawable-hdpi/web_asset.png", "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-mdpi/permission_background_sync.png", @@ -53,7 +53,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-mdpi/permission_javascript.png", "java/res/drawable-mdpi/permission_javascript_jit.png", "java/res/drawable-hdpi/settings_autoplay.png", -@@ -205,6 +207,7 @@ android_resources("java_resources") { +@@ -207,6 +209,7 @@ android_resources("java_resources") { "java/res/drawable-mdpi/web_asset.png", "java/res/drawable-xhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xhdpi/permission_background_sync.png", @@ -61,7 +61,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-xhdpi/permission_javascript.png", "java/res/drawable-xhdpi/permission_javascript_jit.png", "java/res/drawable-xhdpi/permission_popups.png", -@@ -213,6 +216,7 @@ android_resources("java_resources") { +@@ -215,6 +218,7 @@ android_resources("java_resources") { "java/res/drawable-xhdpi/web_asset.png", "java/res/drawable-xxhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xxhdpi/permission_background_sync.png", @@ -69,7 +69,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b "java/res/drawable-xxhdpi/permission_javascript.png", "java/res/drawable-xxhdpi/permission_javascript_jit.png", "java/res/drawable-xxhdpi/permission_popups.png", -@@ -221,6 +225,7 @@ android_resources("java_resources") { +@@ -223,6 +227,7 @@ android_resources("java_resources") { "java/res/drawable-xxhdpi/web_asset.png", "java/res/drawable-xxxhdpi/ic_volume_up_grey600_24dp.png", "java/res/drawable-xxxhdpi/permission_background_sync.png", @@ -190,7 +190,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 -@@ -783,6 +783,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -785,6 +785,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment ? R.string.website_settings_add_site_description_javascript_jit_block : R.string.website_settings_add_site_description_javascript_jit_allow; break; @@ -203,7 +203,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c case SiteSettingsCategory.Type.COOKIES: resource = getCookieSettingsState() == CookieSettingsState.ALLOW ? R.string.website_settings_add_site_description_cookies_block -@@ -947,6 +953,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -949,6 +955,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case SiteSettingsCategory.Type.AUTOPLAY: allowSpecifyingExceptions = true; break; @@ -234,7 +234,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.JAVASCRIPT_JIT) { setUpJavascriptJitPreference(preference); } else if (type == ContentSettingsType.NOTIFICATIONS) { -@@ -1148,6 +1152,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1149,6 +1153,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment mSite.isEmbargoed(ContentSettingsType.REQUEST_DESKTOP_SITE)); } diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch index d8caf257..59fd3311 100644 --- a/build/patches/Timezone-customization.patch +++ b/build/patches/Timezone-customization.patch @@ -93,7 +93,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b ] annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] resources_package = "org.chromium.components.browser_ui.site_settings" -@@ -245,6 +246,8 @@ android_resources("java_resources") { +@@ -248,6 +249,8 @@ android_resources("java_resources") { "java/res/xml/site_settings_preferences.xml", "java/res/xml/site_settings_preferences_with_categories.xml", "java/res/xml/website_preferences.xml", @@ -344,7 +344,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown. public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate"; -@@ -212,6 +217,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -214,6 +219,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment "anti_abuse_things_to_consider_header"; public static final String ANTI_ABUSE_THINGS_TO_CONSIDER_SECTION_ONE = "anti_abuse_things_to_consider_section_one"; @@ -352,7 +352,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c // Keys for Allowed/Blocked preference groups/headers. public static final String ALLOWED_GROUP = "allowed_group"; -@@ -304,7 +310,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -306,7 +312,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment Integer contentSetting = website.site().getContentSetting( browserContextHandle, mCategory.getContentSettingsType()); if (contentSetting != null) { @@ -365,7 +365,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } return false; } -@@ -485,7 +495,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -487,7 +497,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment if (queryHasChanged) getInfoForOrigins(); }); @@ -375,7 +375,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c MenuItem help = menu.add( Menu.NONE, R.id.menu_id_site_settings_help, Menu.NONE, R.string.menu_help); help.setIcon(TraceEventVectorDrawableCompat.create( -@@ -496,7 +507,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -498,7 +509,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.menu_id_site_settings_help) { @@ -387,7 +387,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c getSiteSettingsDelegate().launchProtectedContentHelpAndFeedbackActivity( getActivity()); } else { -@@ -598,6 +612,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -600,6 +614,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment WebsitePreferenceBridge.setDefaultContentSetting( browserContextHandle, mCategory.getContentSettingsType(), setting); getInfoForOrigins(); @@ -400,7 +400,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (FOUR_STATE_COOKIE_TOGGLE_KEY.equals(preference.getKey())) { setCookieSettingsPreference((CookieSettingsState) newValue); getInfoForOrigins(); -@@ -784,6 +804,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -786,6 +806,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment ? R.string.website_settings_blocked_group_heading_request_desktop_site : R.string.website_settings_allowed_group_heading_request_desktop_site; break; @@ -413,7 +413,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } assert resource > 0; return getString(resource); -@@ -903,6 +929,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -905,6 +931,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case SiteSettingsCategory.Type.THIRD_PARTY_COOKIES: allowSpecifyingExceptions = getCookieControlsMode() != CookieControlsMode.OFF; break; @@ -423,7 +423,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c default: break; } -@@ -1120,6 +1149,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1122,6 +1151,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment PreferenceGroup blockedGroup = screen.findPreference(BLOCKED_GROUP); PreferenceGroup managedGroup = screen.findPreference(MANAGED_GROUP); boolean permissionBlockedByOs = mCategory.showPermissionBlockedMessage(getContext()); @@ -433,7 +433,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (mGlobalToggleLayout != GlobalToggleLayout.BINARY_TOGGLE) { screen.removePreference(binaryToggle); -@@ -1133,11 +1165,18 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1135,11 +1167,18 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment if (mGlobalToggleLayout != GlobalToggleLayout.FOUR_STATE_COOKIE_TOGGLE) { screen.removePreference(fourStateCookieToggle); } @@ -452,7 +452,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c configureTriStateToggle(triStateToggle, contentType); break; case GlobalToggleLayout.TRI_STATE_COOKIE_TOGGLE: -@@ -1178,6 +1217,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1183,6 +1222,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment screen.removePreference(antiAbuseThingsToConsiderSectionOne); } @@ -465,7 +465,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (permissionBlockedByOs) { maybeShowOsWarning(screen); -@@ -1333,6 +1378,15 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1338,6 +1383,15 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment triStateToggle.initialize(setting, descriptionIds); } @@ -493,7 +493,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c case ContentSettingsType.AR: return "ar_permission_list"; case ContentSettingsType.MEDIASTREAM_CAMERA: -@@ -944,11 +946,13 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -945,11 +947,13 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment if (value == null) return; setUpPreferenceCommon(preference, value); @@ -508,7 +508,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c switchPreference.setOnPreferenceChangeListener(this); @ContentSettingsType int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey()); -@@ -1148,7 +1152,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1149,7 +1153,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment } mSite.setContentSetting(browserContextHandle, type, permission); @@ -893,7 +893,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen Desktop site -@@ -738,6 +741,38 @@ +@@ -742,6 +745,38 @@ Block sites from playing protected content @@ -935,7 +935,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen 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 -@@ -88,6 +88,8 @@ void PrefProvider::RegisterProfilePrefs( +@@ -89,6 +89,8 @@ void PrefProvider::RegisterProfilePrefs( info->GetPrefRegistrationFlags()); } @@ -944,7 +944,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 -@@ -164,6 +166,10 @@ PrefProvider::PrefProvider(PrefService* prefs, +@@ -165,6 +167,10 @@ PrefProvider::PrefProvider(PrefService* prefs, event_args->set_number_of_exceptions( num_exceptions); // PrefProvider::PrefProvider. }); @@ -955,7 +955,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov } PrefProvider::~PrefProvider() { -@@ -348,4 +354,14 @@ void PrefProvider::SetClockForTesting(base::Clock* clock) { +@@ -351,4 +357,14 @@ void PrefProvider::SetClockForTesting(base::Clock* clock) { clock_ = clock; } @@ -1032,7 +1032,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc -@@ -605,6 +605,14 @@ void HostContentSettingsMap::SetClockForTesting(base::Clock* clock) { +@@ -611,6 +611,14 @@ void HostContentSettingsMap::SetClockForTesting(base::Clock* clock) { provider->SetClockForTesting(clock); } @@ -1063,7 +1063,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -215,7 +215,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -216,7 +216,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::JAVASCRIPT || content_type == ContentSettingsType::POPUPS || content_type == ContentSettingsType::MIXEDSCRIPT || @@ -1073,7 +1073,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -225,6 +226,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -226,6 +227,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(popup_redirect_rules, outermost_main_frame_url); FilterRulesForType(mixed_content_rules, outermost_main_frame_url); FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url); diff --git a/build/patches/Use-64-bit-WebView-processes.patch b/build/patches/Use-64-bit-WebView-processes.patch index b9dee3b3..27dd7cc6 100644 --- a/build/patches/Use-64-bit-WebView-processes.patch +++ b/build/patches/Use-64-bit-WebView-processes.patch @@ -22,23 +22,21 @@ 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 | 2 -- - 1 file changed, 2 deletions(-) + android_webview/nonembedded/java/AndroidManifest.xml | 3 --- + 1 file changed, 3 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 -@@ -43,11 +43,9 @@ by a child template that "extends" this file. +@@ -40,9 +40,6 @@ by a child template that "extends" this file. + android:icon="@{{manifest_package|default('com.android.webview')}}:drawable/icon_webview" android:name="{{ application_name|default('org.chromium.android_webview.nonembedded.WebViewApkApplication') }}" android:multiArch="true" - {% if force_32_bit is defined and force_32_bit == 'true' %} +- {% if force_32_bit is defined and force_32_bit == 'true' %} - android:use32bitAbi="true" - {% endif %} - {# TODO(crbug.com/1411557): Remove #} - {% if force_32_bit is not defined %} -- {{ use32bitAbi|default('android:use32bitAbi="true"') }} - {% endif %} +- {% endif %} android:extractNativeLibs="false"> {# This part is shared between stand-alone WebView and Monochrome #} + {% macro common(manifest_package, webview_lib) %} -- 2.25.1 diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch index 4d00f0c1..23106f46 100644 --- a/build/patches/Welcome-screen.patch +++ b/build/patches/Welcome-screen.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../android/java/res/layout/fre_tosanduma.xml | 160 +++++++++ chrome/android/java/res/values/dimens.xml | 10 + chrome/android/java/res/values/styles.xml | 24 ++ - .../firstrun/ChildAccountStatusSupplier.java | 14 +- + .../firstrun/ChildAccountStatusSupplier.java | 9 - .../browser/firstrun/FirstRunActivity.java | 21 +- .../firstrun/FirstRunActivityBase.java | 6 +- .../firstrun/FirstRunFlowSequencer.java | 52 +-- @@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../firstrun/ToSAndUMAFirstRunFragment.java | 336 ++++++++++++++++++ .../firstrun/TosAndUmaFragmentView.java | 336 ++++++++++++++++++ .../strings/android_chrome_strings.grd | 24 +- - 13 files changed, 911 insertions(+), 91 deletions(-) + 13 files changed, 910 insertions(+), 87 deletions(-) create mode 100644 chrome/android/java/res/layout/fre_tosanduma.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFragmentView.java @@ -27,18 +27,18 @@ 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 -@@ -518,6 +518,7 @@ chrome_java_resources = [ +@@ -525,6 +525,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", + "java/res/layout/fre_tosanduma.xml", "java/res/layout/fullscreen_notification.xml", - "java/res/layout/grid_tab_switcher_view_holder.xml", "java/res/layout/history_clear_browsing_data_header.xml", + "java/res/layout/history_item_view.xml", 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 -@@ -619,6 +619,8 @@ chrome_java_sources = [ +@@ -624,6 +624,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/firstrun/SyncConsentFirstRunFragment.java", "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java", "java/src/org/chromium/chrome/browser/firstrun/TosDialogBehaviorSharedPrefInvalidator.java", @@ -215,7 +215,7 @@ new file mode 100644 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 -@@ -114,6 +114,16 @@ found in the LICENSE file. +@@ -119,6 +119,16 @@ found in the LICENSE file. 48dp 18dp 8dp @@ -278,18 +278,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildA /** * Fetches the child account status to be used by other FRE components. -@@ -40,18 +38,8 @@ public class ChildAccountStatusSupplier implements OneshotSupplier { - * {@link ChildAccountStatusSupplier} will ignore app restrictions and rely solely on - * {@link AccountManagerFacade}. - */ -- public ChildAccountStatusSupplier(AccountManagerFacade accountManagerFacade, -- @Nullable FirstRunAppRestrictionInfo appRestrictionInfo) { -+ public ChildAccountStatusSupplier() { +@@ -41,13 +39,6 @@ public class ChildAccountStatusSupplier implements OneshotSupplier { + public ChildAccountStatusSupplier(AccountManagerFacade accountManagerFacade, + FirstRunAppRestrictionInfo appRestrictionInfo) { mChildAccountStatusStartTime = SystemClock.elapsedRealtime(); - -- if (appRestrictionInfo != null) { -- appRestrictionInfo.getHasAppRestriction(this::onAppRestrictionDetected); -- } +- appRestrictionInfo.getHasAppRestriction(this::onAppRestrictionDetected); - - accountManagerFacade.getAccounts().then(accounts -> { - AccountUtils.checkChildAccountStatus(accountManagerFacade, accounts, @@ -311,8 +305,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR +import org.chromium.chrome.browser.firstrun.ToSAndUMAFirstRunFragment; import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; import org.chromium.components.metrics.LowEntropySource; - import org.chromium.ui.base.LocalizationUtils; -@@ -118,7 +116,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa + import org.chromium.ui.base.ActivityWindowAndroid; +@@ -119,7 +117,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa /** Creates first page and sets up adapter. Should result UI being shown on the screen. */ private void createFirstPage() { BooleanSupplier showWelcomePage = () -> !FirstRunStatus.shouldSkipWelcomePage(); @@ -321,7 +315,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR mFreProgressStates.add(MobileFreProgress.WELCOME_SHOWN); mPagerAdapter = new FirstRunPagerAdapter(FirstRunActivity.this, mPages); mPager.setAdapter(mPagerAdapter); -@@ -140,13 +138,11 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -141,13 +139,11 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa // // TODO(b/245912657): explicitly sign in supervised users in {@link // SigninFirstRunMediator#handleContinueWithNative} rather than relying on SigninChecker. @@ -335,7 +329,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR // An optional page to select a default search engine. if (showSearchEnginePromo.getAsBoolean()) { -@@ -155,11 +151,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -156,11 +152,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa mFreProgressStates.add(MobileFreProgress.DEFAULT_SEARCH_ENGINE_SHOWN); } @@ -347,7 +341,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR if (mPagerAdapter != null) { mPagerAdapter.notifyDataSetChanged(); } -@@ -204,10 +195,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -205,10 +196,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa @Override public void triggerLayoutInflation() { @@ -358,7 +352,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR super.triggerLayoutInflation(); initializeStateFromLaunchData(); -@@ -488,10 +475,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -489,10 +476,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa public void acceptTermsOfService(boolean allowMetricsAndCrashUploading) { assert mNativeInitializationPromise.isFulfilled(); @@ -446,7 +440,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager( - Profile.getLastUsedRegularProfile()); - return FirstRunUtils.canAllowSync() && !signinManager.isSigninDisabledByPolicy() -- && signinManager.isSigninSupported(); +- && signinManager.isSigninSupported(/*requireUpdatedPlayServices=*/false); + return false; } } @@ -1241,7 +1235,7 @@ new file mode 100644 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 -@@ -3125,7 +3125,29 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sGoogle Maps will open in Chrome. By continuing, you agree to the <LINK1>Google Terms of Service</LINK1>, and the <LINK2>Google Chrome and ChromeOS Additional Terms of Service</LINK2>. The <LINK3>Privacy Policy</LINK3> also applies. diff --git a/build/patches/autofill-miscellaneous.patch b/build/patches/autofill-miscellaneous.patch index a04ca581..5d387fce 100644 --- a/build/patches/autofill-miscellaneous.patch +++ b/build/patches/autofill-miscellaneous.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1068,11 +1068,11 @@ void RegisterProfilePrefsForMigration( +@@ -1022,11 +1022,11 @@ void RegisterProfilePrefsForMigration( PrefRegistry::LOSSY_PREF); // Deprecated 11/2022. @@ -41,7 +41,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse 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 -@@ -178,12 +178,7 @@ ChromeAutofillClient::GetURLLoaderFactory() { +@@ -180,12 +180,7 @@ ChromeAutofillClient::GetURLLoaderFactory() { } AutofillDownloadManager* ChromeAutofillClient::GetDownloadManager() { @@ -58,7 +58,7 @@ diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/brows diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -473,35 +473,6 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload, +@@ -472,35 +472,6 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload, return upload_request.SerializeToString(payload); } @@ -94,7 +94,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com // Gets HTTP body payload for API POST request. bool GetAPIBodyPayload(const std::string& payload, AutofillDownloadManager::RequestType type, -@@ -540,18 +511,7 @@ bool IsRawMetadataUploadingEnabled(version_info::Channel channel) { +@@ -539,18 +510,7 @@ bool IsRawMetadataUploadingEnabled(version_info::Channel channel) { } std::string GetAPIKeyForUrl(version_info::Channel channel) { @@ -114,7 +114,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com } } // namespace -@@ -767,6 +727,7 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( +@@ -766,6 +726,7 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( // ID of the resource to add to the API request URL. Nothing will be added if // |resource_id| is empty. std::string resource_id; @@ -122,7 +122,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com std::string method = "POST"; if (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY) { -@@ -787,11 +748,15 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( +@@ -786,11 +747,15 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( // Add the query parameter to set the response format to a serialized proto. url = net::AppendQueryParameter(url, "alt", "proto"); @@ -154,7 +154,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.h b/comp diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/components/autofill/core/browser/browser_autofill_manager.h --- a/components/autofill/core/browser/browser_autofill_manager.h +++ b/components/autofill/core/browser/browser_autofill_manager.h -@@ -778,9 +778,9 @@ class BrowserAutofillManager : public AutofillManager, +@@ -775,9 +775,9 @@ class BrowserAutofillManager : public AutofillManager, credit_card_form_event_logger_; // Have we logged whether Autofill is enabled for this page load? @@ -169,7 +169,7 @@ diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/compo 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 -@@ -729,8 +729,8 @@ BASE_FEATURE(kAutofillLogToTerminal, +@@ -709,8 +709,8 @@ BASE_FEATURE(kAutofillLogToTerminal, // "upload" resources. // i.e., https://other.autofill.server:port/tbproxy/af/ BASE_FEATURE(kAutofillServerCommunication, @@ -183,7 +183,7 @@ diff --git a/components/autofill/core/common/autofill_features.cc b/components/a 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 -@@ -109,7 +109,7 @@ const char kAutocompleteLastVersionRetentionPolicy[] = +@@ -123,7 +123,7 @@ const char kAutofillPaymentMethodsMandatoryReauthPromoShownCounter[] = void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Synced prefs. Used for cross-device choices, e.g., credit card Autofill. registry->RegisterBooleanPref( @@ -192,7 +192,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterIntegerPref( prefs::kAutofillLastVersionDeduped, 0, -@@ -121,10 +121,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -135,10 +135,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { prefs::kAutofillLastVersionDisusedAddressesDeleted, 0, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( @@ -205,7 +205,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); // Non-synced prefs. Used for per-device choices, e.g., signin promo. -@@ -148,7 +148,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -168,7 +168,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Deprecated prefs registered for migration. registry->RegisterBooleanPref( diff --git a/build/patches/build-remove-calling-untrusted-hooks.patch b/build/patches/build-remove-calling-untrusted-hooks.patch index 1a4ec15c..4d98b74f 100644 --- a/build/patches/build-remove-calling-untrusted-hooks.patch +++ b/build/patches/build-remove-calling-untrusted-hooks.patch @@ -22,7 +22,7 @@ diff --git a/DEPS b/DEPS # By default, do not check out src-internal. This can be overridden e.g. with # custom_vars. -@@ -157,7 +157,7 @@ vars = { +@@ -154,7 +154,7 @@ vars = { # support for other platforms may be added in the future. 'checkout_openxr' : 'checkout_win', @@ -31,7 +31,7 @@ diff --git a/DEPS b/DEPS # By default bot checkouts the WPR archive files only when this # flag is set True. -@@ -4063,49 +4063,6 @@ hooks = [ +@@ -4098,49 +4098,6 @@ hooks = [ 'sync', '--extract', ], }, @@ -81,7 +81,7 @@ diff --git a/DEPS b/DEPS { # Case-insensitivity for the Win SDK. Must run before win_toolchain below. 'name': 'ciopfs_linux', -@@ -4277,57 +4234,6 @@ hooks = [ +@@ -4291,57 +4248,6 @@ hooks = [ ], }, @@ -139,7 +139,7 @@ diff --git a/DEPS b/DEPS # Pull rc binaries using checked-in hashes. { 'name': 'rc_win', -@@ -4353,30 +4259,6 @@ hooks = [ +@@ -4367,30 +4273,6 @@ hooks = [ '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', ], }, diff --git a/build/patches/disable-WebView-variations-support.patch b/build/patches/disable-WebView-variations-support.patch index 66242376..f9f46379 100644 --- a/build/patches/disable-WebView-variations-support.patch +++ b/build/patches/disable-WebView-variations-support.patch @@ -5,20 +5,22 @@ Subject: disable WebView variations support Original License: MIT - https://spdx.org/licenses/MIT.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../com/android/webview/chromium/WebViewChromiumAwInit.java | 4 ---- - .../webview/chromium/WebViewChromiumFactoryProvider.java | 2 -- - 2 files changed, 6 deletions(-) + .../com/android/webview/chromium/WebViewChromiumAwInit.java | 6 ------ + .../webview/chromium/WebViewChromiumFactoryProvider.java | 4 ---- + 2 files changed, 10 deletions(-) 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 -@@ -202,10 +202,6 @@ public class WebViewChromiumAwInit { +@@ -202,12 +202,6 @@ public class WebViewChromiumAwInit { AwBrowserProcess.configureChildProcessLauncher(); - // finishVariationsInitLocked() must precede native initialization so the seed is - // available when AwFeatureListCreator::SetUpFieldTrials() runs. -- finishVariationsInitLocked(); +- if (!FastVariationsSeedSafeModeAction.hasRun()) { +- finishVariationsInitLocked(); +- } - AwBrowserProcess.start(); AwBrowserProcess.handleMinidumpsAndSetMetricsConsent(true /* updateMetricsConsent */); @@ -26,11 +28,13 @@ 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 -@@ -479,8 +479,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { +@@ -478,10 +478,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { } } -- mAwInit.startVariationsInit(); +- if (!FastVariationsSeedSafeModeAction.hasRun()) { +- mAwInit.startVariationsInit(); +- } - mShouldDisableThreadChecking = shouldDisableThreadChecking(ctx); diff --git a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch index e4fac049..7ecab059 100644 --- a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch +++ b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -153,12 +153,12 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; +@@ -154,12 +154,12 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; // Time between IPv6 probes, i.e. for how long results of each IPv6 probe are // cached. diff --git a/build/patches/first_run-deactivate-autoupdate-globally.patch b/build/patches/first_run-deactivate-autoupdate-globally.patch index 1fbb3c7c..377bce42 100644 --- a/build/patches/first_run-deactivate-autoupdate-globally.patch +++ b/build/patches/first_run-deactivate-autoupdate-globally.patch @@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -203,8 +203,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { +@@ -202,8 +202,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { user_script_manager_ = std::make_unique(profile_); diff --git a/build/patches/kill-Auth.patch b/build/patches/kill-Auth.patch index 8a058632..bd298626 100644 --- a/build/patches/kill-Auth.patch +++ b/build/patches/kill-Auth.patch @@ -20,7 +20,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.Callback; import org.chromium.base.ContextUtils; -@@ -84,14 +81,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -87,14 +84,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @Override public Account[] getAccounts() { @@ -35,7 +35,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s // Account seeding relies on GoogleAuthUtil.getAccountId to get GAIA ids, // so don't report any accounts if Google Play Services are out of date. return new Account[] {}; -@@ -102,28 +91,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -105,28 +94,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { throws AuthException { ThreadUtils.assertOnBackgroundThread(); assert AccountUtils.GOOGLE_ACCOUNT_TYPE.equals(account.type); @@ -66,7 +66,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s } @Override -@@ -160,17 +133,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -163,17 +136,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @SuppressLint("MissingPermission") @Override public void createAddAccountIntent(Callback callback) { @@ -84,7 +84,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s } // No permission is needed on 23+ and Chrome always has MANAGE_ACCOUNTS permission on lower APIs -@@ -203,12 +165,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -206,12 +168,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @Nullable @Override public String getAccountGaiaId(String accountEmail) { @@ -97,6 +97,6 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s + return null; } - protected boolean isGooglePlayServicesAvailable() { + @Override -- 2.25.1 diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch index 9925e336..54cd6e97 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 -@@ -239,8 +239,6 @@ if (current_toolchain == default_toolchain) { +@@ -212,8 +212,6 @@ if (current_toolchain == 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/openH264-enable-ARM-ARM64-optimizations.patch b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch index edfe4bd4..37d95bcf 100644 --- a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch +++ b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc --- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc +++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -@@ -204,11 +204,11 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) { +@@ -207,11 +207,11 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) { init_params.iRCMode = RC_OFF_MODE; } diff --git a/build/patches/sharing-hub-always-use-visible-URL.patch b/build/patches/sharing-hub-always-use-visible-URL.patch index 4257bb53..2f13a4d7 100644 --- a/build/patches/sharing-hub-always-use-visible-URL.patch +++ b/build/patches/sharing-hub-always-use-visible-URL.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/share/ShareDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java -@@ -177,14 +177,8 @@ public class ShareDelegateImpl implements ShareDelegate { +@@ -183,14 +183,8 @@ public class ShareDelegateImpl implements ShareDelegate { @VisibleForTesting static boolean shouldFetchCanonicalUrl(final Tab currentTab) { diff --git a/build/patches/ungoogled-chromium-Disable-Gaia.patch b/build/patches/ungoogled-chromium-Disable-Gaia.patch index cddc49ec..7315fe08 100644 --- a/build/patches/ungoogled-chromium-Disable-Gaia.patch +++ b/build/patches/ungoogled-chromium-Disable-Gaia.patch @@ -24,7 +24,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_ constexpr char kBadAuthenticationError[] = "BadAuthentication"; constexpr char kBadAuthenticationShortError[] = "badauth"; -@@ -263,6 +263,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( +@@ -272,6 +272,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( const net::NetworkTrafficAnnotationTag& traffic_annotation) { DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; @@ -32,7 +32,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_ auto resource_request = std::make_unique(); resource_request->url = gaia_gurl; original_url_ = gaia_gurl; -@@ -317,6 +318,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( +@@ -326,6 +327,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete, base::Unretained(this)), kMaxMessageSize); diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch index d4b162af..22f3fcd9 100644 --- a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch +++ b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch @@ -13,7 +13,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 -@@ -1396,8 +1396,6 @@ static_library("browser") { +@@ -1389,8 +1389,6 @@ static_library("browser") { "profiles/profile_attributes_storage.cc", "profiles/profile_attributes_storage.h", "profiles/profile_attributes_storage_observer.h", @@ -25,7 +25,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -340,12 +340,6 @@ std::u16string ProfileAttributesEntry::GetUserName() const { +@@ -329,12 +329,6 @@ std::u16string ProfileAttributesEntry::GetUserName() const { gfx::Image ProfileAttributesEntry::GetAvatarIcon( int size_for_placeholder_avatar, bool use_high_res_file) const { diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index 722b6e6f..ff345c86 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -180,7 +180,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc --- a/components/translate/core/browser/translate_manager.cc +++ b/components/translate/core/browser/translate_manager.cc -@@ -849,8 +849,9 @@ void TranslateManager::FilterIsTranslatePossible( +@@ -838,8 +838,9 @@ void TranslateManager::FilterIsTranslatePossible( TriggerDecision::kDisabledOffline); } diff --git a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch index 84ca3e5b..a0d9f004 100644 --- a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch +++ b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch @@ -40,7 +40,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d } bool IsValidPortRange(uint16_t min_port, uint16_t max_port) { -@@ -777,7 +779,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -776,7 +778,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( break; }