diff --git a/build/LASTCHANGE b/build/LASTCHANGE index 21bc755b..1f531766 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -51ecbe42916b78159bd646807da8580213ae2316- \ No newline at end of file +ccd4eb2a7cf58a237c7fed668eecf35c32a1fd99- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index e8e84fba..c026e4ee 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -103.0.5060.140 \ No newline at end of file +104.0.5112.63 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index cb0f34e9..3a749b3c 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -e4e07e53c4ea2e8c573d029470ecfc244647fa98 \ No newline at end of file +7b45de2c5189db31432f355a266bd521b071d237 \ No newline at end of file diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 2c315ac7..d3a61a21 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -195,4 +195,5 @@ Remove-preload-of-com.google.android.gms.fonts.patch Partition-Blink-memory-cache.patch Add-gn-flag-for-clangd-builds.patch Remove-navigator.connection-info.patch +Disable-PrivacyGuide.patch Automated-domain-substitution.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index 72817562..188e641d 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 -@@ -2247,9 +2247,9 @@ +@@ -2278,9 +2278,9 @@ "expiry_milestone": 106 }, { @@ -126,9 +126,9 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis 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 -@@ -52,6 +52,11 @@ bool IsDeviceBlocked(const char* field, const std::string& block_list) { - - } // namespace +@@ -63,6 +63,11 @@ const base::Feature kUseGles2ForOopR { + #endif + }; + +// Use android AImageReader when playing videos with MediaPlayer. @@ -136,23 +136,23 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc + base::FEATURE_ENABLED_BY_DEFAULT}; + #if BUILDFLAG(IS_ANDROID) - // Used to limit GL version to 2.0 for skia raster on Android. - const base::Feature kUseGles2ForOopR{"UseGles2ForOopR", + // Use android SurfaceControl API for managing display compositor's buffer queue + // and using overlays on Android. Also used by webview to disable surface diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h --- a/gpu/config/gpu_finch_features.h +++ b/gpu/config/gpu_finch_features.h @@ -17,6 +17,7 @@ namespace features { + GPU_EXPORT extern const base::Feature kUseGles2ForOopR; + // All features in alphabetical order. The features should be documented ++GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer; // alongside the definition of their values in the .cc file. #if BUILDFLAG(IS_ANDROID) -+GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer; - GPU_EXPORT extern const base::Feature kUseGles2ForOopR; GPU_EXPORT extern const base::Feature kAndroidSurfaceControl; - GPU_EXPORT extern const base::Feature kWebViewSurfaceControl; 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 -@@ -120,6 +120,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; -@@ -343,6 +346,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { +@@ -345,6 +348,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 -@@ -588,6 +588,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -589,6 +589,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 -@@ -730,6 +730,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -746,6 +746,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", // Note: Has no effect if kMediaDrmPreprovisioning feature is disabled. const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -245,7 +245,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 -@@ -227,6 +227,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; +@@ -228,6 +228,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; MEDIA_EXPORT extern const base::Feature kAllowNonSecureOverlays; MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 438234ea..f765f8d6 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -225,6 +225,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -220,6 +220,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; @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.printing.PrintManagerDelegateImpl; import org.chromium.printing.PrintingController; import org.chromium.printing.PrintingControllerImpl; -@@ -949,6 +950,8 @@ public abstract class ChromeActivity +@@ -932,6 +933,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -40,8 +40,8 @@ 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 -@@ -96,6 +96,7 @@ public class ChromeCachedFlags { - .GIVE_JAVA_UI_THREAD_DEFAULT_TASK_TRAITS_USER_BLOCKING_PRIORITY); +@@ -94,6 +94,7 @@ public class ChromeCachedFlags { + add(ChromeFeatureList.FEED_LOADING_PLACEHOLDER); add(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS); add(ChromeFeatureList.IMMERSIVE_UI_MODE); + add(ChromeFeatureList.ALLOW_USER_CERTIFICATES); @@ -51,7 +51,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom 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 -@@ -3242,7 +3242,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3381,7 +3381,11 @@ const FeatureEntry kFeatureEntries[] = { {"enable-container-queries", flag_descriptions::kCSSContainerQueriesName, flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, @@ -82,7 +82,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 -@@ -38,6 +38,9 @@ namespace flag_descriptions { +@@ -39,6 +39,9 @@ namespace flag_descriptions { // Cross-platform ------------------------------------------------------------- @@ -95,7 +95,7 @@ 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 -@@ -144,6 +144,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -145,6 +145,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedLoadingPlaceholder, &feed::kInterestFeedContentSuggestions, &feed::kInterestFeedSpinnerAlwaysAnimate, @@ -103,7 +103,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -408,6 +409,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ +@@ -425,6 +426,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -133,8 +133,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f .put(ChromeFeatureList.CONDITIONAL_TAB_STRIP_ANDROID, false) + .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false) .put(ChromeFeatureList.LENS_CAMERA_ASSISTED_SEARCH, false) - .put(ChromeFeatureList.SERVICE_MANAGER_FOR_DOWNLOAD, true) - .put(ChromeFeatureList.SERVICE_MANAGER_FOR_BACKGROUND_PREFETCH, true) + .put(ChromeFeatureList.COMMAND_LINE_ON_NON_ROOTED, false) + .put(ChromeFeatureList.DOWNLOADS_AUTO_RESUMPTION_NATIVE, true) 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/Add-DuckDuckGo-Lite-search-engine.patch b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch index d9c684c2..37b77156 100644 --- a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch +++ b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch @@ -37,9 +37,9 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_ SEARCH_ENGINE_STARTER_PACK_HISTORY = 62, SEARCH_ENGINE_GOOGLE_EN = 63, + SEARCH_ENGINE_DUCKDUCKGOLIGHT = 64, + SEARCH_ENGINE_STARTER_PACK_TABS = 63, SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. - }; diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch index bf91f8f8..28e2277a 100644 --- a/build/patches/Add-English-only-search-engine.patch +++ b/build/patches/Add-English-only-search-engine.patch @@ -51,9 +51,9 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_ SEARCH_ENGINE_STARTER_PACK_BOOKMARKS = 61, SEARCH_ENGINE_STARTER_PACK_HISTORY = 62, + SEARCH_ENGINE_GOOGLE_EN = 63, + SEARCH_ENGINE_STARTER_PACK_TABS = 63, SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. - }; diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index ad04956d..44408f35 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 -@@ -8210,6 +8210,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8466,6 +8466,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 -@@ -1510,6 +1510,10 @@ const char kHttpsOnlyModeDescription[] = +@@ -1533,6 +1533,10 @@ const char kHttpsOnlyModeDescription[] = "Adds a setting under chrome://settings/security to opt-in to HTTPS-First " "Mode."; @@ -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 -@@ -848,6 +848,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; +@@ -863,6 +863,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; 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 d10e47a6..a1df3fd7 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -277,6 +277,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -267,6 +267,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUISettingsURL)); #endif @@ -95,7 +95,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 -@@ -79,6 +79,12 @@ +@@ -80,6 +80,12 @@ @@ -128,7 +128,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr +#include "components/prefs/pref_registry_simple.h" #if BUILDFLAG(IS_CHROMEOS_ASH) - #include "chromeos/network/proxy/proxy_config_service_impl.h" + #include "chromeos/ash/components/network/proxy/proxy_config_service_impl.h" @@ -72,7 +76,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( return std::make_unique( profile_prefs, local_state_prefs, nullptr); @@ -192,7 +192,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 -@@ -983,6 +985,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1025,6 +1027,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { chrome::enterprise_util::RegisterLocalStatePrefs(registry); component_updater::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -637,7 +637,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 -@@ -286,6 +286,8 @@ static_library("ui") { +@@ -288,6 +288,8 @@ static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -657,7 +657,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" -@@ -765,6 +766,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -775,6 +776,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -1138,14 +1138,14 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/"; const char kChromeUIComponentsHost[] = "components"; @@ -419,6 +421,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { + kChromeUILockScreenNetworkHost, + kChromeUILockScreenStartReauthHost, kChromeUIMobileSetupHost, ++ kChromeUIProxyConfigHost, kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, -+ kChromeUIProxyConfigHost, - kChromeUIOobeHost, - kChromeUIOSCreditsHost, - kChromeUIOSSettingsHost, -@@ -671,6 +674,7 @@ const char* const kChromeHostURLs[] = { + kChromeUINotificationTesterHost, +@@ -674,6 +677,7 @@ const char* const kChromeHostURLs[] = { #if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1316,7 +1316,7 @@ diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc --- a/net/proxy_resolution/proxy_config.cc +++ b/net/proxy_resolution/proxy_config.cc -@@ -112,7 +112,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { +@@ -109,7 +109,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { &single_proxies, ProxyServer::SCHEME_HTTP); type = Type::PROXY_LIST; @@ -1325,7 +1325,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c } // Trim whitespace off the url scheme. -@@ -143,6 +143,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { +@@ -140,6 +140,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { } } diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index c4f3127b..a3f5e425 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -34,7 +34,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/download/DownloadUtils.java | 16 +- .../browser/history/HistoryManager.java | 18 +- .../chrome/browser/history/HistoryPage.java | 16 ++ - .../browser/init/StartupTabPreloader.java | 14 +- .../native_page/NativePageFactory.java | 4 +- .../chrome/browser/ntp/RecentTabsManager.java | 3 +- .../privacy/settings/IncognitoSettings.java | 160 ++++++++++++++++++ @@ -83,7 +82,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../omnibox/browser/base_search_provider.cc | 2 +- components/omnibox/browser/search_provider.cc | 4 +- .../host_content_settings_map_factory.cc | 1 + - 64 files changed, 687 insertions(+), 75 deletions(-) + 63 files changed, 676 insertions(+), 72 deletions(-) create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java @@ -92,7 +91,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 -@@ -679,6 +679,7 @@ chrome_java_resources = [ +@@ -672,6 +672,7 @@ chrome_java_resources = [ "java/res/xml/main_preferences.xml", "java/res/xml/manage_sync_preferences.xml", "java/res/xml/phone_as_a_security_key_accessory_filter.xml", @@ -111,7 +110,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", "java/src/org/chromium/chrome/browser/ActivityTabProvider.java", "java/src/org/chromium/chrome/browser/ActivityUtils.java", -@@ -959,6 +960,7 @@ chrome_java_sources = [ +@@ -953,6 +954,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", @@ -237,7 +236,7 @@ new file mode 100644 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 -@@ -53,6 +53,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; +@@ -54,6 +54,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; import org.chromium.base.task.PostTask; import org.chromium.cc.input.BrowserControlsState; import org.chromium.chrome.R; @@ -245,7 +244,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout; -@@ -1812,8 +1813,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1803,6 +1804,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -289,7 +288,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App import org.chromium.chrome.browser.banners.AppMenuVerbiage; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkFeatures; -@@ -97,6 +98,10 @@ import java.util.ArrayList; +@@ -99,6 +100,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -300,7 +299,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App /** * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu * items based on activity state. -@@ -527,6 +532,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -549,6 +554,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { @@ -314,7 +313,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App // We have to iterate all menu items since same menu item ID may be associated with more // than one menu items. boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU; -@@ -583,7 +595,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -609,7 +621,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } if (item.getItemId() == R.id.recent_tabs_menu_id) { @@ -331,7 +330,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App } if (item.getItemId() == R.id.menu_group_tabs) { item.setVisible(isMenuGroupTabsVisible); -@@ -820,7 +840,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -846,7 +866,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate // is not persisted when adding to the homescreen. // * If creating shortcuts it not supported by the current home screen. return WebappsUtils.isAddToHomeIntentSupported() && !isChromeScheme && !isFileScheme @@ -383,7 +382,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/customtabs/CustomTabActivityLifecycleUmaTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java -@@ -39,31 +39,6 @@ public class CustomTabActivityLifecycleUmaTracker implements PauseResumeWithNati +@@ -66,31 +66,6 @@ public class CustomTabActivityLifecycleUmaTracker implements PauseResumeWithNati private boolean mIsInitialResume = true; private void recordIncognitoLaunchReason() { @@ -449,7 +448,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; -@@ -771,7 +774,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -777,7 +780,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isIncognito() { @@ -501,7 +500,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java -@@ -23,6 +23,7 @@ import org.chromium.base.metrics.RecordHistogram; +@@ -31,6 +31,7 @@ import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; @@ -509,7 +508,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.history_clusters.HistoryClustersCoordinator; -@@ -46,6 +47,12 @@ import org.chromium.ui.base.Clipboard; +@@ -57,6 +58,12 @@ import org.chromium.url.GURL; import java.util.List; @@ -522,7 +521,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History /** * Combines and manages the different UI components of browsing history. */ -@@ -255,7 +262,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve +@@ -330,7 +337,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve return mRootView; } @@ -580,45 +579,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History Uri uri = Uri.parse(url); assert uri.getHost().equals(UrlConstants.HISTORY_HOST); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java -@@ -42,6 +42,9 @@ import org.chromium.url.GURL; - import java.lang.annotation.Retention; - import java.lang.annotation.RetentionPolicy; - -+import org.chromium.base.ContextUtils; -+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; -+ - /** - * This class attempts to preload the tab if the url is known from the intent when the profile - * is created. This is done to improve startup latency. -@@ -446,17 +449,22 @@ public class StartupTabPreloader implements ProfileManager.Observer, DestroyObse - Intent intent = mIntentSupplier.get(); - GURL url = UrlFormatter.fixupUrl(getUrlFromIntent(intent)); - -+ boolean isIncognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito(); -+ -+ Profile profile = Profile.getLastUsedRegularProfile(); - ChromeTabCreator chromeTabCreator = -- (ChromeTabCreator) mTabCreatorManager.getTabCreator(false); -+ (ChromeTabCreator) mTabCreatorManager.getTabCreator(isIncognito); - WebContents webContents = -- WebContentsFactory.createWebContents(Profile.getLastUsedRegularProfile(), false); -+ WebContentsFactory.createWebContents( -+ isIncognito ? profile.getPrimaryOTRProfile(true /* createIfNeeded */) : profile, -+ false); - - mLoadUrlParams = mIntentHandler.createLoadUrlParamsForIntent(url.getSpec(), intent); - - // Create a detached tab, but don't add it to the tab model yet. We'll do that - // later if the loadUrlParams etc... match. - mTab = TabBuilder.createLiveTab(false) -- .setIncognito(false) -+ .setIncognito(isIncognito) - .setLaunchType(TabLaunchType.FROM_EXTERNAL_APP) - .setWindow(mWindowAndroid) - .setWebContents(webContents) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java @@ -829,7 +789,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; -@@ -257,6 +258,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -258,6 +259,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity if (fragment instanceof AdPersonalizationRemovedFragment) { ((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager()); } @@ -952,7 +912,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/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 -@@ -123,6 +123,8 @@ import org.chromium.ui.base.DeviceFormFactor; +@@ -126,6 +126,8 @@ import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.IntentRequestTracker; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.util.TokenHolder; @@ -961,7 +921,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab /** * A {@link RootUiCoordinator} variant that controls tabbed-mode specific UI. -@@ -499,7 +501,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -505,7 +507,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler(); mEmptyBackgroundViewWrapper = new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(), @@ -973,7 +933,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java -@@ -43,6 +43,10 @@ import org.chromium.ui.base.PageTransition; +@@ -42,6 +42,10 @@ import org.chromium.ui.base.PageTransition; import org.chromium.ui.base.WindowAndroid; import org.chromium.url.GURL; @@ -984,7 +944,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome /** * This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */ -@@ -338,7 +342,6 @@ public class ChromeTabCreator extends TabCreator { +@@ -327,7 +331,6 @@ public class ChromeTabCreator extends TabCreator { // TODO(crbug.com/1081924): Clean up the launches from SearchActivity/Chrome. public Tab launchUrlFromExternalApp( LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) { @@ -1086,7 +1046,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI 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 -@@ -4384,6 +4384,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4550,6 +4550,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOfflinePagesLivePageSharingName, flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, @@ -1153,7 +1113,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -303,6 +303,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() +@@ -293,6 +293,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() return IdentityManagerFactory::GetForProfile(profile_); } @@ -1170,7 +1130,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h -@@ -78,6 +78,7 @@ class ChromeAutocompleteProviderClient : public AutocompleteProviderClient { +@@ -77,6 +77,7 @@ class ChromeAutocompleteProviderClient : public AutocompleteProviderClient { const override; signin::IdentityManager* GetIdentityManager() const override; bool IsOffTheRecord() const override; @@ -1227,7 +1187,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c 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 -@@ -3363,6 +3363,12 @@ const char kOfflinePagesLivePageSharingDescription[] = +@@ -3463,6 +3463,12 @@ const char kOfflinePagesLivePageSharingDescription[] = "Enables to share current loaded page as offline page by saving as MHTML " "first."; @@ -1243,7 +1203,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 -@@ -1912,6 +1912,9 @@ extern const char kNotificationPermissionRationaleDescription[]; +@@ -1973,6 +1973,9 @@ extern const char kNotificationPermissionRationaleDescription[]; extern const char kOfflinePagesLivePageSharingName[]; extern const char kOfflinePagesLivePageSharingDescription[]; @@ -1256,7 +1216,7 @@ 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 -@@ -478,8 +478,8 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", +@@ -495,8 +495,8 @@ const base::Feature kCCTNewDownloadTab{"CCTNewDownloadTab", const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1265,8 +1225,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse +const base::Feature kCCTIncognitoAvailableToThirdParty{ // Enabled by default in Bromite + "CCTIncognitoAvailableToThirdParty", base::FEATURE_ENABLED_BY_DEFAULT}; - const base::Feature kCCTPostMessageAPI{"CCTPostMessageAPI", - base::FEATURE_ENABLED_BY_DEFAULT}; + const base::Feature kCCTPackageNameRecording{"CCTPackageNameRecording", + base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc @@ -1564,7 +1524,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -224,6 +224,7 @@ +@@ -226,6 +226,7 @@ #include "components/feed/core/shared_prefs/pref_names.h" #if BUILDFLAG(IS_ANDROID) @@ -1572,7 +1532,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/android/explore_sites/history_statistics_reporter.h" #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" -@@ -1354,6 +1355,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1402,6 +1403,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); @@ -1731,7 +1691,7 @@ new file mode 100644 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 -@@ -3397,6 +3397,12 @@ const char kShowCaretBrowsingDialog[] = +@@ -3409,6 +3409,12 @@ const char kShowCaretBrowsingDialog[] = const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -1747,7 +1707,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 -@@ -1205,6 +1205,8 @@ extern const char kDiscountConsentShowInterestIn[]; +@@ -1208,6 +1208,8 @@ extern const char kDiscountConsentShowInterestIn[]; #if BUILDFLAG(IS_ANDROID) extern const char kWebXRImmersiveArEnabled[]; @@ -1756,7 +1716,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1241,6 +1243,10 @@ extern const char kPrivacyGuideViewed[]; +@@ -1244,6 +1246,10 @@ extern const char kPrivacyGuideViewed[]; extern const char kCorsNonWildcardRequestHeadersSupport[]; @@ -1888,7 +1848,7 @@ diff --git a/components/offline_pages/core/offline_page_feature.h b/components/o diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/components/omnibox/browser/autocomplete_provider_client.cc --- a/components/omnibox/browser/autocomplete_provider_client.cc +++ b/components/omnibox/browser/autocomplete_provider_client.cc -@@ -34,3 +34,7 @@ base::WeakPtr +@@ -29,3 +29,7 @@ base::WeakPtr AutocompleteProviderClient::GetWeakPtr() { return nullptr; } @@ -1899,7 +1859,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/compon diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h --- a/components/omnibox/browser/autocomplete_provider_client.h +++ b/components/omnibox/browser/autocomplete_provider_client.h -@@ -129,6 +129,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client { +@@ -124,6 +124,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client { virtual signin::IdentityManager* GetIdentityManager() const = 0; virtual bool IsOffTheRecord() const = 0; @@ -1922,7 +1882,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc --- a/components/omnibox/browser/search_provider.cc +++ b/components/omnibox/browser/search_provider.cc -@@ -814,7 +814,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const { +@@ -808,7 +808,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const { // keyword input to a keyword suggest server, if any.) const TemplateURL* default_url = providers_.GetDefaultProviderURL(); const TemplateURL* keyword_url = providers_.GetKeywordProviderURL(); diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 135de476..c5b677d4 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -22,8 +22,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../native_page/NativePageFactory.java | 11 +- chrome/browser/BUILD.gn | 11 +- chrome/browser/about_flags.cc | 6 + - .../android/bookmarks/bookmark_bridge.cc | 283 ++++++++++++++++++ - .../android/bookmarks/bookmark_bridge.h | 30 +- + .../bookmarks/android/bookmark_bridge.cc | 283 ++++++++++++++++++ + .../bookmarks/android/bookmark_bridge.h | 30 +- .../browser/bookmarks/bookmark_html_writer.cc | 8 +- .../dialogs/DownloadLocationCustomView.java | 8 +- .../DownloadLocationDialogCoordinator.java | 8 +- @@ -703,9 +703,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1864,6 +1864,13 @@ static_library("browser") { - "webid/federated_identity_sharing_permission_context_factory.h", - ] +@@ -1860,6 +1860,13 @@ static_library("browser") { + ] + } + if (is_android) { + sources += [ @@ -717,7 +717,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -3021,6 +3028,8 @@ static_library("browser") { +@@ -2876,6 +2883,8 @@ static_library("browser") { "autofill/manual_filling_controller.h", "autofill/manual_filling_controller_impl.cc", "autofill/manual_filling_controller_impl.h", @@ -726,7 +726,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "autofill/manual_filling_utils.cc", "autofill/manual_filling_utils.h", "autofill/manual_filling_view_interface.h", -@@ -3658,8 +3667,6 @@ static_library("browser") { +@@ -3519,8 +3528,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -738,7 +738,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 -@@ -8235,6 +8235,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8491,6 +8491,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, #endif @@ -751,9 +751,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if BUILDFLAG(IS_CHROMEOS_ASH) {"snooping-protection", flag_descriptions::kSnoopingProtectionName, flag_descriptions::kSnoopingProtectionDescription, kOsCrOS, -diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc ---- a/chrome/browser/android/bookmarks/bookmark_bridge.cc -+++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc +diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc +--- a/chrome/browser/bookmarks/android/bookmark_bridge.cc ++++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc @@ -56,6 +56,25 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" @@ -778,10 +778,10 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse +#include "content/public/browser/browser_task_traits.h" + using base::android::AttachCurrentThread; - using base::android::ConvertUTF8ToJavaString; using base::android::ConvertUTF16ToJavaString; -@@ -72,8 +91,92 @@ using bookmarks::BookmarkNode; - using bookmarks::BookmarkType; + using base::android::ConvertUTF8ToJavaString; +@@ -72,8 +91,92 @@ using bookmarks::android::JavaBookmarkIdGetId; + using bookmarks::android::JavaBookmarkIdGetType; using content::BrowserThread; +namespace internal { @@ -873,7 +873,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse class BookmarkTitleComparer { public: explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge, -@@ -160,6 +263,10 @@ BookmarkBridge::~BookmarkBridge() { +@@ -159,6 +262,10 @@ BookmarkBridge::~BookmarkBridge() { if (partner_bookmarks_shim_) partner_bookmarks_shim_->RemoveObserver(this); reading_list_manager_->RemoveObserver(this); @@ -884,7 +884,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef&) { -@@ -577,6 +684,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -569,6 +676,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -1065,11 +1065,11 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse +} + void BookmarkBridge::SetBookmarkTitle(JNIEnv* env, - const JavaParamRef& obj, - jlong id, -diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser/android/bookmarks/bookmark_bridge.h ---- a/chrome/browser/android/bookmarks/bookmark_bridge.h -+++ b/chrome/browser/android/bookmarks/bookmark_bridge.h + const JavaParamRef& obj, + jlong id, +diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h +--- a/chrome/browser/bookmarks/android/bookmark_bridge.h ++++ b/chrome/browser/bookmarks/android/bookmark_bridge.h @@ -18,6 +18,7 @@ #include "base/scoped_observation.h" #include "base/strings/utf_string_conversions.h" @@ -1127,7 +1127,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser void SetBookmarkTitle(JNIEnv* env, const base::android::JavaParamRef& obj, jlong id, -@@ -381,12 +401,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -380,12 +400,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, void DestroyJavaObject(); raw_ptr profile_; @@ -1144,7 +1144,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser // Information about the Partner bookmarks (must check for IsLoaded()). // This is owned by profile. -@@ -398,6 +422,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -397,6 +421,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, // Observes the profile destruction and creation. base::ScopedObservation profile_observation_{this}; @@ -1250,7 +1250,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse 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 -@@ -5915,6 +5915,11 @@ const char kWebKioskEnableLacrosDescription[] = +@@ -6068,6 +6068,11 @@ const char kWebKioskEnableLacrosDescription[] = "ChromeOS. When disabled, the Ash-chrome will be used"; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1265,7 +1265,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 -@@ -3422,6 +3422,9 @@ extern const char kWebKioskEnableLacrosName[]; +@@ -3510,6 +3510,9 @@ extern const char kWebKioskEnableLacrosName[]; extern const char kWebKioskEnableLacrosDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1278,7 +1278,7 @@ 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 -@@ -174,6 +174,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -176,6 +176,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kBulkTabRestore, &kCastDeviceFilter, &kCloseTabSuggestions, @@ -1286,7 +1286,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCriticalPersistedTabData, &kCCTBackgroundTab, &kCCTClientDataHeader, -@@ -876,6 +877,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService", +@@ -899,6 +900,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService", const base::Feature kWebApkTrampolineOnInitialIntent{ "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1300,18 +1300,18 @@ 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 -@@ -154,6 +154,7 @@ extern const base::Feature kTestDefaultDisabled; +@@ -154,6 +154,7 @@ extern const base::Feature kTabSwitcherOnReturn; + extern const base::Feature kTabToGTSAnimation; + extern const base::Feature kTestDefaultDisabled; extern const base::Feature kTestDefaultEnabled; ++extern const base::Feature kBookmarksExportUseSaf; extern const base::Feature kToolbarIphAndroid; extern const base::Feature kToolbarMicIphAndroid; -+extern const base::Feature kBookmarksExportUseSaf; - extern const base::Feature kToolbarUseHardwareBitmapDraw; - extern const base::Feature kTrustedWebActivityLocationDelegation; - extern const base::Feature kTrustedWebActivityNewDisclosure; + extern const base::Feature kToolbarScrollAblationAndroid; 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 -@@ -557,6 +557,7 @@ public abstract class ChromeFeatureList { +@@ -565,6 +565,7 @@ public abstract class ChromeFeatureList { public static final String USE_CHIME_ANDROID_SDK = "UseChimeAndroidSdk"; public static final String USE_CLIENT_CONFIG_IPH = "UseClientConfigIPH"; public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy"; @@ -1389,7 +1389,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -1031,6 +1033,7 @@ public final class ChromePreferenceKeys { +@@ -960,6 +962,7 @@ public final class ChromePreferenceKeys { ASSISTANT_VOICE_SEARCH_ENABLED, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1428,7 +1428,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -390,6 +390,9 @@ static_library("common_lib") { +@@ -397,6 +397,9 @@ static_library("common_lib") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1441,7 +1441,7 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn -@@ -82,8 +82,6 @@ static_library("utility") { +@@ -83,8 +83,6 @@ static_library("utility") { if (!is_android) { sources += [ @@ -1450,7 +1450,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/external_process_importer_bridge.cc", -@@ -202,6 +200,11 @@ static_library("utility") { +@@ -204,6 +202,11 @@ static_library("utility") { ] } diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index 2543fac7..c07f14ac 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis // Since configureIntentForResizableCustomTab() might change the componenet/class // associated with the passed intent, it needs to be called after #setClassName(context, // CustomTabActivity.class.getName()); -@@ -411,6 +421,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -415,6 +425,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega if (Intent.ACTION_VIEW.equals(newIntent.getAction()) && !IntentHandler.wasIntentSenderChrome(newIntent)) { @@ -196,7 +196,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 -@@ -4669,6 +4669,21 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 7821324e..02072091 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -156,6 +156,9 @@ +@@ -159,6 +159,9 @@ @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -182,6 +185,9 @@ +@@ -185,6 +188,9 @@ @@ -59,7 +59,7 @@ 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 -@@ -213,6 +213,8 @@ import java.util.HashSet; +@@ -220,6 +220,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct /** * This is the main activity for ChromeMobile when not running in document mode. All the tabs * are accessible via a chrome specific tab switching UI. -@@ -2097,6 +2099,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2313,6 +2314,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 -@@ -3407,6 +3407,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 770d63ea..d8235e59 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 -@@ -467,6 +467,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { +@@ -469,6 +469,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[] = { -@@ -3898,7 +3914,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4058,7 +4074,11 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsLinux | kOsLacros | kOsWin, FEATURE_VALUE_TYPE(features::kSystemNotifications)}, #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -65,7 +65,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/metrics/histogram.h" -@@ -292,6 +294,15 @@ AutocompleteController::AutocompleteController( +@@ -295,6 +297,15 @@ AutocompleteController::AutocompleteController( search_service_worker_signal_sent_(false), template_url_service_(provider_client_->GetTemplateURLService()) { provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -78,13 +78,13 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ + if (!base::Contains(flag_value, "chrome")) + provider_types &= ~AutocompleteProvider::TYPE_BUILTIN; + } - if (provider_types & AutocompleteProvider::TYPE_BOOKMARK) - providers_.push_back(new BookmarkProvider(provider_client_.get())); - if (provider_types & AutocompleteProvider::TYPE_BUILTIN) + if (provider_types & AutocompleteProvider::TYPE_BOOKMARK) { + bookmark_provider_ = new BookmarkProvider(provider_client_.get()); + providers_.push_back(bookmark_provider_.get()); 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 -@@ -472,6 +472,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, +@@ -480,6 +480,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/feature_list.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" -@@ -658,6 +659,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -652,6 +653,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 0a33e901..6ad33f46 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 -@@ -4472,7 +4472,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4638,7 +4638,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 -@@ -1137,6 +1137,10 @@ const char kDeprecateAltBasedSixPackDescription[] = +@@ -1145,6 +1145,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 -@@ -594,6 +594,9 @@ extern const char kDeprecateAltClickDescription[]; +@@ -606,6 +606,9 @@ extern const char kDeprecateAltClickDescription[]; extern const char kDeprecateAltBasedSixPackName[]; extern const char kDeprecateAltBasedSixPackDescription[]; 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 d3368ee1..0c2e6da7 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,8 +21,8 @@ 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 -@@ -902,6 +902,11 @@ const FeatureEntry::FeatureVariation - std::size(kIsolatedPrerenderPrefetchLimitFifteen), nullptr}, +@@ -901,6 +901,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { + switches::kForceDisplayColorProfile, "hdr10"}, }; +const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = { @@ -33,7 +33,7 @@ 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, -@@ -4428,6 +4433,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4594,6 +4599,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAndroidPictureInPictureAPIName, flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid, FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)}, @@ -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 -@@ -1637,6 +1637,10 @@ const char kUnthrottledNestedTimeoutDescription[] = +@@ -1672,6 +1672,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 -@@ -920,6 +920,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -941,6 +941,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 8bf1239b..f84d3e1a 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 -@@ -3190,6 +3190,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3329,6 +3329,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebRtcRemoteEventLogName, flag_descriptions::kWebRtcRemoteEventLogDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebRtcRemoteEventLog)}, @@ -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 -@@ -1221,6 +1221,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1236,6 +1236,11 @@ const char kEnablePenetratingImageSelectionDescription[] = "Enables image options to be surfaced in the context menu for nodes " "covered by transparent overlays."; @@ -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 -@@ -660,6 +660,9 @@ extern const char kEnablePortalsDescription[]; +@@ -676,6 +676,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; @@ -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 -@@ -289,11 +289,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", +@@ -282,11 +282,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", // when in background. const base::Feature kResumeBackgroundVideo { "resume-background-video", @@ -68,6 +68,6 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc -#endif }; - // Experimental: Try to avoid destroying the media player when transferring a + // When enabled, MediaCapabilities will check with GPU Video Accelerator -- 2.25.1 diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 3005240b..6c9a9f0e 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.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 -@@ -5348,6 +5348,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5536,6 +5536,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName, flag_descriptions::kReaderModeInCCTDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, @@ -31,7 +31,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 -@@ -3071,6 +3071,10 @@ const char kCCTResizableForThirdPartiesName[] = +@@ -3150,6 +3150,10 @@ const char kCCTResizableForThirdPartiesName[] = const char kCCTResizableForThirdPartiesDescription[] = "Enable bottom sheet Custom Tabs for third party apps."; @@ -45,7 +45,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 -@@ -729,6 +729,9 @@ extern const char kEnableWasmLazyCompilationName[]; +@@ -742,6 +742,9 @@ extern const char kEnableWasmLazyCompilationName[]; extern const char kEnableWasmLazyCompilationDescription[]; extern const char kEnableWasmTieringName[]; @@ -109,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc #include "net/log/net_log_with_source.h" #include "net/socket/client_socket_factory.h" #include "net/socket/datagram_client_socket.h" -@@ -4102,8 +4103,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -4092,8 +4093,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { 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 7df13401..83589f69 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -12,7 +12,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 -@@ -3171,6 +3171,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3310,6 +3310,9 @@ const FeatureEntry kFeatureEntries[] = { {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, flag_descriptions::kUiPartialSwapDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, @@ -25,7 +25,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 -@@ -3422,6 +3422,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; +@@ -3522,6 +3522,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; const char kPhotoPickerVideoSupportDescription[] = "Enables video files to be shown in the Photo Picker dialog"; @@ -41,7 +41,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 -@@ -1957,6 +1957,9 @@ extern const char kQueryTilesDescription[]; +@@ -2018,6 +2018,9 @@ extern const char kQueryTilesDescription[]; extern const char kQueryTilesNTPName[]; extern const char kQueryTilesNTPDescription[]; 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 ea31f574..a7071090 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 -@@ -6677,6 +6677,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6874,6 +6874,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -33,7 +33,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 -@@ -5626,6 +5626,9 @@ extern const char kLacrosScreenCoordinatesDescription[]; +@@ -5769,6 +5769,9 @@ extern const char kLacrosScreenCoordinatesDescription[]; #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 -@@ -3427,6 +3427,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; +@@ -3515,6 +3515,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; extern const char kWebUITabStripTabDragIntegrationDescription[]; #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) @@ -83,7 +83,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 -@@ -310,6 +310,8 @@ CONTENT_EXPORT extern const base::FeatureParam +@@ -308,6 +308,8 @@ CONTENT_EXPORT extern const base::FeatureParam kCompositorLockTimeout; #endif // BUILDFLAG(IS_ANDROID) @@ -114,7 +114,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c // Maximum number of entries in a vibration pattern. const unsigned kVibrationPatternLengthMax = 99; -@@ -152,6 +153,8 @@ bool VibrationController::vibrate(Navigator& navigator, +@@ -153,6 +154,8 @@ bool VibrationController::vibrate(Navigator& navigator, // reference to |window| or |navigator| was retained in another window. if (!navigator.DomWindow()) return false; @@ -140,7 +140,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 -@@ -1630,6 +1630,10 @@ +@@ -1653,6 +1653,10 @@ name: "OrientationEvent", status: {"Android": "stable"}, }, diff --git a/build/patches/Add-gn-flag-for-clangd-builds.patch b/build/patches/Add-gn-flag-for-clangd-builds.patch index bd86d1f6..c3c48208 100644 --- a/build/patches/Add-gn-flag-for-clangd-builds.patch +++ b/build/patches/Add-gn-flag-for-clangd-builds.patch @@ -16,7 +16,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 -@@ -1531,7 +1531,7 @@ config("default_warnings") { +@@ -1537,7 +1537,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -25,8 +25,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn # TODO(https://crbug.com/1300731) Clean up and enable. cflags += [ "-Wno-unqualified-std-cast-call" ] } -@@ -1541,8 +1541,12 @@ config("default_warnings") { - # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out +@@ -1547,8 +1547,12 @@ config("default_warnings") { + # TODO(https://crbug.com/1322823): Remove flags once potential miscompile is investigated. cflags += [ "-Xclang", - "-no-opaque-pointers", diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch index 48ed358c..b75401da 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -186,8 +186,8 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c 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 -@@ -378,10 +378,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - InstantServiceFactory::GetInstance(); +@@ -386,10 +386,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + LacrosFirstRunServiceFactory::GetInstance(); #endif LanguageModelManagerFactory::GetInstance(); - if (base::FeatureList::IsEnabled( @@ -201,7 +201,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -481,6 +481,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -485,6 +485,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { web_contents); } video_tutorials::VideoTutorialTabHelper::CreateForWebContents(web_contents); @@ -338,7 +338,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid } // Add any origins which have a default content setting value (thus skipped -@@ -176,7 +177,7 @@ void GetOrigins(JNIEnv* env, +@@ -175,7 +176,7 @@ void GetOrigins(JNIEnv* env, seen_origins.push_back(origin); insertionFunc(env, static_cast(content_type), list, ConvertOriginToJavaString(env, origin), jembedder, @@ -350,7 +350,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd --- a/components/browser_ui/strings/android/browser_ui_strings.grd +++ b/components/browser_ui/strings/android/browser_ui_strings.grd -@@ -590,6 +590,11 @@ +@@ -593,6 +593,11 @@ URL truncated @@ -441,7 +441,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 -@@ -156,13 +156,15 @@ ContentSettingPatternSource::ContentSettingPatternSource( +@@ -157,13 +157,15 @@ ContentSettingPatternSource::ContentSettingPatternSource( base::Value setting_value, const std::string& source, bool incognito, @@ -459,7 +459,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo ContentSettingPatternSource::ContentSettingPatternSource() : incognito(false) {} -@@ -179,6 +181,7 @@ ContentSettingPatternSource& ContentSettingPatternSource::operator=( +@@ -180,6 +182,7 @@ ContentSettingPatternSource& ContentSettingPatternSource::operator=( expiration = other.expiration; source = other.source; incognito = other.incognito; @@ -519,7 +519,7 @@ diff --git a/components/content_settings/core/common/content_settings_constraint diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java -@@ -383,9 +383,9 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr +@@ -360,9 +360,9 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr */ @CalledByNative private void addPermissionSection(String name, String nameMidSentence, int type, @@ -618,7 +618,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -1057,6 +1057,8 @@ void PageInfo::PresentSitePermissions() { +@@ -1055,6 +1055,8 @@ void PageInfo::PresentSitePermissions() { permission_info.source = info.source; permission_info.is_one_time = (info.session_model == content_settings::SessionModel::OneTime); @@ -894,7 +894,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc --- a/components/permissions/contexts/geolocation_permission_context_android.cc +++ b/components/permissions/contexts/geolocation_permission_context_android.cc -@@ -157,6 +157,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -158,6 +158,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( ContentSetting content_setting, bool is_one_time) { DCHECK(!is_one_time); @@ -914,7 +914,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (content_setting == CONTENT_SETTING_ALLOW && !location_settings_->IsSystemLocationSettingEnabled()) { -@@ -169,7 +182,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -170,7 +183,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( if (IsInLocationSettingsBackOff(is_default_search)) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -924,7 +924,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LogLocationSettingsMetric( kLocationSettingsSuppressMetricBase, is_default_search, LocationSettingsBackOffLevel(is_default_search)); -@@ -194,7 +208,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -195,7 +209,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( !location_settings_dialog_callback_.is_null()) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -934,7 +934,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr // This case should be very rare, so just pretend it was a denied prompt // for metrics purposes. LogLocationSettingsMetric( -@@ -211,12 +226,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -212,12 +227,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( base::BindOnce( &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown, weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin, @@ -950,7 +950,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr } PermissionResult -@@ -383,6 +399,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -384,6 +400,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( const GURL& embedding_origin, bool persist, ContentSetting content_setting, @@ -958,7 +958,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LocationSettingsDialogOutcome prompt_outcome) { bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (prompt_outcome == GRANTED) { -@@ -410,7 +427,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -411,7 +428,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( FinishNotifyPermissionSet( location_settings_dialog_request_id_, requesting_origin, embedding_origin, @@ -968,7 +968,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr location_settings_dialog_request_id_ = PermissionRequestID(0, 0, PermissionRequestID::RequestLocalId()); -@@ -422,10 +440,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( +@@ -423,10 +441,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( const GURL& embedding_origin, BrowserPermissionCallback callback, bool persist, @@ -986,7 +986,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr diff --git a/components/permissions/contexts/geolocation_permission_context_android.h b/components/permissions/contexts/geolocation_permission_context_android.h --- a/components/permissions/contexts/geolocation_permission_context_android.h +++ b/components/permissions/contexts/geolocation_permission_context_android.h -@@ -88,6 +88,14 @@ class GeolocationPermissionContextAndroid +@@ -87,6 +87,14 @@ class GeolocationPermissionContextAndroid bool persist, ContentSetting content_setting, bool is_one_time) override; @@ -1001,7 +1001,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr PermissionResult UpdatePermissionStatusWithDeviceStatus( PermissionResult result, const GURL& requesting_origin, -@@ -130,6 +138,7 @@ class GeolocationPermissionContextAndroid +@@ -129,6 +137,7 @@ class GeolocationPermissionContextAndroid const GURL& embedding_origin, bool persist, ContentSetting content_setting, @@ -1009,7 +1009,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LocationSettingsDialogOutcome prompt_outcome); void FinishNotifyPermissionSet(const PermissionRequestID& id, -@@ -137,7 +146,9 @@ class GeolocationPermissionContextAndroid +@@ -136,7 +145,9 @@ class GeolocationPermissionContextAndroid const GURL& embedding_origin, BrowserPermissionCallback callback, bool persist, @@ -1023,7 +1023,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc --- a/components/permissions/permission_context_base.cc +++ b/components/permissions/permission_context_base.cc -@@ -244,6 +244,20 @@ PermissionContextBase::CreatePermissionRequest( +@@ -250,6 +250,20 @@ PermissionContextBase::CreatePermissionRequest( std::move(delete_callback)); } @@ -1044,7 +1044,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm PermissionResult PermissionContextBase::GetPermissionStatus( content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, -@@ -436,7 +450,8 @@ void PermissionContextBase::PermissionDecided( +@@ -441,7 +455,8 @@ void PermissionContextBase::PermissionDecided( const GURL& embedding_origin, BrowserPermissionCallback callback, ContentSetting content_setting, @@ -1054,7 +1054,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm DCHECK(content_setting == CONTENT_SETTING_ALLOW || content_setting == CONTENT_SETTING_BLOCK || content_setting == CONTENT_SETTING_DEFAULT); -@@ -444,9 +459,9 @@ void PermissionContextBase::PermissionDecided( +@@ -449,9 +464,9 @@ void PermissionContextBase::PermissionDecided( content_setting); bool persist = content_setting != CONTENT_SETTING_DEFAULT; @@ -1066,7 +1066,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm } content::BrowserContext* PermissionContextBase::browser_context() const { -@@ -496,11 +511,26 @@ void PermissionContextBase::NotifyPermissionSet( +@@ -501,11 +516,26 @@ void PermissionContextBase::NotifyPermissionSet( bool persist, ContentSetting content_setting, bool is_one_time) { @@ -1094,7 +1094,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm } UpdateTabContext(id, requesting_origin, -@@ -521,6 +551,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, +@@ -526,6 +556,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, const GURL& embedding_origin, ContentSetting content_setting, bool is_one_time) { @@ -1110,7 +1110,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm DCHECK_EQ(requesting_origin, requesting_origin.DeprecatedGetOriginAsURL()); DCHECK_EQ(embedding_origin, embedding_origin.DeprecatedGetOriginAsURL()); DCHECK(content_setting == CONTENT_SETTING_ALLOW || -@@ -532,8 +571,7 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, +@@ -537,8 +576,7 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, ->SetContentSettingDefaultScope( requesting_origin, embedding_origin, content_settings_type_, content_setting, @@ -1123,7 +1123,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h --- a/components/permissions/permission_context_base.h +++ b/components/permissions/permission_context_base.h -@@ -143,6 +143,14 @@ class PermissionContextBase : public KeyedService, +@@ -141,6 +141,14 @@ class PermissionContextBase : public KeyedService, // Updates stored content setting if persist is set, updates tab indicators // and runs the callback to finish the request. @@ -1138,7 +1138,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi virtual void NotifyPermissionSet(const PermissionRequestID& id, const GURL& requesting_origin, const GURL& embedding_origin, -@@ -163,6 +171,11 @@ class PermissionContextBase : public KeyedService, +@@ -161,6 +169,11 @@ class PermissionContextBase : public KeyedService, // Store the decided permission as a content setting. // virtual since the permission might be stored with different restrictions // (for example for desktop notifications). @@ -1150,7 +1150,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi virtual void UpdateContentSetting(const GURL& requesting_origin, const GURL& embedding_origin, ContentSetting content_setting, -@@ -195,6 +208,14 @@ class PermissionContextBase : public KeyedService, +@@ -193,6 +206,14 @@ class PermissionContextBase : public KeyedService, PermissionRequest::PermissionDecidedCallback permission_decided_callback, base::OnceClosure delete_callback) const; @@ -1165,7 +1165,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi ContentSettingsType content_settings_type() const { return content_settings_type_; } -@@ -221,7 +242,8 @@ class PermissionContextBase : public KeyedService, +@@ -219,7 +240,8 @@ class PermissionContextBase : public KeyedService, const GURL& embedding_origin, BrowserPermissionCallback callback, ContentSetting content_setting, @@ -1302,7 +1302,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc --- a/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc -@@ -162,7 +162,7 @@ void PermissionRequestManager::AddRequest( +@@ -152,7 +152,7 @@ void PermissionRequestManager::AddRequest( if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kDenyPermissionPrompts)) { @@ -1311,7 +1311,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p request->RequestFinished(); return; } -@@ -238,7 +238,7 @@ void PermissionRequestManager::AddRequest( +@@ -228,7 +228,7 @@ void PermissionRequestManager::AddRequest( if (auto_approval_origin) { if (url::Origin::Create(request->requesting_origin()) == auto_approval_origin.value()) { @@ -1320,7 +1320,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } request->RequestFinished(); return; -@@ -498,12 +498,13 @@ void PermissionRequestManager::Accept() { +@@ -488,12 +488,13 @@ void PermissionRequestManager::Accept() { for (requests_iter = requests_.begin(); requests_iter != requests_.end(); requests_iter++) { PermissionGrantedIncludingDuplicates(*requests_iter, @@ -1336,7 +1336,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p if (ignore_callbacks_from_prompt_) return; DCHECK(view_); -@@ -511,12 +512,22 @@ void PermissionRequestManager::AcceptThisTime() { +@@ -501,12 +502,22 @@ void PermissionRequestManager::AcceptThisTime() { for (requests_iter = requests_.begin(); requests_iter != requests_.end(); requests_iter++) { PermissionGrantedIncludingDuplicates(*requests_iter, @@ -1360,7 +1360,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p if (ignore_callbacks_from_prompt_) return; DCHECK(view_); -@@ -538,7 +549,7 @@ void PermissionRequestManager::Deny() { +@@ -528,7 +539,7 @@ void PermissionRequestManager::Deny() { std::vector::iterator requests_iter; for (requests_iter = requests_.begin(); requests_iter != requests_.end(); requests_iter++) { @@ -1369,7 +1369,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } FinalizeCurrentRequests(PermissionAction::DENIED); } -@@ -890,25 +901,26 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest( +@@ -885,25 +896,26 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest( void PermissionRequestManager::PermissionGrantedIncludingDuplicates( PermissionRequest* request, @@ -1402,7 +1402,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } void PermissionRequestManager::CancelledIncludingDuplicates( -@@ -1084,7 +1096,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) { +@@ -1079,7 +1091,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) { void PermissionRequestManager::DoAutoResponseForTesting() { switch (auto_response_for_test_) { case ACCEPT_ONCE: @@ -1426,7 +1426,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe void Dismiss() override; void Ignore() override; bool WasCurrentRequestAlreadyDisplayed() override; -@@ -272,9 +274,12 @@ class PermissionRequestManager +@@ -273,9 +275,12 @@ class PermissionRequestManager // Calls PermissionGranted on a request and all its duplicates. void PermissionGrantedIncludingDuplicates(PermissionRequest* request, diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index df3382f8..3a32bdbb 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -8,8 +8,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome/browser/ChromeTabbedActivity.java | 26 ++++++++ .../browser/bookmarks/BookmarkBridge.java | 60 +++++++++++++++++++ .../browser/bookmarks/BookmarkUtils.java | 4 ++ - .../android/bookmarks/bookmark_bridge.cc | 17 ++++++ - .../android/bookmarks/bookmark_bridge.h | 4 ++ + .../bookmarks/android/bookmark_bridge.cc | 17 ++++++ + .../bookmarks/android/bookmark_bridge.h | 4 ++ .../browser/bookmarks/bookmark_html_writer.cc | 8 ++- .../bookmarks/chrome_bookmark_client.cc | 2 + .../dialogs/DownloadLocationCustomView.java | 4 +- @@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -179,6 +183,9 @@ +@@ -182,6 +186,9 @@ @@ -54,7 +54,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 -@@ -70,6 +70,8 @@ import org.chromium.chrome.browser.back_press.BackPressManager; +@@ -73,6 +73,8 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.compositor.CompositorViewHolder; @@ -63,7 +63,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.compositor.layouts.Layout; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone; -@@ -2111,6 +2113,8 @@ public class ChromeTabbedActivity extends ChromeActivity getTabModelSelector().closeAllTabs(), /*isIncognito=*/false); RecordUserAction.record("MobileMenuCloseAllTabs"); @@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct } else if (id == R.id.close_all_incognito_tabs_menu_id) { // Close only incognito tabs CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(), -@@ -2163,6 +2167,28 @@ public class ChromeTabbedActivity extends ChromeActivitybookmark_bar_node()->children()) { if (node->is_folder()) top_level_folders.push_back(node.get()); -@@ -482,6 +487,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( +@@ -479,6 +484,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( // Vector to temporarily contain all child bookmarks at same level for sorting std::vector bookmarks = { bookmark_model_->mobile_node(), @@ -250,7 +250,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse bookmark_model_->bookmark_bar_node(), bookmark_model_->other_node(), }; -@@ -536,6 +542,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( +@@ -531,6 +537,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( return folder_id_obj; } @@ -268,9 +268,9 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse ScopedJavaLocalRef BookmarkBridge::GetOtherFolderId( JNIEnv* env, const JavaParamRef& obj) { -diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser/android/bookmarks/bookmark_bridge.h ---- a/chrome/browser/android/bookmarks/bookmark_bridge.h -+++ b/chrome/browser/android/bookmarks/bookmark_bridge.h +diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h +--- a/chrome/browser/bookmarks/android/bookmark_bridge.h ++++ b/chrome/browser/bookmarks/android/bookmark_bridge.h @@ -121,6 +121,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, JNIEnv* env, const base::android::JavaParamRef& obj); @@ -350,7 +350,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -3480,6 +3480,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Track prices @@ -675,7 +675,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks/browser/model_loader.cc --- a/components/bookmarks/browser/model_loader.cc +++ b/components/bookmarks/browser/model_loader.cc -@@ -56,7 +56,8 @@ void LoadBookmarks(const base::FilePath& path, +@@ -57,7 +57,8 @@ void LoadBookmarks(const base::FilePath& path, std::string sync_metadata_str; BookmarkCodec codec; codec.Decode(*root, details->bb_node(), details->other_folder_node(), diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 6702d9cf..c3cb326e 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 -@@ -2137,6 +2137,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2419,6 +2419,11 @@ public abstract class ChromeActivity return true; } @@ -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 -@@ -506,6 +506,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -527,6 +527,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); -@@ -1129,6 +1130,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1152,6 +1153,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate stopPriceTrackingMenuItem.setVisible(false); } @@ -111,8 +111,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust 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 -@@ -309,6 +309,10 @@ CHAR_LIMIT guidelines: - Bluetooth +@@ -312,6 +312,10 @@ CHAR_LIMIT guidelines: + USB + diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 7a928757..690f841a 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -21,7 +21,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/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java -@@ -67,6 +67,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting +@@ -68,6 +68,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting return new ReaderForAccessibilityDelegate(); } @@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s 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 -@@ -438,6 +438,7 @@ public final class ChromePreferenceKeys { +@@ -367,6 +367,7 @@ public final class ChromePreferenceKeys { AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM; public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; @@ -61,7 +61,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java -@@ -82,6 +82,7 @@ public class LegacyChromePreferenceKeys { +@@ -66,6 +66,7 @@ public class LegacyChromePreferenceKeys { ChromePreferenceKeys.FLAGS_CACHED_SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT, ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED, ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR, @@ -84,7 +84,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1389,6 +1389,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1392,6 +1392,12 @@ Your Google account may have other forms of browsing history like searches and a Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps @@ -100,7 +100,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro 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 -@@ -106,22 +106,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con +@@ -110,22 +110,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con public void setToolbar(Toolbar toolbar, boolean isIncognito) { mToolbar = toolbar; mToolbarContainer.setToolbar(mToolbar); @@ -126,7 +126,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -44,7 +44,7 @@ if (is_ios) { +@@ -45,7 +45,7 @@ if (is_ios) { # Omit Lacros because it allows //components to depend on //chrome, which in # turn depends on //extensions. @@ -135,7 +135,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn disallowed_extension_deps_ = [ # Components should largely not depend on //extensions. Since // extensions # is not a component target and is linked with //chrome, depending on most -@@ -636,7 +636,7 @@ test("components_unittests") { +@@ -655,7 +655,7 @@ test("components_unittests") { # On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -144,7 +144,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn assert_no_deps = [ "//chrome/*" ] assert_no_deps += disallowed_extension_deps_ } -@@ -918,7 +918,7 @@ if (!is_ios) { +@@ -939,7 +939,7 @@ if (!is_ios) { # dependency. On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -156,7 +156,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml -@@ -25,6 +25,11 @@ +@@ -34,6 +34,11 @@ android:summary="@string/accessibility_tab_switcher_summary" android:title="@string/accessibility_tab_switcher_title" /> @@ -171,16 +171,16 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java -@@ -27,6 +27,8 @@ public class AccessibilitySettings +@@ -30,6 +30,8 @@ public class AccessibilitySettings public static final String PREF_READER_FOR_ACCESSIBILITY = "reader_for_accessibility"; public static final String PREF_CAPTIONS = "captions"; + private BooleanPreferenceDelegate mForceTabletUIDelegate; + static final String PREF_FORCE_TABLET_UI = "force_tablet_ui"; private TextScalePreference mTextScalePref; - private ChromeBaseCheckBoxPreference mForceEnableZoomPref; - private boolean mRecordFontSizeChangeOnStop; -@@ -85,6 +87,12 @@ public class AccessibilitySettings + private PageZoomPreference mPageZoomDefaultZoomPref; + private ChromeSwitchPreference mPageZoomAlwaysShowPref; +@@ -105,6 +107,12 @@ public class AccessibilitySettings getPreferenceScreen().removePreference(readerForAccessibilityPref); } @@ -193,7 +193,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c ChromeBaseCheckBoxPreference accessibilityTabSwitcherPref = (ChromeBaseCheckBoxPreference) findPreference( AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER); -@@ -133,6 +141,8 @@ public class AccessibilitySettings +@@ -153,6 +161,8 @@ public class AccessibilitySettings mFontSizePrefs.setUserFontScaleFactor((Float) newValue); } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue); @@ -217,7 +217,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn -@@ -362,6 +362,8 @@ android_library("ui_no_recycler_view_java") { +@@ -363,6 +363,8 @@ android_library("ui_no_recycler_view_java") { deps = [ ":ui_java_resources", ":ui_utils_java", diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index e357a8c6..e13eef97 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -35,6 +35,7 @@ import androidx.lifecycle.LifecycleRegistry; +@@ -36,6 +36,7 @@ import androidx.lifecycle.LifecycleRegistry; import org.chromium.base.CallbackController; import org.chromium.base.CommandLine; @@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.base.IntentUtils; import org.chromium.base.Log; import org.chromium.base.MemoryPressureListener; -@@ -1235,8 +1236,10 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

IMAGE 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 0e1afe9a..513714ae 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 @@ -115,10 +115,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask; import org.chromium.chrome.browser.compositor.CompositorViewHolder; +import org.chromium.chrome.browser.homepage.HomepageManager; - import org.chromium.chrome.browser.init.StartupTabPreloader; import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin; import org.chromium.chrome.browser.ntp.NewTabPageUtils; -@@ -323,6 +324,12 @@ public class ChromeTabCreator extends TabCreator { + import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper; +@@ -312,6 +313,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 -@@ -449,6 +449,7 @@ public final class ChromePreferenceKeys { +@@ -378,6 +378,7 @@ public final class ChromePreferenceKeys { public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL = "Chrome.Homepage.PartnerCustomizedDefaultGurl"; @@ -145,7 +145,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java -@@ -87,6 +87,7 @@ public class LegacyChromePreferenceKeys { +@@ -71,6 +71,7 @@ public class LegacyChromePreferenceKeys { ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI, ChromePreferenceKeys.HOMEPAGE_ENABLED, ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI, @@ -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 -@@ -1204,6 +1204,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1207,6 +1207,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour @@ -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 -@@ -372,6 +372,7 @@ extern const char kSettingsShowOSBanner[]; +@@ -373,6 +373,7 @@ extern const char kSettingsShowOSBanner[]; 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 872ac6a4..7b81655b 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -21,15 +21,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 -@@ -132,6 +132,7 @@ - #include "components/security_state/core/security_state.h" +@@ -133,6 +133,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" +#include "components/site_engagement/core/features.h" #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" -@@ -8496,6 +8497,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8744,6 +8745,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kReduceUserAgentMinorVersionDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kReduceUserAgentMinorVersion)}, @@ -44,7 +44,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 -@@ -3000,6 +3000,11 @@ const char kReduceUserAgentMinorVersionDescription[] = +@@ -3082,6 +3082,11 @@ const char kReduceUserAgentMinorVersionDescription[] = "The Chrome version in the User-Agent string will be reported as " "Chrome/.0.0.0."; @@ -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 -@@ -1702,6 +1702,9 @@ extern const char kDurableClientHintsCacheDescription[]; +@@ -1752,6 +1752,9 @@ extern const char kDurableClientHintsCacheDescription[]; extern const char kReduceUserAgentMinorVersionName[]; extern const char kReduceUserAgentMinorVersionDescription[]; diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index 10e16de8..35afa143 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer; -@@ -337,9 +338,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -338,9 +339,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finish(); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 0421d203..a67c4a65 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -258,7 +258,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 -@@ -204,7 +204,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -205,7 +205,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::AUTOPLAY || content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || @@ -268,7 +268,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -216,6 +217,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -217,6 +218,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); @@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h -@@ -1777,6 +1777,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, +@@ -1772,6 +1772,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, DOMArrayBufferView* pixels, int64_t offset); diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index 8619eb38..29e5aaf3 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -254,7 +254,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 -@@ -205,7 +205,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::TIMEZONE_OVERRIDE || @@ -264,7 +264,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -218,6 +219,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -219,6 +220,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); diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 8a3651c6..40600567 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -56,9 +56,9 @@ diff --git a/content/browser/net/cross_origin_embedder_policy_reporter.cc b/cont } if (endpoint) { +#if BUILDFLAG(ENABLE_REPORTING) - base::DictionaryValue body_to_pass; + base::Value::Dict body_to_pass; for (const auto& pair : body) { - body_to_pass.SetString(pair.first, pair.second); + body_to_pass.Set(pair.first, pair.second); @@ -123,7 +125,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( kType, *endpoint, context_url_, reporting_source_, network_isolation_key_, @@ -106,15 +106,15 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) { switch (coop_value) { case network::mojom::CrossOriginOpenerPolicyValue::kUnsafeNone: -@@ -59,6 +52,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) { - return "same-origin-allow-popups-plus-coep"; +@@ -61,6 +54,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) { + return "restrict-properties-plus-coep"; } } +#endif FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) { FrameTreeNode* opener = -@@ -230,6 +224,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( +@@ -232,6 +226,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( network::mojom::SourceLocationPtr source_location, const std::string& reported_window_url, const std::string& initial_popup_url) const { @@ -122,7 +122,7 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten // Cross-Origin-Opener-Policy-Report-Only is not required to provide // endpoints. if (!coop_.report_only_reporting_endpoint) -@@ -278,12 +273,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( +@@ -279,12 +274,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport( storage_partition_->GetNetworkContext()->QueueReport( "coop", endpoint, context_url_, reporting_source_, network_isolation_key_, absl::nullopt, std::move(body)); @@ -130,13 +130,13 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten } void CrossOriginOpenerPolicyReporter::QueueNavigationReport( - base::DictionaryValue body, + base::Value::Dict body, const std::string& endpoint, bool is_report_only) { +#if BUILDFLAG(ENABLE_REPORTING) - body.SetString(kDisposition, - is_report_only ? kDispositionReporting : kDispositionEnforce); - body.SetString( + body.Set(kDisposition, + is_report_only ? kDispositionReporting : kDispositionEnforce); + body.Set(kEffectivePolicy, @@ -292,6 +289,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport( storage_partition_->GetNetworkContext()->QueueReport( "coop", endpoint, context_url_, reporting_source_, network_isolation_key_, @@ -156,18 +156,17 @@ diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/ne #include "content/browser/service_worker/service_worker_host.h" #include "content/browser/worker_host/dedicated_worker_host.h" #include "content/browser/worker_host/shared_worker_host.h" -@@ -173,6 +174,7 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { +@@ -174,12 +175,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { const std::string& group, const std::string& type, - std::unique_ptr body) { + base::Value::Dict body) { +#if BUILDFLAG(ENABLE_REPORTING) auto* rph = RenderProcessHost::FromID(render_process_id_); if (!rph) return; -@@ -180,6 +182,7 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { + rph->GetStoragePartition()->GetNetworkContext()->QueueReport( type, group, url, reporting_source_, network_isolation_key_, - /*user_agent=*/absl::nullopt, - base::Value::FromUniquePtrValue(std::move(body))); + /*user_agent=*/absl::nullopt, std::move(body)); +#endif } @@ -175,10 +174,10 @@ diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/ne 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 -@@ -11549,12 +11549,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( - auto body = base::DictionaryValue(); +@@ -11648,12 +11648,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( + base::Value::Dict body; if (!reason.empty()) - body.SetString("reason", reason); + body.Set("reason", reason); - - // Send the crash report to the Reporting API. - GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport( @@ -221,8 +220,8 @@ diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc --- a/net/reporting/reporting_service.cc +++ b/net/reporting/reporting_service.cc -@@ -212,6 +212,12 @@ class ReportingServiceImpl : public ReportingService { - std::unique_ptr body, +@@ -208,6 +208,12 @@ class ReportingServiceImpl : public ReportingService { + base::Value::Dict body, int depth, base::TimeTicks queued_ticks) { +#if BUILDFLAG(ENABLE_REPORTING) @@ -237,12 +236,12 @@ 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 -@@ -455,10 +455,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -456,10 +456,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const absl::optional& reporting_source, const net::NetworkIsolationKey& network_isolation_key, const absl::optional& user_agent, -- base::Value body) override; -+ base::Value body); +- base::Value::Dict body) override; ++ base::Value::Dict body); void QueueSignedExchangeReport( mojom::SignedExchangeReportPtr report, - const net::NetworkIsolationKey& network_isolation_key) override; @@ -253,7 +252,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte 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 -@@ -963,7 +963,6 @@ mojom("mojom") { +@@ -965,7 +965,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -264,7 +263,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 -@@ -1046,6 +1046,7 @@ interface NetworkContext { +@@ -1055,6 +1055,7 @@ interface NetworkContext { // provided |network_isolation_key|. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -272,7 +271,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1059,6 +1060,7 @@ interface NetworkContext { +@@ -1068,6 +1069,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|. @@ -291,7 +290,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h" #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h" -@@ -2340,9 +2341,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { +@@ -2356,9 +2357,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { return base::UnguessableToken::Null(); } @@ -317,7 +316,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/network/public/mojom/fetch_api.mojom-blink-forward.h" #include "third_party/blink/public/common/frame/frame_ad_evidence.h" -@@ -561,9 +561,9 @@ class CORE_EXPORT LocalFrame final +@@ -564,9 +564,9 @@ class CORE_EXPORT LocalFrame final } SmoothScrollSequencer& GetSmoothScrollSequencer(); diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 808ed505..7b3b877f 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc -@@ -1218,6 +1218,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1217,6 +1217,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -24,7 +24,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc void WebMediaPlayerImpl::EnabledAudioTracksChanged( const WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3585,7 +3591,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3608,7 +3614,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { // Audio only stream is allowed to play when in background. // TODO: We should check IsBackgroundOptimizationCandidate here. But we need // to move the logic of checking video frames out of that function. @@ -40,7 +40,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h -@@ -191,6 +191,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl +@@ -192,6 +192,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl bool HasVideo() const override; bool HasAudio() const override; diff --git a/build/patches/Ask-user-before-closing-all-tabs.patch b/build/patches/Ask-user-before-closing-all-tabs.patch index 250c104c..91450839 100644 --- a/build/patches/Ask-user-before-closing-all-tabs.patch +++ b/build/patches/Ask-user-before-closing-all-tabs.patch @@ -10,7 +10,7 @@ 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 -@@ -460,8 +460,8 @@ const base::Feature kConditionalTabStripAndroid{ +@@ -480,8 +480,8 @@ const base::Feature kConditionalTabStripAndroid{ const base::Feature kCastDeviceFilter{"CastDeviceFilter", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index 3bcee2e3..4184ba72 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -48,7 +48,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc -@@ -486,7 +486,9 @@ double AudioContext::baseLatency() const { +@@ -502,7 +502,9 @@ double AudioContext::baseLatency() const { DCHECK(IsMainThread()); DCHECK(destination()); diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index a0ece8cf..e19f9ac0 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -31,6 +31,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ash/resources/PRESUBMIT.py | 4 +- .../device_sync/cryptauth_client_impl.cc | 8 +- ash/services/ime/constants.cc | 2 +- + ash/system/eche/eche_tray.cc | 2 +- ...pcie_peripheral_notification_controller.cc | 2 +- .../usb_peripheral_notification_controller.cc | 4 +- .../test_wallpaper_controller_client.cc | 2 +- @@ -47,10 +48,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ash/webui/media_app_ui/media_app_guest_ui.cc | 2 +- .../backend/help_content_provider.cc | 4 +- .../os_feedback_ui/resources/fake_data.js | 14 +- + .../os_feedback_ui/resources/search_page.js | 2 +- .../personalization_app_ui.cc | 2 +- .../resources/PRESUBMIT.py | 2 +- .../print_management/resources/PRESUBMIT.py | 2 +- .../projector_app/projector_xhr_sender.cc | 10 +- + .../projector_app/projector_xhr_sender.h | 2 +- .../projector_app/untrusted_projector_ui.cc | 12 +- ash/webui/scanning/resources/PRESUBMIT.py | 2 +- .../scanning/resources/scanning_app.html | 2 +- @@ -63,6 +66,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html base/debug/debugger_posix.cc | 4 +- base/debug/stack_trace_posix.cc | 2 +- base/ios/device_util.mm | 2 +- + base/memory/raw_ptr.cc | 2 +- + base/memory/raw_ptr_asan_service.cc | 2 +- base/third_party/libevent/evdns.c | 2 +- build/android/PRESUBMIT.py | 2 +- build/android/gradle/generate_gradle.py | 2 +- @@ -98,6 +103,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html build/config/sanitizers/sanitizers.gni | 2 +- build/config/win/control_flow_guard.gni | 2 +- build/fuchsia/PRESUBMIT.py | 2 +- + build/fuchsia/binary_size_differ.py | 2 +- build/fuchsia/binary_sizes.py | 2 +- build/linux/install-chromeos-fonts.py | 2 +- .../linux/sysroot_scripts/install-sysroot.py | 2 +- @@ -118,9 +124,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../javatest_manifest_config_delta.json | 12 +- .../manifest/maps_go_manifest_config.json | 10 +- chrome/app/PRESUBMIT.py | 8 +- - chrome/app/chromium_strings.grd | 22 +- - chrome/app/generated_resources.grd | 266 +- - chrome/app/google_chrome_strings.grd | 22 +- + chrome/app/chromium_strings.grd | 24 +- + chrome/app/generated_resources.grd | 280 +- + chrome/app/google_chrome_strings.grd | 24 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- chrome/browser/about_flags.cc | 4 +- @@ -129,6 +135,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/browser/android/vr/PRESUBMIT.py | 2 +- .../android/webapk/webapk_installer.cc | 4 +- .../app_service/webapk/webapk_install_task.cc | 2 +- + .../apps/digital_goods/digital_goods_ash.cc | 2 +- .../digital_goods_factory_impl.cc | 2 +- .../apps/platform_apps/install_chrome_app.cc | 2 +- .../ash/android_sms/android_sms_urls.cc | 16 +- @@ -143,7 +150,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../resources/web_time_limit_error_page.html | 2 +- chrome/browser/ash/crostini/crostini_util.cc | 2 +- .../customization/customization_document.cc | 2 +- - .../eche_app_notification_controller.cc | 4 +- + .../eche_app_notification_controller.cc | 2 +- .../enhanced_network_tts_constants.cc | 2 +- .../file_manager/file_manager_string_util.cc | 12 +- chrome/browser/ash/file_manager/file_tasks.cc | 4 +- @@ -171,6 +178,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../wallpaper_handlers/wallpaper_handlers.cc | 16 +- .../ash/web_applications/terminal_source.cc | 4 +- .../autofill/autofill_gstatic_reader.cc | 4 +- + .../apc_onboarding_coordinator_impl.cc | 2 +- .../browser_switcher_service.cc | 2 +- chrome/browser/cart/cart_discount_fetcher.cc | 2 +- .../cart/cart_discount_link_fetcher.cc | 2 +- @@ -184,10 +192,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../dlp/dlp_clipboard_bubble_constants.h | 2 +- chrome/browser/devtools/url_constants.cc | 4 +- .../mixed_content_download_blocking.cc | 2 +- - .../connectors/connectors_service.cc | 4 +- .../management_service/rotate_util.cc | 2 +- .../file_system/browsertest_helper.cc | 6 +- .../file_system/signin_dialog_delegate.cc | 2 +- + .../connectors/service_provider_config.cc | 4 +- .../extension_request_notification.cc | 4 +- .../enterprise/signals/signals_utils.cc | 4 +- ...e_js_error_report_processor_nonchromeos.cc | 4 +- @@ -239,7 +247,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../resources/chromeos/about_os_credits.html | 6 +- .../dictation/macros/list_commands_macro.js | 2 +- .../magnifier/magnifier.js | 2 +- - .../chromevox/background/command_handler.js | 6 +- + .../chromevox/background/command_handler.js | 8 +- .../chromevox/options/options.css | 2 +- .../tools/webstore_extension_util.py | 10 +- .../chromevox_manifest.json.jinja2 | 8 +- @@ -262,7 +270,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chromeos/emoji_picker/icons.html | 2 +- .../resources/chromeos/emulator/icons.html | 2 +- .../input_method/google_xkb_manifest.json | 8 +- - .../resources/chromeos/login/debug/debug.js | 2 +- + .../resources/chromeos/login/debug/debug.js | 10 +- .../screens/common/arc_terms_of_service.js | 4 +- .../screens/common/consolidated_consent.js | 2 +- .../screens/common/marketing_opt_in.html | 2 +- @@ -273,7 +281,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../parent_access/parent_access_ui.js | 8 +- .../chromeos/wallpaper_manager/manifest.json | 2 +- .../browser/resources/cryptotoken/enroller.js | 2 +- - .../default_apps/external_extensions.json | 14 +- + .../default_apps/external_extensions.json | 2 +- .../discards/graph_doc_template.html | 2 +- chrome/browser/resources/downloads/icons.html | 2 +- .../resources/gaia_auth_host/PRESUBMIT.py | 2 +- @@ -317,7 +325,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome_cleaner/srt_field_trial_win.cc | 6 +- .../chrome_enterprise_url_lookup_service.cc | 2 +- .../chrome_password_protection_service.cc | 4 +- - .../binary_upload_service.cc | 4 +- + .../cloud_binary_upload_service.cc | 4 +- .../check_client_download_request_base.cc | 4 +- .../download_protection/download_feedback.cc | 2 +- .../ppapi_download_request.cc | 6 +- @@ -338,7 +346,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../supervised_user_block_interstitial.html | 2 +- .../supervised_user_service.cc | 2 +- .../supervised_user_url_filter.cc | 12 +- - .../strings/android_chrome_strings.grd | 42 +- + .../strings/android_chrome_strings.grd | 46 +- .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- .../ui/app_list/search/common/string_util.cc | 2 +- .../search/files/item_suggest_cache.h | 2 +- @@ -347,6 +355,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ui/ash/calendar/calendar_keyed_service.cc | 2 +- .../browser/ui/ash/chrome_shell_delegate.cc | 2 +- .../ui/ash/in_session_auth_dialog_client.cc | 2 +- + .../projector/pending_screencast_manager.cc | 2 +- .../browser/ui/ash/system_tray_client_impl.cc | 4 +- .../tab_under_navigation_throttle.h | 2 +- ...r_content_setting_bubble_model_delegate.cc | 4 +- @@ -357,7 +366,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ui/dialogs/outdated_upgrade_bubble.cc | 2 +- .../installation_error_infobar_delegate.cc | 2 +- chrome/browser/ui/managed_ui.cc | 2 +- - .../quick_answers_access_token_fetcher.cc | 2 +- .../quick_answers_ui_controller.cc | 2 +- chrome/browser/ui/signin_view_controller.cc | 2 +- .../toolbar/media_router_contextual_menu.cc | 6 +- @@ -385,7 +393,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ui/webui/sanitized_image_source.cc | 6 +- .../chromeos/parental_controls_handler.cc | 2 +- .../webui/settings/reset_settings_handler.cc | 2 +- - .../settings_localized_strings_provider.cc | 2 +- + .../settings_localized_strings_provider.cc | 6 +- ...nin_restriction_policy_fetcher_chromeos.cc | 2 +- .../ui/webui/welcome/google_apps_handler.cc | 12 +- .../webui/welcome/ntp_background_handler.cc | 2 +- @@ -414,7 +422,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chromeos_system_extension_info.cc | 2 +- chrome/common/extensions/PRESUBMIT.py | 2 +- chrome/common/extensions/api/PRESUBMIT.py | 2 +- - .../common/extensions/api/_api_features.json | 4 +- + .../common/extensions/api/_api_features.json | 2 +- chrome/common/extensions/api/cookies.json | 2 +- chrome/common/extensions/api/debugger.json | 8 +- .../extensions/api/declarative_content.json | 4 +- @@ -503,6 +511,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chromecast/crash/linux/minidump_uploader.cc | 2 +- chromecast/net/connectivity_checker_impl.h | 4 +- .../components/dbus/rmad/fake_rmad_client.cc | 2 +- + .../assistant_manager_service_impl.cc | 2 +- + chromeos/ash/services/assistant/service.cc | 2 +- chromeos/chromeos_strings.grd | 6 +- .../translation_result_loader.cc | 2 +- chromeos/printing/ppd_provider.h | 2 +- @@ -522,8 +532,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../printing/uri_fuzzer_seed_corpus/uri4.txt | 2 +- .../printing/uri_fuzzer_seed_corpus/uri49.txt | 2 +- .../printing/uri_fuzzer_seed_corpus/uri5.txt | 2 +- - .../assistant_manager_service_impl.cc | 2 +- - chromeos/services/assistant/service.cc | 2 +- .../error_page_populator.cc | 2 +- .../predictor_config_definitions.cc | 2 +- components/autofill/PRESUBMIT.py | 2 +- @@ -681,8 +689,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../prediction_service/prediction_common.h | 2 +- .../core/browser/browser_policy_connector.cc | 10 +- ...cloud_signin_restriction_policy_fetcher.cc | 2 +- + .../common/default_chrome_apps_migrator.cc | 2 +- .../core/common/policy_loader_common.cc | 4 +- - .../policy/resources/policy_templates.json | 2318 ++++++++--------- + .../policy/resources/policy_templates.json | 2328 ++++++++--------- .../request_handler_for_policy.cc | 2 +- .../policy/test_support/signature_provider.h | 4 +- .../syntax_check_policy_template_json.py | 2 +- @@ -767,7 +776,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ios/shared_highlighting_constants.mm | 2 +- .../browser/chrome_connected_header_helper.cc | 4 +- .../browser/account_consistency_service.mm | 12 +- - .../signin/public/base/test_signin_client.cc | 2 +- .../identity_manager/access_token_fetcher.cc | 2 +- .../browser/spelling_service_client.cc | 2 +- .../browser/subresource_filter_constants.h | 8 +- @@ -791,8 +799,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../variations/variations_url_constants.cc | 4 +- .../installable/installable_logging.cc | 2 +- components/wifi/wifi_service_win.cc | 2 +- - content/app/resources/README.txt | 4 +- .../render_widget_host_view_cocoa.mm | 2 +- + .../aggregation_service_features.cc | 2 +- .../attribution_reporting/PRESUBMIT.py | 2 +- .../indexed_db/indexed_db_backing_store.cc | 2 +- .../indexed_db/indexed_db_reporting.cc | 2 +- @@ -839,7 +847,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html extensions/strings/extensions_strings.grd | 4 +- google_apis/drive/drive_api_url_generator.cc | 2 +- google_apis/gaia/gaia_auth_fetcher.cc | 4 +- - google_apis/gaia/gaia_auth_util.cc | 6 +- + google_apis/gaia/gaia_auth_util.cc | 8 +- google_apis/gaia/gaia_constants.cc | 80 +- google_apis/gaia/gaia_oauth_client.cc | 6 +- google_apis/gaia/gaia_urls.cc | 10 +- @@ -958,6 +966,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../interstitials/interstitial_ui_util.mm | 2 +- ..._credential_provider_extension_strings.grd | 8 +- .../password_spec_fetcher.mm | 2 +- + .../https_only_mode_blocking_page.mm | 2 +- ios/net/cookies/cookie_store_ios_test_util.mm | 2 +- ios/net/crn_http_protocol_handler.mm | 2 +- .../browser/signin/chrome_identity_service.mm | 4 +- @@ -1098,7 +1107,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../unexpected_passes_common/data_types.py | 2 +- testing/unexpected_passes_common/queries.py | 2 +- testing/variations/PRESUBMIT.py | 2 +- - .../variations/fieldtrial_testing_config.json | 16 +- + .../variations/fieldtrial_testing_config.json | 20 +- .../markdown/extensions/smarty.py | 2 +- .../Python-Markdown/markdown/pep562.py | 2 +- .../abseil-cpp/absl/abseil.podspec.gen.py | 2 +- @@ -1209,13 +1218,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../common/loader/record_load_histograms.cc | 2 +- .../public/common/scheduler/PRESUBMIT.py | 2 +- .../mojom/permissions_policy/PRESUBMIT.py | 2 +- - .../public/mojom/use_counter/PRESUBMIT.py | 2 +- - .../public/mojom/web_feature/PRESUBMIT.py | 2 +- + .../mojom/use_counter/metrics/PRESUBMIT.py | 2 +- .../blink/public/strings/blink_strings.grd | 8 +- .../blink/renderer/bindings/PRESUBMIT.py | 2 +- .../renderer/bindings/scripts/utilities.py | 2 +- .../build/scripts/update_css_ranking.py | 4 +- .../core/css/remote_font_face_source.cc | 2 +- + .../blink/renderer/core/dom/element.cc | 2 +- .../renderer/core/dom/events/event_target.cc | 4 +- .../blink/renderer/core/events/touch_event.cc | 2 +- .../blink/renderer/core/events/wheel_event.cc | 2 +- @@ -1478,6 +1487,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html third_party/rust/autocxx_macro/v0_22/BUILD.gn | 2 +- .../rust/autocxx_parser/v0_22/BUILD.gn | 2 +- third_party/rust/bindgen/v0_59/BUILD.gn | 4 +- + third_party/rust/camino/v1/BUILD.gn | 2 +- third_party/rust/clap/v2/BUILD.gn | 2 +- third_party/rust/cxx/v1/BUILD.gn | 2 +- third_party/rust/cxx_gen/v0_7/BUILD.gn | 2 +- @@ -1702,7 +1712,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chromevoxclassic/manifest.json.jinja2 | 2 +- .../accessibility_extensions_strings.grd | 2 +- ui/base/clipboard/clipboard_test_template.h | 10 +- - ui/base/cocoa/base_view.mm | 2 +- .../constrained_window_animation.mm | 2 +- ui/base/cocoa/tool_tip_base_view.mm | 2 +- .../cocoa/underlay_opengl_hosting_window.mm | 2 +- @@ -1718,6 +1727,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ui/gl/gl_image_io_surface_egl.mm | 2 +- ui/ozone/ozone.gni | 2 +- ui/resources/PRESUBMIT.py | 4 +- + ui/resources/README.txt | 4 +- ui/resources/resource_check/ico_files.py | 4 +- .../resource_check/resource_scale_factors.py | 4 +- ui/strings/ui_strings.grd | 4 +- @@ -1729,7 +1739,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html url/third_party/mozilla/LICENSE.txt | 4 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1725 files changed, 5259 insertions(+), 5259 deletions(-) + 1735 files changed, 5287 insertions(+), 5287 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -1738,12 +1748,12 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py """Top-level presubmit script for Chromium. --See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -+See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts +-See https://www.chromium.org/developers/how-tos/depottools/presubmit-scripts/ ++See https://www.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts/ for more details about the presubmit API built into depot_tools. """ -@@ -213,7 +213,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -220,7 +220,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView addTrackingRect:owner:userData:assumeInside:] is' 'prohibited. Please use CrTrackingArea instead.', @@ -1752,7 +1762,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -222,7 +222,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -229,7 +229,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of NSTrackingAreas is prohibited. Please use CrTrackingArea', 'instead.', @@ -1761,7 +1771,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -231,7 +231,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -238,7 +238,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertPointFromBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) fromView:nil| instead.', @@ -1770,7 +1780,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -240,7 +240,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -247,7 +247,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertPointToBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) toView:nil| instead.', @@ -1779,7 +1789,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -249,7 +249,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -256,7 +256,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertRectFromBase:] is almost certainly wrong.', 'Please use |convertRect:(point) fromView:nil| instead.', @@ -1788,7 +1798,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -258,7 +258,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -265,7 +265,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertRectToBase:] is almost certainly wrong.', 'Please use |convertRect:(point) toView:nil| instead.', @@ -1797,7 +1807,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -267,7 +267,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -274,7 +274,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertSizeFromBase:] is almost certainly wrong.', 'Please use |convertSize:(point) fromView:nil| instead.', @@ -1806,7 +1816,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -276,7 +276,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( +@@ -283,7 +283,7 @@ _BANNED_OBJC_FUNCTIONS : Sequence[BanRule] = ( ( 'The use of -[NSView convertSizeToBase:] is almost certainly wrong.', 'Please use |convertSize:(point) toView:nil| instead.', @@ -1815,7 +1825,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -492,7 +492,7 @@ _BANNED_CPP_FUNCTIONS : Sequence[BanRule] = ( +@@ -499,7 +499,7 @@ _BANNED_CPP_FUNCTIONS : Sequence[BanRule] = ( ( "Don't use CallJavascriptFunctionUnsafe() in new code. Instead, use", 'AllowJavascript(), OnJavascriptAllowed()/OnJavascriptDisallowed(),', @@ -1824,7 +1834,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1025,7 +1025,7 @@ _BANNED_MOJOM_PATTERNS : Sequence[BanRule] = ( +@@ -1054,7 +1054,7 @@ _BANNED_MOJOM_PATTERNS : Sequence[BanRule] = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -1833,7 +1843,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1170,9 +1170,9 @@ _KNOWN_ROBOTS = set( +@@ -1199,9 +1199,9 @@ _KNOWN_ROBOTS = set( 'infra-try-recipes-tester', 'lacros-tracking-roller') ) | set('%s@skia-public.iam.gserviceaccount.com' % s for s in ('chromium-autoroll', 'chromium-release-autoroll') @@ -1845,7 +1855,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('swarming-tasks',)) _INVALID_GRD_FILE_LINE = [ -@@ -1575,7 +1575,7 @@ def CheckNoDEPSGIT(input_api, output_api): +@@ -1611,7 +1611,7 @@ def CheckNoDEPSGIT(input_api, output_api): 'Never commit changes to .DEPS.git. This file is maintained by an\n' 'automated system based on what\'s in DEPS and your changes will be\n' 'overwritten.\n' @@ -1854,7 +1864,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information') ] -@@ -1767,7 +1767,7 @@ def CheckNoPragmaOnce(input_api, output_api): +@@ -1803,7 +1803,7 @@ def CheckNoPragmaOnce(input_api, output_api): return [ output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -1863,7 +1873,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files) ] return [] -@@ -2007,7 +2007,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -2043,7 +2043,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): @@ -1872,7 +1882,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2130,7 +2130,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2166,7 +2166,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): output_api.PresubmitError( 'The name of PNG files should not have abbreviations. \n' 'Use _hover.png, _center.png, instead of _h.png, _c.png.\n' @@ -1881,7 +1891,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3007,7 +3007,7 @@ def CheckSecurityOwners(input_api, output_api): +@@ -3072,7 +3072,7 @@ def CheckSecurityOwners(input_api, output_api): input_api, output_api) if ipc_results.has_security_sensitive_files: @@ -1889,8 +1899,8 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py + output_api.AppendCC('ipc-security-reviews@ch40m1um.qjz9zk') results = [] - if input_api.is_committing: -@@ -3305,7 +3305,7 @@ def _CheckAndroidToastUsage(input_api, output_api): + +@@ -3374,7 +3374,7 @@ def _CheckAndroidToastUsage(input_api, output_api): 'android.widget.Toast usage is detected. Android toasts use hardware' ' acceleration, and can be\ncostly on low-end devices. Please use' ' org.chromium.ui.widget.Toast instead.\n' @@ -1899,7 +1909,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3444,7 +3444,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3513,7 +3513,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): results.append( output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -1908,7 +1918,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3476,7 +3476,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3545,7 +3545,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): output_api.PresubmitPromptWarning( 'The newly created files include Test classes that inherits from base' ' class. Please do not use inheritance in JUnit4 tests or add new' @@ -1917,7 +1927,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3501,7 +3501,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3570,7 +3570,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): 'Annotations in android.test.suitebuilder.annotation have been' ' deprecated since API level 24. Please use android.support.test.filters' ' from //third_party/android_support_test_runner:runner_java instead.' @@ -1926,7 +1936,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3523,7 +3523,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3592,7 +3592,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): 'MDPI assets should be placed in /res/drawable-mdpi/ or ' '/res/drawable-ldrtl-mdpi/\ninstead of /res/drawable/ and' '/res/drawable-ldrtl/.\n' @@ -1935,7 +1945,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -4125,7 +4125,7 @@ def CheckGnGlobForward(input_api, output_api): +@@ -4194,7 +4194,7 @@ def CheckGnGlobForward(input_api, output_api): 'The variables "visibilty" and "test_only" should be ' 'explicitly listed in forward_variables_from(). For more ' 'details, see:\n' @@ -1944,7 +1954,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'build/docs/writing_gn_templates.md' '#Using-forward_variables_from')) ] -@@ -4293,7 +4293,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): +@@ -4362,7 +4362,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): 'LLVMFuzzerInitialize should not be used, unless your fuzz target needs ' 'to access command line arguments passed to the fuzzer. Instead, prefer ' 'static initialization and shared resources as documented in ' @@ -1953,7 +1963,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % (', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER)) -@@ -4331,7 +4331,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4400,7 +4400,7 @@ def _CheckNewImagesWarning(input_api, output_api): output_api.PresubmitPromptWarning( 'It looks like you are trying to commit some images. If these are ' 'non-test-only images, please make sure to read and apply the tips in ' @@ -1962,7 +1972,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'binary_size/optimization_advice.md#optimizing-images\nThis check is ' 'FYI only and will not block your CL on the CQ.', image_paths)) return errors -@@ -4547,7 +4547,7 @@ _NON_INCLUSIVE_TERMS = ( +@@ -4616,7 +4616,7 @@ _NON_INCLUSIVE_TERMS = ( '"# nocheck" or ""', 'at the end of the offending line will bypass this PRESUBMIT error', 'but avoid using this whenever possible. Reach out to', @@ -1971,7 +1981,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py True),) def ChecksCommon(input_api, output_api): -@@ -4820,7 +4820,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4889,7 +4889,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): def CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -1980,7 +1990,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py """ base_pattern = r'IPC_ENUM_TRAITS\(' inclusion_pattern = input_api.re.compile(r'(%s)' % base_pattern) -@@ -5107,9 +5107,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): +@@ -5176,9 +5176,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): 'You are adding/modifying code' 'related to technologies which will soon be deprecated (Chrome Apps, NaCl,' ' PNaCl, PPAPI). See this blog post for more details:\n' @@ -1992,7 +2002,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py '\n'.join(problems)) ] -@@ -5163,7 +5163,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -5232,7 +5232,7 @@ def CheckChangeOnCommit(input_api, output_api): input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -2001,7 +2011,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5509,7 +5509,7 @@ def CheckStrings(input_api, output_api): +@@ -5578,7 +5578,7 @@ def CheckStrings(input_api, output_api): results.append( output_api.PresubmitPromptWarning( 'ICU syntax errors were found in the following strings (problems or ' @@ -2010,7 +2020,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py items=icu_syntax_errors)) return results -@@ -5829,7 +5829,7 @@ def CheckMPArchApiUsage(input_api, output_api): +@@ -5898,7 +5898,7 @@ def CheckMPArchApiUsage(input_api, output_api): if not used_apis: return [] @@ -2019,7 +2029,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py message = ('This change uses API(s) that are ambiguous in the presence of ' 'MPArch features such as bfcache, prerendering, and fenced ' 'frames.') -@@ -5840,8 +5840,8 @@ def CheckMPArchApiUsage(input_api, output_api): +@@ -5909,8 +5909,8 @@ def CheckMPArchApiUsage(input_api, output_api): 'navigation. See this doc [1] and the comments on the individual APIs ' 'for guidance and this doc [2] for context. The MPArch review ' 'watchlist has been CC\'d on this change to help identify any issues.\n' @@ -2048,7 +2058,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/M/6.0_r32/" } }, -@@ -100,12 +100,12 @@ +@@ -125,12 +125,12 @@ "arch": { "arm64": { "filename": "arm64/N/android-cts-arm64-7.0_r33.zip", @@ -2063,7 +2073,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/N/7.0_r33/" } }, -@@ -137,12 +137,12 @@ +@@ -187,12 +187,12 @@ "arch": { "arm64": { "filename": "arm64/O/android-cts-arm64-8.0_r26.zip", @@ -2078,7 +2088,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/O/8.0_r26" } }, -@@ -159,12 +159,12 @@ +@@ -242,12 +242,12 @@ "arch": { "arm64": { "filename": "arm64/P/android-cts-arm64-9.0_r19.zip", @@ -2093,7 +2103,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/P/9.0_r19" } }, -@@ -192,12 +192,12 @@ +@@ -308,12 +308,12 @@ "arch": { "arm64": { "filename": "arm64/Q/android-cts-arm64-10_r11.zip", @@ -2108,7 +2118,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/Q/10_r11" } }, -@@ -241,12 +241,12 @@ +@@ -397,12 +397,12 @@ "arch": { "arm64": { "filename": "arm64/R/android-cts-arm64-11_r7.zip", @@ -2123,7 +2133,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/R/11_r7/" } }, -@@ -290,12 +290,12 @@ +@@ -510,12 +510,12 @@ "arch": { "arm64": { "filename": "arm64/S/android-cts-arm64-12_r3.zip", @@ -2216,7 +2226,7 @@ diff --git a/android_webview/tools/update_cts.py b/android_webview/tools/update_ diff --git a/ash/accelerators/accelerator_notifications.cc b/ash/accelerators/accelerator_notifications.cc --- a/ash/accelerators/accelerator_notifications.cc +++ b/ash/accelerators/accelerator_notifications.cc -@@ -154,7 +154,7 @@ void RemoveNotification(const std::string& notification_id) { +@@ -164,7 +164,7 @@ void RemoveNotification(const std::string& notification_id) { // Shortcut help URL. const char kKeyboardShortcutHelpPageUrl[] = @@ -2240,7 +2250,7 @@ diff --git a/ash/app_list/PRESUBMIT.py b/ash/app_list/PRESUBMIT.py diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd -@@ -681,7 +681,7 @@ This file contains the strings for ash. +@@ -687,7 +687,7 @@ This file contains the strings for ash. other {Update device within # seconds}} @@ -2249,7 +2259,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -706,7 +706,7 @@ This file contains the strings for ash. +@@ -712,7 +712,7 @@ This file contains the strings for ash. other {Change device to previous version within # seconds}} @@ -2258,7 +2268,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -716,10 +716,10 @@ This file contains the strings for ash. +@@ -722,10 +722,10 @@ This file contains the strings for ash. Update overdue @@ -2271,7 +2281,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -753,10 +753,10 @@ This file contains the strings for ash. +@@ -759,10 +759,10 @@ This file contains the strings for ash. This update requires powerwashing your $1Chromebook. All data will be deleted. Learn more about the latest $2ChromiumOS update. @@ -2284,7 +2294,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd $1Learn more about the latest ChromiumOS update. This Chromebook needs to restart to apply an update. This can take up to 1 minute. -@@ -850,7 +850,7 @@ This file contains the strings for ash. +@@ -856,7 +856,7 @@ This file contains the strings for ash. @@ -2293,7 +2303,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -1251,7 +1251,7 @@ This file contains the strings for ash. +@@ -1257,7 +1257,7 @@ This file contains the strings for ash. Supervised user @@ -2302,7 +2312,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1550,7 +1550,7 @@ This file contains the strings for ash. +@@ -1556,7 +1556,7 @@ This file contains the strings for ash. Tap to configure @@ -2311,7 +2321,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Connected devices settings -@@ -3166,7 +3166,7 @@ This file contains the strings for ash. +@@ -3215,7 +3215,7 @@ Connect your device to power. Save your $1Pixel Buds @@ -2320,7 +2330,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Settings -@@ -3199,7 +3199,7 @@ This file contains the strings for ash. +@@ -3248,7 +3248,7 @@ Connect your device to power. Connect $1Pixel Buds to this Chromebook @@ -2329,7 +2339,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Cancel -@@ -3325,7 +3325,7 @@ This file contains the strings for ash. +@@ -3374,7 +3374,7 @@ Connect your device to power. Multiple sign-in has been disabled @@ -2338,7 +2348,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3808,7 +3808,7 @@ Here are some things you can try to get started. +@@ -3864,7 +3864,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -2551,8 +2561,8 @@ diff --git a/ash/quick_pair/repository/fast_pair/footprints_fetcher_impl.cc b/as "?key=%s&alt=proto"; const char kUserDeleteDeviceUrl[] = -- "https://nearbydevices-pa.googleapis.com/v1/user/devices/%s" -+ "https://nearbydevices-pa.9oo91eapis.qjz9zk/v1/user/devices/%s" +- "https://nearbydevices-pa.googleapis.com/v1/user/device/%s" ++ "https://nearbydevices-pa.9oo91eapis.qjz9zk/v1/user/device/%s" "?key=%s&alt=proto"; const net::PartialNetworkTrafficAnnotationTag kTrafficAnnotation = @@ -2633,10 +2643,22 @@ diff --git a/ash/services/ime/constants.cc b/ash/services/ime/constants.cc } // namespace ime } // namespace ash +diff --git a/ash/system/eche/eche_tray.cc b/ash/system/eche/eche_tray.cc +--- a/ash/system/eche/eche_tray.cc ++++ b/ash/system/eche/eche_tray.cc +@@ -231,7 +231,7 @@ bool EcheTray::PerformAction(const ui::Event& event) { + HideBubble(); + } else { + #ifdef FAKE_BUBBLE_FOR_DEBUG +- LoadBubble(GURL("http://google.com"), std::move(gfx::Image()), ++ LoadBubble(GURL("http://9oo91e.qjz9zk"), std::move(gfx::Image()), + u"visible_name"); + #endif + ShowBubble(); diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc --- a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc +++ b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc -@@ -31,7 +31,7 @@ namespace ash { +@@ -32,7 +32,7 @@ namespace ash { namespace { const char kNotifierPciePeripheral[] = "ash.pcie_peripheral"; const char kLearnMoreHelpUrl[] = @@ -2648,7 +2670,7 @@ diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller. diff --git a/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc b/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc --- a/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc +++ b/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc -@@ -36,9 +36,9 @@ const char kUsbPeripheralInvalidTBTCableNotificationId[] = +@@ -37,9 +37,9 @@ const char kUsbPeripheralInvalidTBTCableNotificationId[] = const char kUsbPeripheralSpeedLimitingCableNotificationId[] = "cros_usb_peripheral_speed_limiting_cable_notification_id"; const char kNotificationDisplayLandingPageUrl[] = @@ -2663,10 +2685,10 @@ diff --git a/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc diff --git a/ash/wallpaper/test_wallpaper_controller_client.cc b/ash/wallpaper/test_wallpaper_controller_client.cc --- a/ash/wallpaper/test_wallpaper_controller_client.cc +++ b/ash/wallpaper/test_wallpaper_controller_client.cc -@@ -122,7 +122,7 @@ void TestWallpaperControllerClient::FetchGooglePhotosPhoto( +@@ -123,7 +123,7 @@ void TestWallpaperControllerClient::FetchGooglePhotosPhoto( std::move(callback).Run( personalization_app::mojom::GooglePhotosPhoto::New( - id, "test_name", base::TimeFormatFriendlyDate(time), + id, "dedup_key", "test_name", base::TimeFormatFriendlyDate(time), - GURL("https://google.com/picture.png"), "home"), + GURL("https://9oo91e.qjz9zk/picture.png"), "home"), /*success=*/true); @@ -2778,7 +2800,7 @@ diff --git a/ash/webui/diagnostics_ui/resources/PRESUBMIT.py b/ash/webui/diagnos diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diagnostics_ui/resources/network_card.js --- a/ash/webui/diagnostics_ui/resources/network_card.js +++ b/ash/webui/diagnostics_ui/resources/network_card.js -@@ -17,7 +17,7 @@ import {Network, NetworkHealthProviderInterface, NetworkState, NetworkStateObser +@@ -16,7 +16,7 @@ import {Network, NetworkHealthProviderInterface, NetworkState, NetworkStateObser import {filterNameServers, formatMacAddress, getNetworkCardTitle, getNetworkState, getNetworkType, isConnectedOrOnline, isNetworkMissingNameServers} from './diagnostics_utils.js'; import {getNetworkHealthProvider} from './mojo_interface_provider.js'; @@ -2903,10 +2925,22 @@ diff --git a/ash/webui/os_feedback_ui/resources/fake_data.js b/ash/webui/os_feed contentType: HelpContentType.kUnknown } ]; +diff --git a/ash/webui/os_feedback_ui/resources/search_page.js b/ash/webui/os_feedback_ui/resources/search_page.js +--- a/ash/webui/os_feedback_ui/resources/search_page.js ++++ b/ash/webui/os_feedback_ui/resources/search_page.js +@@ -237,7 +237,7 @@ export class SearchPageElement extends SearchPageElementBase { + */ + feedbackWritingGuidanceUrl_() { + // TODO(xiangdongkong): append ?hl={the application locale} to the url. +- const url = 'https://support.google.com/chromebook/answer/2982029'; ++ const url = 'https://support.9oo91e.qjz9zk/chromebook/answer/2982029'; + return url; + } + diff --git a/ash/webui/personalization_app/personalization_app_ui.cc b/ash/webui/personalization_app/personalization_app_ui.cc --- a/ash/webui/personalization_app/personalization_app_ui.cc +++ b/ash/webui/personalization_app/personalization_app_ui.cc -@@ -30,7 +30,7 @@ namespace personalization_app { +@@ -32,7 +32,7 @@ namespace personalization_app { namespace { @@ -2961,6 +2995,18 @@ diff --git a/ash/webui/projector_app/projector_xhr_sender.cc b/ash/webui/project // Return true if the url matches the allowed URL prefix. bool IsUrlAllowlisted(const std::string& url) { +diff --git a/ash/webui/projector_app/projector_xhr_sender.h b/ash/webui/projector_app/projector_xhr_sender.h +--- a/ash/webui/projector_app/projector_xhr_sender.h ++++ b/ash/webui/projector_app/projector_xhr_sender.h +@@ -27,7 +27,7 @@ class URLLoaderFactory; + + namespace ash { + +-constexpr char kDriveV3BaseUrl[] = "https://www.googleapis.com/drive/v3/files/"; ++constexpr char kDriveV3BaseUrl[] = "https://www.9oo91eapis.qjz9zk/drive/v3/files/"; + constexpr char kRequestMethodPatch[] = "PATCH"; + + /** diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/projector_app/untrusted_projector_ui.cc --- a/ash/webui/projector_app/untrusted_projector_ui.cc +++ b/ash/webui/projector_app/untrusted_projector_ui.cc @@ -3068,7 +3114,7 @@ diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py for more details on the presubmit API built into depot_tools. """ -@@ -30,7 +30,7 @@ def _CheckNoInterfacesInBase(input_api, output_api): +@@ -48,7 +48,7 @@ def _CheckNoInterfacesInBase(input_api, output_api): if len(files): return [ output_api.PresubmitError( 'Objective-C interfaces or categories are forbidden in libbase. ' + @@ -3146,6 +3192,30 @@ diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm // generating a new one. if (!client_id || [client_id isEqualToString:kZeroUUID]) { client_id = [[[UIDevice currentDevice] identifierForVendor] UUIDString]; +diff --git a/base/memory/raw_ptr.cc b/base/memory/raw_ptr.cc +--- a/base/memory/raw_ptr.cc ++++ b/base/memory/raw_ptr.cc +@@ -165,7 +165,7 @@ void AsanBackupRefPtrImpl::AsanCheckIfValidExtraction( + "Otherwise, it is still likely a bug to rely on the address of an " + "already freed allocation.\n" + "Refer to " +- "https://chromium.googlesource.com/chromium/src/+/main/base/memory/" ++ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/base/memory/" + "raw_ptr.md for details.\n" + "================================================================="); + } +diff --git a/base/memory/raw_ptr_asan_service.cc b/base/memory/raw_ptr_asan_service.cc +--- a/base/memory/raw_ptr_asan_service.cc ++++ b/base/memory/raw_ptr_asan_service.cc +@@ -181,7 +181,7 @@ void RawPtrAsanService::ErrorReportCallback(const char* report) { + + Log("\nMiraclePtr Status: %s\n" + "Refer to " +- "https://chromium.googlesource.com/chromium/src/+/main/base/memory/" ++ "https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/base/memory/" + "raw_ptr.md for details.", + status_body); + } diff --git a/base/third_party/libevent/evdns.c b/base/third_party/libevent/evdns.c --- a/base/third_party/libevent/evdns.c +++ b/base/third_party/libevent/evdns.c @@ -3173,7 +3243,7 @@ diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/generate_gradle.py --- a/build/android/gradle/generate_gradle.py +++ b/build/android/gradle/generate_gradle.py -@@ -914,7 +914,7 @@ def main(): +@@ -913,7 +913,7 @@ def main(): logging.warning('Generated files will only appear once you\'ve built them.') logging.warning('Generated projects for Android Studio %s', channel) @@ -3209,7 +3279,7 @@ diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py -@@ -359,7 +359,7 @@ def _OptimizeWithR8(options, +@@ -363,7 +363,7 @@ def _OptimizeWithR8(options, # Python will print the original exception as well. raise Exception( 'R8 failed. Please see ' @@ -3218,7 +3288,7 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py 'android/docs/java_optimization.md#Debugging-common-failures') from e base_has_imported_lib = False -@@ -498,7 +498,7 @@ out/Release/apks/YourApk.apk > dex.txt +@@ -505,7 +505,7 @@ out/Release/apks/YourApk.apk > dex.txt stderr += """ You may need to update build configs to run FragmentActivityReplacer for additional targets. See @@ -3456,7 +3526,7 @@ diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py diff --git a/build/android/test_runner.py b/build/android/test_runner.py --- a/build/android/test_runner.py +++ b/build/android/test_runner.py -@@ -1071,7 +1071,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): +@@ -1088,7 +1088,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): result_html_string, _, _ = test_results_presentation.result_details( json_path=json_file.name, test_name=args.command, @@ -3516,7 +3586,7 @@ diff --git a/build/chromeos/PRESUBMIT.py b/build/chromeos/PRESUBMIT.py diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py --- a/build/chromeos/test_runner.py +++ b/build/chromeos/test_runner.py -@@ -906,7 +906,7 @@ def main(): +@@ -894,7 +894,7 @@ def main(): tast_test_parser = subparsers.add_parser( 'tast', help='Runs a device-side set of Tast tests. For more details, see: ' @@ -3528,7 +3598,7 @@ diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py 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 -@@ -1738,7 +1738,7 @@ if (enable_java_templates) { +@@ -1769,7 +1769,7 @@ if (enable_java_templates) { # * public.txt # * annotations.zip # * assets/ @@ -3591,8 +3661,8 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler - # https://chromium.googlesource.com/chromium/src/+/main/docs/design/sandbox.md#cet-shadow-stack + # https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/design/sandbox.md#cet-shadow-stack enable_cet_shadow_stack = target_cpu == "x64" - } + # If true, optimize for size. Does not affect windows builds. @@ -232,7 +232,7 @@ declare_args() { # results independent of the checkout and build directory names, which # in turn is important for goma compile hit rate. @@ -3674,10 +3744,22 @@ diff --git a/build/fuchsia/PRESUBMIT.py b/build/fuchsia/PRESUBMIT.py details on the presubmit API built into depot_tools. """ +diff --git a/build/fuchsia/binary_size_differ.py b/build/fuchsia/binary_size_differ.py +--- a/build/fuchsia/binary_size_differ.py ++++ b/build/fuchsia/binary_size_differ.py +@@ -27,7 +27,7 @@ from binary_sizes import ReadPackageSizesJson + from binary_sizes import PACKAGES_SIZES_FILE + + _MAX_DELTA_BYTES = 12 * 1024 # 12 KiB +-_TRYBOT_DOC = 'https://chromium.googlesource.com/chromium/src/+/main/docs/speed/binary_size/fuchsia_binary_size_trybot.md' ++_TRYBOT_DOC = 'https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/speed/binary_size/fuchsia_binary_size_trybot.md' + + + def ComputePackageDiffs(before_sizes_file, after_sizes_file): diff --git a/build/fuchsia/binary_sizes.py b/build/fuchsia/binary_sizes.py --- a/build/fuchsia/binary_sizes.py +++ b/build/fuchsia/binary_sizes.py -@@ -95,7 +95,7 @@ def CreateTestResults(test_status, timestamp): +@@ -96,7 +96,7 @@ def CreateTestResults(test_status, timestamp): """Create test results data to write to JSON test results file. The JSON data format is defined in @@ -3713,7 +3795,7 @@ diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroo diff --git a/build/mac_toolchain.py b/build/mac_toolchain.py --- a/build/mac_toolchain.py +++ b/build/mac_toolchain.py -@@ -88,7 +88,7 @@ def RequestCipdAuthentication(): +@@ -89,7 +89,7 @@ def RequestCipdAuthentication(): print() print('and follow the instructions.') print() @@ -4033,19 +4115,24 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -823,10 +823,10 @@ Permissions you've already given to websites and apps may apply to this account. - You're signed in to Chromium! - - -- You're signed in as $1foo@gmail.com. Now you can access your bookmarks, history, and other settings on all your signed in devices. -+ You're signed in as $1foo@9ma1l.qjz9zk. Now you can access your bookmarks, history, and other settings on all your signed in devices. - +@@ -819,7 +819,7 @@ Permissions you've already given to websites and apps may apply to this account. + + - You were signed in to Chromium as $1foo@gmail.com. Please use the same account to sign in again. + You were signed in to Chromium as $1foo@9ma1l.qjz9zk. Please use the same account to sign in again. Someone previously signed in to Chromium on this computer as $1user@example.com. Please create a new Chromium user to keep your information separate. +@@ -854,7 +854,7 @@ Permissions you've already given to websites and apps may apply to this account. + You're signed in to Chromium! + + +- You're signed in as $1foo@gmail.com. Now you can access your bookmarks, history, and other settings on all your signed in devices. ++ You're signed in as $1foo@9ma1l.qjz9zk. Now you can access your bookmarks, history, and other settings on all your signed in devices. + + + @@ -876,7 +876,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -4066,8 +4153,17 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd - This will create a new Chromium profile for $1foo@gmail.com + This will create a new Chromium profile for $1foo@9ma1l.qjz9zk - - + + Another account is already signed in. To keep your browsing separate, Chromium can create your own profile for you. +@@ -1398,7 +1398,7 @@ Permissions you've already given to websites and apps may apply to this account. + Welcome to Chromium + + +- Get your Chromium browser stuff from $1Jane.Doe@gmail.com ++ Get your Chromium browser stuff from $1Jane.Doe@9ma1l.qjz9zk + + + Your account is managed by $1example.com. Your administrator can see and edit this Chromium browser profile and its data like bookmarks, history, and passwords. 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 @@ -4101,7 +4197,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -786,7 +786,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -780,7 +780,7 @@ are declared in tools/grit/grit_rule.gni. Search images with $1Google Lens @@ -4110,7 +4206,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -864,7 +864,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -858,7 +858,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -4119,7 +4215,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -1049,7 +1049,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1037,7 +1037,7 @@ are declared in tools/grit/grit_rule.gni. Search Images with $1Google Lens @@ -4128,7 +4224,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1281,7 +1281,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1269,7 +1269,7 @@ are declared in tools/grit/grit_rule.gni. @@ -4137,7 +4233,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -1418,7 +1418,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1406,7 +1406,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -4146,7 +4242,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -3054,10 +3054,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3060,10 +3060,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -4159,7 +4255,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -3066,7 +3066,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3072,7 +3072,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -4168,7 +4264,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -3078,28 +3078,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -3084,28 +3084,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -4204,7 +4300,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -3120,19 +3120,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -3126,19 +3126,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -4229,7 +4325,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -3144,7 +3144,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3150,7 +3150,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -4238,7 +4334,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -3153,7 +3153,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3159,7 +3159,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -4247,7 +4343,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -3277,7 +3277,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3283,7 +3283,7 @@ are declared in tools/grit/grit_rule.gni. @@ -4256,7 +4352,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3792,13 +3792,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3798,13 +3798,13 @@ are declared in tools/grit/grit_rule.gni. @@ -4273,7 +4369,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3807,7 +3807,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3813,7 +3813,7 @@ are declared in tools/grit/grit_rule.gni. Stop sharing @@ -4282,7 +4378,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Switch to capturing tab -@@ -4013,16 +4013,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -4019,16 +4019,16 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -4303,16 +4399,20 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -4031,7 +4031,7 @@ are declared in tools/grit/grit_rule.gni. - Plugin Broker: $1Unknown Plugin +@@ -4038,10 +4038,10 @@ are declared in tools/grit/grit_rule.gni. - + + +- Prerender: $1http://www.google.com ++ Prerender: $1http://www.9oo91e.qjz9zk + + - Prerender: $1http://www.google.com + Prerender: $1http://www.9oo91e.qjz9zk Spare Renderer -@@ -4067,22 +4067,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4077,28 +4077,28 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -4338,10 +4438,18 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - Incognito Portal: $1https://youtube.com/ + Incognito Portal: $1https://y0u1ub3.qjz9zk/ + + +- Fenced Frame: $1https://youtube.com/ ++ Fenced Frame: $1https://y0u1ub3.qjz9zk/ + + +- Incognito Fenced Frame: $1https://youtube.com/ ++ Incognito Fenced Frame: $1https://y0u1ub3.qjz9zk/ App: $1com.android.systemui -@@ -4304,7 +4304,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4332,7 +4332,7 @@ are declared in tools/grit/grit_rule.gni. "$1Gmail Checker" @@ -4350,7 +4458,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources The extension "$1Gmail Checker" was blocked by your administrator -@@ -4316,10 +4316,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4344,10 +4344,10 @@ are declared in tools/grit/grit_rule.gni. @@ -4363,7 +4471,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -4458,22 +4458,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4486,22 +4486,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -4392,7 +4500,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4482,10 +4482,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4510,10 +4510,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -4405,7 +4513,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4869,10 +4869,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4894,16 +4894,16 @@ are declared in tools/grit/grit_rule.gni. Allow $13? @@ -4416,9 +4524,17 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - Requesting to read and change $1google.com: + Requesting to read and change $19oo91e.qjz9zk: - - -@@ -4882,16 +4882,16 @@ are declared in tools/grit/grit_rule.gni. + +- Always allow "$1Gmail Checker" to run on $2google.com? ++ Always allow "$1Gmail Checker" to run on $29oo91e.qjz9zk? + + +- Always allow these extensions to run on $1google.com? ++ Always allow these extensions to run on $19oo91e.qjz9zk? + + + Always allow +@@ -4920,16 +4920,16 @@ are declared in tools/grit/grit_rule.gni. This can read and change site data @@ -4438,7 +4554,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4944,16 +4944,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -4982,16 +4982,16 @@ are declared in tools/grit/grit_rule.gni. This Can Read and Change Site Data @@ -4458,7 +4574,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -5258,7 +5258,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5296,7 +5296,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -4467,7 +4583,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5351,25 +5351,25 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5388,28 +5388,28 @@ Keep your key file in a safe place. You will need it to create new versions of y Permissions @@ -4484,6 +4600,10 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - No extensions have requested to read and change $1google.com + No extensions have requested to read and change $19oo91e.qjz9zk + + +- No extensions are allowed to read and change $1google.com ++ No extensions are allowed to read and change $19oo91e.qjz9zk Choose your default setting @@ -4498,7 +4618,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Customize permissions for each extension -@@ -5656,10 +5656,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5696,10 +5696,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -4511,7 +4631,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved in your Google Account so you can use them on any device -@@ -5668,7 +5668,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5708,7 +5708,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Google Password Manager @@ -4520,7 +4640,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved to $1Google Password Manager on this device. -@@ -5677,7 +5677,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5717,7 +5717,7 @@ Keep your key file in a safe place. You will need it to create new versions of y You can view and manage saved passwords in $1Google Password Manager. @@ -4529,7 +4649,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved to $1Google Password Manager. -@@ -5686,10 +5686,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5726,10 +5726,10 @@ Keep your key file in a safe place. You will need it to create new versions of y You can view and manage saved passwords in Google Password Manager @@ -4542,7 +4662,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6125,7 +6125,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6177,7 +6177,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4551,7 +4671,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -6136,7 +6136,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6188,7 +6188,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4560,7 +4680,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -6146,7 +6146,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6198,7 +6198,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4569,7 +4689,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -6155,16 +6155,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6207,16 +6207,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -4589,7 +4709,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -6600,7 +6600,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6652,7 +6652,7 @@ Keep your key file in a safe place. You will need it to create new versions of y memories from Google Photos @@ -4598,7 +4718,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources <br> <br> You can manage settings for this card from the card menu or see more options in Customize Chrome. -@@ -6652,10 +6652,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6707,10 +6707,10 @@ Keep your key file in a safe place. You will need it to create new versions of y About this card @@ -4611,25 +4731,25 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -7001,7 +7001,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7059,7 +7059,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome - From $1https://google.com + From $1https://9oo91e.qjz9zk - + Open in app -@@ -7011,7 +7011,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - +@@ -7070,7 +7070,7 @@ Keep your key file in a safe place. You will need it to create new versions of y -- -+ - Always use the $1YouTube app to open supported web links? - - -@@ -7141,7 +7141,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + +- ++ + Always use the $1YouTube app to open supported web links? + + +@@ -7209,7 +7209,7 @@ Keep your key file in a safe place. You will need it to create new versions of y This site has been blocked from seeing text and images copied to the clipboard @@ -4638,7 +4758,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -7270,7 +7270,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7338,7 +7338,7 @@ Keep your key file in a safe place. You will need it to create new versions of y The page has become unresponsive. You can wait for it to become responsive or close it. @@ -4647,7 +4767,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -7307,7 +7307,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7375,7 +7375,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Automatically sign in to websites using stored credentials. When the feature is disabled, you will be asked for confirmation every time before signing in to a website. @@ -4656,7 +4776,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7568,10 +7568,10 @@ Check your passwords anytime in $1Google +@@ -7636,10 +7636,10 @@ Check your passwords anytime in $1Google Suggest strong password @@ -4669,7 +4789,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Confirm your username -@@ -7764,7 +7764,7 @@ Check your passwords anytime in $1Google +@@ -7832,7 +7832,7 @@ Check your passwords anytime in $1Google Clear browsing data @@ -4678,7 +4798,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -7774,7 +7774,7 @@ Check your passwords anytime in $1Google +@@ -7842,7 +7842,7 @@ Check your passwords anytime in $1Google @@ -4687,7 +4807,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -7995,7 +7995,7 @@ Check your passwords anytime in $1Google +@@ -8063,7 +8063,7 @@ Check your passwords anytime in $1Google Uploading ($127%)... @@ -4696,7 +4816,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8410,7 +8410,7 @@ Check your passwords anytime in $1Google +@@ -8478,7 +8478,7 @@ Check your passwords anytime in $1Google @@ -4705,7 +4825,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8418,10 +8418,10 @@ Check your passwords anytime in $1Google +@@ -8486,10 +8486,10 @@ Check your passwords anytime in $1Google Sign in to Security Device @@ -4718,7 +4838,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -8730,7 +8730,7 @@ Check your passwords anytime in $1Google +@@ -8798,7 +8798,7 @@ Check your passwords anytime in $1Google Sending link to $1Ted's Pixel2 @@ -4727,16 +4847,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources You can send tabs between devices that are signed in with the same Google Account -@@ -9580,7 +9580,7 @@ Check your passwords anytime in $1Google +@@ -9651,7 +9651,7 @@ Check your passwords anytime in $1Google This will separate your browsing from $1bob@example.com - $2Bob's profile is linked to $1bob@gmail.com + $2Bob's profile is linked to $1bob@9ma1l.qjz9zk - - -@@ -9595,10 +9595,10 @@ Check your passwords anytime in $1Google + + Separate your browsing? +@@ -9669,10 +9669,10 @@ Check your passwords anytime in $1Google Can't sign in @@ -4749,7 +4869,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -9623,13 +9623,13 @@ Check your passwords anytime in $1Google +@@ -9697,13 +9697,13 @@ Check your passwords anytime in $1Google This wasn't me. @@ -4765,7 +4885,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -9684,7 +9684,7 @@ Check your passwords anytime in $1Google +@@ -9758,7 +9758,7 @@ Check your passwords anytime in $1Google Open $1Adobe Acrobat? @@ -4774,7 +4894,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -9695,8 +9695,8 @@ Check your passwords anytime in $1Google +@@ -9769,8 +9769,8 @@ Check your passwords anytime in $1Google Cancel @@ -4785,7 +4905,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10273,7 +10273,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10347,7 +10347,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -4794,7 +4914,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10700,7 +10700,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10774,7 +10774,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -4803,7 +4923,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -10743,7 +10743,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10817,7 +10817,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from having full control of MIDI devices. @@ -4812,7 +4932,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from having full control of MIDI devices -@@ -10831,7 +10831,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10905,7 +10905,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -4821,7 +4941,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10863,10 +10863,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10937,10 +10937,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -4834,7 +4954,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10977,19 +10977,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11051,19 +11051,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -4857,7 +4977,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -11012,7 +11012,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11086,7 +11086,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -4866,7 +4986,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -11039,7 +11039,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11113,7 +11113,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -4875,7 +4995,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11240,7 +11240,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11314,7 +11314,7 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Hangouts wants to share the contents of your screen. @@ -4884,7 +5004,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share system audio -@@ -11360,8 +11360,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11434,8 +11434,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -4895,7 +5015,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -11575,7 +11575,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11649,7 +11649,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4904,7 +5024,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -11687,7 +11687,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11761,7 +11761,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4913,7 +5033,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -11727,7 +11727,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11801,7 +11801,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4922,7 +5042,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -11812,7 +11812,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11886,7 +11886,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4931,7 +5051,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -11936,7 +11936,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12010,7 +12010,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4940,7 +5060,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources wants to see the make and model of your Security Key -@@ -12123,13 +12123,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12205,13 +12205,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4956,7 +5076,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -12226,7 +12226,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12308,7 +12308,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4965,7 +5085,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Didn't get it? -@@ -12244,7 +12244,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12326,7 +12326,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Security key request @@ -4974,7 +5094,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Add a new Android phone -@@ -12340,7 +12340,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12422,7 +12422,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4983,7 +5103,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -12356,7 +12356,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12438,7 +12438,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Your security key can't be used with this site @@ -4992,7 +5112,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Your security key does not have enough space for any more accounts. -@@ -12365,13 +12365,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12447,13 +12447,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -5008,7 +5128,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -12726,7 +12726,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12811,7 +12811,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -5017,6 +5137,15 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources +@@ -13141,7 +13141,7 @@ Please help our engineers fix this problem. Tell us what happened right before y + + Help us build a more private web + +- ++ + Help us build a better web + + diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -5057,19 +5186,24 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -867,10 +867,10 @@ Permissions you've already given to websites and apps may apply to this account. - You're signed in to Chrome! - - -- You're signed in as $1foo@gmail.com. Now you can access your bookmarks, history, and other settings on all your signed in devices. -+ You're signed in as $1foo@9ma1l.qjz9zk. Now you can access your bookmarks, history, and other settings on all your signed in devices. - +@@ -863,7 +863,7 @@ Permissions you've already given to websites and apps may apply to this account. + + - You were signed in to Chrome as $1foo@gmail.com. Please use the same account to sign in again. + You were signed in to Chrome as $1foo@9ma1l.qjz9zk. Please use the same account to sign in again. Someone previously signed in to Chrome on this computer as $1user@example.com. Please create a new Chrome user to keep your information separate. +@@ -898,7 +898,7 @@ Permissions you've already given to websites and apps may apply to this account. + You're signed in to Chrome! + + +- You're signed in as $1foo@gmail.com. Now you can access your bookmarks, history, and other settings on all your signed in devices. ++ You're signed in as $1foo@9ma1l.qjz9zk. Now you can access your bookmarks, history, and other settings on all your signed in devices. + + + @@ -920,7 +920,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -5090,8 +5224,17 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str - This will create a new Chrome profile for $1foo@gmail.com + This will create a new Chrome profile for $1foo@9ma1l.qjz9zk - - + + Another account is already signed in. To keep your browsing separate, Chrome can create your own profile for you. +@@ -1493,7 +1493,7 @@ Permissions you've already given to websites and apps may apply to this account. + Welcome to Chrome + + +- Get your Chrome browser stuff from $1Jane.Doe@gmail.com ++ Get your Chrome browser stuff from $1Jane.Doe@9ma1l.qjz9zk + + + Your account is managed by $1example.com. Your administrator can see and edit this Chrome browser profile and its data like bookmarks, history, and passwords. diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -5150,7 +5293,7 @@ diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py 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 -@@ -4212,7 +4212,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4378,7 +4378,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( syncer::kSyncServiceURL, @@ -5159,7 +5302,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !BUILDFLAG(IS_ANDROID) {"block-migrated-default-chrome-app-sync", flag_descriptions::kBlockMigratedDefaultChromeAppSyncName, -@@ -4496,7 +4496,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4662,7 +4662,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -5237,6 +5380,18 @@ diff --git a/chrome/browser/apps/app_service/webapk/webapk_install_task.cc b/chr constexpr net::NetworkTrafficAnnotationTag kWebApksTrafficAnnotation = net::DefineNetworkTrafficAnnotation("webapk_minter_install_request", +diff --git a/chrome/browser/apps/digital_goods/digital_goods_ash.cc b/chrome/browser/apps/digital_goods/digital_goods_ash.cc +--- a/chrome/browser/apps/digital_goods/digital_goods_ash.cc ++++ b/chrome/browser/apps/digital_goods/digital_goods_ash.cc +@@ -21,7 +21,7 @@ namespace apps { + + namespace { + +-constexpr char kSupportedPaymentMethod[] = "https://play.google.com/billing"; ++constexpr char kSupportedPaymentMethod[] = "https://play.9oo91e.qjz9zk/billing"; + + // Gets the package name of the Android app linked to this web app. + absl::optional GetTwaPackageName(const std::string& app_id) { diff --git a/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc b/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc --- a/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc +++ b/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc @@ -5341,8 +5496,8 @@ diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc b/chrome diff --git a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc --- a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc +++ b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc -@@ -59,7 +59,7 @@ constexpr int kTitleFontSize = 20; - constexpr int kBodyFontSize = 13; +@@ -73,7 +73,7 @@ constexpr SkColor kAlphaBgColor = SkColorSetA(gfx::kGoogleBlue300, 0x4D); + constexpr SkColor kAlphaTextColor = gfx::kGoogleBlue200; constexpr char kFeedbackUrl[] = - "https://docs.google.com/forms/d/e/" @@ -5426,7 +5581,7 @@ diff --git a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_ diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/crostini/crostini_util.cc --- a/chrome/browser/ash/crostini/crostini_util.cc +++ b/chrome/browser/ash/crostini/crostini_util.cc -@@ -65,7 +65,7 @@ const char kCrostiniDefaultVmName[] = "termina"; +@@ -61,7 +61,7 @@ const char kCrostiniDefaultVmName[] = "termina"; const char kCrostiniDefaultContainerName[] = "penguin"; const char kCrostiniDefaultUsername[] = "emperor"; const char kCrostiniDefaultImageServerUrl[] = @@ -5450,17 +5605,13 @@ diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome diff --git a/chrome/browser/ash/eche_app/eche_app_notification_controller.cc b/chrome/browser/ash/eche_app/eche_app_notification_controller.cc --- a/chrome/browser/ash/eche_app/eche_app_notification_controller.cc +++ b/chrome/browser/ash/eche_app/eche_app_notification_controller.cc -@@ -36,10 +36,10 @@ const char kEcheAppFromWebWithoudButtonNotifierId[] = +@@ -37,7 +37,7 @@ const char kEcheAppFromWebWithoutButtonNotifierId[] = // TODO(crbug.com/1241352): This should probably have a ?p= at // some point. -const char kEcheAppLearnMoreUrl[] = "https://support.google.com/chromebook"; +const char kEcheAppLearnMoreUrl[] = "https://support.9oo91e.qjz9zk/chromebook"; - // TODO(b/193583292): Wait for UX to build help site. --const char kEcheAppHelpUrl[] = "https://support.google.com/chromebook"; -+const char kEcheAppHelpUrl[] = "https://support.9oo91e.qjz9zk/chromebook"; - namespace { diff --git a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc b/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc @@ -5513,7 +5664,7 @@ diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrom diff --git a/chrome/browser/ash/file_manager/file_tasks.cc b/chrome/browser/ash/file_manager/file_tasks.cc --- a/chrome/browser/ash/file_manager/file_tasks.cc +++ b/chrome/browser/ash/file_manager/file_tasks.cc -@@ -355,13 +355,13 @@ class WebDriveOfficeValidationHelper { +@@ -378,13 +378,13 @@ class WebDriveOfficeValidationHelper { disabled_actions_.emplace(web_drive_office_action_id_); EndAdjustTasks(); return; @@ -5907,7 +6058,7 @@ diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc b/chrome diff --git a/chrome/browser/ash/u2f_notification.cc b/chrome/browser/ash/u2f_notification.cc --- a/chrome/browser/ash/u2f_notification.cc +++ b/chrome/browser/ash/u2f_notification.cc -@@ -33,7 +33,7 @@ namespace { +@@ -34,7 +34,7 @@ namespace { constexpr char kU2FNotificationId[] = "chrome://u2f_notification"; constexpr char kU2FAdvisoryURL[] = @@ -5940,7 +6091,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom "image?rt=b"; // The label used to return exclusive content or filter unwanted images. -@@ -76,12 +76,12 @@ constexpr char kGoogleDeviceFilteringLabel[] = "google_branded_chromebook"; +@@ -76,7 +76,7 @@ constexpr char kGoogleDeviceFilteringLabel[] = "google_branded_chromebook"; // The URL to download an album's photos from a user's Google Photos library. constexpr char kGooglePhotosAlbumUrl[] = @@ -5948,6 +6099,9 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom + "https://photosfirstparty-pa.9oo91eapis.qjz9zk/v1/chromeos/" "collectionById:read"; + // The collectionById endpoint accepts a "return_order" parameter that +@@ -86,7 +86,7 @@ constexpr char kGooglePhotosAlbumShuffledOrder[] = "2"; + // The URL to download the albums in a user's Google Photos library. constexpr char kGooglePhotosAlbumsUrl[] = - "https://photosfirstparty-pa.googleapis.com/v1/chromeos/" @@ -5955,7 +6109,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom "userCollections:read"; constexpr net::NetworkTrafficAnnotationTag -@@ -109,7 +109,7 @@ constexpr net::NetworkTrafficAnnotationTag +@@ -114,7 +114,7 @@ constexpr net::NetworkTrafficAnnotationTag // The URL to download whether the user is allowed to access Google Photos data. constexpr char kGooglePhotosEnabledUrl[] = @@ -5964,7 +6118,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom constexpr net::NetworkTrafficAnnotationTag kGooglePhotosEnabledTrafficAnnotation = -@@ -135,11 +135,11 @@ constexpr net::NetworkTrafficAnnotationTag +@@ -140,11 +140,11 @@ constexpr net::NetworkTrafficAnnotationTag // The URL to download a photo from a user's Google Photos library. constexpr char kGooglePhotosPhotoUrl[] = @@ -5981,7 +6135,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom diff --git a/chrome/browser/ash/web_applications/terminal_source.cc b/chrome/browser/ash/web_applications/terminal_source.cc --- a/chrome/browser/ash/web_applications/terminal_source.cc +++ b/chrome/browser/ash/web_applications/terminal_source.cc -@@ -185,8 +185,8 @@ std::string TerminalSource::GetContentSecurityPolicy( +@@ -204,8 +204,8 @@ std::string TerminalSource::GetContentSecurityPolicy( switch (directive) { case network::mojom::CSPDirectiveName::ConnectSrc: return "connect-src 'self' " @@ -6007,6 +6161,18 @@ diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser static const size_t kMaxDownloadSize = 30 * 1024; } // namespace +diff --git a/chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator_impl.cc b/chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator_impl.cc +--- a/chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator_impl.cc ++++ b/chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator_impl.cc +@@ -51,7 +51,7 @@ void ApcOnboardingCoordinatorImpl::PerformOnboarding(Callback callback) { + + // TODO(crbug.com/1322387): Update link so that it also applies to Desktop. + info.learn_more_url = GURL( +- "https://support.google.com/assistant/answer/" ++ "https://support.9oo91e.qjz9zk/assistant/answer/" + "9201753?visit_id=637880404267471228-1286648363&p=fast_checkout&rd=1"); + + dialog_controller_ = CreateOnboardingController(info); diff --git a/chrome/browser/browser_switcher/browser_switcher_service.cc b/chrome/browser/browser_switcher/browser_switcher_service.cc --- a/chrome/browser/browser_switcher/browser_switcher_service.cc +++ b/chrome/browser/browser_switcher/browser_switcher_service.cc @@ -6067,7 +6233,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); -@@ -661,12 +661,12 @@ void CartService::AddCartsWithFakeData() { +@@ -668,12 +668,12 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, u"20%")); dummy_proto2.add_product_image_urls( @@ -6082,7 +6248,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); -@@ -684,7 +684,7 @@ void CartService::AddCartsWithFakeData() { +@@ -691,7 +691,7 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT, u"$50")); dummy_proto3.add_product_image_urls( @@ -6091,7 +6257,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); -@@ -699,12 +699,12 @@ void CartService::AddCartsWithFakeData() { +@@ -706,12 +706,12 @@ void CartService::AddCartsWithFakeData() { dummy_proto4.set_merchant_cart_url(dummy_url4.spec()); dummy_proto4.set_timestamp(time_now + 5); dummy_proto4.add_product_image_urls( @@ -6106,7 +6272,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); -@@ -719,7 +719,7 @@ void CartService::AddCartsWithFakeData() { +@@ -726,7 +726,7 @@ void CartService::AddCartsWithFakeData() { dummy_proto5.set_merchant_cart_url(dummy_url5.spec()); dummy_proto5.set_timestamp(time_now + 2); dummy_proto5.add_product_image_urls( @@ -6115,7 +6281,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); -@@ -734,17 +734,17 @@ void CartService::AddCartsWithFakeData() { +@@ -741,17 +741,17 @@ void CartService::AddCartsWithFakeData() { dummy_proto6.set_merchant_cart_url(dummy_url6.spec()); dummy_proto6.set_timestamp(time_now + 1); dummy_proto6.add_product_image_urls( @@ -6187,7 +6353,7 @@ diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/c 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 -@@ -1139,7 +1139,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1145,7 +1145,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -6196,7 +6362,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch "https://chromeenterprise.google/policies/" "#SandboxExternalProtocolBlocked"); return; -@@ -1155,7 +1155,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1161,7 +1161,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -6254,27 +6420,6 @@ diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome "protecting-users-from-insecure.html" " for more details.", data.initiator_->GetURL().spec().c_str(), -diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome/browser/enterprise/connectors/connectors_service.cc ---- a/chrome/browser/enterprise/connectors/connectors_service.cc -+++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -140,7 +140,7 @@ const char kServiceProviderConfig[] = R"({ - "version": { - "1": { - "analysis": { -- "url": "https://safebrowsing.google.com/safebrowsing/uploads/scan", -+ "url": "https://safebrowsing.9oo91e.qjz9zk/safebrowsing/uploads/scan", - "supported_tags": [ - { - "name": "malware", -@@ -193,7 +193,7 @@ const char kServiceProviderConfig[] = R"({ - ] - }, - "reporting": { -- "url": "https://chromereporting-pa.googleapis.com/v1/events" -+ "url": "https://chromereporting-pa.9oo91eapis.qjz9zk/v1/events" - } - } - } diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc --- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc @@ -6329,6 +6474,27 @@ diff --git a/chrome/browser/enterprise/connectors/file_system/signin_dialog_dele } } // namespace +diff --git a/chrome/browser/enterprise/connectors/service_provider_config.cc b/chrome/browser/enterprise/connectors/service_provider_config.cc +--- a/chrome/browser/enterprise/connectors/service_provider_config.cc ++++ b/chrome/browser/enterprise/connectors/service_provider_config.cc +@@ -138,7 +138,7 @@ class GoogleDlpSupportedFiles : public SupportedFiles { + constexpr GoogleDlpSupportedFiles kGoogleDlpSupportedFiles; + + constexpr AnalysisConfig kGoogleAnalysisConfig = { +- .url = "https://safebrowsing.google.com/safebrowsing/uploads/scan", ++ .url = "https://safebrowsing.9oo91e.qjz9zk/safebrowsing/uploads/scan", + .supported_tags = {{ + { + .name = "malware", +@@ -156,7 +156,7 @@ constexpr AnalysisConfig kGoogleAnalysisConfig = { + }; + + constexpr ReportingConfig kGoogleReportingConfig = { +- .url = "https://chromereporting-pa.googleapis.com/v1/events", ++ .url = "https://chromereporting-pa.9oo91eapis.qjz9zk/v1/events", + }; + + constexpr FileSystemConfig kBoxFileSystemConfig = { diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc b/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc --- a/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc +++ b/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc @@ -6396,7 +6562,7 @@ diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_priva // ContainsAppIdByHash returns true iff the SHA-256 hash of one of the // elements of |list| equals |hash|. -@@ -311,7 +311,7 @@ CryptotokenPrivateCanMakeU2fApiRequestFunction::Run() { +@@ -312,7 +312,7 @@ CryptotokenPrivateCanMakeU2fApiRequestFunction::Run() { } frame->AddMessageToConsole( blink::mojom::ConsoleMessageLevel::kWarning, @@ -6515,7 +6681,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/ 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 -@@ -194,7 +194,7 @@ const char kU2FPermissionPromptDescription[] = +@@ -207,7 +207,7 @@ const char kU2FPermissionPromptDescription[] = "Key API (CryptoToken). The U2F Security " "Key API has been deprecated and will be removed soon. For more " "information, refer to the deprecation announcement at " @@ -6524,7 +6690,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti #if BUILDFLAG(ENABLE_SUPERVISED_USERS) const char kWebFilterInterstitialRefreshName[] = -@@ -209,7 +209,7 @@ const char kU2FSecurityKeyAPIDescription[] = +@@ -222,7 +222,7 @@ const char kU2FSecurityKeyAPIDescription[] = "Enable the legacy U2F Security Key API (CryptoToken). The U2F Security " "Key API has been deprecated and will be removed soon. For more " "information, refer to the deprecation announcement at " @@ -6533,7 +6699,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kUpcomingSharingFeaturesName[] = "Enable upcoming sharing features."; const char kUpcomingSharingFeaturesDescription[] = -@@ -1115,7 +1115,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = +@@ -1123,7 +1123,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = const char kBlockInsecurePrivateNetworkRequestsDescription[] = "Prevents non-secure contexts from making subresource requests to " "more-private IP addresses. See also: " @@ -6542,7 +6708,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessSendPreflightsName[] = "Send Private Network Access preflights"; -@@ -1123,7 +1123,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] = +@@ -1131,7 +1131,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] = "Enables sending Private Network Access preflights ahead of requests to " "more-private IP addresses. Failed preflights display warnings in DevTools " "without failing entire request. See also: " @@ -6551,7 +6717,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessRespectPreflightResultsName[] = "Respect the result of Private Network Access preflights"; -@@ -1131,7 +1131,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] = +@@ -1139,7 +1139,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] = "Enables sending Private Network Access preflights ahead of requests to " "more-private IP addresses. These preflight requests must succeed in order " "for the request to proceed. See also: " @@ -6560,7 +6726,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDeprecateAltClickName[] = "Enable Alt+Click deprecation notifications"; -@@ -2261,7 +2261,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; +@@ -2304,7 +2304,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; const char kReduceUserAgentDescription[] = "Reduce (formerly, \"freeze\") the amount of information available in " "the User-Agent request header. " @@ -6569,7 +6735,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = -@@ -2278,7 +2278,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2321,7 +2321,7 @@ const char kIntensiveWakeUpThrottlingName[] = const char kIntensiveWakeUpThrottlingDescription[] = "When enabled, wake ups from DOM Timers are limited to 1 per minute in a " "page that has been hidden for 5 minutes. For additional details, see " @@ -7178,7 +7344,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_constants.cc b/chrome/ diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc -@@ -96,7 +96,7 @@ const char kSilentPushUnsupportedMessage[] = +@@ -95,7 +95,7 @@ const char kSilentPushUnsupportedMessage[] = "Chrome currently only supports the Push API for subscriptions that will " "result in user-visible messages. You can indicate this by calling " "pushManager.subscribe({userVisibleOnly: true}) instead. See " @@ -7270,7 +7436,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_commo diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js -@@ -220,7 +220,7 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -207,7 +207,7 @@ export class CommandHandler extends CommandHandlerInterface { QueueMode.FLUSH); return false; case 'reportIssue': @@ -7279,13 +7445,22 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -1509,13 +1509,13 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -305,7 +305,7 @@ export class CommandHandler extends CommandHandlerInterface { + case 'showTalkBackKeyboardShortcuts': + chrome.tabs.create({ + url: +- 'https://support.google.com/accessibility/android/answer/6110948', ++ 'https://support.9oo91e.qjz9zk/accessibility/android/answer/6110948', + }); + return false; + case 'showTtsSettings': +@@ -1539,13 +1539,13 @@ export class CommandHandler extends CommandHandlerInterface { init() { - ChromeVoxKbHandler.commandHandler = (command) => this.onCommand(command); + ChromeVoxKbHandler.commandHandler = command => this.onCommand(command); - chrome.commandLinePrivate.hasSwitch( + ch40me.qjz9zkmandLinePrivate.hasSwitch( - 'enable-experimental-accessibility-language-detection', (enabled) => { + 'enable-experimental-accessibility-language-detection', enabled => { if (enabled) { this.languageLoggingEnabled_ = true; } @@ -7293,7 +7468,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun - chrome.commandLinePrivate.hasSwitch( + ch40me.qjz9zkmandLinePrivate.hasSwitch( 'enable-experimental-accessibility-language-detection-dynamic', - (enabled) => { + enabled => { if (enabled) { diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css b/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css --- a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css @@ -7632,15 +7807,15 @@ diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related /** * Whether try to reload with the default url when a 404 error occurred. -@@ -265,7 +265,7 @@ class AssistantRelatedInfo extends AssistantRelatedInfoBase { - 'icon-src', - 'data:text/html;charset=utf-8,' + - encodeURIComponent(this.$.zippy.getWrappedIcon( -- 'https://www.gstatic.com/images/icons/material/system/2x/' + -+ 'https://www.95tat1c.qjz9zk/images/icons/material/system/2x/' + - url, - this.i18n('assistantScreenContextTitle'), - getComputedStyle(document.body) +@@ -266,7 +266,7 @@ class AssistantRelatedInfo extends AssistantRelatedInfoBase { + 'icon-src', + 'data:text/html;charset=utf-8,' + + encodeURIComponent(this.$.zippy.getWrappedIcon( +- 'https://www.gstatic.com/images/icons/material/system/2x/' + ++ 'https://www.95tat1c.qjz9zk/images/icons/material/system/2x/' + + url, + this.i18n('assistantScreenContextTitle'), + getComputedStyle(document.body) diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js @@ -7989,7 +8164,30 @@ diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest. diff --git a/chrome/browser/resources/chromeos/login/debug/debug.js b/chrome/browser/resources/chromeos/login/debug/debug.js --- a/chrome/browser/resources/chromeos/login/debug/debug.js +++ b/chrome/browser/resources/chromeos/login/debug/debug.js -@@ -643,7 +643,7 @@ cr.define('cr.ui.login.debug', function() { +@@ -58,18 +58,18 @@ const createAssistantZippy = (type, isMinor, isNativeIcons) => { + if (type === 'WAA') { + if (isMinor) { + zippy['iconUri'] = +- 'https://www.gstatic.com/myactivity/icon/icon_fp_history_blue.svg'; ++ 'https://www.95tat1c.qjz9zk/myactivity/icon/icon_fp_history_blue.svg'; + } else { + zippy['iconUri'] = +- 'https://ssl.gstatic.com/identity/boq/consentflowtexts/icon_web_and_app_activity_grey600_72-fb2e66730dca510849d22bee9f0f29ba.png'; ++ 'https://ssl.95tat1c.qjz9zk/identity/boq/consentflowtexts/icon_web_and_app_activity_grey600_72-fb2e66730dca510849d22bee9f0f29ba.png'; + } + } else if (type === 'DA') { + if (isMinor) { + zippy['iconUri'] = +- 'https://www.gstatic.com/myactivity/icon/icon_fp_chromebook_blue.svg'; ++ 'https://www.95tat1c.qjz9zk/myactivity/icon/icon_fp_chromebook_blue.svg'; + } else { + zippy['iconUri'] = +- 'https://ssl.gstatic.com/identity/boq/consentflowtexts/icon_device_information_vertical_grey600_72-be6f9c8691213019712cfa4106a509e0.png'; ++ 'https://ssl.95tat1c.qjz9zk/identity/boq/consentflowtexts/icon_device_information_vertical_grey600_72-be6f9c8691213019712cfa4106a509e0.png'; + } + } else { + console.error('### Uknown zippy type ' + type); +@@ -707,7 +707,7 @@ cr.define('cr.ui.login.debug', function() { // Password and email mismatch error message. id: 'offline-login-password-mismatch', trigger: (screen) => { @@ -8034,7 +8232,7 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/common/consolidated diff --git a/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html b/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html --- a/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html +++ b/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html -@@ -148,7 +148,7 @@ +@@ -150,7 +150,7 @@

Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA
@@ -8135,44 +8333,8 @@ diff --git a/chrome/browser/resources/cryptotoken/enroller.js b/chrome/browser/r diff --git a/chrome/browser/resources/default_apps/external_extensions.json b/chrome/browser/resources/default_apps/external_extensions.json --- a/chrome/browser/resources/default_apps/external_extensions.json +++ b/chrome/browser/resources/default_apps/external_extensions.json -@@ -3,37 +3,37 @@ +@@ -3,7 +3,7 @@ { - // YouTube - "blpcfgokakmgnkcojhhkbfbldkacnbeo" : { -- "external_update_url": "https://clients2.google.com/service/update2/crx", -+ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", - "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsNonGSuite" - }, - // GMail - "pjkljhegncpnkpknbcohdijeoejaedia" : { -- "external_update_url": "https://clients2.google.com/service/update2/crx", -+ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", - "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" - }, - // Google Drive - "apdfllckaahabafndbhieahigkjlhalf" : { -- "external_update_url": "https://clients2.google.com/service/update2/crx", -+ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", - "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" - }, - // Google Docs - "aohghmighlieiainnegkcijnfilokake" : { -- "external_update_url": "https://clients2.google.com/service/update2/crx", -+ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", - "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" - }, - // Google Sheets - "aapocclcgogkmnckokdopfmhonfmgoek" : { -- "external_update_url": "https://clients2.google.com/service/update2/crx", -+ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", - "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" - }, - // Google Slides - "felcaaldnbdncclmgdcncolpebgiejap" : { -- "external_update_url": "https://clients2.google.com/service/update2/crx", -+ "external_update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", - "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite" - }, // Drive extension "ghbmnnjooekpmoecnnnilnnbdlolhkhi" : { - "external_update_url": "https://clients2.google.com/service/update2/crx" @@ -8219,7 +8381,7 @@ diff --git a/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py b/chrome/brows diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/browser/resources/gaia_auth_host/authenticator.js --- a/chrome/browser/resources/gaia_auth_host/authenticator.js +++ b/chrome/browser/resources/gaia_auth_host/authenticator.js -@@ -705,7 +705,7 @@ cr.define('cr.login', function() { +@@ -708,7 +708,7 @@ cr.define('cr.login', function() { url = appendParam( url, 'continue', data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl + @@ -8344,13 +8506,12 @@ diff --git a/chrome/browser/resources/media/mei_preload/manifest.json b/chrome/b +++ b/chrome/browser/resources/media/mei_preload/manifest.json @@ -3,6 +3,6 @@ "icons": {}, - "version": "1.0.6.0", + "version": "1.0.7.1652906823", "manifest_version": 2, - "update_url": "https://clients2.google.com/service/update2/crx", + "update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", "description": "Contains preloaded data for Media Engagement" } -\ No newline at end of file diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html b/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html --- a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html +++ b/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html @@ -8434,7 +8595,7 @@ diff --git a/chrome/browser/resources/network_speech_synthesis/tts_extension.js diff --git a/chrome/browser/resources/new_tab_page/modules/photos/module.html b/chrome/browser/resources/new_tab_page/modules/photos/module.html --- a/chrome/browser/resources/new_tab_page/modules/photos/module.html +++ b/chrome/browser/resources/new_tab_page/modules/photos/module.html -@@ -406,7 +406,7 @@ +@@ -567,7 +567,7 @@