diff --git a/build/RELEASE b/build/RELEASE index f8c4259b..e5e4eee0 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -95.0.4638.78 +96.0.4664.54 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 113b8edb..86716f6c 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -1,4 +1,3 @@ -Disable-third-party-cookies-by-default.patch AV1-codec-support.patch Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch @@ -17,7 +16,6 @@ Do-not-store-passwords-by-default.patch Disable-NTP-remote-suggestions-by-default.patch Disable-references-to-fonts.googleapis.com.patch Change-default-webRTC-policy-to-not-use-any-address.patch -Never-send-any-crash-upload-data.patch Hide-send-reports-checkbox.patch Never-fetch-popular-sites.patch ungoogled-chromium-Disable-webRTC-log-uploader.patch @@ -90,7 +88,7 @@ disable-AdsBlockedInfoBar.patch Bromite-AdBlockUpdaterService.patch Replace-DoH-probe-domain-with-RIPE-domain.patch Increase-number-of-autocomplete-matches-from-5-to-10.patch -Disable-HEAD-requests-for-single-word-Omnibar-searches.patch +Disable-requests-for-single-word-Omnibar-searches.patch Disable-some-signed-exchange-features.patch Add-flag-to-disable-WebGL.patch DoH-secure-mode-by-default.patch @@ -118,9 +116,9 @@ Disable-the-DIAL-repeating-discovery.patch Block-qjz9zk-or-trk-requests.patch Hardening-against-incognito-mode-detection.patch Remove-weblayer-dependency-on-Play-Services.patch -Timezone-customization.patch Move-some-account-settings-back-to-privacy-settings.patch Restore-Simplified-NTP-launch.patch +Add-option-to-use-home-page-as-NTP.patch Revert-the-removal-of-an-option-to-block-autoplay.patch Disable-text-fragments-by-default.patch disable-WebView-variations-support.patch @@ -132,6 +130,7 @@ Revert-flags-remove-num-raster-threads.patch webview-Hard-no-to-persistent-histograms.patch Ignore-enterprise-policies-for-secure-DNS.patch Add-menu-item-to-bookmark-all-tabs.patch +Ask-user-before-closing-all-tabs.patch Add-flag-for-save-data-header.patch Add-option-to-force-tablet-UI.patch Make-all-favicon-requests-on-demand.patch @@ -158,7 +157,6 @@ Add-custom-tab-intents-privacy-option.patch Enable-share-intent.patch Site-setting-for-images.patch Bromite-auto-updater.patch -Experimental-user-scripts-support.patch Enable-native-Android-autofill.patch Keep-empty-tabs-between-sessions.patch Disable-third-party-origin-trials.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index 6c227ca4..e3e6a860 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -61,9 +61,9 @@ diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_image_reader_compat.h --- a/base/android/android_image_reader_compat.h +++ b/base/android/android_image_reader_compat.h -@@ -22,6 +22,9 @@ class BASE_EXPORT AndroidImageReader { - // Thread safe GetInstance. - static AndroidImageReader& GetInstance(); +@@ -25,6 +25,9 @@ class BASE_EXPORT AndroidImageReader { + AndroidImageReader(const AndroidImageReader&) = delete; + AndroidImageReader& operator=(const AndroidImageReader&) = delete; + // Disable image reader support. + static void DisableSupport(); @@ -71,7 +71,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i // Check if the image reader usage is supported. This function returns TRUE // if android version is >=OREO, image reader support is not disabled and all // the required functions are loaded. -@@ -59,6 +62,7 @@ class BASE_EXPORT AndroidImageReader { +@@ -62,6 +65,7 @@ class BASE_EXPORT AndroidImageReader { jobject ANativeWindow_toSurface(JNIEnv* env, ANativeWindow* window); private: @@ -82,15 +82,15 @@ 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 -@@ -2101,7 +2101,7 @@ +@@ -2121,7 +2121,7 @@ { - "name": "enable-image-reader", - "owners": [ "vikassoni", "liberato" ], + "name": "enable-launcher-app-paging", + "owners": [ "//ash/app_list/OWNERS" ], - "expiry_milestone": 95 + "expiry_milestone": -1 }, { - "name": "enable-immersive-fullscreen-toolbar", + "name": "enable-layout-ng", diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json --- a/gpu/config/gpu_driver_bug_list.json +++ b/gpu/config/gpu_driver_bug_list.json @@ -171,7 +171,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt --- a/gpu/config/gpu_workaround_list.txt +++ b/gpu/config/gpu_workaround_list.txt -@@ -13,6 +13,7 @@ decode_encode_srgb_for_generatemipmap +@@ -14,6 +14,7 @@ decode_encode_srgb_for_generatemipmap depth_stencil_renderbuffer_resize_emulation disable_2d_canvas_auto_flush disable_accelerated_av1_decode @@ -182,7 +182,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 -@@ -517,6 +517,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -521,6 +521,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } } @@ -205,7 +205,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ #include "base/android/scoped_hardware_buffer_fence_sync.h" #include "base/bind.h" #include "base/feature_list.h" -@@ -50,7 +51,15 @@ std::unique_ptr MakeCurrent( +@@ -51,7 +52,15 @@ std::unique_ptr MakeCurrent( } TextureOwner::Mode GetTextureOwnerMode() { @@ -225,7 +225,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 -@@ -653,6 +653,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -663,6 +663,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}; @@ -239,7 +239,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 -@@ -216,6 +216,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; +@@ -219,6 +219,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/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index ad8002ec..82a5176e 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -33,7 +33,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn include_dirs = libaom_include_dirs } -@@ -193,7 +193,7 @@ if (enable_libaom) { +@@ -194,7 +194,7 @@ if (enable_libaom) { configs += [ "//build/config/compiler:no_chromium_code" ] if (current_cpu == "arm") { configs -= [ "//build/config/compiler:compiler_arm_fpu" ] @@ -42,7 +42,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn } configs += [ ":libaom_config" ] -@@ -256,6 +256,8 @@ if (enable_libaom) { +@@ -257,6 +257,8 @@ if (enable_libaom) { if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect") { deps += [ ":libaom_intrinsics_neon" ] @@ -54,7 +54,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni --- a/third_party/libaom/libaom_srcs.gni +++ b/third_party/libaom/libaom_srcs.gni -@@ -634,6 +634,11 @@ aom_mem_sources = [ +@@ -642,6 +642,11 @@ aom_mem_sources = [ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/float.asm" ] @@ -69,7 +69,7 @@ diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm -@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -49,7 +49,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -81,7 +81,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -93,7 +93,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm -@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -49,7 +49,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -105,7 +105,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -117,7 +117,7 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm -@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -49,7 +49,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -129,7 +129,7 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -141,7 +141,7 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm -@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -49,7 +49,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -153,7 +153,7 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -165,7 +165,7 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm -@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 +@@ -49,7 +49,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 @@ -177,7 +177,7 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -189,7 +189,7 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ %define CONFIG_OPTICAL_FLOW_API 0 %define CONFIG_OS_SUPPORT 1 %define CONFIG_PARTITION_SEARCH_ORDER 0 @@ -201,7 +201,7 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 723e9b30..3472e6bd 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -26,7 +26,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; -@@ -984,6 +985,8 @@ public abstract class ChromeActivity +@@ -981,6 +982,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -38,9 +38,9 @@ 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 -@@ -87,6 +87,7 @@ public class ChromeCachedFlags { - add(ChromeFeatureList.EARLY_LIBRARY_LOAD); - add(ChromeFeatureList.ELASTIC_OVERSCROLL); +@@ -90,6 +90,7 @@ public class ChromeCachedFlags { + add(ChromeFeatureList + .GIVE_JAVA_UI_THREAD_DEFAULT_TASK_TRAITS_USER_BLOCKING_PRIORITY); add(ChromeFeatureList.IMMERSIVE_UI_MODE); + add(ChromeFeatureList.ALLOW_USER_CERTIFICATES); add(ChromeFeatureList.INSTANT_START); @@ -49,7 +49,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 -@@ -2910,6 +2910,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2874,6 +2874,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, #if defined(OS_ANDROID) @@ -91,7 +91,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 -@@ -142,6 +142,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -150,6 +150,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedSignInPromoDismiss, &feed::kInterestFeedContentSuggestions, &feed::kInterestFeedSpinnerAlwaysAnimate, @@ -99,7 +99,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -377,6 +378,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ +@@ -387,6 +388,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index ad65703f..ee086099 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -14,7 +14,7 @@ Subject: Add IsCleartextPermitted flag diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7852,6 +7852,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7783,6 +7783,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( chrome::android::kBookmarksExportUseSaf)}, @@ -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 -@@ -1460,6 +1460,10 @@ const char kHttpsOnlyModeDescription[] = +@@ -1507,6 +1507,10 @@ const char kHttpsOnlyModeDescription[] = "Adds a setting under chrome://settings/security to opt-in to HTTPS-First " "Mode."; @@ -43,7 +43,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 -@@ -845,6 +845,9 @@ extern const char kHostedAppShimCreationDescription[]; +@@ -867,6 +867,9 @@ extern const char kHostedAppShimCreationDescription[]; extern const char kHttpsOnlyModeName[]; extern const char kHttpsOnlyModeDescription[]; @@ -81,7 +81,7 @@ diff --git a/net/base/features.h b/net/base/features.h diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -215,6 +215,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -234,6 +234,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { } #if defined(OS_ANDROID) diff --git a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch index 08fe58e5..f6f543a7 100644 --- a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -17,7 +17,7 @@ See also: 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 -@@ -7709,6 +7709,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7538,6 +7538,12 @@ const FeatureEntry kFeatureEntries[] = { "AndroidDynamicColor")}, #endif // defined(OS_ANDROID) @@ -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 -@@ -658,6 +658,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] = +@@ -712,6 +712,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] = "authenticator (if available) to verify card ownership when retrieving " "credit cards from Google Payments."; @@ -48,7 +48,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 -@@ -420,6 +420,9 @@ extern const char kEnableAutofillSaveCardInfoBarAccountIndicationFooterName[]; +@@ -446,6 +446,9 @@ extern const char kEnableAutofillSaveCardInfoBarAccountIndicationFooterName[]; extern const char kEnableAutofillSaveCardInfoBarAccountIndicationFooterDescription[]; @@ -75,7 +75,7 @@ diff --git a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmp diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc -@@ -344,6 +344,9 @@ const char kHomePage[] = "homepage"; +@@ -335,6 +335,9 @@ const char kHomePage[] = "homepage"; // Causes the browser to launch directly in incognito mode. const char kIncognito[] = "incognito"; @@ -88,7 +88,7 @@ diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h -@@ -114,6 +114,7 @@ extern const char kForceStackedTabStripLayout[]; +@@ -110,6 +110,7 @@ extern const char kForceStackedTabStripLayout[]; extern const char kHideCrashRestoreBubble[]; extern const char kHomePage[]; extern const char kIncognito[]; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 1eb6fec3..3019ad12 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -70,7 +70,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -49,6 +49,7 @@ import org.chromium.ui.text.SpanApplier; +@@ -52,6 +52,7 @@ import org.chromium.ui.text.SpanApplier; public class PrivacySettings extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener, INeedSnackbarManager { @@ -81,7 +81,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 -@@ -367,6 +367,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -374,6 +374,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUISettingsURL)); #endif @@ -119,7 +119,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chromeos/network/proxy/proxy_config_service_impl.h" -@@ -59,7 +62,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( +@@ -73,7 +76,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( return std::make_unique( profile_prefs, local_state_prefs, nullptr); #else @@ -141,7 +141,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr #endif // BUILDFLAG(IS_CHROMEOS_ASH) } -@@ -75,3 +91,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( +@@ -89,3 +105,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( nullptr); #endif // BUILDFLAG(IS_CHROMEOS_ASH) } @@ -162,18 +162,18 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro class PrefProxyConfigTracker; class PrefService; @@ -37,6 +38,8 @@ class ProxyServiceFactory { - static std::unique_ptr - CreatePrefProxyConfigTrackerOfLocalState(PrefService* local_state_prefs); + CreatePrefProxyConfigTrackerOfProfile(PrefService* profile_prefs, + PrefService* local_state_prefs); + static void RegisterPrefs(PrefRegistrySimple* registry); + - private: - DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory); - }; + // Creates a PrefProxyConfigTracker that tracks local state only. This tracker + // should be used for the system request context and the signin screen + // (ChromeOS only). 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 -@@ -160,6 +160,8 @@ +@@ -164,6 +164,8 @@ #include "printing/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h" @@ -182,7 +182,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 -@@ -941,6 +943,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -960,6 +962,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { PluginsResourceService::RegisterPrefs(registry); #endif @@ -194,7 +194,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc -@@ -157,7 +157,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { +@@ -161,7 +161,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { SetValue( proxy_config::prefs::kProxy, std::make_unique(ProxyConfigDictionary::CreateFixedServers( @@ -627,7 +627,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 -@@ -265,6 +265,8 @@ static_library("ui") { +@@ -278,6 +278,8 @@ static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -646,8 +646,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom +#include "chrome/browser/ui/webui/proxy_config_ui.h" #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h" #include "chrome/browser/ui/webui/signin_internals_ui.h" - #include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h" -@@ -638,6 +639,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, + #include "chrome/browser/ui/webui/support_tool_ui.h" +@@ -644,6 +645,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -801,7 +801,7 @@ new file mode 100644 + } + + proxy_config_service_ = ProxyServiceFactory::CreateProxyConfigService( -+ pref_proxy_config_tracker_.get()); ++ pref_proxy_config_tracker_.get(), nullptr); +} + +void ProxyConfigMessageHandler::OnProxyConfigChanged( @@ -1121,7 +1121,7 @@ new file mode 100644 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -35,6 +35,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; +@@ -37,6 +37,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; const char kChromeUICertificateViewerURL[] = "chrome://view-cert/"; const char kChromeUIChromeSigninHost[] = "chrome-signin"; const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/"; @@ -1130,7 +1130,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons const char kChromeUIChromeURLsHost[] = "chrome-urls"; const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/"; const char kChromeUIComponentsHost[] = "components"; -@@ -346,6 +348,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -354,6 +356,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { kChromeUIMobileSetupHost, kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, @@ -1138,7 +1138,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIOobeHost, kChromeUIOSCreditsHost, kChromeUIOSSettingsHost, -@@ -568,6 +571,7 @@ const char* const kChromeHostURLs[] = { +@@ -584,6 +587,7 @@ const char* const kChromeHostURLs[] = { #if !defined(OS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1149,7 +1149,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -126,6 +126,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -127,6 +127,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; @@ -1172,7 +1172,7 @@ diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/compone diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/proxy_config/proxy_config_dictionary.cc --- a/components/proxy_config/proxy_config_dictionary.cc +++ b/components/proxy_config/proxy_config_dictionary.cc -@@ -28,6 +28,8 @@ const char kProxyPacMandatory[] = "pac_mandatory"; +@@ -30,6 +30,8 @@ const char kProxyPacMandatory[] = "pac_mandatory"; // String containing proxy bypass rules. For a specification of the // expected syntax see net::ProxyBypassRules::ParseFromString(). const char kProxyBypassList[] = "bypass_list"; @@ -1181,7 +1181,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro } // namespace -@@ -72,6 +74,14 @@ bool ProxyConfigDictionary::HasBypassList() const { +@@ -78,6 +80,14 @@ bool ProxyConfigDictionary::HasBypassList() const { return dict_.FindKey(kProxyBypassList); } @@ -1196,7 +1196,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro const base::Value& ProxyConfigDictionary::GetDictionary() const { return dict_; } -@@ -79,29 +89,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const { +@@ -85,29 +95,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const { // static base::Value ProxyConfigDictionary::CreateDirect() { return CreateDictionary(ProxyPrefs::MODE_DIRECT, std::string(), false, @@ -1232,7 +1232,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro } else { return CreateDirect(); } -@@ -110,7 +121,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers( +@@ -116,7 +127,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers( // static base::Value ProxyConfigDictionary::CreateSystem() { return CreateDictionary(ProxyPrefs::MODE_SYSTEM, std::string(), false, @@ -1241,7 +1241,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro } // static -@@ -119,7 +130,8 @@ base::Value ProxyConfigDictionary::CreateDictionary( +@@ -125,7 +136,8 @@ base::Value ProxyConfigDictionary::CreateDictionary( const std::string& pac_url, bool pac_mandatory, const std::string& proxy_server, @@ -1251,7 +1251,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro base::Value dict(base::Value::Type::DICTIONARY); dict.SetKey(kProxyMode, base::Value(ProxyModeToString(mode))); if (!pac_url.empty()) { -@@ -128,8 +140,10 @@ base::Value ProxyConfigDictionary::CreateDictionary( +@@ -134,8 +146,10 @@ base::Value ProxyConfigDictionary::CreateDictionary( } if (!proxy_server.empty()) dict.SetKey(kProxyServer, base::Value(proxy_server)); @@ -1266,7 +1266,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/proxy_config/proxy_config_dictionary.h --- a/components/proxy_config/proxy_config_dictionary.h +++ b/components/proxy_config/proxy_config_dictionary.h -@@ -38,6 +38,7 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary { +@@ -43,6 +43,7 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary { bool GetProxyServer(std::string* out) const; bool GetBypassList(std::string* out) const; bool HasBypassList() const; @@ -1274,7 +1274,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox const base::Value& GetDictionary() const; -@@ -46,7 +47,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary { +@@ -51,7 +52,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary { static base::Value CreatePacScript(const std::string& pac_url, bool pac_mandatory); static base::Value CreateFixedServers(const std::string& proxy_server, @@ -1284,7 +1284,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox static base::Value CreateSystem(); // Encodes the proxy server as "=://". -@@ -62,7 +64,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary { +@@ -67,7 +69,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary { const std::string& pac_url, bool pac_mandatory, const std::string& proxy_server, @@ -1293,7 +1293,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox + bool reverse_bypass); base::Value dict_; - + }; diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc --- a/components/proxy_config/proxy_policy_handler.cc +++ b/components/proxy_config/proxy_policy_handler.cc @@ -1309,7 +1309,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 -@@ -110,7 +110,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { +@@ -112,7 +112,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { &single_proxies, ProxyServer::SCHEME_HTTP); type = Type::PROXY_LIST; @@ -1318,7 +1318,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c } // Trim whitespace off the url scheme. -@@ -141,6 +141,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { +@@ -143,6 +143,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { } } @@ -1332,7 +1332,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c + std::string proxy_list; + for (const ProxyServer& proxy_server : + single_proxies.GetAll()) { -+ proxy_list += proxy_server.ToURI() + ";"; ++ proxy_list += ProxyServerToProxyUri(proxy_server) + ";"; + } + // remove last semicolon + if (proxy_list.length() != 0 ) { @@ -1351,19 +1351,19 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c + std::string list; + for (const ProxyServer& proxy_server : + proxies_for_http.GetAll()) { -+ list += "http=" + proxy_server.ToURI() + ";"; ++ list += "http=" + ProxyServerToProxyUri(proxy_server) + ";"; + } + for (const ProxyServer& proxy_server : + proxies_for_https.GetAll()) { -+ list += "https=" + proxy_server.ToURI() + ";"; ++ list += "https=" + ProxyServerToProxyUri(proxy_server) + ";"; + } + for (const ProxyServer& proxy_server : + proxies_for_ftp.GetAll()) { -+ list += "ftp=" + proxy_server.ToURI() + ";"; ++ list += "ftp=" + ProxyServerToProxyUri(proxy_server) + ";"; + } + for (const ProxyServer& proxy_server : + fallback_proxies.GetAll()) { -+ list += "socks=" + proxy_server.ToURI() + ";"; ++ list += "socks=" + ProxyServerToProxyUri(proxy_server) + ";"; + } + if (list.length() != 0 ) { + // remove last semicolon diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index b502e6b2..aaf070fb 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -45,7 +45,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -32,6 +32,11 @@ +@@ -37,6 +37,11 @@ android:key="secure_dns" android:title="@string/settings_secure_dns_title" android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings"/> @@ -153,7 +153,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; -@@ -1766,8 +1767,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1891,6 +1892,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -189,7 +189,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 -@@ -378,6 +378,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -538,6 +538,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { @@ -201,7 +201,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 isMenuGroupTabsVisible = TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext) + boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java @@ -340,7 +340,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -26,6 +26,10 @@ import org.chromium.chrome.browser.profiles.Profile; +@@ -29,6 +29,10 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; @@ -351,7 +351,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate; import org.chromium.components.browser_ui.settings.SettingsLauncher; -@@ -40,7 +44,12 @@ import org.chromium.ui.text.SpanApplier; +@@ -43,7 +47,12 @@ import org.chromium.ui.text.SpanApplier; * Fragment to keep track of the all the privacy related preferences. */ public class PrivacySettings @@ -365,7 +365,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_NETWORK_PREDICTIONS = "preload_pages"; private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; -@@ -83,6 +92,25 @@ public class PrivacySettings +@@ -96,6 +105,25 @@ public class PrivacySettings (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); canMakePaymentPref.setOnPreferenceChangeListener(this); @@ -391,7 +391,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting ChromeSwitchPreference networkPredictionPref = (ChromeSwitchPreference) findPreference(PREF_NETWORK_PREDICTIONS); networkPredictionPref.setChecked( -@@ -114,6 +142,9 @@ public class PrivacySettings +@@ -156,6 +184,9 @@ public class PrivacySettings } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { PrivacyPreferencesManagerImpl.getInstance().setNetworkPredictionEnabled( (boolean) newValue); @@ -401,7 +401,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); -@@ -191,4 +222,8 @@ public class PrivacySettings +@@ -238,4 +269,8 @@ public class PrivacySettings } return false; } @@ -434,7 +434,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin 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 -@@ -117,6 +117,8 @@ import org.chromium.ui.base.DeviceFormFactor; +@@ -121,6 +121,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; @@ -443,7 +443,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. -@@ -479,11 +481,13 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -483,11 +485,13 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { // TODO(twellington): Supply TabModelSelector as well and move initialization earlier. if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { @@ -537,7 +537,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import org.chromium.base.Log; import org.chromium.base.ObserverList; import org.chromium.base.StreamUtil; -@@ -56,6 +57,8 @@ import org.chromium.content_public.browser.LoadUrlParams; +@@ -55,6 +56,8 @@ import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.UiThreadTaskTraits; import org.chromium.url.GURL; @@ -546,7 +546,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -@@ -654,6 +657,13 @@ public class TabPersistentStore { +@@ -643,6 +646,13 @@ public class TabPersistentStore { } } } @@ -563,9 +563,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java -@@ -28,6 +28,9 @@ import org.chromium.chrome.browser.browserservices.intents.WebappExtras; - import org.chromium.chrome.browser.flags.ActivityType; +@@ -29,6 +29,9 @@ import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.components.browser_ui.widget.TintedDrawable; + import org.chromium.device.mojom.ScreenOrientationLockType; +import org.chromium.base.ContextUtils; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; @@ -573,7 +573,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI /** * Stores info about a web app. */ -@@ -41,6 +44,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider +@@ -42,6 +45,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider private final Intent mIntent; private final ColorProviderImpl mColorProvider; @@ -582,7 +582,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI /** * Returns the toolbar color to use if a custom color is not specified by the webapp. */ -@@ -62,6 +67,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider +@@ -63,6 +68,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider mWebappExtras = webappExtras; mWebApkExtras = webApkExtras; mActivityType = (webApkExtras != null) ? ActivityType.WEB_APK : ActivityType.WEBAPP; @@ -593,7 +593,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI } @Override -@@ -150,6 +159,11 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider +@@ -151,6 +160,11 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider return mWebApkExtras; } @@ -603,12 +603,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI + } + @Override - public int getDefaultOrientation() { + public @ScreenOrientationLockType.EnumType int getDefaultOrientation() { return mWebappExtras.orientation; 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 -@@ -445,7 +445,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", +@@ -455,7 +455,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognitoAvailableToThirdParty{ @@ -620,7 +620,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/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 -@@ -922,6 +922,19 @@ Your Google account may have other forms of browsing history like searches and a +@@ -930,6 +930,19 @@ Your Google account may have other forms of browsing history like searches and a Clears history from all synced devices. diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index e4ac5687..8be45931 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -14,15 +14,15 @@ Completely remove contacts picker permission from the file dialog .../browser/TabbedModeTabDelegateFactory.java | 5 +- .../browser/bookmarks/BookmarkActionBar.java | 12 + .../browser/bookmarks/BookmarkActivity.java | 30 ++ - .../browser/bookmarks/BookmarkBridge.java | 278 +++++++++++++++++ + .../browser/bookmarks/BookmarkBridge.java | 277 +++++++++++++++++ .../browser/bookmarks/BookmarkDelegate.java | 10 + .../browser/bookmarks/BookmarkManager.java | 22 ++ .../browser/bookmarks/BookmarkPage.java | 8 +- .../native_page/NativePageFactory.java | 11 +- - chrome/browser/BUILD.gn | 11 +- + chrome/browser/BUILD.gn | 7 + chrome/browser/about_flags.cc | 6 + .../android/bookmarks/bookmark_bridge.cc | 284 ++++++++++++++++++ - .../android/bookmarks/bookmark_bridge.h | 28 +- + .../android/bookmarks/bookmark_bridge.h | 29 +- .../browser/bookmarks/bookmark_html_writer.cc | 8 +- .../dialogs/DownloadLocationCustomView.java | 8 +- .../DownloadLocationDialogCoordinator.java | 8 +- @@ -44,7 +44,7 @@ Completely remove contacts picker permission from the file dialog ui/shell_dialogs/select_file_dialog.h | 2 + .../select_file_dialog_android.cc | 6 + ui/shell_dialogs/select_file_dialog_android.h | 2 + - 38 files changed, 891 insertions(+), 29 deletions(-) + 38 files changed, 889 insertions(+), 27 deletions(-) diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc --- a/base/android/content_uri_utils.cc @@ -196,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java -@@ -84,6 +84,12 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -85,6 +85,12 @@ public class BookmarkActionBar extends SelectableListToolbar } else if (menuItem.getItemId() == R.id.search_menu_id) { mDelegate.openSearchUI(); return true; @@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } SelectionDelegate selectionDelegate = mDelegate.getSelectionDelegate(); -@@ -135,6 +141,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -136,6 +142,8 @@ public class BookmarkActionBar extends SelectableListToolbar void showLoadingUi() { setTitle(null); setNavigationButton(NAVIGATION_BUTTON_NONE); @@ -218,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false); } -@@ -144,6 +152,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -145,6 +153,8 @@ public class BookmarkActionBar extends SelectableListToolbar super.showNormalView(); if (mDelegate == null) { @@ -227,7 +227,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false); } -@@ -174,6 +184,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -175,6 +185,8 @@ public class BookmarkActionBar extends SelectableListToolbar public void onFolderStateSet(BookmarkId folder) { mCurrentFolder = mDelegate.getModel().getBookmarkById(folder); @@ -330,7 +330,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import android.text.TextUtils; import android.util.Pair; -@@ -27,8 +40,33 @@ import org.chromium.components.url_formatter.UrlFormatter; +@@ -30,8 +43,33 @@ import org.chromium.components.url_formatter.UrlFormatter; import org.chromium.content_public.browser.WebContents; import org.chromium.url.GURL; @@ -364,7 +364,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Provides the communication channel for Android to fetch and manipulate the -@@ -585,6 +623,210 @@ public class BookmarkBridge { +@@ -588,6 +626,209 @@ public class BookmarkBridge { mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType()); } @@ -529,7 +529,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView) + .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources, + R.string.export_bookmarks) -+ .with(ModalDialogProperties.PRIMARY_BUTTON_FILLED, true) + .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, resources, + R.string.cancel) + .build(); @@ -569,13 +568,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + }; + dialog.initialize(controller); + dialog.showDialog(context, modalDialogManager, /*totalBytes*/ 0, -+ DownloadLocationDialogType.DEFAULT, /*suggestedPath*/ ""); ++ DownloadLocationDialogType.DEFAULT, /*suggestedPath*/ "", /*isIncognito*/ false); + } + /** * Synchronously gets a list of bookmarks that match the specified search query. * @param query Keyword used for searching bookmarks. -@@ -1021,6 +1263,39 @@ public class BookmarkBridge { +@@ -1100,6 +1341,39 @@ public class BookmarkBridge { depthList.add(depth); } @@ -615,7 +614,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private static List> createPairsList(int[] left, int[] right) { List> pairList = new ArrayList>(); for (int i = 0; i < left.length; i++) { -@@ -1088,6 +1363,9 @@ public class BookmarkBridge { +@@ -1167,6 +1441,9 @@ public class BookmarkBridge { int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type); void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type, List bookmarksList); @@ -666,7 +665,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private BookmarkUndoController mUndoController; private final ObserverList mUIObservers = new ObserverList<>(); private BasicNativePage mNativePage; -@@ -331,6 +335,14 @@ public class BookmarkManager +@@ -341,6 +345,14 @@ public class BookmarkManager mNativePage = nativePage; } @@ -681,7 +680,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * @return Current URL representing the UI state of bookmark manager. If no state has been shown * yet in this session, on phone return last used state stored in preference; on tablet -@@ -509,6 +521,16 @@ public class BookmarkManager +@@ -521,6 +533,16 @@ public class BookmarkManager } } @@ -748,7 +747,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final BrowserControlsManager mBrowserControlsManager; private final Supplier mCurrentTabSupplier; -@@ -72,7 +73,7 @@ public class NativePageFactory { +@@ -71,7 +72,7 @@ public class NativePageFactory { private NativePageBuilder mNativePageBuilder; @@ -757,7 +756,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat @NonNull BottomSheetController sheetController, @NonNull BrowserControlsManager browserControlsManager, @NonNull Supplier currentTabSupplier, -@@ -123,7 +124,7 @@ public class NativePageFactory { +@@ -119,7 +120,7 @@ public class NativePageFactory { @VisibleForTesting static class NativePageBuilder { @@ -766,7 +765,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final Supplier mUma; private final BrowserControlsManager mBrowserControlsManager; -@@ -137,7 +138,7 @@ public class NativePageFactory { +@@ -132,7 +133,7 @@ public class NativePageFactory { private final JankTracker mJankTracker; private final Supplier mToolbarSupplier; @@ -775,7 +774,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat BottomSheetController sheetController, BrowserControlsManager browserControlsManager, Supplier currentTabSupplier, Supplier snackbarManagerSupplier, -@@ -176,7 +177,7 @@ public class NativePageFactory { +@@ -169,7 +170,7 @@ public class NativePageFactory { protected NativePage buildBookmarksPage(Tab tab) { return new BookmarkPage(mActivity.getComponentName(), mSnackbarManagerSupplier.get(), mTabModelSelector.isIncognitoSelected(), @@ -787,7 +786,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1832,6 +1832,13 @@ static_library("browser") { +@@ -1843,6 +1843,13 @@ static_library("browser") { "window_placement/window_placement_permission_context.h", ] @@ -801,30 +800,12 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -2965,6 +2972,8 @@ static_library("browser") { - "autofill/manual_filling_view_interface.h", - "banners/android/chrome_app_banner_manager_android.cc", - "banners/android/chrome_app_banner_manager_android.h", -+ "bookmarks/bookmark_html_writer.cc", -+ "bookmarks/bookmark_html_writer.h", - "browser_process_platform_part_android.cc", - "browser_process_platform_part_android.h", - "chrome_browser_field_trials_mobile.cc", -@@ -3541,8 +3550,6 @@ static_library("browser") { - "badging/badge_manager_factory.h", - "banners/app_banner_manager_desktop.cc", - "banners/app_banner_manager_desktop.h", -- "bookmarks/bookmark_html_writer.cc", -- "bookmarks/bookmark_html_writer.h", - "browsing_data/chrome_browsing_data_lifetime_manager.cc", - "browsing_data/chrome_browsing_data_lifetime_manager.h", - "browsing_data/chrome_browsing_data_lifetime_manager_factory.cc", 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 -@@ -7802,6 +7802,12 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kCommerceDeveloperDescription, kOsAll, - FEATURE_VALUE_TYPE(commerce::kCommerceDeveloper)}, +@@ -7733,6 +7733,12 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ui::kLibinputHandleTouchpad)}, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + {"export-bookmarks-use-saf", + flag_descriptions::kBookmarksExportUseSafName, @@ -838,7 +819,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -39,6 +39,7 @@ +@@ -43,6 +43,7 @@ #include "components/bookmarks/common/android/bookmark_type.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" @@ -846,7 +827,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse #include "components/dom_distiller/core/url_utils.h" #include "components/prefs/pref_service.h" #include "components/query_parser/query_parser.h" -@@ -48,6 +49,24 @@ +@@ -52,6 +53,24 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" @@ -871,7 +852,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse using base::android::AttachCurrentThread; using base::android::ConvertUTF8ToJavaString; using base::android::ConvertUTF16ToJavaString; -@@ -64,8 +83,93 @@ using bookmarks::BookmarkNode; +@@ -68,8 +87,93 @@ using bookmarks::BookmarkNode; using bookmarks::BookmarkType; using content::BrowserThread; @@ -965,7 +946,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse const int kInvalidId = -1; class BookmarkTitleComparer { -@@ -152,6 +256,10 @@ BookmarkBridge::~BookmarkBridge() { +@@ -156,6 +260,10 @@ BookmarkBridge::~BookmarkBridge() { if (partner_bookmarks_shim_) partner_bookmarks_shim_->RemoveObserver(this); reading_list_manager_->RemoveObserver(this); @@ -976,7 +957,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef&) { -@@ -543,6 +651,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -547,6 +655,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -1190,7 +1171,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser public: BookmarkBridge(JNIEnv* env, const base::android::JavaRef& obj, -@@ -55,6 +60,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -59,6 +64,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, bool IsDoingExtensiveChanges(JNIEnv* env, const base::android::JavaParamRef& obj); @@ -1203,7 +1184,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser jboolean IsEditBookmarksEnabled(JNIEnv* env); void LoadEmptyPartnerBookmarkShimForTesting( -@@ -142,6 +153,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -146,6 +157,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, jlong id, jint type); @@ -1219,7 +1200,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, -@@ -315,12 +335,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -347,12 +367,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, void DestroyJavaObject(); Profile* profile_; @@ -1235,16 +1216,17 @@ 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. -@@ -332,6 +355,9 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -363,6 +386,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, + // Observes the profile destruction and creation. base::ScopedObservation profile_observation_{this}; - ++ + const std::string FileSelectedImpl(const base::FilePath& path); + void FileSelectedImplOnUIThread(const base::FilePath& path, + const std::string& contents); - DISALLOW_COPY_AND_ASSIGN(BookmarkBridge); }; + #endif // CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARK_BRIDGE_H_ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -1256,7 +1238,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" -@@ -230,7 +231,12 @@ class Writer : public base::RefCountedThreadSafe { +@@ -235,7 +236,12 @@ class Writer : public base::RefCountedThreadSafe { // Opens the file, returning true on success. bool OpenFile() { int flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE; @@ -1273,7 +1255,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java -@@ -46,7 +46,7 @@ public class DownloadLocationCustomView +@@ -49,7 +49,7 @@ public class DownloadLocationCustomView private TextView mFileSize; private Spinner mFileLocation; private TextView mLocationAvailableSpace; @@ -1282,7 +1264,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse private @DownloadLocationDialogType int mDialogType; private long mTotalBytes; -@@ -68,7 +68,7 @@ public class DownloadLocationCustomView +@@ -72,7 +72,7 @@ public class DownloadLocationCustomView mDontShowAgain = findViewById(R.id.show_again_checkbox); } @@ -1291,7 +1273,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse // TODO(xingliu): Remove this function, currently used by smart suggestion. mDialogType = dialogType; mTotalBytes = totalBytes; -@@ -117,7 +117,7 @@ public class DownloadLocationCustomView +@@ -125,7 +125,7 @@ public class DownloadLocationCustomView * @return The text that the user inputted as the name of the file. */ @Nullable @@ -1300,7 +1282,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse if (mFileName == null || mFileName.getText() == null) return null; return mFileName.getText().toString(); } -@@ -126,7 +126,7 @@ public class DownloadLocationCustomView +@@ -134,7 +134,7 @@ public class DownloadLocationCustomView * @return The file path based on what the user selected as the location of the file. */ @Nullable @@ -1312,7 +1294,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java -@@ -36,12 +36,12 @@ import java.util.ArrayList; +@@ -37,12 +37,12 @@ import java.util.ArrayList; public class DownloadLocationDialogCoordinator implements ModalDialogProperties.Controller { @NonNull private DownloadLocationDialogController mController; @@ -1328,7 +1310,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse private long mTotalBytes; private @DownloadLocationDialogType int mDialogType; private String mSuggestedPath; -@@ -127,7 +127,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties. +@@ -131,7 +131,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties. * Called after retrieved the download directory options. * @param dirs An list of available download directories. */ @@ -1340,7 +1322,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 -@@ -5415,6 +5415,11 @@ const char kWebKioskEnableLacrosDescription[] = +@@ -5474,6 +5474,11 @@ const char kWebKioskEnableLacrosDescription[] = "Chrome OS. When disabled, the Ash-chrome will be used"; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1355,7 +1337,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 -@@ -3162,6 +3162,9 @@ extern const char kWebKioskEnableLacrosName[]; +@@ -3185,6 +3185,9 @@ extern const char kWebKioskEnableLacrosName[]; extern const char kWebKioskEnableLacrosDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1368,7 +1350,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 -@@ -165,6 +165,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -174,6 +174,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kBackgroundThreadPool, &kBentoOffline, &kBookmarkBottomSheet, @@ -1376,7 +1358,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCastDeviceFilter, &kCloseTabSuggestions, &kCriticalPersistedTabData, -@@ -812,6 +813,10 @@ const base::Feature kWebApkInstallCompleteNotification{ +@@ -824,6 +825,10 @@ const base::Feature kWebApkInstallCompleteNotification{ const base::Feature kWebApkTrampolineOnInitialIntent{ "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1390,7 +1372,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -146,6 +146,7 @@ extern const base::Feature kToolbarMicIphAndroid; +@@ -149,6 +149,7 @@ extern const base::Feature kToolbarMicIphAndroid; extern const base::Feature kToolbarUseHardwareBitmapDraw; extern const base::Feature kTrustedWebActivityLocationDelegation; extern const base::Feature kTrustedWebActivityNewDisclosure; @@ -1401,7 +1383,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -546,6 +546,7 @@ public abstract class ChromeFeatureList { +@@ -552,6 +552,7 @@ public abstract class ChromeFeatureList { "WebApkTrampolineOnInitialIntent"; public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; public static final String WEB_OTP_CROSS_DEVICE_SIMPLE_STRING = "WebOtpCrossDeviceSimpleString"; @@ -1455,7 +1437,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/ #include "components/favicon_base/favicon_usage_data.h" #include "components/history/core/browser/history_types.h" #include "components/search_engines/template_url_service.h" -@@ -68,6 +69,11 @@ class ProfileWriter : public base::RefCountedThreadSafe { +@@ -71,6 +72,11 @@ class ProfileWriter : public base::RefCountedThreadSafe { virtual void AddBookmarks(const std::vector& bookmarks, const std::u16string& top_level_folder_name); @@ -1470,7 +1452,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/ 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 -@@ -124,6 +124,8 @@ public final class ChromePreferenceKeys { +@@ -121,6 +121,8 @@ public final class ChromePreferenceKeys { public static final String BOOKMARKS_LAST_USED_URL = "enhanced_bookmark_last_used_url"; public static final String BOOKMARKS_LAST_USED_PARENT = "enhanced_bookmark_last_used_parent_folder"; @@ -1479,7 +1461,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -1059,6 +1061,7 @@ public final class ChromePreferenceKeys { +@@ -1042,6 +1044,7 @@ public final class ChromePreferenceKeys { AUTOFILL_ASSISTANT_PROACTIVE_HELP, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1518,7 +1500,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 -@@ -412,6 +412,9 @@ static_library("common") { +@@ -414,6 +414,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1745,7 +1727,7 @@ diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/st diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h --- a/ui/shell_dialogs/select_file_dialog.h +++ b/ui/shell_dialogs/select_file_dialog.h -@@ -202,6 +202,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog +@@ -205,6 +205,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog void* params); bool HasMultipleFileTypeChoices(); @@ -1773,7 +1755,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/s diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h --- a/ui/shell_dialogs/select_file_dialog_android.h +++ b/ui/shell_dialogs/select_file_dialog_android.h -@@ -55,6 +55,8 @@ class SelectFileDialogImpl : public SelectFileDialog { +@@ -58,6 +58,8 @@ class SelectFileDialogImpl : public SelectFileDialog { gfx::NativeWindow owning_window, void* params) override; diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index cf86f95f..e2c5602d 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -20,7 +20,7 @@ See also: https://github.com/bromite/bromite/issues/1474 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -60,6 +60,16 @@ +@@ -65,6 +65,16 @@ android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" android:key="do_not_track" android:title="@string/do_not_track_title"/> @@ -123,7 +123,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -90,6 +90,9 @@ public class PrivacySettings +@@ -94,6 +94,9 @@ public class PrivacySettings private ManagedPreferenceDelegate mManagedPreferenceDelegate; @@ -133,8 +133,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -190,6 +193,9 @@ public class PrivacySettings - updateSummaries(); +@@ -232,6 +235,9 @@ public class PrivacySettings + incognitoReauthPreference.setChecked(lastPrefValue); } + public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents"; @@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); -@@ -221,6 +227,14 @@ public class PrivacySettings +@@ -266,6 +272,14 @@ public class PrivacySettings } else if (PREF_INCOGNITO_TAB_HISTORY_ENABLED.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED, (boolean) newValue); @@ -158,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; -@@ -256,6 +270,16 @@ public class PrivacySettings +@@ -301,6 +315,16 @@ public class PrivacySettings canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -194,7 +194,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 -@@ -4555,6 +4555,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 a06727d1..99c36240 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -14,7 +14,7 @@ Corrected Exit functionality 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 -@@ -124,6 +124,9 @@ +@@ -150,6 +150,9 @@ android:icon="@drawable/gm_filled_cardboard_24" /> @@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -150,6 +153,9 @@ +@@ -176,6 +179,9 @@ @@ -33,7 +33,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re + android:icon="@drawable/ic_exit_to_app_white_24dp" /> - + diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java @@ -46,7 +46,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. -@@ -2028,6 +2030,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2316,6 +2317,11 @@ public abstract class ChromeActivity return true; } @@ -97,9 +97,9 @@ 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 -@@ -3193,6 +3193,9 @@ To change this setting, <resetlink>reset sync

- Turn on Request desktop site +@@ -3229,6 +3229,9 @@ To change this setting, <resetlink>reset sync

+ Dark theme + + Exit diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 4bd25009..403f207f 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -15,7 +15,7 @@ and internal chrome:// pages will be used for the autocomplete results. 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 -@@ -456,6 +456,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { +@@ -459,6 +459,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { base::size(kReaderModeOfferInSettings), nullptr}}; #endif // OS_ANDROID @@ -38,7 +38,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if defined(OS_ANDROID) const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = { {"mode", "always-none"}}; -@@ -4973,6 +4989,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4916,6 +4932,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) @@ -102,7 +102,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" -@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -646,6 +647,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 f845f0ec..0de0977e 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -14,7 +14,7 @@ Subject: Add flag for save-data-header 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 -@@ -4700,6 +4700,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4655,6 +4655,9 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if defined(OS_ANDROID) @@ -27,7 +27,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 -@@ -1058,6 +1058,10 @@ const char kDisableKeepaliveFetchDescription[] = +@@ -1111,6 +1111,10 @@ const char kDisableKeepaliveFetchDescription[] = "Disable fetch with keepalive set " "(https://fetch.spec.whatwg.org/#request-keepalive-flag)."; @@ -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 -@@ -583,6 +583,9 @@ extern const char kDiagnosticsAppNavigationDescription[]; +@@ -605,6 +605,9 @@ extern const char kDiagnosticsAppNavigationDescription[]; extern const char kDisableKeepaliveFetchName[]; extern const char kDisableKeepaliveFetchDescription[]; @@ -70,7 +70,7 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -140,6 +140,10 @@ const base::FeatureParam +@@ -141,6 +141,10 @@ const base::FeatureParam "DisabledProviders", ""}; // Disable special treatment on requests with keepalive set (see 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 11407c50..72b698d7 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 @@ -19,7 +19,7 @@ with limited CPU/memory resources and it is disabled by default. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -868,6 +868,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -849,6 +849,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { net::kEffectiveConnectionType4G}, }; @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // Ensure that all effective connection types returned by Network Quality // Estimator (NQE) are also exposed via flags. static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 == -@@ -3974,6 +3979,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3918,6 +3923,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAndroidPictureInPictureAPIName, flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid, FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)}, @@ -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 -@@ -1572,6 +1572,10 @@ const char kMediaHistoryDescription[] = +@@ -1626,6 +1626,10 @@ const char kMediaHistoryDescription[] = "Enables Media History which records data around media playbacks on " "websites."; @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -905,6 +905,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -933,6 +933,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kMediaHistoryName[]; extern const char kMediaHistoryDescription[]; 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 77a2028d..7668af94 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 @@ -13,7 +13,7 @@ Disable it by default on Android as it is everywhere else 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 -@@ -2837,6 +2837,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2801,6 +2801,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebRtcRemoteEventLogName, flag_descriptions::kWebRtcRemoteEventLogDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebRtcRemoteEventLog)}, @@ -27,7 +27,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 -@@ -1143,6 +1143,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1196,6 +1196,11 @@ const char kEnablePenetratingImageSelectionDescription[] = "Enables image options to be surfaced in the context menu for nodes " "covered by transparent overlays."; @@ -42,7 +42,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 -@@ -648,6 +648,9 @@ extern const char kEnablePortalsDescription[]; +@@ -673,6 +673,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; @@ -55,7 +55,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 -@@ -276,11 +276,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", @@ -67,7 +67,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc + base::FEATURE_DISABLED_BY_DEFAULT }; - // When enabled, MediaCapabilities will check with GPU Video Accelerator + // Experimental: Try to avoid destroying the media player when transferring a -- 2.20.1 diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 8956a4e7..5dccdbff 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -16,7 +16,7 @@ Subject: Add flag to disable IPv6 probes 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 -@@ -4949,6 +4949,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4892,6 +4892,11 @@ const FeatureEntry kFeatureEntries[] = { #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || // defined(OS_CHROMEOS) @@ -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 -@@ -3070,6 +3070,10 @@ const char kContextualSearchRankerQueryDescription[] = +@@ -3124,6 +3124,10 @@ const char kContextualSearchRankerQueryDescription[] = const char kContextualSearchSecondTapName[] = "Contextual Search second tap triggering"; @@ -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 -@@ -711,6 +711,9 @@ extern const char kEnableWasmLazyCompilationName[]; +@@ -736,6 +736,9 @@ extern const char kEnableWasmLazyCompilationName[]; extern const char kEnableWasmLazyCompilationDescription[]; extern const char kEnableWasmTieringName[]; @@ -101,7 +101,7 @@ diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/compon diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -88,6 +88,7 @@ +@@ -89,6 +89,7 @@ #include "net/log/net_log_event_type.h" #include "net/log/net_log_source.h" #include "net/log/net_log_source_type.h" @@ -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" -@@ -3692,8 +3693,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3695,8 +3696,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { @@ -128,7 +128,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -42,6 +42,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -43,6 +43,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kThrottleDelayable{"ThrottleDelayable", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/build/patches/Add-flag-to-disable-WebGL.patch b/build/patches/Add-flag-to-disable-WebGL.patch index f5bb9bbb..db556ead 100644 --- a/build/patches/Add-flag-to-disable-WebGL.patch +++ b/build/patches/Add-flag-to-disable-WebGL.patch @@ -11,7 +11,7 @@ Subject: Add flag to disable WebGL 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 -@@ -2772,6 +2772,9 @@ const FeatureEntry::Choice kDocumentTransitionSlowdownFactorChoices[] = { +@@ -2736,6 +2736,9 @@ const FeatureEntry::FeatureVariation kWin11StyleMenusVariations[] = { // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and @@ -24,7 +24,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 -@@ -636,6 +636,10 @@ const char kEnableAudioFocusEnforcementName[] = "Audio Focus Enforcement"; +@@ -690,6 +690,10 @@ const char kEnableAudioFocusEnforcementName[] = "Audio Focus Enforcement"; const char kEnableAudioFocusEnforcementDescription[] = "Enables enforcement of a single media session having audio focus at " "any one time. Requires #enable-media-session-service to be enabled too."; @@ -38,7 +38,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 -@@ -354,6 +354,9 @@ extern const char kForceColorProfileSRGB[]; +@@ -380,6 +380,9 @@ extern const char kForceColorProfileSRGB[]; extern const char kForceColorProfileP3[]; extern const char kForceColorProfileColorSpin[]; extern const char kForceColorProfileSCRGBLinear[]; 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 0dee75d8..2e203910 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -11,7 +11,7 @@ Subject: Add flag to disable external intent requests 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 -@@ -2826,6 +2826,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2790,6 +2790,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebrtcCaptureMultiChannelApmName, flag_descriptions::kWebrtcCaptureMultiChannelApmDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebRtcEnableCaptureMultiChannelApm)}, @@ -24,9 +24,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3344,6 +3344,12 @@ const char kProcessSharingWithStrictSiteInstancesDescription[] = - "separated like strict site isolation, but process selection puts multiple " - "site instances in a single process."; +@@ -3378,6 +3378,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; + const char kPhotoPickerVideoSupportDescription[] = + "Enables video files to be shown in the Photo Picker dialog"; +const char kDisableExternalIntentRequestsName[] = + "Never forward URL requests to external intents"; @@ -40,7 +40,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 -@@ -1930,6 +1930,9 @@ extern const char kQueryTilesNTPDescription[]; +@@ -1948,6 +1948,9 @@ extern const char kQueryTilesNTPDescription[]; extern const char kQueryTilesOmniboxName[]; extern const char kQueryTilesOmniboxDescription[]; 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 2faebb2f..c381e9e1 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -18,7 +18,7 @@ Subject: Add flag to disable vibration 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 -@@ -6412,6 +6412,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6357,6 +6357,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -32,8 +32,8 @@ 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 -@@ -5242,6 +5242,9 @@ const char kDefaultMeetWebAppDescription[] = - "Enables the Meet web app to be installed by default."; +@@ -5283,6 +5283,9 @@ const char kDefaultCalculatorWebAppDescription[] = + "chrome app."; #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) +const char kEnableVibrationName[] = "Vibration"; @@ -45,8 +45,8 @@ 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 -@@ -3044,6 +3044,9 @@ extern const char kDefaultMeetWebAppName[]; - extern const char kDefaultMeetWebAppDescription[]; +@@ -3054,6 +3054,9 @@ extern const char kDefaultCalculatorWebAppName[]; + extern const char kDefaultCalculatorWebAppDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) +extern const char kEnableVibrationName[]; @@ -69,20 +69,20 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -103,6 +103,9 @@ const base::Feature kBackForwardCacheSameSiteForBots{ +@@ -103,6 +103,9 @@ const base::Feature kBackForwardCacheMemoryControls { + }; - // BackForwardCacheMemoryControls is enabled only on Android to disable - // BackForwardCache for lower memory devices due to memory limiations. + // Block subresource requests whose URLs contain embedded credentials (e.g. +// Enables vibration; an user gesture will still be required if enabled. +const base::Feature kVibration{"Vibration", + base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kBackForwardCacheMemoryControls{ - "BackForwardCacheMemoryControls", - + // `https://user:pass@example.com/resource`). + const base::Feature kBlockCredentialedSubresources{ + "BlockCredentialedSubresources", base::FEATURE_ENABLED_BY_DEFAULT}; 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 -@@ -273,6 +273,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; +@@ -274,6 +274,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; CONTENT_EXPORT extern const base::Feature kWebNfc; #endif // defined(OS_ANDROID) @@ -139,7 +139,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 -@@ -1575,6 +1575,10 @@ +@@ -1577,6 +1577,10 @@ name: "OrientationEvent", status: {"Android": "stable"}, }, diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index f6047e5a..1295c053 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -17,7 +17,7 @@ See also: https://github.com/bromite/bromite/pull/1427 .../CustomTabAppMenuPropertiesDelegate.java | 3 + .../browser/download/DownloadUtils.java | 16 +- .../browser/history/HistoryManager.java | 17 +- - .../chrome/browser/history/HistoryPage.java | 14 + + .../chrome/browser/history/HistoryPage.java | 15 + .../chrome/browser/ntp/RecentTabsManager.java | 8 +- .../privacy/settings/PrivacySettings.java | 18 + .../browser/tab/HistoricalTabSaver.java | 12 +- @@ -35,9 +35,9 @@ See also: https://github.com/bromite/bromite/pull/1427 .../android/offline_page_bridge.cc | 13 +- .../android/offline_page_model_factory.cc | 21 +- .../android/request_coordinator_factory.cc | 17 + - .../offline_page_model_factory.h | 2 + + .../offline_page_model_factory.h | 1 + .../offline_pages/recent_tab_helper.cc | 12 + - .../request_coordinator_factory.h | 3 + + .../request_coordinator_factory.h | 2 + chrome/browser/prefs/browser_prefs.cc | 3 + .../browser/ui/android/native_page/BUILD.gn | 2 + .../browser/ui/native_page/NativePage.java | 6 +- @@ -46,7 +46,7 @@ See also: https://github.com/bromite/bromite/pull/1427 chrome/common/pref_names.cc | 5 + chrome/common/pref_names.h | 4 + chrome/test/BUILD.gn | 5 + - 36 files changed, 1046 insertions(+), 38 deletions(-) + 36 files changed, 1045 insertions(+), 38 deletions(-) create mode 100644 chrome/android/javatests/src/org/chromium/chrome/browser/history/Bromite_HistoryManagerTest.java create mode 100644 chrome/android/javatests/src/org/chromium/chrome/browser/privacy/settings/Bromite_PrivacySettingsFragmentTest_HistoryInAlwaysIncognito.java create mode 100644 chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/Bromite_AppMenuPropertiesDelegateUnitTest.java @@ -56,7 +56,7 @@ See also: https://github.com/bromite/bromite/pull/1427 diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/chrome_junit_test_java_sources.gni --- a/chrome/android/chrome_junit_test_java_sources.gni +++ b/chrome/android/chrome_junit_test_java_sources.gni -@@ -225,3 +225,7 @@ chrome_junit_test_java_sources = [ +@@ -226,3 +226,7 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/webapps/WebappLauncherActivityTest.java", "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java", ] @@ -68,7 +68,7 @@ diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/ diff --git a/chrome/android/chrome_test_java_sources.gni b/chrome/android/chrome_test_java_sources.gni --- a/chrome/android/chrome_test_java_sources.gni +++ b/chrome/android/chrome_test_java_sources.gni -@@ -649,3 +649,9 @@ chrome_test_java_sources = [ +@@ -653,3 +653,9 @@ chrome_test_java_sources = [ if (enable_feed_v2) { chrome_test_java_sources += [ "javatests/src/org/chromium/chrome/browser/ntp/NewTabPageColorWithFeedV2Test.java" ] } @@ -81,7 +81,7 @@ diff --git a/chrome/android/chrome_test_java_sources.gni b/chrome/android/chrome diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -46,6 +46,11 @@ +@@ -51,6 +51,11 @@ android:title="@string/close_tabs_on_exit_title" android:summary="@string/close_tabs_on_exit_summary" android:defaultValue="false" /> @@ -96,9 +96,9 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/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 -@@ -75,6 +75,10 @@ import java.lang.annotation.RetentionPolicy; - import java.util.ArrayList; +@@ -92,6 +92,10 @@ import java.util.ArrayList; import java.util.List; + import java.util.Map; +import org.chromium.components.prefs.PrefService; +import org.chromium.components.user_prefs.UserPrefs; @@ -107,7 +107,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. -@@ -133,6 +137,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -153,6 +157,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate protected BookmarkBridge mBookmarkBridge; protected Runnable mAppMenuInvalidator; @@ -121,7 +121,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App /** * Construct a new {@link AppMenuPropertiesDelegateImpl}. * @param context The activity context. -@@ -379,7 +390,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -539,7 +550,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { @@ -131,7 +131,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App final MenuItem newTabOption = menu.findItem(R.id.new_tab_menu_id); if (newTabOption != null) newTabOption.setVisible(false); -@@ -444,7 +456,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -601,7 +613,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } if (item.getItemId() == R.id.recent_tabs_menu_id) { @@ -148,7 +148,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); -@@ -632,7 +652,10 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -811,7 +831,10 @@ 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 @@ -163,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -169,6 +169,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -170,6 +170,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat downloadItemVisible = false; openInChromeItemVisible = false; } @@ -209,7 +209,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 -@@ -42,6 +42,12 @@ import org.chromium.ui.base.Clipboard; +@@ -41,6 +41,12 @@ import org.chromium.ui.base.Clipboard; import java.util.List; @@ -222,7 +222,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History /** * Combines and manages the different UI components of browsing history. */ -@@ -216,7 +222,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve +@@ -213,7 +219,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve : mSelectableListLayout; } @@ -243,7 +243,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java -@@ -17,6 +17,12 @@ import org.chromium.chrome.browser.ui.native_page.BasicNativePage; +@@ -16,6 +16,12 @@ import org.chromium.chrome.browser.ui.native_page.BasicNativePage; import org.chromium.chrome.browser.ui.native_page.NativePageHost; import org.chromium.components.embedder_support.util.UrlConstants; @@ -256,8 +256,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History /** * Native page for managing browsing history. */ -@@ -40,6 +46,14 @@ public class HistoryPage extends BasicNativePage { - boolean isIncognito, TabCreatorManager tabCreatorManager, Supplier tabSupplier) { +@@ -37,8 +43,17 @@ public class HistoryPage extends BasicNativePage { + boolean isIncognito, Supplier tabSupplier) { super(host); + if (isIncognito && @@ -268,13 +268,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History + if (historyEnabledInIncognito == true) isIncognito = false; + } + - mHistoryManager = new HistoryManager( - activity, false, snackbarManager, isIncognito, tabCreatorManager, tabSupplier); + mHistoryManager = + new HistoryManager(activity, false, snackbarManager, isIncognito, tabSupplier); ++ mTitle = host.getContext().getResources().getString(R.string.menu_history); + + initWithView(mHistoryManager.getView()); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java -@@ -86,15 +86,15 @@ public class RecentTabsManager implements SignInStateObserver, +@@ -87,15 +87,15 @@ public class RecentTabsManager implements SignInStateObserver, */ public RecentTabsManager( Tab tab, Profile profile, Context context, Runnable showHistoryManager) { @@ -305,7 +308,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.R; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl; import org.chromium.chrome.browser.flags.ChromeFeatureList; -@@ -136,6 +137,11 @@ public class PrivacySettings +@@ -149,6 +150,11 @@ public class PrivacySettings Preference secureDnsPref = findPreference(PREF_SECURE_DNS); secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); @@ -314,13 +317,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting + historyInIncognitoPref.setOnPreferenceChangeListener(this); + historyInIncognitoPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); + - updateSummaries(); + updatePreferences(); } -@@ -158,11 +164,16 @@ public class PrivacySettings - } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { +@@ -203,11 +209,16 @@ public class PrivacySettings + } else if (PREF_INCOGNITO_LOCK.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) - .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); + .setBoolean(Pref.INCOGNITO_REAUTHENTICATION_FOR_ANDROID, (boolean) newValue); + } else if (PREF_INCOGNITO_TAB_HISTORY_ENABLED.equals(key)) { + UserPrefs.get(Profile.getLastUsedRegularProfile()) + .setBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED, (boolean) newValue); @@ -334,20 +337,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onResume() { super.onResume(); -@@ -203,6 +214,13 @@ public class PrivacySettings - (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT); +@@ -249,6 +260,13 @@ public class PrivacySettings closeTabsOnExitPref.setOnPreferenceChangeListener(this); closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); -+ + + ChromeSwitchPreference historyInIncognitoPref = + (ChromeSwitchPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED); + if (historyInIncognitoPref != null) { + historyInIncognitoPref.setChecked( + prefService.getBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED)); + } ++ + updateIncognitoReauthPreference(); } - private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/HistoricalTabSaver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/HistoricalTabSaver.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/HistoricalTabSaver.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/HistoricalTabSaver.java @@ -389,7 +392,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/HistoricalT diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java -@@ -153,7 +153,10 @@ public class TabPersistentStore { +@@ -150,7 +150,10 @@ public class TabPersistentStore { @Override public void didCloseTab(Tab tab) { PersistedTabData.onTabClose(tab); @@ -1265,7 +1268,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc @@ -27,6 +27,9 @@ - #include "chrome/browser/android/feed/v2/feed_service_factory.h" + #include "chrome/browser/feed/android/feed_service_factory.h" #include "components/feed/core/v2/public/feed_api.h" #include "components/feed/core/v2/public/feed_service.h" +#include "chrome/common/pref_names.h" @@ -1274,7 +1277,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo #else #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -345,6 +348,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -352,6 +355,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -1288,7 +1291,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo if (profile->IsOffTheRecord()) return NULL; -@@ -352,6 +362,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -359,6 +369,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -1313,8 +1316,8 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor namespace history { struct HistoryAddPageArgs; -@@ -39,6 +41,11 @@ class HistoryTabHelper : public content::WebContentsObserver, - force_eligibile_tab_for_testing_ = force; +@@ -42,6 +44,11 @@ class HistoryTabHelper : public content::WebContentsObserver, + force_eligible_tab_for_testing_ = force; } + static void RegisterProfilePrefs(PrefRegistrySimple* registry); @@ -1325,7 +1328,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor private: explicit HistoryTabHelper(content::WebContents* web_contents); friend class content::WebContentsUserData; -@@ -65,9 +72,6 @@ class HistoryTabHelper : public content::WebContentsObserver, +@@ -68,9 +75,6 @@ class HistoryTabHelper : public content::WebContentsObserver, bool started_from_context_menu, bool renderer_initiated) override; @@ -1516,15 +1519,14 @@ diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc diff --git a/chrome/browser/offline_pages/offline_page_model_factory.h b/chrome/browser/offline_pages/offline_page_model_factory.h --- a/chrome/browser/offline_pages/offline_page_model_factory.h +++ b/chrome/browser/offline_pages/offline_page_model_factory.h -@@ -47,6 +47,8 @@ class OfflinePageModelFactory : public SimpleKeyedServiceFactory { +@@ -49,6 +49,7 @@ class OfflinePageModelFactory : public SimpleKeyedServiceFactory { + std::unique_ptr BuildServiceInstanceFor( SimpleFactoryKey* key) const override; - + SimpleFactoryKey* GetKeyToUse(SimpleFactoryKey* key) const override; -+ - DISALLOW_COPY_AND_ASSIGN(OfflinePageModelFactory); }; + } // namespace offline_pages diff --git a/chrome/browser/offline_pages/recent_tab_helper.cc b/chrome/browser/offline_pages/recent_tab_helper.cc --- a/chrome/browser/offline_pages/recent_tab_helper.cc +++ b/chrome/browser/offline_pages/recent_tab_helper.cc @@ -1557,20 +1559,19 @@ diff --git a/chrome/browser/offline_pages/recent_tab_helper.cc b/chrome/browser/ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome/browser/offline_pages/request_coordinator_factory.h --- a/chrome/browser/offline_pages/request_coordinator_factory.h +++ b/chrome/browser/offline_pages/request_coordinator_factory.h -@@ -34,6 +34,9 @@ class RequestCoordinatorFactory : public BrowserContextKeyedServiceFactory { +@@ -37,6 +37,8 @@ class RequestCoordinatorFactory : public BrowserContextKeyedServiceFactory { + KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const override; - + content::BrowserContext* GetBrowserContextToUse( + content::BrowserContext* context) const override; -+ - DISALLOW_COPY_AND_ASSIGN(RequestCoordinatorFactory); }; + } // namespace offline_pages 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 -@@ -212,6 +212,8 @@ +@@ -216,6 +216,8 @@ #endif #if defined(OS_ANDROID) @@ -1579,7 +1580,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" -@@ -1239,6 +1241,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1259,6 +1261,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); @@ -1613,7 +1614,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ /** * An interface for pages that will be using Android views instead of html/rendered Web content. */ -@@ -156,7 +158,9 @@ public interface NativePage { +@@ -158,7 +160,9 @@ public interface NativePage { return NativePageType.DOWNLOADS; } else if (UrlConstants.HISTORY_HOST.equals(host)) { return NativePageType.HISTORY; @@ -1668,7 +1669,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -953,6 +953,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -961,6 +961,12 @@ Your Google account may have other forms of browsing history like searches and a Your changes will take effect the next time you relaunch Bromite. @@ -1684,7 +1685,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -3238,6 +3238,11 @@ const char kShowCaretBrowsingDialog[] = +@@ -3276,6 +3276,11 @@ const char kShowCaretBrowsingDialog[] = const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -1699,7 +1700,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 -@@ -1192,6 +1192,10 @@ extern const char kLastWhatsNewVersion[]; +@@ -1201,6 +1201,10 @@ extern const char kLastWhatsNewVersion[]; extern const char kLensRegionSearchEnabled[]; #endif @@ -1713,7 +1714,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -4837,6 +4837,11 @@ test("unit_tests") { +@@ -4818,6 +4818,11 @@ test("unit_tests") { ] } 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 400acff4..6a953699 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -147,6 +151,9 @@ +@@ -173,6 +177,9 @@ @@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.compositor.CompositorViewHolder; -@@ -2040,6 +2042,8 @@ public class ChromeTabbedActivity extends ChromeActivity folderList, List depthList); BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller); @@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java -@@ -515,6 +515,7 @@ public class BookmarkUtils { +@@ -595,6 +595,7 @@ public class BookmarkUtils { List topLevelFolders = new ArrayList<>(); BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId(); BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId(); @@ -216,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm BookmarkId othersNodeId = bookmarkModel.getOtherFolderId(); List specialFoldersIds = -@@ -540,6 +541,9 @@ public class BookmarkUtils { +@@ -620,6 +621,9 @@ public class BookmarkUtils { if (bookmarkModel.isFolderVisible(mobileNodeId)) { topLevelFolders.add(mobileNodeId); } @@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm 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 -@@ -424,6 +424,11 @@ void BookmarkBridge::GetTopLevelFolderIDs( +@@ -428,6 +428,11 @@ void BookmarkBridge::GetTopLevelFolderIDs( top_level_folders.push_back(node.get()); } @@ -241,7 +241,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse for (const auto& node : bookmark_model_->bookmark_bar_node()->children()) { if (node->is_folder()) top_level_folders.push_back(node.get()); -@@ -462,6 +467,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( +@@ -466,6 +471,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( // Vector to temporarily contain all child bookmarks at same level for sorting std::vector bookmarks = { bookmark_model_->mobile_node(), @@ -249,7 +249,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse bookmark_model_->bookmark_bar_node(), bookmark_model_->other_node(), }; -@@ -516,6 +522,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( +@@ -520,6 +526,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( return folder_id_obj; } @@ -270,7 +270,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse 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 -@@ -110,6 +110,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -114,6 +114,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, JNIEnv* env, const base::android::JavaParamRef& obj); @@ -284,7 +284,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc -@@ -186,6 +186,8 @@ class Writer : public base::RefCountedThreadSafe { +@@ -191,6 +191,8 @@ class Writer : public base::RefCountedThreadSafe { roots->FindDictKey(BookmarkCodec::kOtherBookmarkFolderNameKey); base::Value* mobile_folder_value = roots->FindDictKey(BookmarkCodec::kMobileBookmarkFolderNameKey); @@ -293,7 +293,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b DCHECK(root_folder_value); DCHECK(other_folder_value); DCHECK(mobile_folder_value); -@@ -197,7 +199,9 @@ class Writer : public base::RefCountedThreadSafe { +@@ -202,7 +204,9 @@ class Writer : public base::RefCountedThreadSafe { !WriteNode(*static_cast(other_folder_value), BookmarkNode::OTHER_NODE) || !WriteNode(*static_cast(mobile_folder_value), @@ -304,7 +304,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b NotifyOnFinish(BookmarksExportObserver::Result::kCouldNotWriteNodes); return; } -@@ -464,6 +468,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() { +@@ -467,6 +471,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() { BookmarkModelFactory::GetForBrowserContext(profile_)->other_node()); ExtractUrls( BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node()); @@ -316,7 +316,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc --- a/chrome/browser/bookmarks/chrome_bookmark_client.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc -@@ -105,6 +105,8 @@ bool ChromeBookmarkClient::IsPermanentNodeVisibleWhenEmpty( +@@ -117,6 +117,8 @@ bool ChromeBookmarkClient::IsPermanentNodeVisibleWhenEmpty( return !is_mobile; case bookmarks::BookmarkNode::MOBILE: return is_mobile; @@ -328,7 +328,7 @@ diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java -@@ -75,7 +75,7 @@ public class DownloadLocationCustomView +@@ -79,7 +79,7 @@ public class DownloadLocationCustomView mDirectoryAdapter.update(); } @@ -337,7 +337,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse mTitle.setText(title); } -@@ -83,7 +83,7 @@ public class DownloadLocationCustomView +@@ -87,7 +87,7 @@ public class DownloadLocationCustomView mSubtitleView.setText(subtitle); } @@ -349,7 +349,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 -@@ -3273,6 +3273,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Track prices @@ -491,7 +491,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h --- a/components/bookmarks/browser/bookmark_codec.h +++ b/components/bookmarks/browser/bookmark_codec.h -@@ -46,6 +46,7 @@ class BookmarkCodec { +@@ -50,6 +50,7 @@ class BookmarkCodec { base::Value Encode(const BookmarkNode* bookmark_bar_node, const BookmarkNode* other_folder_node, const BookmarkNode* mobile_folder_node, @@ -499,7 +499,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark const BookmarkNode::MetaInfoMap* model_meta_info_map, const std::string& sync_metadata_str); -@@ -58,6 +59,7 @@ class BookmarkCodec { +@@ -62,6 +63,7 @@ class BookmarkCodec { BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -507,7 +507,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark int64_t* max_node_id, std::string* sync_metadata_str); -@@ -103,6 +105,7 @@ class BookmarkCodec { +@@ -107,6 +109,7 @@ class BookmarkCodec { // Allows the BookmarkClient to read and a write a string blob from the JSON // file. That string captures the bookmarks sync metadata. static const char kSyncMetadata[]; @@ -515,7 +515,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark // Possible values for kTypeKey. static const char kTypeURL[]; -@@ -119,6 +122,7 @@ class BookmarkCodec { +@@ -123,6 +126,7 @@ class BookmarkCodec { bool DecodeHelper(BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -523,7 +523,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark const base::Value& value, std::string* sync_metadata_str); -@@ -130,7 +134,8 @@ class BookmarkCodec { +@@ -134,7 +138,8 @@ class BookmarkCodec { // Reassigns bookmark IDs for all nodes. void ReassignIDs(BookmarkNode* bb_node, BookmarkNode* other_node, @@ -569,7 +569,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc --- a/components/bookmarks/browser/bookmark_model.cc +++ b/components/bookmarks/browser/bookmark_model.cc -@@ -562,7 +562,7 @@ bool BookmarkModel::HasBookmarks() { +@@ -564,7 +564,7 @@ bool BookmarkModel::HasBookmarks() { bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return bookmark_bar_node_->children().empty() && @@ -578,7 +578,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar } bool BookmarkModel::IsBookmarked(const GURL& url) { -@@ -804,6 +804,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { +@@ -806,6 +806,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { bookmark_bar_node_ = details->bb_node(); other_node_ = details->other_folder_node(); mobile_node_ = details->mobile_folder_node(); @@ -589,7 +589,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h --- a/components/bookmarks/browser/bookmark_model.h +++ b/components/bookmarks/browser/bookmark_model.h -@@ -116,6 +116,12 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -120,6 +120,12 @@ class BookmarkModel : public BookmarkUndoProvider, return mobile_node_; } @@ -602,7 +602,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark bool is_root_node(const BookmarkNode* node) const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return node == root_; -@@ -391,6 +397,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -395,6 +401,7 @@ class BookmarkModel : public BookmarkUndoProvider, BookmarkPermanentNode* bookmark_bar_node_ = nullptr; BookmarkPermanentNode* other_node_ = nullptr; BookmarkPermanentNode* mobile_node_ = nullptr; @@ -661,7 +661,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks static const char kManagedNodeGuid[]; // A bug in sync caused some problematic GUIDs to be produced. -@@ -247,6 +249,9 @@ class BookmarkPermanentNode : public BookmarkNode { +@@ -251,6 +253,9 @@ class BookmarkPermanentNode : public BookmarkNode { static std::unique_ptr CreateMobileBookmarks( int64_t id, bool visible_when_empty); diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 0bd5eb7e..7d8f802d 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/ 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 -@@ -88,6 +88,9 @@ +@@ -103,6 +103,9 @@ @@ -41,7 +41,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 -@@ -2063,6 +2063,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2451,6 +2451,11 @@ public abstract class ChromeActivity return true; } @@ -68,15 +68,15 @@ 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 -@@ -355,6 +355,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -511,6 +511,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate isChromeScheme, isFileScheme, isContentScheme, isIncognito, url)); - updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */); + updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme); + updateViewSourceMenuItem(menu, currentTab); - // Only display reader mode settings menu option if the current page is in reader mode. - menu.findItem(R.id.reader_mode_prefs_id).setVisible(shouldShowReaderModePrefs(currentTab)); -@@ -845,6 +846,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate + updateAutoDarkMenuItem(menu, currentTab, isChromeScheme); + +@@ -1027,6 +1028,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } } @@ -99,10 +99,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -214,6 +214,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat - } +@@ -217,6 +217,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat - updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible); + updateRequestDesktopSiteMenuItem( + menu, currentTab, requestDesktopSiteVisible, isChromeScheme); + updateViewSourceMenuItem(menu, currentTab); prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible); } diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index bc3ae850..c86c3210 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -3,17 +3,17 @@ Date: Mon, 1 Feb 2021 19:18:55 +0200 Subject: Add option to force tablet UI --- - .../android/java/res/xml/accessibility_preferences.xml | 5 +++++ - .../accessibility/settings/AccessibilitySettings.java | 10 ++++++++++ - .../browser/preferences/ChromePreferenceKeys.java | 1 + - .../preferences/LegacyChromePreferenceKeys.java | 1 + - .../chrome/browser/omnibox/LocationBarCoordinator.java | 2 +- - .../ui/android/strings/android_chrome_strings.grd | 6 ++++++ - .../browser/toolbar/top/ToolbarControlContainer.java | 2 +- - components/BUILD.gn | 4 ++-- - ui/android/BUILD.gn | 2 ++ - .../src/org/chromium/ui/base/DeviceFormFactor.java | 5 +++++ - 10 files changed, 34 insertions(+), 4 deletions(-) + .../java/res/xml/accessibility_preferences.xml | 5 +++++ + .../settings/AccessibilitySettings.java | 10 ++++++++++ + .../preferences/ChromePreferenceKeys.java | 1 + + .../preferences/LegacyChromePreferenceKeys.java | 1 + + .../browser/omnibox/LocationBarCoordinator.java | 2 +- + .../android/strings/android_chrome_strings.grd | 6 ++++++ + .../toolbar/top/ToolbarControlContainer.java | 16 ---------------- + components/BUILD.gn | 4 ++-- + ui/android/BUILD.gn | 2 ++ + .../org/chromium/ui/base/DeviceFormFactor.java | 5 +++++ + 10 files changed, 33 insertions(+), 19 deletions(-) diff --git a/chrome/android/java/res/xml/accessibility_preferences.xml b/chrome/android/java/res/xml/accessibility_preferences.xml --- a/chrome/android/java/res/xml/accessibility_preferences.xml @@ -33,15 +33,15 @@ diff --git a/chrome/android/java/res/xml/accessibility_preferences.xml b/chrome/ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java -@@ -37,6 +37,7 @@ public class AccessibilitySettings +@@ -35,6 +35,7 @@ public class AccessibilitySettings + static final String PREF_CAPTIONS = "captions"; static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions"; - static final String PREF_ACCESSIBILITY_PAGE_ZOOM = "accessibility_page_zoom"; + static final String PREF_FORCE_TABLET_UI = "force_tablet_ui"; private TextScalePreference mTextScalePref; private ChromeBaseCheckBoxPreference mForceEnableZoomPref; private boolean mRecordFontSizeChangeOnStop; -@@ -82,6 +83,12 @@ public class AccessibilitySettings +@@ -80,6 +81,12 @@ public class AccessibilitySettings .getBoolean(Pref.READER_FOR_ACCESSIBILITY)); readerForAccessibilityPref.setOnPreferenceChangeListener(this); @@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s ChromeBaseCheckBoxPreference mAccessibilityTabSwitcherPref = (ChromeBaseCheckBoxPreference) findPreference( ChromePreferenceKeys.ACCESSIBILITY_TAB_SWITCHER); -@@ -137,6 +144,9 @@ public class AccessibilitySettings +@@ -131,6 +138,9 @@ public class AccessibilitySettings mFontSizePrefs.setUserFontScaleFactor((Float) newValue); } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue); @@ -67,7 +67,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 -@@ -543,6 +543,7 @@ public final class ChromePreferenceKeys { +@@ -516,6 +516,7 @@ public final class ChromePreferenceKeys { public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom"; public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; @@ -78,7 +78,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 -@@ -99,6 +99,7 @@ public class LegacyChromePreferenceKeys { +@@ -98,6 +98,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, @@ -89,7 +89,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java -@@ -348,7 +348,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse +@@ -355,7 +355,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse // OmniboxSuggestionsDropdownEmbedder implementation @Override public boolean isTablet() { @@ -101,7 +101,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 -@@ -1223,6 +1223,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1234,6 +1234,12 @@ Your Google account may have other forms of browsing history like searches and a Turn off @@ -117,19 +117,33 @@ 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 -@@ -109,7 +109,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con - // On tablet, draw a fake tab strip and toolbar until the compositor is - // ready to draw the real tab strip. (On phone, the toolbar is made entirely - // of Android views, which are already initialized.) -- setBackgroundResource(R.drawable.toolbar_background); -+// setBackgroundResource(R.drawable.toolbar_background); - } +@@ -106,22 +106,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con + public void setToolbar(Toolbar toolbar, boolean isIncognito) { + mToolbar = toolbar; + mToolbarContainer.setToolbar(mToolbar); +- +- View toolbarView = findViewById(R.id.toolbar); +- assert toolbarView != null; +- +- if (toolbarView instanceof ToolbarTablet) { +- // On tablet, draw a fake tab strip and toolbar until the compositor is +- // ready to draw the real tab strip. (On phone, the toolbar is made entirely +- // of Android views, which are already initialized.) +- final Drawable backgroundDrawable = +- AppCompatResources.getDrawable(getContext(), R.drawable.toolbar_background) +- .mutate(); +- backgroundDrawable.setTint( +- ChromeColors.getDefaultThemeColor(getContext(), isIncognito)); +- backgroundDrawable.setTintMode(PorterDuff.Mode.MULTIPLY); +- setBackground(backgroundDrawable); +- } } + @Override diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -549,7 +549,7 @@ test("components_unittests") { +@@ -555,7 +555,7 @@ test("components_unittests") { # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency. # On other platforms, no components should depend on Chrome. @@ -138,7 +152,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn assert_no_deps = [ "//chrome/*" ] } -@@ -798,7 +798,7 @@ if (!is_ios) { +@@ -804,7 +804,7 @@ if (!is_ios) { # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency. # On other platforms, no components should depend on Chrome. @@ -150,7 +164,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn -@@ -369,6 +369,8 @@ android_library("ui_no_recycler_view_java") { +@@ -359,6 +359,8 @@ android_library("ui_no_recycler_view_java") { ":ui_java_resources", ":ui_utils_java", "//base:base_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 8e8e706f..7dc5e88a 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 @@ -12,7 +12,7 @@ Subject: Add option to not persist tabs across sessions diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -37,6 +37,11 @@ +@@ -42,6 +42,11 @@ android:title="@string/always_incognito_title" android:summary="@string/always_incognito_summary" android:defaultValue="false" /> @@ -59,16 +59,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.R; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl; import org.chromium.chrome.browser.flags.ChromeFeatureList; -@@ -59,6 +62,8 @@ public class PrivacySettings - private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; +@@ -63,6 +66,8 @@ public class PrivacySettings private static final String PREF_PRIVACY_REVIEW = "privacy_review"; + private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; + private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit"; + private ManagedPreferenceDelegate mManagedPreferenceDelegate; @Override -@@ -136,7 +141,11 @@ public class PrivacySettings +@@ -178,7 +183,11 @@ public class PrivacySettings @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); @@ -81,22 +81,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { -@@ -188,6 +197,11 @@ public class PrivacySettings - privacySandboxPreference.setSummary( +@@ -234,6 +243,11 @@ public class PrivacySettings PrivacySandboxSettingsFragment.getStatusString(getContext())); } -+ + + ChromeSwitchPreference closeTabsOnExitPref = + (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT); + closeTabsOnExitPref.setOnPreferenceChangeListener(this); + closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); ++ + updateIncognitoReauthPreference(); } - private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() { 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 -@@ -4081,6 +4081,12 @@ To change this setting, <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 7d0101bf..228a28d6 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 @@ -35,7 +35,7 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java -@@ -209,6 +209,22 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat +@@ -214,6 +214,22 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat notifyHomepageUpdated(); } @@ -132,10 +132,10 @@ 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 -@@ -550,6 +550,7 @@ public final class ChromePreferenceKeys { - public static final String HOMEPAGE_ENABLED = "homepage"; - public static final String HOMEPAGE_USE_CHROME_NTP = "Chrome.Homepage.UseNTP"; +@@ -524,6 +524,7 @@ public final class ChromePreferenceKeys { public static final String HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled"; + public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_URI = + "Chrome.Homepage.PartnerCustomizedDefaultUri"; + public static final String HOMEPAGE_NTP_IS_HOMEPAGE = "newtabpage_is_homepage"; /** @@ -143,7 +143,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 -@@ -105,6 +105,7 @@ public class LegacyChromePreferenceKeys { +@@ -103,6 +103,7 @@ public class LegacyChromePreferenceKeys { ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI, ChromePreferenceKeys.HOMEPAGE_ENABLED, ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI, @@ -154,7 +154,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 -@@ -1050,6 +1050,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1010,6 +1010,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index aba65a46..f58cf299 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -25,7 +25,7 @@ Subject: Allow building without enable_reporting diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -1251,6 +1251,10 @@ source_set("browser") { +@@ -1275,6 +1275,10 @@ source_set("browser") { "net/browser_online_state_observer.cc", "net/browser_online_state_observer.h", "net/cookie_store_factory.cc", @@ -36,7 +36,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn "net/network_errors_listing_ui.cc", "net/network_errors_listing_ui.h", "net/network_quality_observer_impl.cc", -@@ -3009,10 +3013,6 @@ source_set("browser") { +@@ -3035,10 +3039,6 @@ source_set("browser") { if (enable_reporting) { sources += [ @@ -69,7 +69,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow diff --git a/content/browser/devtools/protocol/network_handler.h b/content/browser/devtools/protocol/network_handler.h --- a/content/browser/devtools/protocol/network_handler.h +++ b/content/browser/devtools/protocol/network_handler.h -@@ -304,8 +304,10 @@ class NetworkHandler : public DevToolsDomainHandler, +@@ -309,8 +309,10 @@ class NetworkHandler : public DevToolsDomainHandler, Response response, mojo::ScopedDataPipeConsumerHandle pipe, const std::string& mime_type); @@ -83,7 +83,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.h b/content/brows diff --git a/content/browser/net/cross_origin_embedder_policy_reporter.cc b/content/browser/net/cross_origin_embedder_policy_reporter.cc --- a/content/browser/net/cross_origin_embedder_policy_reporter.cc +++ b/content/browser/net/cross_origin_embedder_policy_reporter.cc -@@ -107,6 +107,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( +@@ -112,6 +112,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( kType, context_url_, blink::mojom::ReportBody::New(std::move(list)))); } if (endpoint) { @@ -91,7 +91,7 @@ diff --git a/content/browser/net/cross_origin_embedder_policy_reporter.cc b/cont base::DictionaryValue body_to_pass; for (const auto& pair : body) { body_to_pass.SetString(pair.first, pair.second); -@@ -117,6 +118,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( +@@ -122,6 +123,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( kType, *endpoint, context_url_, reporting_source_, network_isolation_key_, /*user_agent=*/absl::nullopt, std::move(body_to_pass)); @@ -179,7 +179,7 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten 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 -@@ -10653,6 +10653,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( +@@ -10649,6 +10649,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( void RenderFrameHostImpl::MaybeGenerateCrashReport( base::TerminationStatus status, int exit_code) { @@ -187,7 +187,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b if (!last_committed_url_.SchemeIsHTTPOrHTTPS()) return; -@@ -10702,6 +10703,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -10698,6 +10699,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( /*type=*/"crash", /*group=*/"default", last_committed_url_, GetReportingSource(), isolation_info_.network_isolation_key(), absl::nullopt /* user_agent */, std::move(body)); @@ -240,7 +240,7 @@ 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 -@@ -202,6 +202,12 @@ class ReportingServiceImpl : public ReportingService { +@@ -206,6 +206,12 @@ class ReportingServiceImpl : public ReportingService { std::unique_ptr body, int depth, base::TimeTicks queued_ticks) { @@ -256,7 +256,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic diff --git a/services/network/network_context.cc b/services/network/network_context.cc --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -1118,25 +1118,9 @@ void NetworkContext::SetDocumentReportingEndpoints( +@@ -1121,25 +1121,9 @@ void NetworkContext::SetDocumentReportingEndpoints( void NetworkContext::SendReportsAndRemoveSource( const base::UnguessableToken& reporting_source) { @@ -286,7 +286,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont diff --git a/services/network/network_context.h b/services/network/network_context.h --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -415,17 +415,6 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -418,17 +418,6 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const base::flat_map& endpoints) override; void SendReportsAndRemoveSource( const base::UnguessableToken& reporting_source) override; @@ -307,7 +307,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 -@@ -888,6 +888,9 @@ mojom("mojom") { +@@ -916,6 +916,9 @@ mojom("mojom") { export_class_attribute_blink = "BLINK_PLATFORM_EXPORT" export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" @@ -320,7 +320,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 -@@ -972,6 +972,7 @@ interface NetworkContext { +@@ -986,6 +986,7 @@ interface NetworkContext { // provided |network_isolation_key|. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -328,7 +328,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -985,6 +986,7 @@ interface NetworkContext { +@@ -999,6 +1000,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|. @@ -347,7 +347,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" -@@ -2282,9 +2283,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { +@@ -2302,9 +2303,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { return base::UnguessableToken::Null(); } @@ -373,7 +373,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" -@@ -544,9 +544,9 @@ class CORE_EXPORT LocalFrame final : public Frame, +@@ -545,9 +545,9 @@ class CORE_EXPORT LocalFrame final : public Frame, } SmoothScrollSequencer& GetSmoothScrollSequencer(); diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index f82e8442..6fb849dd 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -23,7 +23,7 @@ diff --git a/third_party/blink/public/platform/media/web_media_player_impl.h b/t 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 -@@ -1120,6 +1120,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1115,6 +1115,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -36,7 +36,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc void WebMediaPlayerImpl::EnabledAudioTracksChanged( const WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3492,7 +3498,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3479,7 +3485,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. diff --git a/build/patches/Allow-website-sign-in-without-account-sign-in.patch b/build/patches/Allow-website-sign-in-without-account-sign-in.patch index a4db1936..91f309f2 100644 --- a/build/patches/Allow-website-sign-in-without-account-sign-in.patch +++ b/build/patches/Allow-website-sign-in-without-account-sign-in.patch @@ -10,10 +10,10 @@ Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -127,7 +127,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs( - #if BUILDFLAG(ENABLE_DICE_SUPPORT) - registry->RegisterBooleanPref(kDiceMigrationCompletePref, false); - #endif +@@ -113,7 +113,7 @@ AccountConsistencyModeManager::~AccountConsistencyModeManager() {} + // static + void AccountConsistencyModeManager::RegisterProfilePrefs( + user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true); + registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false); } diff --git a/build/patches/Always-allow-partner-customisation.patch b/build/patches/Always-allow-partner-customisation.patch index 4f13138e..9f1f9cf6 100644 --- a/build/patches/Always-allow-partner-customisation.patch +++ b/build/patches/Always-allow-partner-customisation.patch @@ -9,7 +9,7 @@ Subject: Always allow partner customisation diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java -@@ -324,14 +324,14 @@ public class PartnerBrowserCustomizations { +@@ -329,14 +329,14 @@ public class PartnerBrowserCustomizations { @Override protected Void doInBackground() { try { diff --git a/build/patches/Always-use-new-tab-page-for-default-home-page.patch b/build/patches/Always-use-new-tab-page-for-default-home-page.patch index 06d9b6aa..25025b36 100644 --- a/build/patches/Always-use-new-tab-page-for-default-home-page.patch +++ b/build/patches/Always-use-new-tab-page-for-default-home-page.patch @@ -17,9 +17,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa - if (PartnerBrowserCustomizations.getInstance().isHomepageProviderAvailableAndEnabled()) { - return PartnerBrowserCustomizations.getInstance().getHomePageUrl(); - } - return UrlConstants.NTP_NON_NATIVE_URL; - } + String homepagePartnerDefaultUri = SharedPreferencesManager.getInstance().readString( + ChromePreferenceKeys.HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_URI, ""); -- 2.20.1 diff --git a/build/patches/Ask-user-before-close-all-tabs.patch b/build/patches/Ask-user-before-closing-all-tabs.patch similarity index 94% rename from build/patches/Ask-user-before-close-all-tabs.patch rename to build/patches/Ask-user-before-closing-all-tabs.patch index bf1d1eef..6a1a6bec 100644 --- a/build/patches/Ask-user-before-close-all-tabs.patch +++ b/build/patches/Ask-user-before-closing-all-tabs.patch @@ -1,6 +1,6 @@ From: uazo Date: Sat, 20 Nov 2021 17:42:41 +0000 -Subject: Ask user before close all tabs +Subject: Ask user before closing all tabs --- .../chrome/browser/ChromeTabbedActivity.java | 20 +++++++++++++++++-- @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.base.CallbackController; import org.chromium.base.CommandLine; -@@ -2040,8 +2041,23 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

Close all tabs diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index 9e71234f..f8e41afb 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -46,7 +46,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 -@@ -458,7 +458,9 @@ double AudioContext::baseLatency() const { +@@ -457,7 +457,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 db487ad5..958a8ecf 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -12,23 +12,22 @@ Subject: Automated domain substitution ash/accelerators/accelerator_notifications.cc | 2 +- ash/app_list/PRESUBMIT.py | 2 +- ash/ash_strings.grd | 10 +- + ash/assistant/PRESUBMIT.py | 2 +- ash/assistant/assistant_setup_controller.cc | 2 +- ash/assistant/util/deep_link_util.cc | 16 +- ash/components/drivefs/drivefs_auth.cc | 2 +- .../translation_result_loader.cc | 2 +- - .../quick_answers_controller_impl.cc | 2 +- .../quick_answers_ui_controller.cc | 2 +- .../fast_pair/device_metadata_fetcher.cc | 2 +- + .../fast_pair/footprints_fetcher.cc | 4 +- ash/resources/PRESUBMIT.py | 4 +- ...pcie_peripheral_notification_controller.cc | 2 +- - .../diagnostics_ui/resources/network_card.js | 2 +- - .../resources/network_troubleshooting.js | 2 +- + .../diagnostics_ui/resources/network_card.js | 4 +- .../resources/routine_section.js | 2 +- .../help_app_kids_magazine_untrusted_ui.cc | 2 +- ash/webui/media_app_ui/media_app_guest_ui.cc | 2 +- .../scanning/resources/scanning_app.html | 2 +- ash/webui/scanning/resources/scanning_app.js | 2 +- - .../backend/shimless_rma_service.cc | 2 +- .../reimaging_firmware_update_page.js | 2 +- base/PRESUBMIT.py | 4 +- base/android/jni_generator/PRESUBMIT.py | 2 +- @@ -91,17 +90,18 @@ Subject: Automated domain substitution .../manifest/maps_go_manifest_config.json | 10 +- chrome/app/PRESUBMIT.py | 8 +- chrome/app/chromium_strings.grd | 14 +- - chrome/app/generated_resources.grd | 252 +- + chrome/app/generated_resources.grd | 254 +- chrome/app/google_chrome_strings.grd | 14 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- - chrome/browser/about_flags.cc | 12 +- + chrome/browser/about_flags.cc | 4 +- .../browser/android/explore_sites/url_util.cc | 2 +- .../explore_sites/url_util_experimental.cc | 2 +- chrome/browser/android/vr/PRESUBMIT.py | 2 +- .../app_service/webapk/webapk_install_task.cc | 2 +- .../digital_goods_factory_impl.cc | 2 +- .../apps/platform_apps/install_chrome_app.cc | 2 +- + .../ash/android_sms/android_sms_urls.cc | 16 +- chrome/browser/ash/app_mode/fake_cws.cc | 2 +- .../auth/arc_background_auth_code_fetcher.cc | 2 +- .../arc/auth/arc_robot_auth_code_fetcher.cc | 2 +- @@ -117,18 +117,26 @@ Subject: Automated domain substitution .../file_manager/file_manager_string_util.cc | 12 +- .../first_run/drive_first_run_controller.cc | 4 +- chrome/browser/ash/hats/hats_dialog.cc | 2 +- - .../ash/input_method/assistive_suggester.cc | 18 +- + .../assistive_suggester_client_filter.cc | 18 +- .../easy_unlock/easy_unlock_key_names.cc | 2 +- .../ash/login/marketing_backend_connector.cc | 4 +- .../login/saml/password_sync_token_fetcher.cc | 2 +- .../recommend_apps_fetcher_impl.cc | 2 +- + .../arc_dns_resolution_routine.cc | 6 +- + .../dns_latency_routine.cc | 2 +- + .../dns_resolution_routine.cc | 2 +- + .../network_diagnostics_util.cc | 14 +- + .../video_conferencing_routine.cc | 4 +- .../ash/plugin_vm/plugin_vm_diagnostics.cc | 4 +- .../plugin_vm/plugin_vm_license_checker.cc | 4 +- .../browser/ash/plugin_vm/plugin_vm_util.cc | 6 +- + .../dlp/dlp_clipboard_bubble_constants.h | 2 +- .../account_status_check_fetcher.cc | 6 +- .../powerwash_requirements_checker.cc | 2 +- .../device_command_start_crd_session_job.cc | 6 +- .../policy/uploading/heartbeat_scheduler.cc | 4 +- + chrome/browser/ash/u2f_notification.cc | 2 +- + .../ash/web_applications/terminal_source.cc | 4 +- .../autofill/autofill_gstatic_reader.cc | 4 +- .../browser_switcher_service.cc | 2 +- chrome/browser/buildflags.gni | 2 +- @@ -139,23 +147,17 @@ Subject: Automated domain substitution .../cart_domain_cart_url_mapping.json | 2 +- .../resources/cart_domain_name_mapping.json | 2 +- .../browser/chrome_browser_application_mac.mm | 2 +- - .../chromeos/android_sms/android_sms_urls.cc | 16 +- .../eche_app_notification_controller.cc | 2 +- .../file_manager/private_api_misc.cc | 2 +- - .../arc_dns_resolution_routine.cc | 6 +- - .../dns_latency_routine.cc | 2 +- - .../dns_resolution_routine.cc | 2 +- - .../network_diagnostics_util.cc | 14 +- - .../video_conferencing_routine.cc | 4 +- - chrome/browser/chromeos/u2f_notification.cc | 2 +- .../protocol_handler_registry.cc | 4 +- .../data_reduction_proxy_chrome_settings.cc | 4 +- chrome/browser/devtools/url_constants.cc | 4 +- .../mixed_content_download_blocking.cc | 2 +- .../connectors/connectors_service.cc | 4 +- + .../file_system/browsertest_helper.cc | 6 +- .../file_system/signin_dialog_delegate.cc | 2 +- .../extension_request_notification.cc | 4 +- - .../signals/context_info_fetcher.cc | 4 +- + .../enterprise/signals/signals_utils.cc | 4 +- ...e_js_error_report_processor_nonchromeos.cc | 4 +- .../cryptotoken_private_api.cc | 8 +- .../enterprise_platform_keys_api.cc | 2 +- @@ -168,7 +170,7 @@ Subject: Automated domain substitution .../chrome_extension_downloader_factory.cc | 2 +- .../updater/chrome_update_client_config.cc | 2 +- .../floc_remote_permission_service.cc | 2 +- - chrome/browser/flag_descriptions.cc | 8 +- + chrome/browser/flag_descriptions.cc | 10 +- .../importer/edge_importer_browsertest_win.cc | 8 +- .../importer/ie_importer_browsertest_win.cc | 30 +- .../lacros/lacros_startup_infobar_delegate.cc | 4 +- @@ -225,8 +227,9 @@ Subject: Automated domain substitution .../resources/chromeos/emulator/icons.html | 2 +- .../input_method/google_xkb_manifest.json | 10 +- .../chromeos/login/arc_terms_of_service.js | 4 +- + .../chromeos/login/consolidated_consent.js | 2 +- .../resources/chromeos/login/debug/debug.js | 2 +- - .../chromeos/login/marketing_opt_in.html | 2 +- + .../screens/common/marketing_opt_in.html | 2 +- .../login/screens/login/offline_login.html | 2 +- .../login/screens/login/offline_login.js | 2 +- .../browser_tabs_metadata_form.js | 2 +- @@ -256,6 +259,7 @@ Subject: Automated domain substitution .../new_tab_page/doodle_share_dialog.js | 2 +- .../new_tab_page/modules/drive/module.js | 2 +- .../new_tab_page/modules/drive_v2/module.js | 2 +- + .../new_tab_page/modules/photos/module.html | 2 +- .../new_tab_page/voice_search_overlay.js | 2 +- chrome/browser/resources/omnibox/omnibox.html | 2 +- .../resources/omnibox/omnibox_output.js | 4 +- @@ -266,7 +270,6 @@ Subject: Automated domain substitution .../plugin_metadata/plugins_win.json | 4 +- .../resources/print_preview/ui/icons.html | 2 +- chrome/browser/resources/proxy_config.html | 10 +- - .../resources/settings/a11y_page/a11y_page.js | 2 +- .../settings/about_page/about_page.html | 4 +- .../resources/settings/chromeos/PRESUBMIT.py | 4 +- .../crostini_disk_resize_dialog.html | 2 +- @@ -292,7 +295,7 @@ Subject: Automated domain substitution .../incident_report_uploader_impl.cc | 4 +- .../default_settings_fetcher.cc | 2 +- ...ings_reset_prompt_model_browsertest_win.cc | 2 +- - .../background/ntp_background_service.cc | 6 +- + .../background/ntp_background_service.cc | 2 +- .../search/background/ntp_backgrounds.cc | 10 +- .../browser/share/default_ranking_android.cc | 8 +- .../remote_copy_message_handler.cc | 2 +- @@ -301,14 +304,12 @@ Subject: Automated domain substitution .../browser/ssl/connection_help_tab_helper.cc | 2 +- chrome/browser/ssl/sct_reporting_service.cc | 2 +- .../subresource_redirect_util.cc | 2 +- - .../child_accounts/family_info_fetcher.cc | 2 +- .../child_accounts/kids_management_api.cc | 2 +- .../kids_chrome_management_client.cc | 2 +- .../supervised_user_block_interstitial.html | 2 +- .../supervised_user_service.cc | 2 +- .../supervised_user_url_filter.cc | 12 +- - .../browser/tracing/crash_service_uploader.cc | 2 +- - .../strings/android_chrome_strings.grd | 38 +- + .../strings/android_chrome_strings.grd | 42 +- .../arc/arc_app_reinstall_app_result.cc | 2 +- .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- .../search/files/item_suggest_cache.h | 2 +- @@ -340,6 +341,8 @@ Subject: Automated domain substitution .../internals_ui_handler.cc | 2 +- .../add_supervision/add_supervision_ui.cc | 4 +- .../edu_coexistence_login_handler_chromeos.cc | 2 +- + .../consolidated_consent_screen_handler.h | 4 +- + .../parent_access/parent_access_ui.cc | 4 +- .../ui/webui/interstitials/interstitial_ui.cc | 2 +- .../ui/webui/media_router/cast_feedback_ui.cc | 4 +- .../ui/webui/new_tab_page/foo/foo_handler.cc | 12 +- @@ -371,6 +374,7 @@ Subject: Automated domain substitution .../chrome_cleaner/logging/dummy_api_keys.cc | 4 +- .../logging/reporter_logging_service.cc | 6 +- .../apps/platform_apps/api/PRESUBMIT.py | 2 +- + .../chromeos_system_extension_info.cc | 4 +- .../cloud_print/cloud_print_constants.cc | 2 +- chrome/common/extensions/PRESUBMIT.py | 2 +- chrome/common/extensions/api/PRESUBMIT.py | 2 +- @@ -389,7 +393,7 @@ Subject: Automated domain substitution chrome/common/extensions/api/windows.json | 2 +- .../extensions/chrome_extensions_client.cc | 4 +- chrome/common/google_url_loader_throttle.cc | 4 +- - chrome/common/url_constants.cc | 242 +- + chrome/common/url_constants.cc | 248 +- .../gaiacp/associated_user_validator.cc | 2 +- .../gaiacp/gaia_credential_base.cc | 8 +- .../credential_provider/gaiacp/gcp_utils.cc | 4 +- @@ -475,6 +479,7 @@ Subject: Automated domain substitution chromeos/components/phonehub/url_constants.cc | 2 +- .../untrusted_projector_ui_config.cc | 2 +- .../trial_group/trial_group_checker.cc | 2 +- + chromeos/dbus/rmad/fake_rmad_client.cc | 2 +- .../simple_geolocation_provider.cc | 2 +- chromeos/printing/ppd_provider.h | 2 +- chromeos/printing/printer_config_cache.cc | 2 +- @@ -527,10 +532,10 @@ Subject: Automated domain substitution .../components_google_chrome_strings.grd | 2 +- .../notes/core/server/notes_repository.cc | 2 +- .../notes/core/server/notes_server_base.cc | 4 +- + .../reactions/core/reaction_list_factory.cc | 4 +- .../crash/core/app/crash_reporter_client.cc | 2 +- .../crash/core/browser/resources/crashes.js | 4 +- components/cronet/PRESUBMIT.py | 2 +- - .../cronet_consumer_app_delegate.mm | 4 +- components/cronet/tools/generate_javadoc.py | 2 +- .../core/common/chrome_proxy_header.txt | 4 +- .../core/html/dom_distiller_viewer.html | 2 +- @@ -572,8 +577,8 @@ Subject: Automated domain substitution .../resources/omnibox_pedal_concepts.json | 28 +- .../resources/omnibox_pedal_concepts_ar.json | 20 +- .../resources/omnibox_pedal_concepts_de.json | 20 +- - .../omnibox_pedal_concepts_en-GB.json | 20 +- - .../resources/omnibox_pedal_concepts_en.json | 26 +- + .../omnibox_pedal_concepts_en-GB.json | 24 +- + .../resources/omnibox_pedal_concepts_en.json | 24 +- .../omnibox_pedal_concepts_es-419.json | 20 +- .../resources/omnibox_pedal_concepts_fr.json | 20 +- .../resources/omnibox_pedal_concepts_ja.json | 20 +- @@ -611,7 +616,7 @@ Subject: Automated domain substitution .../core/browser/browser_policy_connector.cc | 10 +- components/policy/core/browser/url_util.cc | 4 +- .../core/common/policy_loader_common.cc | 2 +- - .../policy/resources/policy_templates.json | 2090 ++++++++--------- + .../policy/resources/policy_templates.json | 2126 ++++++++--------- .../policy/test_support/policy_testserver.py | 14 +- .../request_handler_for_policy.cc | 2 +- .../policy/test_support/signature_provider.h | 4 +- @@ -677,8 +682,9 @@ Subject: Automated domain substitution components/resources/terms/terms_zh-TW.html | 4 +- .../browser/client_side_detection_service.cc | 2 +- .../content/browser/triggers/trigger_util.cc | 2 +- + .../content/resources/PRESUBMIT.py | 2 +- .../browser/db/v4_protocol_manager_util.cc | 4 +- - .../password_protection_service_base.cc | 6 +- + .../password_protection_service_base.cc | 2 +- .../browser/realtime/url_lookup_service.cc | 2 +- .../safe_search_url_checker_client.cc | 2 +- .../safe_search_api/stub_url_checker.cc | 2 +- @@ -718,7 +724,7 @@ Subject: Automated domain substitution components/wifi/wifi_service_win.cc | 2 +- content/app/resources/README.txt | 4 +- .../render_widget_host_view_cocoa.mm | 2 +- - content/browser/conversions/PRESUBMIT.py | 2 +- + .../attribution_reporting/PRESUBMIT.py | 2 +- .../indexed_db/indexed_db_backing_store.cc | 4 +- .../indexed_db/indexed_db_reporting.cc | 2 +- .../portal/portal_navigation_throttle.cc | 2 +- @@ -726,7 +732,6 @@ Subject: Automated domain substitution .../renderer_host/render_frame_host_impl.cc | 2 +- content/browser/resources/PRESUBMIT.py | 2 +- content/browser/resources/gpu/info_view.js | 2 +- - .../service_worker/service_worker_metrics.cc | 8 +- .../speech/speech_recognition_engine.cc | 2 +- content/browser/speech/tts_mac.mm | 2 +- .../browser/web_contents/web_contents_impl.cc | 2 +- @@ -762,7 +767,7 @@ Subject: Automated domain substitution 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_constants.cc | 72 +- + google_apis/gaia/gaia_constants.cc | 76 +- google_apis/gaia/gaia_oauth_client.cc | 6 +- google_apis/gaia/gaia_urls.cc | 10 +- google_apis/gcm/base/mcs_util.cc | 2 +- @@ -808,7 +813,7 @@ Subject: Automated domain substitution .../signin_earl_grey_app_interface.mm | 6 +- .../ui/bookmarks/bookmark_earl_grey.mm | 2 +- .../new_tab_page_app_interface.mm | 4 +- - .../content_suggestions/ntp_home_mediator.mm | 8 +- + .../content_suggestions/ntp_home_mediator.mm | 6 +- .../browser/ui/ntp/discover_feed_constants.mm | 2 +- ios/chrome/browser/ui/ntp/incognito_view.mm | 2 +- .../ui/ntp/notification_promo_whats_new.mm | 2 +- @@ -818,8 +823,8 @@ Subject: Automated domain substitution .../table_cell_catalog_view_controller.mm | 8 +- .../translate_table_view_controller.mm | 2 +- .../interstitials/interstitial_ui_util.mm | 2 +- - .../password_spec_fetcher.mm | 2 +- ..._credential_provider_extension_strings.grd | 4 +- + .../password_spec_fetcher.mm | 2 +- ios/net/cookies/cookie_store_ios_test_util.mm | 2 +- ios/net/crn_http_protocol_handler.mm | 2 +- .../chrome/browser/omaha/test_omaha.cc | 2 +- @@ -899,6 +904,7 @@ Subject: Automated domain substitution net/quic/quic_stream_factory.cc | 8 +- net/spdy/spdy_session.cc | 2 +- net/tools/print_certificates.py | 2 +- + net/tools/testserver/testserver.py.vpython3 | 4 +- .../transport_security_state_generator.cc | 2 +- .../breakpad_crash_test/crash_in_syscall.html | 4 +- .../trusted_crash_in_startup.html | 4 +- @@ -942,8 +948,6 @@ Subject: Automated domain substitution sandbox/policy/win/sandbox_win.cc | 2 +- .../geolocation/network_location_request.cc | 2 +- .../image_annotation_service.h | 4 +- - styleguide/c++/c++11.html | 42 +- - styleguide/c++/chromium-cpp/main.py | 2 +- testing/PRESUBMIT.py | 2 +- .../java/AndroidManifest.xml.jinja2 | 4 +- .../browser_test_commands_linux.txt | 2 +- @@ -955,9 +959,7 @@ Subject: Automated domain substitution testing/merge_scripts/results_merger.py | 2 +- testing/scripts/PRESUBMIT.py | 2 +- testing/scripts/common.py | 2 +- - testing/scripts/run_chromedriver_tests.py | 2 +- .../scripts/run_finch_smoke_tests_android.py | 2 +- - testing/scripts/run_performance_tests.py | 4 +- testing/scripts/run_variations_smoke_tests.py | 2 +- testing/test_env.py | 8 +- testing/trigger_scripts/PRESUBMIT.py | 2 +- @@ -1103,7 +1105,6 @@ Subject: Automated domain substitution .../modules/geolocation/geolocation.cc | 2 +- .../play_app_url_manifest.json | 2 +- .../modules/payments/payment_request.cc | 6 +- - .../modules/payments/skip_to_gpay_utils.cc | 6 +- .../peerconnection/rtc_peer_connection.cc | 2 +- .../modules/vibration/vibration_controller.cc | 4 +- .../modules/webaudio/audio_context.cc | 4 +- @@ -1266,7 +1267,6 @@ Subject: Automated domain substitution .../src/hu/hyph-hu.lic.txt | 4 +- .../src/hy/hyph-hy.lic.txt | 2 +- third_party/inspector_protocol/roll.py | 4 +- - .../scripts/unpack_binaries.py | 2 +- third_party/jstemplate/compile.py | 2 +- .../jstemplate/jstemplate_example.html | 2 +- third_party/jstemplate/jstemplate_jsunit.html | 10 +- @@ -1355,6 +1355,7 @@ Subject: Automated domain substitution .../tensorflow_text/core/ops/rouge_l_op.cc | 2 +- .../metrics/text_similarity_metric_ops.py | 2 +- third_party/wpt_tools/wpt/tools/lint/rules.py | 4 +- + .../tools/third_party/pywebsocket3/setup.py | 2 +- .../wpt/tools/webdriver/webdriver/client.py | 2 +- .../wpt_tools/wpt/tools/wpt/android.py | 2 +- .../wpt_tools/wpt/tools/wpt/browser.py | 28 +- @@ -1478,7 +1479,6 @@ Subject: Automated domain substitution tools/tracing/PRESUBMIT.py | 2 +- tools/tracing/rename_breakpad.py | 2 +- .../good_partial_annotation.txt | 2 +- - .../auditor/traffic_annotation_auditor_ui.cc | 2 +- .../sample_traffic_annotation.cc | 2 +- .../scripts/auditor/auditor.py | 4 +- .../scripts/update_annotations_doc.py | 4 +- @@ -1517,7 +1517,6 @@ Subject: Automated domain substitution .../foreground/elements/icons.html | 2 +- ui/file_manager/file_manager/manifest.json | 10 +- ui/file_manager/image_loader/piex/Makefile | 2 +- - ui/file_manager/video_player/manifest.json | 2 +- ui/gl/gl_image_io_surface_egl.mm | 2 +- ui/ozone/ozone.gni | 2 +- ui/resources/PRESUBMIT.py | 4 +- @@ -1532,9 +1531,10 @@ Subject: Automated domain substitution weblayer/browser/default_search_engine.cc | 2 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1529 files changed, 4790 insertions(+), 4790 deletions(-) + 1528 files changed, 4791 insertions(+), 4791 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py +index 9e55724846910..41c2f63ea22dc 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -4,7 +4,7 @@ @@ -1627,7 +1627,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1033,7 +1033,7 @@ _DEPRECATED_MOJO_TYPES = ( +@@ -1032,7 +1032,7 @@ _DEPRECATED_MOJO_TYPES = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -1636,7 +1636,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1193,9 +1193,9 @@ _KNOWN_ROBOTS = set( +@@ -1191,9 +1191,9 @@ _KNOWN_ROBOTS = set( 'lacros-version-skew-roller', 'skylab-test-cros-roller') ) | set('%s@skia-public.iam.gserviceaccount.com' % s for s in ('chromium-autoroll', 'chromium-release-autoroll') @@ -1648,7 +1648,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('swarming-tasks',)) _INVALID_GRD_FILE_LINE = [ -@@ -1525,7 +1525,7 @@ def CheckNoDEPSGIT(input_api, output_api): +@@ -1568,7 +1568,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' @@ -1657,7 +1657,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information')] return [] -@@ -1736,7 +1736,7 @@ def CheckNoPragmaOnce(input_api, output_api): +@@ -1779,7 +1779,7 @@ def CheckNoPragmaOnce(input_api, output_api): if files: return [output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -1666,7 +1666,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files)] return [] -@@ -1951,7 +1951,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -1994,7 +1994,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): @@ -1675,7 +1675,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2060,7 +2060,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2103,7 +2103,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): results.append(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' @@ -1684,7 +1684,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -2830,7 +2830,7 @@ def CheckSecurityOwners(input_api, output_api): +@@ -2873,7 +2873,7 @@ def CheckSecurityOwners(input_api, output_api): if to_check: # If there are any OWNERS files to check, there are IPC-related changes in # this CL. Auto-CC the review list. @@ -1693,7 +1693,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py # Go through the OWNERS files to check, filtering out rules that are already # present in that OWNERS file. -@@ -3131,7 +3131,7 @@ def _CheckAndroidToastUsage(input_api, output_api): +@@ -3174,7 +3174,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' @@ -1702,7 +1702,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3265,7 +3265,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3308,7 +3308,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): if errors: results.append(output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -1711,7 +1711,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3296,7 +3296,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3339,7 +3339,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): results.append(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' @@ -1720,7 +1720,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3320,7 +3320,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3363,7 +3363,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.' @@ -1729,7 +1729,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3340,7 +3340,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3383,7 +3383,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' @@ -1738,7 +1738,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3875,7 +3875,7 @@ def CheckGnGlobForward(input_api, output_api): +@@ -3918,7 +3918,7 @@ def CheckGnGlobForward(input_api, output_api): long_text=('The variables "visibilty" and "test_only" should be ' 'explicitly listed in forward_variables_from(). For more ' 'details, see:\n' @@ -1747,7 +1747,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'build/docs/writing_gn_templates.md' '#Using-forward_variables_from'))] return [] -@@ -4037,7 +4037,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): +@@ -4080,7 +4080,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 ' @@ -1756,7 +1756,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % ( ', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER) ) -@@ -4072,7 +4072,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4115,7 +4115,7 @@ def _CheckNewImagesWarning(input_api, output_api): errors.append(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 ' @@ -1765,7 +1765,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 -@@ -4166,7 +4166,7 @@ _NON_INCLUSIVE_TERMS = ( +@@ -4209,7 +4209,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', @@ -1774,7 +1774,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py True),) def ChecksCommon(input_api, output_api): -@@ -4435,7 +4435,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4478,7 +4478,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): def CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -1783,7 +1783,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) -@@ -4688,9 +4688,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): +@@ -4731,9 +4731,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): return [output_api.PresubmitPromptWarning('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' @@ -1795,7 +1795,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py '\n'.join(problems))] return [] -@@ -4733,7 +4733,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -4776,7 +4776,7 @@ def CheckChangeOnCommit(input_api, output_api): results.extend(input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -1804,7 +1804,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5065,7 +5065,7 @@ def CheckStrings(input_api, output_api): +@@ -5108,7 +5108,7 @@ def CheckStrings(input_api, output_api): if icu_syntax_errors: results.append(output_api.PresubmitPromptWarning( 'ICU syntax errors were found in the following strings (problems or ' @@ -1814,6 +1814,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/android_webview/tools/cts_config/webview_cts_gcs_path.json +index a58cd54312419..fe203c2c4860f 100644 --- a/android_webview/tools/cts_config/webview_cts_gcs_path.json +++ b/android_webview/tools/cts_config/webview_cts_gcs_path.json @@ -3,12 +3,12 @@ @@ -1907,9 +1908,10 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi } }, diff --git a/android_webview/tools/generate_flag_labels.py b/android_webview/tools/generate_flag_labels.py +index f687af3505ac7..45bad09402b2e 100755 --- a/android_webview/tools/generate_flag_labels.py +++ b/android_webview/tools/generate_flag_labels.py -@@ -245,7 +245,7 @@ double-check this picked the correct labels for your new features (labels are +@@ -246,7 +246,7 @@ double-check this picked the correct labels for your new features (labels are case-sensitive!), add these to enums.xml, run `git-cl format`, and then follow these steps as a final check: @@ -1919,6 +1921,7 @@ diff --git a/android_webview/tools/generate_flag_labels.py b/android_webview/too If any labels were generated incorrectly, please edit this script and change KNOWN_MISTAKES. diff --git a/android_webview/tools/record_netlog.py b/android_webview/tools/record_netlog.py +index 90e647e5974c1..bc2852b15426d 100755 --- a/android_webview/tools/record_netlog.py +++ b/android_webview/tools/record_netlog.py @@ -6,7 +6,7 @@ @@ -1949,6 +1952,7 @@ diff --git a/android_webview/tools/record_netlog.py b/android_webview/tools/reco raise RuntimeError('It appears your device is a "user" build. We only ' 'support capturing netlog on userdebug/eng builds. See ' diff --git a/android_webview/tools/remove_preinstalled_webview.py b/android_webview/tools/remove_preinstalled_webview.py +index 2a5f1f5788ac5..ee0a249411c40 100755 --- a/android_webview/tools/remove_preinstalled_webview.py +++ b/android_webview/tools/remove_preinstalled_webview.py @@ -92,7 +92,7 @@ def RemovePreinstalledWebViews(device): @@ -1961,6 +1965,7 @@ diff --git a/android_webview/tools/remove_preinstalled_webview.py b/android_webv '\n') raise diff --git a/android_webview/tools/update_cts.py b/android_webview/tools/update_cts.py +index 3a7034ea0e1e0..49f38b96d49b7 100755 --- a/android_webview/tools/update_cts.py +++ b/android_webview/tools/update_cts.py @@ -74,7 +74,7 @@ class UpdateCTS(object): @@ -1982,6 +1987,7 @@ diff --git a/android_webview/tools/update_cts.py b/android_webview/tools/update_ Please create a new branch, then edit the diff --git a/ash/accelerators/accelerator_notifications.cc b/ash/accelerators/accelerator_notifications.cc +index 384acfd8c1677..1d0a432ce314d 100644 --- a/ash/accelerators/accelerator_notifications.cc +++ b/ash/accelerators/accelerator_notifications.cc @@ -154,7 +154,7 @@ void RemoveNotification(const std::string& notification_id) { @@ -1994,6 +2000,7 @@ diff --git a/ash/accelerators/accelerator_notifications.cc b/ash/accelerators/ac // Accessibility notification ids. const char kDockedMagnifierToggleAccelNotificationId[] = diff --git a/ash/app_list/PRESUBMIT.py b/ash/app_list/PRESUBMIT.py +index 67cf3ecca5927..c2bf6d63a9628 100644 --- a/ash/app_list/PRESUBMIT.py +++ b/ash/app_list/PRESUBMIT.py @@ -4,7 +4,7 @@ @@ -2006,9 +2013,10 @@ 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 +index d2a05e1460659..a7d61013183e0 100644 --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd -@@ -677,7 +677,7 @@ This file contains the strings for ash. +@@ -683,7 +683,7 @@ This file contains the strings for ash. @@ -2017,7 +2025,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -1051,7 +1051,7 @@ This file contains the strings for ash. +@@ -1057,7 +1057,7 @@ This file contains the strings for ash. Supervised user @@ -2026,7 +2034,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1299,7 +1299,7 @@ This file contains the strings for ash. +@@ -1314,7 +1314,7 @@ This file contains the strings for ash. Tap to configure @@ -2035,7 +2043,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Connected devices settings -@@ -2829,7 +2829,7 @@ This file contains the strings for ash. +@@ -2859,7 +2859,7 @@ This file contains the strings for ash. Multiple sign-in has been disabled @@ -2044,7 +2052,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3189,7 +3189,7 @@ Here are some things you can try to get started. +@@ -3271,7 +3271,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -2053,7 +2061,21 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd To see notifications on your lock screen, unlock to change the setting +diff --git a/ash/assistant/PRESUBMIT.py b/ash/assistant/PRESUBMIT.py +index d210b617da1b1..b3bc6bddd440c 100644 +--- a/ash/assistant/PRESUBMIT.py ++++ b/ash/assistant/PRESUBMIT.py +@@ -4,7 +4,7 @@ + + """Presubmit script. + +-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts ++See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts + for more details about the presubmit API built into depot_tools. + """ + PRESUBMIT_VERSION = '2.0.0' diff --git a/ash/assistant/assistant_setup_controller.cc b/ash/assistant/assistant_setup_controller.cc +index fa87d38ffaad1..e53f2068a8354 100644 --- a/ash/assistant/assistant_setup_controller.cc +++ b/ash/assistant/assistant_setup_controller.cc @@ -16,7 +16,7 @@ @@ -2066,6 +2088,7 @@ diff --git a/ash/assistant/assistant_setup_controller.cc b/ash/assistant/assista } // namespace diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link_util.cc +index f922775085a6c..ed9df09702548 100644 --- a/ash/assistant/util/deep_link_util.cc +++ b/ash/assistant/util/deep_link_util.cc @@ -395,21 +395,21 @@ absl::optional GetAssistantUrl( @@ -2107,11 +2130,12 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link if (!IsWebDeepLinkType(type, params)) return absl::nullopt; diff --git a/ash/components/drivefs/drivefs_auth.cc b/ash/components/drivefs/drivefs_auth.cc +index c4fe446b37fd4..3299b074a2398 100644 --- a/ash/components/drivefs/drivefs_auth.cc +++ b/ash/components/drivefs/drivefs_auth.cc @@ -63,7 +63,7 @@ void DriveFsAuth::GetAccessToken( timer_->Start( - FROM_HERE, base::TimeDelta::FromSeconds(30), + FROM_HERE, base::Seconds(30), base::BindOnce(&DriveFsAuth::AuthTimeout, base::Unretained(this))); - std::set scopes({"https://www.googleapis.com/auth/drive"}); + std::set scopes({"https://www.9oo91eapis.qjz9zk/auth/drive"}); @@ -2119,6 +2143,7 @@ diff --git a/ash/components/drivefs/drivefs_auth.cc b/ash/components/drivefs/dri std::make_unique( kIdentityConsumerId, identity_manager, scopes, diff --git a/ash/components/quick_answers/translation_result_loader.cc b/ash/components/quick_answers/translation_result_loader.cc +index 4477de6fa8adb..86ac7ddccc7d1 100644 --- a/ash/components/quick_answers/translation_result_loader.cc +++ b/ash/components/quick_answers/translation_result_loader.cc @@ -35,7 +35,7 @@ using network::mojom::URLLoaderFactory; @@ -2130,22 +2155,11 @@ diff --git a/ash/components/quick_answers/translation_result_loader.cc b/ash/com constexpr char kAuthorizationHeaderFormat[] = "Bearer "; constexpr base::StringPiece kQueryKey = "q"; -diff --git a/ash/quick_answers/quick_answers_controller_impl.cc b/ash/quick_answers/quick_answers_controller_impl.cc ---- a/ash/quick_answers/quick_answers_controller_impl.cc -+++ b/ash/quick_answers/quick_answers_controller_impl.cc -@@ -33,7 +33,7 @@ constexpr char kAssistantRelatedInfoUrl[] = - constexpr char kQuickAnswersSettingsUrl[] = - "chrome://os-settings/osSearch/search"; - constexpr char kDogfoodUrl[] = -- "https://goto.google.com/quick-answers-dogfood-bugs"; -+ "https://goto.9oo91e.qjz9zk/quick-answers-dogfood-bugs"; - - constexpr char kQuickAnswersExitPoint[] = "QuickAnswers.ExitPoint"; - diff --git a/ash/quick_answers/quick_answers_ui_controller.cc b/ash/quick_answers/quick_answers_ui_controller.cc +index c4ebe25382495..69a265d5d951d 100644 --- a/ash/quick_answers/quick_answers_ui_controller.cc +++ b/ash/quick_answers/quick_answers_ui_controller.cc -@@ -31,7 +31,7 @@ namespace { +@@ -30,7 +30,7 @@ namespace { using quick_answers::QuickAnswer; using quick_answers::QuickAnswersExitPoint; @@ -2155,6 +2169,7 @@ diff --git a/ash/quick_answers/quick_answers_ui_controller.cc b/ash/quick_answer constexpr char kFeedbackDescriptionTemplate[] = "#QuickAnswers\nQuery:%s\n"; diff --git a/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc b/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc +index 42e4803b9ec99..b95e093c29fe3 100644 --- a/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc +++ b/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc @@ -16,7 +16,7 @@ @@ -2165,8 +2180,27 @@ diff --git a/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc b/as + "https://nearbydevices-pa.9oo91eapis.qjz9zk/v1/device/" "%d?key=%s&mode=MODE_RELEASE&alt=proto"; + // TODO(crbug/1226117): Update annotation with policy details when available. +diff --git a/ash/quick_pair/repository/fast_pair/footprints_fetcher.cc b/ash/quick_pair/repository/fast_pair/footprints_fetcher.cc +index fba4778c4fea5..1b515776066f8 100644 +--- a/ash/quick_pair/repository/fast_pair/footprints_fetcher.cc ++++ b/ash/quick_pair/repository/fast_pair/footprints_fetcher.cc +@@ -22,11 +22,11 @@ namespace quick_pair { + namespace { + + const char kUserDevicesUrl[] = +- "https://nearbydevices-pa.googleapis.com/v1/user/devices" ++ "https://nearbydevices-pa.9oo91eapis.qjz9zk/v1/user/devices" + "?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" + "?key=%s&alt=proto"; + // TODO(crbug/1226117): Update annotation with policy details when available. diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py +index c3c663bbac570..ba977fd591f07 100644 --- a/ash/resources/PRESUBMIT.py +++ b/ash/resources/PRESUBMIT.py @@ -4,9 +4,9 @@ @@ -2182,6 +2216,7 @@ diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py """ diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc b/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.cc +index 0a8213fde78e0..f9f3a5a5ac261 100644 --- 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 { @@ -2194,9 +2229,19 @@ diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller. const char kPciePeripheralLimitedPerformanceNotificationId[] = diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diagnostics_ui/resources/network_card.js +index 33cf7a45e9ec1..516ddf1255cd6 100644 --- a/ash/webui/diagnostics_ui/resources/network_card.js +++ b/ash/webui/diagnostics_ui/resources/network_card.js -@@ -111,7 +111,7 @@ Polymer({ +@@ -17,7 +17,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'; + +-const BASE_SUPPORT_URL = 'https://support.google.com/chromebook?p=diagnostics_'; ++const BASE_SUPPORT_URL = 'https://support.9oo91e.qjz9zk/chromebook?p=diagnostics_'; + const SETTINGS_URL = 'chrome://os-settings/'; + + /** +@@ -199,7 +199,7 @@ Polymer({ /** @protected */ onTroubleConnectingClicked_() { // TODO(michaelcheco): Add correct URL. @@ -2204,23 +2249,12 @@ diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diag + window.open('https://support.9oo91e.qjz9zk/chromebook?p=diagnostics_'); }, - /** -diff --git a/ash/webui/diagnostics_ui/resources/network_troubleshooting.js b/ash/webui/diagnostics_ui/resources/network_troubleshooting.js ---- a/ash/webui/diagnostics_ui/resources/network_troubleshooting.js -+++ b/ash/webui/diagnostics_ui/resources/network_troubleshooting.js -@@ -37,7 +37,7 @@ export class NetworkTroubleshootingElement extends - /** @protected */ - onTroubleConnectingClicked_() { - // TODO(michaelcheco): Add correct URL. -- window.open('https://support.google.com/chromebook?p=diagnostics_'); -+ window.open('https://support.9oo91e.qjz9zk/chromebook?p=diagnostics_'); - } - /** diff --git a/ash/webui/diagnostics_ui/resources/routine_section.js b/ash/webui/diagnostics_ui/resources/routine_section.js +index 64370e984aa54..7b84563eec5aa 100644 --- a/ash/webui/diagnostics_ui/resources/routine_section.js +++ b/ash/webui/diagnostics_ui/resources/routine_section.js -@@ -329,7 +329,7 @@ Polymer({ +@@ -430,7 +430,7 @@ Polymer({ /** @protected */ onLearnMoreClicked_() { const baseSupportUrl = @@ -2230,6 +2264,7 @@ diff --git a/ash/webui/diagnostics_ui/resources/routine_section.js b/ash/webui/d window.open(baseSupportUrl + this.learnMoreLinkSection); diff --git a/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc b/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc +index 6f037a1228c5c..a815cf01f81ab 100644 --- a/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc +++ b/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc @@ -53,7 +53,7 @@ content::WebUIDataSource* CreateHelpAppKidsMagazineUntrustedDataSource() { @@ -2242,6 +2277,7 @@ diff --git a/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc b/ash/ } diff --git a/ash/webui/media_app_ui/media_app_guest_ui.cc b/ash/webui/media_app_ui/media_app_guest_ui.cc +index 191bc857ca1f7..c8caf5cb510b7 100644 --- a/ash/webui/media_app_ui/media_app_guest_ui.cc +++ b/ash/webui/media_app_ui/media_app_guest_ui.cc @@ -80,7 +80,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( @@ -2254,6 +2290,7 @@ diff --git a/ash/webui/media_app_ui/media_app_guest_ui.cc b/ash/webui/media_app_ // Allow use of SharedArrayBuffer (required by the wasm). source->OverrideCrossOriginOpenerPolicy("same-origin"); diff --git a/ash/webui/scanning/resources/scanning_app.html b/ash/webui/scanning/resources/scanning_app.html +index 32929d64fb271..8152b42230f11 100644 --- a/ash/webui/scanning/resources/scanning_app.html +++ b/ash/webui/scanning/resources/scanning_app.html @@ -255,7 +255,7 @@ @@ -2266,6 +2303,7 @@ diff --git a/ash/webui/scanning/resources/scanning_app.html b/ash/webui/scanning [[i18n('getHelpLinkText')]] diff --git a/ash/webui/scanning/resources/scanning_app.js b/ash/webui/scanning/resources/scanning_app.js +index 5162774268d6d..fe38064b1efd5 100644 --- a/ash/webui/scanning/resources/scanning_app.js +++ b/ash/webui/scanning/resources/scanning_app.js @@ -43,7 +43,7 @@ import {ScanningBrowserProxy, ScanningBrowserProxyImpl, SelectedPath} from './sc @@ -2277,22 +2315,11 @@ diff --git a/ash/webui/scanning/resources/scanning_app.js b/ash/webui/scanning/r /** * @fileoverview -diff --git a/ash/webui/shimless_rma/backend/shimless_rma_service.cc b/ash/webui/shimless_rma/backend/shimless_rma_service.cc ---- a/ash/webui/shimless_rma/backend/shimless_rma_service.cc -+++ b/ash/webui/shimless_rma/backend/shimless_rma_service.cc -@@ -243,7 +243,7 @@ void ShimlessRmaService::GetRsuDisableWriteProtectChallenge( - void ShimlessRmaService::GetRsuDisableWriteProtectChallengeQrCode( - GetRsuDisableWriteProtectChallengeQrCodeCallback callback) { - // TODO(gavindodd): Get URL from proto when available. -- std::string challenge_url_string = "https://www.google.com"; -+ std::string challenge_url_string = "https://www.9oo91e.qjz9zk"; - QRCodeGenerator qr_generator; - absl::optional qr_data = - qr_generator.Generate(base::as_bytes(base::make_span( diff --git a/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js b/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js +index 34379325da23d..761252055500c 100644 --- a/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js +++ b/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js -@@ -109,7 +109,7 @@ export class ReimagingFirmwareUpdatePageElement extends PolymerElement { +@@ -113,7 +113,7 @@ export class ReimagingFirmwareUpdatePageElement extends PolymerElement { /** @protected */ linkToRecoveryClicked_() { // TODO(joonbug): Update with real link and check for browser leak. @@ -2302,6 +2329,7 @@ diff --git a/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js }; diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py +index d0410f6aa2375..5a86299070944 100644 --- a/base/PRESUBMIT.py +++ b/base/PRESUBMIT.py @@ -4,7 +4,7 @@ @@ -2323,6 +2351,7 @@ diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py files) ] return [] diff --git a/base/android/jni_generator/PRESUBMIT.py b/base/android/jni_generator/PRESUBMIT.py +index f2aa0cf854da4..7a56a20b53fa6 100644 --- a/base/android/jni_generator/PRESUBMIT.py +++ b/base/android/jni_generator/PRESUBMIT.py @@ -4,7 +4,7 @@ @@ -2335,6 +2364,7 @@ diff --git a/base/android/jni_generator/PRESUBMIT.py b/base/android/jni_generato """ diff --git a/base/android/resource_exclusions.gni b/base/android/resource_exclusions.gni +index 21a25b3331eca..024c81e5dc919 100644 --- a/base/android/resource_exclusions.gni +++ b/base/android/resource_exclusions.gni @@ -16,7 +16,7 @@ common_resource_exclusion_exceptions = [ @@ -2347,9 +2377,10 @@ diff --git a/base/android/resource_exclusions.gni b/base/android/resource_exclus # ic_arrow_down_24dp # It saves XXkb to omit the config. diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc +index b2d5b6e07c16d..584ad0c69f13a 100644 --- a/base/debug/debugger_posix.cc +++ b/base/debug/debugger_posix.cc -@@ -140,7 +140,7 @@ void VerifyDebugger() { +@@ -135,7 +135,7 @@ void VerifyDebugger() { << "Detected lldb without sourcing //tools/lldb/lldbinit.py. lldb may " "not be able to find debug symbols. Please see debug instructions for " "using //tools/lldb/lldbinit.py:\n" @@ -2358,7 +2389,7 @@ diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc "lldbinit.md\n" "To continue anyway, type 'continue' in lldb. To always skip this " "check, define an environment variable CHROMIUM_LLDBINIT_SOURCED=1"; -@@ -223,7 +223,7 @@ void VerifyDebugger() { +@@ -218,7 +218,7 @@ void VerifyDebugger() { << "Detected gdb without sourcing //tools/gdb/gdbinit. gdb may not be " "able to find debug symbols, and pretty-printing of STL types may not " "work. Please see debug instructions for using //tools/gdb/gdbinit:\n" @@ -2368,6 +2399,7 @@ diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc "To continue anyway, type 'continue' in gdb. To always skip this " "check, define an environment variable CHROMIUM_GDBINIT_SOURCED=1"; diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc +index c1456bc7ddfd8..9a8d1779c31ee 100644 --- a/base/debug/stack_trace_posix.cc +++ b/base/debug/stack_trace_posix.cc @@ -361,7 +361,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* info, void* void_context) { @@ -2380,6 +2412,7 @@ diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc #endif // BUILDFLAG(CFI_ENFORCEMENT_TRAP) diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm +index 06a8e850bf571..696f6c5a527a7 100644 --- a/base/ios/device_util.mm +++ b/base/ios/device_util.mm @@ -41,7 +41,7 @@ NSString* GenerateClientId() { @@ -2392,6 +2425,7 @@ diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm if (!client_id || [client_id isEqualToString:kZeroUUID]) { client_id = [[[UIDevice currentDevice] identifierForVendor] UUIDString]; diff --git a/base/third_party/libevent/evdns.c b/base/third_party/libevent/evdns.c +index 05fe594bc75ed..5df1c12d4f894 100644 --- a/base/third_party/libevent/evdns.c +++ b/base/third_party/libevent/evdns.c @@ -2006,7 +2006,7 @@ nameserver_send_probe(struct nameserver *const ns) { @@ -2404,6 +2438,7 @@ diff --git a/base/third_party/libevent/evdns.c b/base/third_party/libevent/evdns /* we force this into the inflight queue no matter what */ request_trans_id_set(req, transaction_id_pick()); diff --git a/build/android/PRESUBMIT.py b/build/android/PRESUBMIT.py +index 05c739f2f7a97..2571ae8bfe527 100644 --- a/build/android/PRESUBMIT.py +++ b/build/android/PRESUBMIT.py @@ -4,7 +4,7 @@ @@ -2416,6 +2451,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 +index 8a5c0abb8e742..9f72fbc13cfb8 100755 --- a/build/android/gradle/generate_gradle.py +++ b/build/android/gradle/generate_gradle.py @@ -922,7 +922,7 @@ def main(): @@ -2428,9 +2464,10 @@ diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/gene diff --git a/build/android/gyp/assert_static_initializers.py b/build/android/gyp/assert_static_initializers.py +index 5f746e971107c..bde5aa5cf0eaa 100755 --- a/build/android/gyp/assert_static_initializers.py +++ b/build/android/gyp/assert_static_initializers.py -@@ -175,7 +175,7 @@ def main(): +@@ -176,7 +176,7 @@ def main(): print(' //tools/binary_size/diagnose_bloat.py') print() print('For more information:') @@ -2440,6 +2477,7 @@ diff --git a/build/android/gyp/assert_static_initializers.py b/build/android/gyp sys.exit(1) diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py +index e277b37c36226..9d21b00ce0965 100755 --- a/build/android/gyp/lint.py +++ b/build/android/gyp/lint.py @@ -23,7 +23,7 @@ from util import build_utils @@ -2452,6 +2490,7 @@ diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py # These checks are not useful for chromium. _DISABLED_ALWAYS = [ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py +index 9da100e42d5bf..64e43bb6c2457 100755 --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py @@ -379,7 +379,7 @@ def _OptimizeWithR8(options, @@ -2473,6 +2512,7 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py elif had_unfiltered_items: # Left only with empty headings. All indented items filtered out. diff --git a/build/android/gyp/util/diff_utils.py b/build/android/gyp/util/diff_utils.py +index 530a6881916b5..65f2df25f6c01 100644 --- a/build/android/gyp/util/diff_utils.py +++ b/build/android/gyp/util/diff_utils.py @@ -100,10 +100,10 @@ def CheckExpectations(actual_data, options, custom_msg=''): @@ -2489,6 +2529,7 @@ diff --git a/build/android/gyp/util/diff_utils.py b/build/android/gyp/util/diff_ {} diff --git a/build/android/gyp/util/protoresources.py b/build/android/gyp/util/protoresources.py +index 272574f1174c8..3e9179b67c77c 100644 --- a/build/android/gyp/util/protoresources.py +++ b/build/android/gyp/util/protoresources.py @@ -4,7 +4,7 @@ @@ -2501,9 +2542,10 @@ diff --git a/build/android/gyp/util/protoresources.py b/build/android/gyp/util/p import logging diff --git a/build/android/incremental_install/installer.py b/build/android/incremental_install/installer.py +index b9ab7f0cbbf65..99c5549d5adc6 100755 --- a/build/android/incremental_install/installer.py +++ b/build/android/incremental_install/installer.py -@@ -246,7 +246,7 @@ def Install(device, install_json, apk=None, enable_device_cache=False, +@@ -250,7 +250,7 @@ def Install(device, install_json, apk=None, enable_device_cache=False, if apis_allowed.strip() not in '01': msg = """\ Cannot use incremental installs on Android P+ without first enabling access to @@ -2513,6 +2555,7 @@ diff --git a/build/android/incremental_install/installer.py b/build/android/incr To enable access: adb -s {0} shell settings put global {1} 0 diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py +index 44b190f2ac911..716041f045fdd 100644 --- a/build/android/pylib/constants/__init__.py +++ b/build/android/pylib/constants/__init__.py @@ -127,7 +127,7 @@ BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT, @@ -2525,6 +2568,7 @@ diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/con # TODO(jbudorick): Remove once unused. DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop' diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py +index c4d2bb3da3d0d..973df444cabd8 100644 --- a/build/android/pylib/device_settings.py +++ b/build/android/pylib/device_settings.py @@ -19,9 +19,9 @@ def ConfigureContentSettings(device, desired_settings): @@ -2550,6 +2594,7 @@ diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device # Ensure that we never get random dialogs like "Unfortunately the process # android.process.acore has stopped", which steal the focus, and make our diff --git a/build/android/pylib/dex/dex_parser.py b/build/android/pylib/dex/dex_parser.py +index 1ff8d25276c0e..538369b7b635d 100755 --- a/build/android/pylib/dex/dex_parser.py +++ b/build/android/pylib/dex/dex_parser.py @@ -287,10 +287,10 @@ class _DexReader(object): @@ -2575,6 +2620,7 @@ diff --git a/build/android/pylib/dex/dex_parser.py b/build/android/pylib/dex/dex Fields: reader: _DexReader object used to decode dex file contents. diff --git a/build/android/pylib/local/device/local_device_monkey_test_run.py b/build/android/pylib/local/device/local_device_monkey_test_run.py +index 71dd9bd793387..21de64bfb2cf2 100644 --- a/build/android/pylib/local/device/local_device_monkey_test_run.py +++ b/build/android/pylib/local/device/local_device_monkey_test_run.py @@ -123,6 +123,6 @@ class LocalDeviceMonkeyTestRun(local_device_test_run.LocalDeviceTestRun): @@ -2586,6 +2632,7 @@ diff --git a/build/android/pylib/local/device/local_device_monkey_test_run.py b/ except device_errors.CommandFailedError: pass diff --git a/build/android/pylib/results/flakiness_dashboard/json_results_generator.py b/build/android/pylib/results/flakiness_dashboard/json_results_generator.py +index ff035ec1c7de9..1e681fc4888a1 100644 --- a/build/android/pylib/results/flakiness_dashboard/json_results_generator.py +++ b/build/android/pylib/results/flakiness_dashboard/json_results_generator.py @@ -671,7 +671,7 @@ def _EncodeMultipartFormData(fields, files): @@ -2598,6 +2645,7 @@ diff --git a/build/android/pylib/results/flakiness_dashboard/json_results_genera BOUNDARY = '-M-A-G-I-C---B-O-U-N-D-A-R-Y-' CRLF = '\r\n' diff --git a/build/android/pylib/results/presentation/test_results_presentation.py b/build/android/pylib/results/presentation/test_results_presentation.py +index fc14b8bf03766..38be48ed3c4b1 100755 --- a/build/android/pylib/results/presentation/test_results_presentation.py +++ b/build/android/pylib/results/presentation/test_results_presentation.py @@ -110,7 +110,7 @@ def action_cell(action, data, html_class): @@ -2637,6 +2685,7 @@ diff --git a/build/android/pylib/results/presentation/test_results_presentation. ui_screenshot_link = '%s?%s' % (ui_catalog_url, ui_catalog_query) diff --git a/build/android/pylib/utils/google_storage_helper.py b/build/android/pylib/utils/google_storage_helper.py +index 94efe33f85cc5..417642d9a0b2a 100644 --- a/build/android/pylib/utils/google_storage_helper.py +++ b/build/android/pylib/utils/google_storage_helper.py @@ -28,8 +28,8 @@ from devil.utils import cmd_helper @@ -2651,6 +2700,7 @@ diff --git a/build/android/pylib/utils/google_storage_helper.py b/build/android/ @decorators.NoRaiseException(default_return_value='') diff --git a/build/android/pylib/utils/maven_downloader.py b/build/android/pylib/utils/maven_downloader.py +index 7247f7c88c9ca..6f63b84c85894 100755 --- a/build/android/pylib/utils/maven_downloader.py +++ b/build/android/pylib/utils/maven_downloader.py @@ -36,7 +36,7 @@ class MavenDownloader(object): @@ -2663,6 +2713,7 @@ diff --git a/build/android/pylib/utils/maven_downloader.py b/build/android/pylib # Default Maven repository. _DEFAULT_REPO_PATH = os.path.join( diff --git a/build/android/pylib/utils/simpleperf.py b/build/android/pylib/utils/simpleperf.py +index b3ba00e6c226b..00ffbc4c5822f 100644 --- a/build/android/pylib/utils/simpleperf.py +++ b/build/android/pylib/utils/simpleperf.py @@ -231,7 +231,7 @@ def ConvertSimpleperfToPprof(simpleperf_out_path, build_directory, @@ -2675,9 +2726,10 @@ diff --git a/build/android/pylib/utils/simpleperf.py b/build/android/pylib/utils # Recreate the directory structure locally, and symlink unstripped libs. diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py +index 28664371920cb..52d3dc1d9e55f 100755 --- a/build/android/resource_sizes.py +++ b/build/android/resource_sizes.py -@@ -146,7 +146,7 @@ def _ReadZipInfoExtraFieldLength(zip_file, zip_info): +@@ -150,7 +150,7 @@ def _ReadZipInfoExtraFieldLength(zip_file, zip_info): def _MeasureApkSignatureBlock(zip_file): """Measures the size of the v2 / v3 signing block. @@ -2687,9 +2739,10 @@ diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py # Seek to "end of central directory" struct. eocd_offset_from_end = -22 - len(zip_file.comment) diff --git a/build/android/test_runner.py b/build/android/test_runner.py +index 1e312ba0b8bec..d9dfc5fc4904c 100755 --- a/build/android/test_runner.py +++ b/build/android/test_runner.py -@@ -1055,7 +1055,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): +@@ -1057,7 +1057,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, @@ -2699,6 +2752,7 @@ diff --git a/build/android/test_runner.py b/build/android/test_runner.py results_detail_file.write(result_html_string.encode('utf-8')) results_detail_file.flush() diff --git a/build/android/test_wrapper/logdog_wrapper.py b/build/android/test_wrapper/logdog_wrapper.py +index 303e2883be212..21e2199643be1 100755 --- a/build/android/test_wrapper/logdog_wrapper.py +++ b/build/android/test_wrapper/logdog_wrapper.py @@ -25,7 +25,7 @@ from py_utils import tempfile_ext @@ -2711,6 +2765,7 @@ diff --git a/build/android/test_wrapper/logdog_wrapper.py b/build/android/test_w '/service-account-luci-logdog-publisher.json') LOGDOG_TERMINATION_TIMEOUT = 30 diff --git a/build/apple/tweak_info_plist.py b/build/apple/tweak_info_plist.py +index 76f64dc37cc0e..180c0184a52c7 100755 --- a/build/apple/tweak_info_plist.py +++ b/build/apple/tweak_info_plist.py @@ -156,9 +156,9 @@ def _AddBreakpadKeys(plist, branding, platform, staging): @@ -2735,6 +2790,7 @@ diff --git a/build/apple/tweak_info_plist.py b/build/apple/tweak_info_plist.py _RemoveKeys(plist, 'KSChannelID') if base_tag != '': diff --git a/build/chromeos/PRESUBMIT.py b/build/chromeos/PRESUBMIT.py +index 0e829278fb7cf..0bf2cbbdc2c49 100644 --- a/build/chromeos/PRESUBMIT.py +++ b/build/chromeos/PRESUBMIT.py @@ -3,7 +3,7 @@ @@ -2747,6 +2803,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 +index 319f64c0ed016..b2ba69abfed0e 100755 --- a/build/chromeos/test_runner.py +++ b/build/chromeos/test_runner.py @@ -949,7 +949,7 @@ def main(): @@ -2759,9 +2816,10 @@ diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py tast_test_parser.set_defaults(func=device_test) tast_test_parser.add_argument( diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni +index b2cc715a91b9f..255787694882a 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -1710,7 +1710,7 @@ if (enable_java_templates) { +@@ -1713,7 +1713,7 @@ if (enable_java_templates) { # * public.txt # * annotations.zip # * assets/ @@ -2771,6 +2829,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni # Variables: # output: Path to the output .aar. diff --git a/build/config/chromeos/args.gni b/build/config/chromeos/args.gni +index a1bfc5c026b7f..c486ed18024c0 100644 --- a/build/config/chromeos/args.gni +++ b/build/config/chromeos/args.gni @@ -21,8 +21,8 @@ declare_args() { @@ -2785,6 +2844,7 @@ diff --git a/build/config/chromeos/args.gni b/build/config/chromeos/args.gni # Determines if we run the test in skylab, aka the CrOS labs. diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni +index 09f9701a7a77c..14260c32d5f7e 100644 --- a/build/config/chromeos/rules.gni +++ b/build/config/chromeos/rules.gni @@ -124,7 +124,7 @@ if (cros_sdk_version != "") { @@ -2815,6 +2875,7 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni data_deps = [ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni +index 008a386efa7a9..b8cb1f5de6483 100644 --- a/build/config/compiler/compiler.gni +++ b/build/config/compiler/compiler.gni @@ -113,7 +113,7 @@ declare_args() { @@ -2836,6 +2897,7 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler # paths, so we disable this feature for official benefit. The main benefit is # deterministic builds to reduce compile times, so this is less relevant for diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni +index 834c46175f4c0..69001105e7211 100644 --- a/build/config/nacl/rules.gni +++ b/build/config/nacl/rules.gni @@ -38,7 +38,7 @@ template("generate_nmf") { @@ -2848,6 +2910,7 @@ diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni if (current_cpu == "pnacl") { objdump = rebase_path("${nacl_toolchain_bindir}/x86_64-nacl-objdump") diff --git a/build/config/ozone.gni b/build/config/ozone.gni +index 9f94d11b308eb..5ade8a953ae77 100644 --- a/build/config/ozone.gni +++ b/build/config/ozone.gni @@ -28,7 +28,7 @@ declare_args() { @@ -2860,6 +2923,7 @@ diff --git a/build/config/ozone.gni b/build/config/ozone.gni # Trace will be saved to /tmp/gltrace.dat file by default. You can # override it at run time with TRACE_FILE= environment variable. diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni +index 8d26d0054cce7..9c41a64625dd4 100644 --- a/build/config/sanitizers/sanitizers.gni +++ b/build/config/sanitizers/sanitizers.gni @@ -76,7 +76,7 @@ declare_args() { @@ -2872,6 +2936,7 @@ diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sa # Compile for fuzzing with AFL. diff --git a/build/config/win/control_flow_guard.gni b/build/config/win/control_flow_guard.gni +index bf6a82af0c386..d8a01bec2495e 100644 --- a/build/config/win/control_flow_guard.gni +++ b/build/config/win/control_flow_guard.gni @@ -12,7 +12,7 @@ declare_args() { @@ -2884,6 +2949,7 @@ diff --git a/build/config/win/control_flow_guard.gni b/build/config/win/control_ # turned on either. # ASan and CFG leads to slow process startup. Chromium's test runner uses diff --git a/build/fuchsia/PRESUBMIT.py b/build/fuchsia/PRESUBMIT.py +index d21d7b0e7be4f..7f2e8b07b260b 100644 --- a/build/fuchsia/PRESUBMIT.py +++ b/build/fuchsia/PRESUBMIT.py @@ -3,7 +3,7 @@ @@ -2896,6 +2962,7 @@ diff --git a/build/fuchsia/PRESUBMIT.py b/build/fuchsia/PRESUBMIT.py """ diff --git a/build/fuchsia/binary_sizes.py b/build/fuchsia/binary_sizes.py +index 52d05999d0b34..9ce2fa100946a 100755 --- a/build/fuchsia/binary_sizes.py +++ b/build/fuchsia/binary_sizes.py @@ -96,7 +96,7 @@ def CreateTestResults(test_status, timestamp): @@ -2908,6 +2975,7 @@ diff --git a/build/fuchsia/binary_sizes.py b/build/fuchsia/binary_sizes.py results = { diff --git a/build/linux/install-chromeos-fonts.py b/build/linux/install-chromeos-fonts.py +index da8fb40f48d55..76ee5cd9c8658 100755 --- a/build/linux/install-chromeos-fonts.py +++ b/build/linux/install-chromeos-fonts.py @@ -14,7 +14,7 @@ import shutil @@ -2920,6 +2988,7 @@ diff --git a/build/linux/install-chromeos-fonts.py b/build/linux/install-chromeo # Taken from the media-fonts/ ebuilds in chromiumos-overlay. diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py +index ada6208644cb2..ce7239778781c 100755 --- a/build/linux/sysroot_scripts/install-sysroot.py +++ b/build/linux/sysroot_scripts/install-sysroot.py @@ -42,7 +42,7 @@ except ImportError: @@ -2932,6 +3001,7 @@ diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroo VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips', 'mips64el') diff --git a/build/mac_toolchain.py b/build/mac_toolchain.py +index 2dfdb43eeece4..056bcfea5ab99 100755 --- a/build/mac_toolchain.py +++ b/build/mac_toolchain.py @@ -90,7 +90,7 @@ def RequestCipdAuthentication(): @@ -2944,6 +3014,7 @@ diff --git a/build/mac_toolchain.py b/build/mac_toolchain.py print('-----------------------------------------------------------------') print() diff --git a/build/nocompile.gni b/build/nocompile.gni +index 5b4aeb8f4ada7..b1860f6c980a0 100644 --- a/build/nocompile.gni +++ b/build/nocompile.gni @@ -7,7 +7,7 @@ @@ -2956,6 +3027,7 @@ diff --git a/build/nocompile.gni b/build/nocompile.gni # To use this, create a gyp target with the following form: # diff --git a/build/skia_gold_common/PRESUBMIT.py b/build/skia_gold_common/PRESUBMIT.py +index f4aeda79cf233..a77d47d343bed 100644 --- a/build/skia_gold_common/PRESUBMIT.py +++ b/build/skia_gold_common/PRESUBMIT.py @@ -3,7 +3,7 @@ @@ -2968,6 +3040,7 @@ diff --git a/build/skia_gold_common/PRESUBMIT.py b/build/skia_gold_common/PRESUB """ diff --git a/build/toolchain/cros_toolchain.gni b/build/toolchain/cros_toolchain.gni +index ccc4db293c1f6..6531f377bc28b 100644 --- a/build/toolchain/cros_toolchain.gni +++ b/build/toolchain/cros_toolchain.gni @@ -15,7 +15,7 @@ @@ -2980,6 +3053,7 @@ diff --git a/build/toolchain/cros_toolchain.gni b/build/toolchain/cros_toolchain # # For example, to compile a Chrome source tree in /g/src for an diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni +index 8b2fe90d004b3..f668977e14acf 100644 --- a/build/toolchain/gcc_toolchain.gni +++ b/build/toolchain/gcc_toolchain.gni @@ -673,7 +673,7 @@ template("gcc_toolchain") { @@ -2992,6 +3066,7 @@ diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.g rust_outfile = "{{target_out_dir}}/{{crate_name}}.a" depfile = "{{output}}.d" diff --git a/build/util/lib/common/perf_tests_results_helper.py b/build/util/lib/common/perf_tests_results_helper.py +index 153886dce568b..7245008773d23 100644 --- a/build/util/lib/common/perf_tests_results_helper.py +++ b/build/util/lib/common/perf_tests_results_helper.py @@ -103,7 +103,7 @@ def PrintPerfResult(measurement, trace, values, units, @@ -3004,9 +3079,10 @@ diff --git a/build/util/lib/common/perf_tests_results_helper.py b/build/util/lib Args: measurement: A description of the quantity being measured, e.g. "vm_peak". diff --git a/build/util/lib/results/result_sink.py b/build/util/lib/results/result_sink.py +index 5f4de26d85e70..cd46c985a813a 100644 --- a/build/util/lib/results/result_sink.py +++ b/build/util/lib/results/result_sink.py -@@ -133,7 +133,7 @@ class ResultSinkClient(object): +@@ -138,7 +138,7 @@ class ResultSinkClient(object): if test_file and str(test_file).startswith('//'): tr['testMetadata']['location'] = { 'file_name': test_file, @@ -3016,6 +3092,7 @@ diff --git a/build/util/lib/results/result_sink.py b/build/util/lib/results/resu res = requests.post(url=self.test_results_url, diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt +index de293c0f5ff40..cf8f76e7165fc 100644 --- a/build/whitespace_file.txt +++ b/build/whitespace_file.txt @@ -163,7 +163,7 @@ In the BUILD we trust. @@ -3028,6 +3105,7 @@ diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt No, really, I couldn't eat another bit. When I hunger I think of you, and a pastrami sandwich. diff --git a/buildtools/README.txt b/buildtools/README.txt +index 1a2d5863f78ae..3a3048d820653 100644 --- a/buildtools/README.txt +++ b/buildtools/README.txt @@ -3,7 +3,7 @@ projects. The actual binaries are pulled from Google Storage, normally as part @@ -3049,6 +3127,7 @@ diff --git a/buildtools/README.txt b/buildtools/README.txt There is a checked-in version of gsutil as part of depot_tools. diff --git a/buildtools/clang_format/README.txt b/buildtools/clang_format/README.txt +index 20e72c32254b9..480e7d115478c 100644 --- a/buildtools/clang_format/README.txt +++ b/buildtools/clang_format/README.txt @@ -2,7 +2,7 @@ This folder contains clang-format scripts. The binaries will be automatically @@ -3075,6 +3154,7 @@ diff --git a/buildtools/clang_format/README.txt b/buildtools/clang_format/README - https://developers.google.com/storage/docs/gsutil + https://developers.9oo91e.qjz9zk/storage/docs/gsutil diff --git a/cc/PRESUBMIT.py b/cc/PRESUBMIT.py +index a3a40eda5eff9..a8aad2bcc82b5 100644 --- a/cc/PRESUBMIT.py +++ b/cc/PRESUBMIT.py @@ -4,7 +4,7 @@ @@ -3087,6 +3167,7 @@ diff --git a/cc/PRESUBMIT.py b/cc/PRESUBMIT.py """ diff --git a/chrome/PRESUBMIT.py b/chrome/PRESUBMIT.py +index 3f4d40903259d..721f22a49c199 100644 --- a/chrome/PRESUBMIT.py +++ b/chrome/PRESUBMIT.py @@ -4,7 +4,7 @@ @@ -3099,6 +3180,7 @@ diff --git a/chrome/PRESUBMIT.py b/chrome/PRESUBMIT.py """ diff --git a/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd b/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd +index 71f0199bc520e..dc2dc7f99d098 100644 --- a/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd +++ b/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd @@ -205,7 +205,7 @@ @@ -3111,6 +3193,7 @@ diff --git a/chrome/android/features/autofill_assistant/java/strings/android_chr @@ -3283,9 +3371,10 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd +index 0ac5ea2e1ef1e..b72c892cf4906 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -405,16 +405,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -402,16 +402,16 @@ are declared in tools/grit/grit_rule.gni. Permission request expired @@ -3306,7 +3395,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This file -@@ -603,7 +603,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -600,7 +600,7 @@ are declared in tools/grit/grit_rule.gni. Open link as @@ -3315,7 +3404,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -772,7 +772,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -769,7 +769,7 @@ are declared in tools/grit/grit_rule.gni. Search images with $1Google Lens @@ -3324,7 +3413,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -847,7 +847,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -844,7 +844,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -3333,7 +3422,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -1028,7 +1028,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1025,7 +1025,7 @@ are declared in tools/grit/grit_rule.gni. Search Images with $1Google Lens @@ -3342,7 +3431,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1248,7 +1248,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1251,7 +1251,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3351,7 +3440,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -1385,7 +1385,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1388,7 +1388,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -3360,7 +3449,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -2822,10 +2822,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -2864,10 +2864,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -3373,7 +3462,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -2834,7 +2834,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2876,7 +2876,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -3382,7 +3471,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -2846,28 +2846,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -2888,28 +2888,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -3418,7 +3507,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -2888,19 +2888,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -2930,19 +2930,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -3443,7 +3532,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -2912,7 +2912,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2954,7 +2954,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -3452,7 +3541,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -2921,7 +2921,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2963,7 +2963,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -3461,7 +3550,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -3045,7 +3045,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3087,7 +3087,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3470,7 +3559,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3570,13 +3570,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3612,13 +3612,13 @@ are declared in tools/grit/grit_rule.gni. @@ -3487,7 +3576,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3585,7 +3585,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3627,7 +3627,7 @@ are declared in tools/grit/grit_rule.gni. Stop sharing @@ -3496,7 +3585,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Switch to capturing tab -@@ -3791,16 +3791,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -3833,16 +3833,16 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -3517,7 +3606,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -3809,7 +3809,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3851,7 +3851,7 @@ are declared in tools/grit/grit_rule.gni. Plugin Broker: $1Unknown Plugin @@ -3526,7 +3615,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Spare Renderer -@@ -3845,22 +3845,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -3887,22 +3887,22 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -3555,7 +3644,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources App: $1com.android.systemui -@@ -4075,7 +4075,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4117,7 +4117,7 @@ are declared in tools/grit/grit_rule.gni. "$1Gmail Checker" @@ -3564,7 +3653,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources The extension "$1Gmail Checker" was blocked by your administrator -@@ -4087,10 +4087,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4129,10 +4129,10 @@ are declared in tools/grit/grit_rule.gni. @@ -3577,7 +3666,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -4229,22 +4229,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4271,22 +4271,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -3606,7 +3695,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4253,10 +4253,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4295,10 +4295,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -3619,7 +3708,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4621,7 +4621,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4678,7 +4678,7 @@ are declared in tools/grit/grit_rule.gni. When you click the extension @@ -3628,7 +3717,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4665,7 +4665,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4722,7 +4722,7 @@ are declared in tools/grit/grit_rule.gni. When You Click the Extension @@ -3637,7 +3726,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -4958,7 +4958,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5015,7 +5015,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -3646,7 +3735,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5204,10 +5204,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5261,10 +5261,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -3659,7 +3748,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 -@@ -5534,7 +5534,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5588,7 +5588,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3668,7 +3757,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -5545,7 +5545,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5599,7 +5599,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3677,7 +3766,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -5555,7 +5555,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5609,7 +5609,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3686,7 +3775,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -5564,16 +5564,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5618,16 +5618,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -3706,16 +3795,25 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -5958,7 +5958,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6009,7 +6009,7 @@ Keep your key file in a safe place. You will need it to create new versions of y You’re seeing your recent and suggested documents based on your previous activity using Google Drive. <br> <br> - Learn about the data Google Drive collects and why <a href="https://support.google.com/drive/answer/2450387" target="_blank">here</a>. + Learn about the data Google Drive collects and why <a href="https://support.9oo91e.qjz9zk/drive/answer/2450387" target="_blank">here</a>. - - Top picks for you -@@ -5967,10 +5967,10 @@ Keep your key file in a safe place. You will need it to create new versions of y + + From your Google Photos +@@ -6033,7 +6033,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Your memories from Google Photos are shown here. They are visible only to you, whenever you’re signed in. + <br> + <br> +- Manage what you see in your memories at <a href="https://photos.google.com/settings?referrer=CHROME_NTP" target="_blank">photos.google.com/settings</a>. ++ Manage what you see in your memories at <a href="https://photos.9oo91e.qjz9zk/settings?referrer=CHROME_NTP" target="_blank">photos.9oo91e.qjz9zk/settings</a>. + + + Explore more of your memories in Google Photos +@@ -6063,10 +6063,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Why am I seeing this? @@ -3728,7 +3826,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6250,7 +6250,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6349,7 +6349,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -3737,7 +3835,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6357,7 +6357,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6456,7 +6456,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 @@ -3746,7 +3844,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -6469,7 +6469,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6568,7 +6568,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. @@ -3755,7 +3853,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6506,7 +6506,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6605,7 +6605,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. @@ -3764,7 +3862,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6673,13 +6673,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6780,13 +6780,13 @@ Keep your key file in a safe place. You will need it to create new versions of y Suggest strong password @@ -3780,7 +3878,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6863,7 +6863,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6970,7 +6970,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Clear browsing data @@ -3789,7 +3887,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -6873,7 +6873,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6980,7 +6980,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3798,7 +3896,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -7097,7 +7097,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7204,7 +7204,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Uploading ($127%)... @@ -3807,7 +3905,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7443,31 +7443,31 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7575,31 +7575,31 @@ Keep your key file in a safe place. You will need it to create new versions of y $1html5rocks.com is sharing your screen. @@ -3844,7 +3942,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Hide -@@ -7495,7 +7495,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7627,7 +7627,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3853,7 +3951,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7503,10 +7503,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7635,10 +7635,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Sign in to Security Device @@ -3866,7 +3964,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -7846,7 +7846,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7978,7 +7978,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Sending link to $1Ted's Pixel2 @@ -3875,7 +3973,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8609,7 +8609,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8747,7 +8747,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Work @@ -3884,7 +3982,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8618,10 +8618,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8756,10 +8756,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Can't sign in @@ -3897,7 +3995,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -8646,13 +8646,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8784,13 +8784,13 @@ Keep your key file in a safe place. You will need it to create new versions of y This wasn't me. @@ -3913,7 +4011,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -8701,7 +8701,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8839,7 +8839,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Open $1Adobe Acrobat? @@ -3922,7 +4020,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -8712,8 +8712,8 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8850,8 +8850,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Cancel @@ -3933,7 +4031,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8738,7 +8738,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8876,7 +8876,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Date Modified @@ -3942,7 +4040,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9320,7 +9320,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9458,7 +9458,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -3951,7 +4049,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9734,7 +9734,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9872,7 +9872,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -3960,7 +4058,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -9777,7 +9777,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9915,7 +9915,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. @@ -3969,7 +4067,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 -@@ -9866,7 +9866,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10004,7 +10004,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -3978,7 +4076,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9898,10 +9898,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10036,10 +10036,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -3991,7 +4089,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10012,19 +10012,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10150,19 +10150,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -4014,7 +4112,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -10045,10 +10045,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10183,10 +10183,10 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4027,7 +4125,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open $1search links -@@ -10085,7 +10085,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10223,7 +10223,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -4036,7 +4134,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -10112,7 +10112,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10250,7 +10250,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -4045,7 +4143,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10304,7 +10304,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10442,7 +10442,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. @@ -4054,7 +4152,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share system audio -@@ -10348,7 +10348,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10492,7 +10492,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4063,7 +4161,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10420,8 +10420,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10564,8 +10564,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -4074,7 +4172,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -10629,7 +10629,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10773,7 +10773,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4083,7 +4181,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -10735,7 +10735,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10879,7 +10879,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4092,7 +4190,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -10775,7 +10775,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10919,7 +10919,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4101,7 +4199,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -10823,7 +10823,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10982,7 +10982,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4110,7 +4208,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -10944,7 +10944,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11103,7 +11103,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4119,7 +4217,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 -@@ -11131,13 +11131,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11290,13 +11290,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4135,7 +4233,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -11231,7 +11231,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11390,7 +11390,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4144,7 +4242,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Didn't get it? -@@ -11246,7 +11246,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11405,7 +11405,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Security key request @@ -4153,7 +4251,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11345,7 +11345,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11498,7 +11498,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4162,7 +4260,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -11361,7 +11361,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11514,7 +11514,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 @@ -4171,7 +4269,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. -@@ -11370,13 +11370,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11523,13 +11523,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -4187,7 +4285,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -11656,7 +11656,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11809,7 +11809,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4197,6 +4295,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd +index 69566e4e026e1..dada23df8199b 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -337,7 +337,7 @@ chromium_strings.grd. --> @@ -4253,6 +4352,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd +index 977121fb19515..7393af34233db 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -173,12 +173,12 @@ @@ -4293,6 +4393,7 @@ diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/loc diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py +index de05ded0fa8d8..1938e2116a685 100644 --- a/chrome/app/theme/PRESUBMIT.py +++ b/chrome/app/theme/PRESUBMIT.py @@ -4,9 +4,9 @@ @@ -4308,28 +4409,10 @@ 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 +index ae3adcf47ea15..ceb2810f56042 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -331,14 +331,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { - const FeatureEntry::Choice kTraceUploadURL[] = { - {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, - {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, -- "https://performance-insights.appspot.com/upload?tags=flags,Other"}, -+ "https://performance-insights.8pp2p8t.qjz9zk/upload?tags=flags,Other"}, - {flag_descriptions::kTraceUploadUrlChoiceEmloading, - switches::kTraceUploadURL, -- "https://performance-insights.appspot.com/upload?tags=flags,emloading"}, -+ "https://performance-insights.8pp2p8t.qjz9zk/upload?tags=flags,emloading"}, - {flag_descriptions::kTraceUploadUrlChoiceQa, switches::kTraceUploadURL, -- "https://performance-insights.appspot.com/upload?tags=flags,QA"}, -+ "https://performance-insights.8pp2p8t.qjz9zk/upload?tags=flags,QA"}, - {flag_descriptions::kTraceUploadUrlChoiceTesting, switches::kTraceUploadURL, -- "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam"}}; -+ "https://performance-insights.8pp2p8t.qjz9zk/upload?tags=flags,TestingTeam"}}; - - const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = { - {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -3875,7 +3875,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3818,7 +3818,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -4338,7 +4421,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !defined(OS_ANDROID) {"media-router-cast-allow-all-ips", flag_descriptions::kMediaRouterCastAllowAllIPsName, -@@ -4107,7 +4107,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4050,7 +4050,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -4348,6 +4431,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #endif // OS_ANDROID {"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName, diff --git a/chrome/browser/android/explore_sites/url_util.cc b/chrome/browser/android/explore_sites/url_util.cc +index af7b94d43b7aa..53df3d4d1c0ed 100644 --- a/chrome/browser/android/explore_sites/url_util.cc +++ b/chrome/browser/android/explore_sites/url_util.cc @@ -14,7 +14,7 @@ namespace explore_sites { @@ -4360,6 +4444,7 @@ diff --git a/chrome/browser/android/explore_sites/url_util.cc b/chrome/browser/a chrome::android::kExploreSites, kBaseURLOption); if (field_trial_param.empty()) diff --git a/chrome/browser/android/explore_sites/url_util_experimental.cc b/chrome/browser/android/explore_sites/url_util_experimental.cc +index 5b78c54d404bc..f707775b84404 100644 --- a/chrome/browser/android/explore_sites/url_util_experimental.cc +++ b/chrome/browser/android/explore_sites/url_util_experimental.cc @@ -15,7 +15,7 @@ namespace explore_sites { @@ -4372,6 +4457,7 @@ diff --git a/chrome/browser/android/explore_sites/url_util_experimental.cc b/chr chrome::android::kExploreSites, kBaseURLOption); if (field_trial_param.empty()) diff --git a/chrome/browser/android/vr/PRESUBMIT.py b/chrome/browser/android/vr/PRESUBMIT.py +index 1e21693751de7..ca0f49ffabfd9 100644 --- a/chrome/browser/android/vr/PRESUBMIT.py +++ b/chrome/browser/android/vr/PRESUBMIT.py @@ -4,7 +4,7 @@ @@ -4384,10 +4470,11 @@ diff --git a/chrome/browser/android/vr/PRESUBMIT.py b/chrome/browser/android/vr/ """ diff --git a/chrome/browser/apps/app_service/webapk/webapk_install_task.cc b/chrome/browser/apps/app_service/webapk/webapk_install_task.cc +index 1cfc5afcb3817..41c000dfd2315 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_install_task.cc +++ b/chrome/browser/apps/app_service/webapk/webapk_install_task.cc -@@ -62,7 +62,7 @@ constexpr base::TimeDelta kMinterResponseTimeout = - base::TimeDelta::FromSeconds(60); +@@ -61,7 +61,7 @@ const uint64_t kMurmur2HashSeed = 0; + constexpr base::TimeDelta kMinterResponseTimeout = base::Seconds(60); constexpr char kWebApkServerUrl[] = - "https://webapk.googleapis.com/v1/webApks?key="; @@ -4396,6 +4483,7 @@ 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_factory_impl.cc b/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc +index 040e7b3b21b3c..46ce616ed46a7 100644 --- a/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc +++ b/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc @@ -16,7 +16,7 @@ @@ -4408,6 +4496,7 @@ diff --git a/chrome/browser/apps/digital_goods/digital_goods_factory_impl.cc b/c } // namespace diff --git a/chrome/browser/apps/platform_apps/install_chrome_app.cc b/chrome/browser/apps/platform_apps/install_chrome_app.cc +index cfd81b3f31f0f..6c2b3887ba3d1 100644 --- a/chrome/browser/apps/platform_apps/install_chrome_app.cc +++ b/chrome/browser/apps/platform_apps/install_chrome_app.cc @@ -24,7 +24,7 @@ namespace { @@ -4419,7 +4508,50 @@ diff --git a/chrome/browser/apps/platform_apps/install_chrome_app.cc b/chrome/br // Error given when the extension is not an app. const char kInstallChromeAppErrorNotAnApp[] = +diff --git a/chrome/browser/ash/android_sms/android_sms_urls.cc b/chrome/browser/ash/android_sms/android_sms_urls.cc +index bd4a5f41c1eb6..f581cda797b14 100644 +--- a/chrome/browser/ash/android_sms/android_sms_urls.cc ++++ b/chrome/browser/ash/android_sms/android_sms_urls.cc +@@ -18,15 +18,15 @@ namespace android_sms { + namespace { + + // Note: Install and app URLs are the same for the android.com domain. +-const char kProdAndroidUrl[] = "https://messages.android.com/"; ++const char kProdAndroidUrl[] = "https://messages.8n6r01d.qjz9zk/"; + +-const char kProdGoogleAppUrl[] = "https://messages.google.com/web/"; ++const char kProdGoogleAppUrl[] = "https://messages.9oo91e.qjz9zk/web/"; + const char kProdGoogleInstallUrl[] = +- "https://messages.google.com/web/authentication"; ++ "https://messages.9oo91e.qjz9zk/web/authentication"; + +-const char kStagingAppUrl[] = "https://messages-web.sandbox.google.com/web/"; ++const char kStagingAppUrl[] = "https://messages-web.sandbox.9oo91e.qjz9zk/web/"; + const char kStagingInstallUrl[] = +- "https://messages-web.sandbox.google.com/web/authentication"; ++ "https://messages-web.sandbox.9oo91e.qjz9zk/web/authentication"; + + GURL GetCustomDomain(bool use_install_url) { + std::string custom_domain = +@@ -52,13 +52,13 @@ GURL GetCustomDomain(bool use_install_url) { + std::ostream& operator<<(std::ostream& stream, const PwaDomain& pwa_domain) { + switch (pwa_domain) { + case PwaDomain::kProdAndroid: +- stream << "[Production: messages.android.com]"; ++ stream << "[Production: messages.8n6r01d.qjz9zk]"; + break; + case PwaDomain::kProdGoogle: +- stream << "[Production: messages.google.com]"; ++ stream << "[Production: messages.9oo91e.qjz9zk]"; + break; + case PwaDomain::kStaging: +- stream << "[Staging: messages-web.sandbox.google.com]"; ++ stream << "[Staging: messages-web.sandbox.9oo91e.qjz9zk]"; + break; + } + return stream; diff --git a/chrome/browser/ash/app_mode/fake_cws.cc b/chrome/browser/ash/app_mode/fake_cws.cc +index 3570e338030b3..16e90b58e848c 100644 --- a/chrome/browser/ash/app_mode/fake_cws.cc +++ b/chrome/browser/ash/app_mode/fake_cws.cc @@ -55,7 +55,7 @@ const char kPrivateStoreAppHasUpdateTemplate[] = @@ -4432,6 +4564,7 @@ diff --git a/chrome/browser/ash/app_mode/fake_cws.cc b/chrome/browser/ash/app_mo "" "$APPS" diff --git a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc +index 33fdf0717f7a0..97aa5d2a7de6d 100644 --- a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc +++ b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc @@ -57,7 +57,7 @@ signin::ScopeSet GetAccessTokenScopes() { @@ -4444,6 +4577,7 @@ diff --git a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc b/c ArcBackgroundAuthCodeFetcher::ArcBackgroundAuthCodeFetcher( scoped_refptr url_loader_factory, diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc +index 91571f7220030..f12df42ce083e 100644 --- a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc +++ b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc @@ -24,7 +24,7 @@ namespace { @@ -4456,6 +4590,7 @@ diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc b/chrome policy::DeviceManagementService* GetDeviceManagementService() { policy::BrowserPolicyConnectorAsh* const connector = diff --git a/chrome/browser/ash/assistant/assistant_util.cc b/chrome/browser/ash/assistant/assistant_util.cc +index b4979f693df16..0bb6ac3fee814 100644 --- a/chrome/browser/ash/assistant/assistant_util.cc +++ b/chrome/browser/ash/assistant/assistant_util.cc @@ -118,8 +118,8 @@ bool IsEmailDomainSupported(const Profile* profile) { @@ -4470,6 +4605,7 @@ diff --git a/chrome/browser/ash/assistant/assistant_util.cc b/chrome/browser/ash } diff --git a/chrome/browser/ash/attestation/attestation_ca_client.cc b/chrome/browser/ash/attestation/attestation_ca_client.cc +index e26e388b3e2e4..9d611e9eb16fa 100644 --- a/chrome/browser/ash/attestation/attestation_ca_client.cc +++ b/chrome/browser/ash/attestation/attestation_ca_client.cc @@ -33,15 +33,15 @@ const char kAttestationServerTest[] = "test"; @@ -4493,6 +4629,7 @@ diff --git a/chrome/browser/ash/attestation/attestation_ca_client.cc b/chrome/br const char kMimeContentType[] = "application/octet-stream"; diff --git a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc b/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc +index b45ac4ed19244..81e374a91e2cf 100644 --- a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc +++ b/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc @@ -27,17 +27,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; @@ -4517,6 +4654,7 @@ diff --git a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_h // The label used to return exclusive content or filter unwanted images. diff --git a/chrome/browser/ash/borealis/borealis_util.cc b/chrome/browser/ash/borealis/borealis_util.cc +index e5257f954d9a9..0289e9f946fd6 100644 --- a/chrome/browser/ash/borealis/borealis_util.cc +++ b/chrome/browser/ash/borealis/borealis_util.cc @@ -24,7 +24,7 @@ const char kBorealisAppIdRegex[] = "([^/]+\\d+)"; @@ -4529,6 +4667,7 @@ diff --git a/chrome/browser/ash/borealis/borealis_util.cc b/chrome/browser/ash/b "viewform?usp=pp_url"; diff --git a/chrome/browser/ash/child_accounts/child_user_service.cc b/chrome/browser/ash/child_accounts/child_user_service.cc +index b6507cc9488c6..0f290fe450a8e 100644 --- a/chrome/browser/ash/child_accounts/child_user_service.cc +++ b/chrome/browser/ash/child_accounts/child_user_service.cc @@ -61,7 +61,7 @@ const char ChildUserService::kFamilyLinkHelperAppPackageName[] = @@ -4541,6 +4680,7 @@ diff --git a/chrome/browser/ash/child_accounts/child_user_service.cc b/chrome/br ChildUserService::TestApi::TestApi(ChildUserService* service) diff --git a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html +index a34ab7bae7d11..9c975b8caf4ea 100644 --- a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html +++ b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html @@ -5,7 +5,7 @@ @@ -4553,9 +4693,10 @@ 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 +index 12f38ff874dfe..dd9495c5224be 100644 --- a/chrome/browser/ash/crostini/crostini_util.cc +++ b/chrome/browser/ash/crostini/crostini_util.cc -@@ -67,7 +67,7 @@ const char kCrostiniDefaultVmName[] = "termina"; +@@ -69,7 +69,7 @@ const char kCrostiniDefaultVmName[] = "termina"; const char kCrostiniDefaultContainerName[] = "penguin"; const char kCrostiniDefaultUsername[] = "emperor"; const char kCrostiniDefaultImageServerUrl[] = @@ -4565,6 +4706,7 @@ diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/c const base::FilePath::CharType kHomeDirectory[] = FILE_PATH_LITERAL("/home"); diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome/browser/ash/customization/customization_document.cc +index d9386f8356e47..3efb121270d63 100644 --- a/chrome/browser/ash/customization/customization_document.cc +++ b/chrome/browser/ash/customization/customization_document.cc @@ -175,7 +175,7 @@ std::string ReadFileInBackground(const base::FilePath& file) { @@ -4577,6 +4719,7 @@ diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome // A custom extensions::ExternalLoader that the ServicesCustomizationDocument // creates and uses to publish OEM default apps to the extensions system. 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 +index 9bc7f670b0d21..cbbd7df7589f1 100644 --- a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc +++ b/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.cc @@ -10,7 +10,7 @@ namespace enhanced_network_tts { @@ -4589,6 +4732,7 @@ diff --git a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_consta const char kNetworkRequestUploadType[] = "application/json"; diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrome/browser/ash/file_manager/file_manager_string_util.cc +index 07a0c595651b7..76c8f72d01bba 100644 --- a/chrome/browser/ash/file_manager/file_manager_string_util.cc +++ b/chrome/browser/ash/file_manager/file_manager_string_util.cc @@ -27,25 +27,25 @@ namespace { @@ -4624,6 +4768,7 @@ diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrom // Location of the help page for low space warning in the downloads directory. const int kDownloadsLowSpaceWarningHelpNumber = 1061547; diff --git a/chrome/browser/ash/first_run/drive_first_run_controller.cc b/chrome/browser/ash/first_run/drive_first_run_controller.cc +index 1a80c65359654..902df43c78085 100644 --- a/chrome/browser/ash/first_run/drive_first_run_controller.cc +++ b/chrome/browser/ash/first_run/drive_first_run_controller.cc @@ -60,7 +60,7 @@ int kWebContentsTimeoutSeconds = 15; @@ -4645,6 +4790,7 @@ diff --git a/chrome/browser/ash/first_run/drive_first_run_controller.cc b/chrome } // namespace diff --git a/chrome/browser/ash/hats/hats_dialog.cc b/chrome/browser/ash/hats/hats_dialog.cc +index 70468232b7f9c..44906ae7ae278 100644 --- a/chrome/browser/ash/hats/hats_dialog.cc +++ b/chrome/browser/ash/hats/hats_dialog.cc @@ -53,7 +53,7 @@ const char kClientActionUnhandledError[] = "survey-loading-error"; @@ -4656,10 +4802,11 @@ diff --git a/chrome/browser/ash/hats/hats_dialog.cc b/chrome/browser/ash/hats/ha // Delimiters used to join the separate device info elements into a single // string to be used as site context. -diff --git a/chrome/browser/ash/input_method/assistive_suggester.cc b/chrome/browser/ash/input_method/assistive_suggester.cc ---- a/chrome/browser/ash/input_method/assistive_suggester.cc -+++ b/chrome/browser/ash/input_method/assistive_suggester.cc -@@ -37,23 +37,23 @@ const char kMaxTextBeforeCursorLength = 50; +diff --git a/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc b/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc +index 27f85ec362353..81fbfb75edf1e 100644 +--- a/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc ++++ b/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc +@@ -21,23 +21,23 @@ namespace { const char* kAllowedDomainsForPersonalInfoSuggester[] = { "discord.com", "messenger.com", "web.whatsapp.com", @@ -4693,6 +4840,7 @@ diff --git a/chrome/browser/ash/input_method/assistive_suggester.cc b/chrome/bro const char* kTestUrls[] = { diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc +index 9e41a9f158e03..1e2e73344b3bd 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc @@ -18,7 +18,7 @@ const char kKeyPsk[] = "psk"; @@ -4705,10 +4853,11 @@ diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.cc b/chr } // namespace key_names diff --git a/chrome/browser/ash/login/marketing_backend_connector.cc b/chrome/browser/ash/login/marketing_backend_connector.cc +index e00a201dd4fdb..6fc35d932d5ad 100644 --- a/chrome/browser/ash/login/marketing_backend_connector.cc +++ b/chrome/browser/ash/login/marketing_backend_connector.cc -@@ -32,10 +32,10 @@ namespace chromeos { - namespace { +@@ -32,10 +32,10 @@ namespace { + // The scope that will be used to access the ChromebookEmailService API. const char kChromebookOAuth2Scope[] = - "https://www.googleapis.com/auth/chromebook.email"; @@ -4721,6 +4870,7 @@ diff --git a/chrome/browser/ash/login/marketing_backend_connector.cc b/chrome/br constexpr size_t kResponseMaxBodySize = 4 * 1024 * 1024; // 4MiB diff --git a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc b/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc +index 26d075eadb7d5..abe3af300e8a8 100644 --- a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc +++ b/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc @@ -73,7 +73,7 @@ const char kAcceptValue[] = @@ -4733,6 +4883,7 @@ diff --git a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc b/chro const char kPasswordSyncTokenCreateEndPoint[] = ""; diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc +index 7bef2d9cf3701..4a68a37fd66e5 100644 --- a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc +++ b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc @@ -38,7 +38,7 @@ namespace ash { @@ -4744,417 +4895,10 @@ diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetc constexpr int kResponseErrorNotEnoughApps = 5; -diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc ---- a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc -+++ b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc -@@ -107,7 +107,7 @@ class PluginVmDiagnostics : public base::RefCounted { - entry.SetFail( - IDS_VM_STATUS_PAGE_EPHEMERAL_PROFILE_EXPLANATION, - /*learn_more_link=*/ -- GURL("https://support.google.com/chromebook?p=ephemeral_mode")); -+ GURL("https://support.9oo91e.qjz9zk/chromebook?p=ephemeral_mode")); - break; - case ProfileSupported::kErrorNotSupported: - entry.SetFail(IDS_VM_STATUS_PAGE_UNSUPPORTED_PROFILE_EXPLANATION); -@@ -212,7 +212,7 @@ class PluginVmDiagnostics : public base::RefCounted { - l10n_util::GetStringUTF16(IDS_PLUGIN_VM_APP_NAME)), - /*learn_more_link=*/ - GURL( -- "https://support.google.com/chromebook?p=parallels_setup")); -+ "https://support.9oo91e.qjz9zk/chromebook?p=parallels_setup")); - } else { - // Everything is good. Do nothing. - } -diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc ---- a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc -+++ b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc -@@ -34,8 +34,8 @@ namespace plugin_vm { - namespace { - - constexpr char kValidationOAuth2Scope[] = -- "https://www.googleapis.com/auth/applicense.bytebot"; --constexpr char kValidationEndpoint[] = "https://bytebot.googleapis.com/"; -+ "https://www.9oo91eapis.qjz9zk/auth/applicense.bytebot"; -+constexpr char kValidationEndpoint[] = "https://bytebot.9oo91eapis.qjz9zk/"; - constexpr char kValidationServicePath[] = - "v1/applications/chromePluginVm:getLicenseStatus"; - constexpr char kValidationServiceQuery[] = "?checkOnly=true&access_token="; -diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc ---- a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc -+++ b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc -@@ -110,7 +110,7 @@ void RemoveDriveDownloadDirectoryIfExists() { - absl::optional GetIdFromDriveUrl(const GURL& url) { - const std::string& spec = url.spec(); - -- const std::string kOpenUrlBase = "https://drive.google.com/open?"; -+ const std::string kOpenUrlBase = "https://drive.9oo91e.qjz9zk/open?"; - if (base::StartsWith(spec, kOpenUrlBase, - base::CompareCase::INSENSITIVE_ASCII)) { - // e.g. https://drive.google.com/open?id=[ID] -@@ -122,9 +122,9 @@ absl::optional GetIdFromDriveUrl(const GURL& url) { - - // These will match some invalid URLs, which is fine. - const std::string kViewUrlPatternWithDomain = -- "https://drive.google.com/a/*/file/d/*/view*"; -+ "https://drive.9oo91e.qjz9zk/a/*/file/d/*/view*"; - const std::string kViewUrlPatternWithoutDomain = -- "https://drive.google.com/file/d/*/view*"; -+ "https://drive.9oo91e.qjz9zk/file/d/*/view*"; - if (base::MatchPattern(spec, kViewUrlPatternWithDomain) || - base::MatchPattern(spec, kViewUrlPatternWithoutDomain)) { - // e.g. https://drive.google.com/a/example.org/file/d/[ID]/view?usp=sharing -diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc ---- a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc -+++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc -@@ -140,7 +140,7 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", - "execs.com", - "exemail.com.au", - "f-m.fm", -- "facebook.com", -+ "f8c3b00k.qjz9zk", - "fast-email.com", - "fast-mail.org", - "fastem.com", -@@ -179,9 +179,9 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", - "gardener.com", - "geologist.com", - "germanymail.com", -- "gmail.com", -+ "9ma1l.qjz9zk", - "gmx.com", -- "googlemail.com", -+ "9oo91email.qjz9zk", - "graduate.org", - "graphic-designer.com", - "greenmail.net", -diff --git a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc ---- a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc -+++ b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc -@@ -53,7 +53,7 @@ const gfx::VectorIcon& kNotificationIcon = vector_icons::kBusinessIcon; - constexpr mc::SystemNotificationWarningLevel kNotificationLevel = - mc::SystemNotificationWarningLevel::NORMAL; - const char kNotificationLearnMoreLink[] = -- "https://support.google.com/chromebook?p=factory_reset"; -+ "https://support.9oo91e.qjz9zk/chromebook?p=factory_reset"; - - std::u16string GetEnterpriseManager() { - policy::BrowserPolicyConnectorAsh* connector = -diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc ---- a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc -+++ b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc -@@ -33,11 +33,11 @@ namespace { - - // OAuth2 Token scopes - constexpr char kCloudDevicesOAuth2Scope[] = -- "https://www.googleapis.com/auth/clouddevices"; -+ "https://www.9oo91eapis.qjz9zk/auth/clouddevices"; - constexpr char kChromotingRemoteSupportOAuth2Scope[] = -- "https://www.googleapis.com/auth/chromoting.remote.support"; -+ "https://www.9oo91eapis.qjz9zk/auth/chromoting.remote.support"; - constexpr char kTachyonOAuth2Scope[] = -- "https://www.googleapis.com/auth/tachyon"; -+ "https://www.9oo91eapis.qjz9zk/auth/tachyon"; - - // Job parameters fields: - -diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc ---- a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc -+++ b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc -@@ -30,11 +30,11 @@ const char kHeartbeatGCMAppID[] = "com.google.chromeos.monitoring"; - - // The default destination we send our GCM messages to. - const char kHeartbeatGCMDestinationID[] = "1013309121859"; --const char kHeartbeatGCMSenderSuffix[] = "@google.com"; -+const char kHeartbeatGCMSenderSuffix[] = "@9oo91e.qjz9zk"; - - // Destination of upstream notification sign up message. - const char kUpstreamNotificationSignUpDestinationID[] = -- "https://gcm.googleapis.com/gcm/gcm.event_tracker"; -+ "https://gcm.9oo91eapis.qjz9zk/gcm/gcm.event_tracker"; - - // A bit mask, listening events of upstream notification. - const char kUpstreamNotificationSignUpListeningEvents[] = -diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser/autofill/autofill_gstatic_reader.cc ---- a/chrome/browser/autofill/autofill_gstatic_reader.cc -+++ b/chrome/browser/autofill/autofill_gstatic_reader.cc -@@ -27,9 +27,9 @@ static const char kTokenizationBinRangeAllowlistKey[] = - static const char kTokenizationMerchantAllowlistKey[] = - "cpan_eligible_merchant_wl"; - static const char kTokenizationBinRangeAllowlistURL[] = -- "https://www.gstatic.com/autofill/hourly/bins.json"; -+ "https://www.95tat1c.qjz9zk/autofill/hourly/bins.json"; - static const char kTokenizationMerchantAllowlistURL[] = -- "https://www.gstatic.com/autofill/weekly/merchants.json"; -+ "https://www.95tat1c.qjz9zk/autofill/weekly/merchants.json"; - static const size_t kMaxDownloadSize = 30 * 1024; - } // namespace - -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 -@@ -52,7 +52,7 @@ constexpr net::NetworkTrafficAnnotationTag traffic_annotation = - "an alternative browser. This is often on the organization's " - "intranet. For more information on Internet Explorer's Enterprise " - "Mode, see: " -- "https://docs.microsoft.com/internet-explorer/ie11-deploy-guide" -+ "https://docs.m1cr050ft.qjz9zk/internet-explorer/ie11-deploy-guide" - "/what-is-enterprise-mode" - trigger: - "1 minute after browser startup, and then refreshes every 30 " -diff --git a/chrome/browser/buildflags.gni b/chrome/browser/buildflags.gni ---- a/chrome/browser/buildflags.gni -+++ b/chrome/browser/buildflags.gni -@@ -16,7 +16,7 @@ declare_args() { - # TODO(crbug.com/1054060) - enable_chromium_updater = false - -- # TODO(stahon@microsoft.com) Remove this when app_session_service is enabled -+ # TODO(stahon@m1cr050ft.qjz9zk) Remove this when app_session_service is enabled - # across the board. Until then, this buildflag allows some platforms to use - # app_session_service and some not. - enable_app_session_service = -diff --git a/chrome/browser/cart/cart_discount_fetcher.cc b/chrome/browser/cart/cart_discount_fetcher.cc ---- a/chrome/browser/cart/cart_discount_fetcher.cc -+++ b/chrome/browser/cart/cart_discount_fetcher.cc -@@ -30,7 +30,7 @@ const char kAcceptLanguageKey[] = "Accept-Language"; - const char kClientDataHeader[] = "X-Client-Data"; - - const char kFetchDiscountsEndpoint[] = -- "https://memex-pa.googleapis.com/v1/shopping/cart/discounts"; -+ "https://memex-pa.9oo91eapis.qjz9zk/v1/shopping/cart/discounts"; - const int64_t kTimeoutMs = 30000; - - const char kCartDiscountFetcherEndpointParam[] = -diff --git a/chrome/browser/cart/cart_discount_link_fetcher.cc b/chrome/browser/cart/cart_discount_link_fetcher.cc ---- a/chrome/browser/cart/cart_discount_link_fetcher.cc -+++ b/chrome/browser/cart/cart_discount_link_fetcher.cc -@@ -22,7 +22,7 @@ const char kPostMethod[] = "POST"; - const char kContentType[] = "application/json; charset=UTF-8"; - - const char kFetchDiscountLinkEndpoint[] = -- "https://memex-pa.googleapis.com/v1/shopping/cart/discounted"; -+ "https://memex-pa.9oo91eapis.qjz9zk/v1/shopping/cart/discounted"; - const int64_t kTimeoutMs = 30000; - } // namespace - -diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_service.cc ---- a/chrome/browser/cart/cart_service.cc -+++ b/chrome/browser/cart/cart_service.cc -@@ -462,7 +462,7 @@ void CartService::AddCartsWithFakeData() { - // Polulate and add some carts with fake data. - double time_now = base::Time::Now().ToDoubleT(); - cart_db::ChromeCartContentProto dummy_proto1; -- GURL dummy_url1 = GURL("https://shopping.google.com"); -+ GURL dummy_url1 = GURL("https://shopping.9oo91e.qjz9zk"); - dummy_proto1.set_key(std::string(kFakeDataPrefix) + eTLDPlusOne(dummy_url1)); - dummy_proto1.set_merchant("Cart Foo"); - dummy_proto1.set_merchant_cart_url(dummy_url1.spec()); -@@ -471,17 +471,17 @@ void CartService::AddCartsWithFakeData() { - l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, - u"15%")); - dummy_proto1.add_product_image_urls( -- "https://encrypted-tbn3.gstatic.com/" -+ "https://encrypted-tbn3.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" - "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" - "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); - dummy_proto1.add_product_image_urls( -- "https://encrypted-tbn0.gstatic.com/" -+ "https://encrypted-tbn0.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" - "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" - "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); - dummy_proto1.add_product_image_urls( -- "https://encrypted-tbn1.gstatic.com/" -+ "https://encrypted-tbn1.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" - "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" - "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); -@@ -499,12 +499,12 @@ void CartService::AddCartsWithFakeData() { - l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, - u"20%")); - dummy_proto2.add_product_image_urls( -- "https://encrypted-tbn3.gstatic.com/" -+ "https://encrypted-tbn3.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" - "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" - "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); - dummy_proto2.add_product_image_urls( -- "https://encrypted-tbn0.gstatic.com/" -+ "https://encrypted-tbn0.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" - "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" - "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); -@@ -522,7 +522,7 @@ void CartService::AddCartsWithFakeData() { - l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT, - u"$50")); - dummy_proto3.add_product_image_urls( -- "https://encrypted-tbn3.gstatic.com/" -+ "https://encrypted-tbn3.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" - "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" - "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); -@@ -537,12 +537,12 @@ void CartService::AddCartsWithFakeData() { - dummy_proto4.set_merchant_cart_url(dummy_url4.spec()); - dummy_proto4.set_timestamp(time_now + 3); - dummy_proto4.add_product_image_urls( -- "https://encrypted-tbn0.gstatic.com/" -+ "https://encrypted-tbn0.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" - "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" - "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); - dummy_proto4.add_product_image_urls( -- "https://encrypted-tbn1.gstatic.com/" -+ "https://encrypted-tbn1.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" - "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" - "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); -@@ -557,7 +557,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( -- "https://encrypted-tbn3.gstatic.com/" -+ "https://encrypted-tbn3.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" - "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" - "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); -@@ -572,17 +572,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( -- "https://encrypted-tbn3.gstatic.com/" -+ "https://encrypted-tbn3.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" - "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" - "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); - dummy_proto6.add_product_image_urls( -- "https://encrypted-tbn0.gstatic.com/" -+ "https://encrypted-tbn0.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" - "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" - "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); - dummy_proto6.add_product_image_urls( -- "https://encrypted-tbn1.gstatic.com/" -+ "https://encrypted-tbn1.95tat1c.qjz9zk/" - "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" - "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" - "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); -diff --git a/chrome/browser/cart/fetch_discount_worker.cc b/chrome/browser/cart/fetch_discount_worker.cc ---- a/chrome/browser/cart/fetch_discount_worker.cc -+++ b/chrome/browser/cart/fetch_discount_worker.cc -@@ -26,7 +26,7 @@ - - namespace { - const char kOauthName[] = "rbd"; --const char kOauthScopes[] = "https://www.googleapis.com/auth/chromememex"; -+const char kOauthScopes[] = "https://www.9oo91eapis.qjz9zk/auth/chromememex"; - const char kEmptyToken[] = ""; - } // namespace - -diff --git a/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json b/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json ---- a/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json -+++ b/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json -@@ -63,7 +63,7 @@ - "lululemon.com": "https://shop.lululemon.com/shop/mybag", - "lulus.com": "https://www.lulus.com/checkout/bag", - "macys.com": "https://www.macys.com/my-bag", --"microsoft.com": "https://www.microsoft.com/en-us/store/cart", -+"m1cr050ft.qjz9zk": "https://www.m1cr050ft.qjz9zk/en-us/store/cart", - "midwayusa.com": "https://www.midwayusa.com/cart", - "neimanmarcus.com": "https://www.neimanmarcus.com/checkout/cart.jsp", - "newegg.com": "https://secure.newegg.com/shop/cart", -diff --git a/chrome/browser/cart/resources/cart_domain_name_mapping.json b/chrome/browser/cart/resources/cart_domain_name_mapping.json ---- a/chrome/browser/cart/resources/cart_domain_name_mapping.json -+++ b/chrome/browser/cart/resources/cart_domain_name_mapping.json -@@ -63,7 +63,7 @@ - "lululemon.com": "lululemon", - "lulus.com": "Lulus", - "macys.com": "Macy's", --"microsoft.com": "Microsoft", -+"m1cr050ft.qjz9zk": "Microsoft", - "midwayusa.com": "MidwayUSA", - "neimanmarcus.com": "Neiman Marcus", - "newegg.com": "Newegg", -diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm ---- a/chrome/browser/chrome_browser_application_mac.mm -+++ b/chrome/browser/chrome_browser_application_mac.mm -@@ -153,7 +153,7 @@ std::string DescriptionForNSEvent(NSEvent* event) { - - //////////////////////////////////////////////////////////////////////////////// - // HISTORICAL COMMENT (by viettrungluu, from --// http://codereview.chromium.org/1520006 with mild editing): -+// http://codereview.ch40m1um.qjz9zk/1520006 with mild editing): - // - // A quick summary of the state of things (before the changes to shutdown): - // -diff --git a/chrome/browser/chromeos/android_sms/android_sms_urls.cc b/chrome/browser/chromeos/android_sms/android_sms_urls.cc ---- a/chrome/browser/chromeos/android_sms/android_sms_urls.cc -+++ b/chrome/browser/chromeos/android_sms/android_sms_urls.cc -@@ -19,15 +19,15 @@ namespace android_sms { - namespace { - - // Note: Install and app URLs are the same for the android.com domain. --const char kProdAndroidUrl[] = "https://messages.android.com/"; -+const char kProdAndroidUrl[] = "https://messages.8n6r01d.qjz9zk/"; - --const char kProdGoogleAppUrl[] = "https://messages.google.com/web/"; -+const char kProdGoogleAppUrl[] = "https://messages.9oo91e.qjz9zk/web/"; - const char kProdGoogleInstallUrl[] = -- "https://messages.google.com/web/authentication"; -+ "https://messages.9oo91e.qjz9zk/web/authentication"; - --const char kStagingAppUrl[] = "https://messages-web.sandbox.google.com/web/"; -+const char kStagingAppUrl[] = "https://messages-web.sandbox.9oo91e.qjz9zk/web/"; - const char kStagingInstallUrl[] = -- "https://messages-web.sandbox.google.com/web/authentication"; -+ "https://messages-web.sandbox.9oo91e.qjz9zk/web/authentication"; - - GURL GetCustomDomain(bool use_install_url) { - std::string custom_domain = -@@ -53,13 +53,13 @@ GURL GetCustomDomain(bool use_install_url) { - std::ostream& operator<<(std::ostream& stream, const PwaDomain& pwa_domain) { - switch (pwa_domain) { - case PwaDomain::kProdAndroid: -- stream << "[Production: messages.android.com]"; -+ stream << "[Production: messages.8n6r01d.qjz9zk]"; - break; - case PwaDomain::kProdGoogle: -- stream << "[Production: messages.google.com]"; -+ stream << "[Production: messages.9oo91e.qjz9zk]"; - break; - case PwaDomain::kStaging: -- stream << "[Staging: messages-web.sandbox.google.com]"; -+ stream << "[Staging: messages-web.sandbox.9oo91e.qjz9zk]"; - break; - } - return stream; -diff --git a/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc b/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc ---- a/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc -+++ b/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc -@@ -29,7 +29,7 @@ const char kEcheAppFromWebWithoudButtonNotifierId[] = - - // 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"; - - namespace { - -diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc ---- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -@@ -87,7 +87,7 @@ namespace { - - using api::file_manager_private::ProfileInfo; - --const char kCWSScope[] = "https://www.googleapis.com/auth/chromewebstore"; -+const char kCWSScope[] = "https://www.9oo91eapis.qjz9zk/auth/chromewebstore"; - - // Thresholds for mountCrostini() API. - constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold = -diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.cc b/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.cc ---- a/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.cc -+++ b/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_routine.cc +diff --git a/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc +index f2077d99583b6..7f34ec43c7ca9 100644 +--- a/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc ++++ b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc @@ -18,9 +18,9 @@ namespace { // These hostnames were chosen because they need to be resolved for a @@ -5168,21 +4912,23 @@ diff --git a/chrome/browser/chromeos/net/network_diagnostics/arc_dns_resolution_ } // namespace -diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc b/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc ---- a/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc -+++ b/chrome/browser/chromeos/net/network_diagnostics/dns_latency_routine.cc +diff --git a/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc +index 1659db70eadf2..cc47612c64fee 100644 +--- a/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc ++++ b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc @@ -40,7 +40,7 @@ constexpr base::TimeDelta kBadLatencyMs = - base::TimeDelta::FromMilliseconds(util::kDnsPotentialProblemLatencyMs); + base::Milliseconds(util::kDnsPotentialProblemLatencyMs); constexpr base::TimeDelta kVeryBadLatencyMs = - base::TimeDelta::FromMilliseconds(util::kDnsProblemLatencyMs); + base::Milliseconds(util::kDnsProblemLatencyMs); -constexpr char kHostSuffix[] = "-ccd-testing-v4.metric.gstatic.com"; +constexpr char kHostSuffix[] = "-ccd-testing-v4.metric.95tat1c.qjz9zk"; const std::string GetRandomString(int length) { std::string prefix; -diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.cc b/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.cc ---- a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.cc -+++ b/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_routine.cc +diff --git a/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc +index 17b7fe7856e50..027cf3d3137aa 100644 +--- a/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc ++++ b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc @@ -23,7 +23,7 @@ namespace chromeos { namespace network_diagnostics { namespace { @@ -5192,9 +4938,10 @@ diff --git a/chrome/browser/chromeos/net/network_diagnostics/dns_resolution_rout constexpr int kHttpPort = 80; // For an explanation of error codes, see "net/base/net_error_list.h". constexpr int kRetryResponseCodes[] = {net::ERR_TIMED_OUT, -diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc b/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc ---- a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc -+++ b/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics_util.cc +diff --git a/chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.cc b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.cc +index fa9a311e48c96..4608580d56576 100644 +--- a/chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.cc ++++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.cc @@ -41,14 +41,14 @@ std::vector GetRandomPrefixes(size_t num_prefixes, int length) { } // namespace @@ -5228,9 +4975,10 @@ diff --git a/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics std::vector hostnames; for (auto* const& hostname : kHostnames) { hostnames.push_back(GURL(hostname)); -diff --git a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.cc b/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.cc ---- a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.cc -+++ b/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_routine.cc +diff --git a/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.cc b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.cc +index 23b4e2b6d77d6..5d77f4518180d 100644 +--- a/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.cc ++++ b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.cc @@ -22,12 +22,12 @@ namespace network_diagnostics { namespace { @@ -5243,12 +4991,163 @@ diff --git a/chrome/browser/chromeos/net/network_diagnostics/video_conferencing_ // TODO(crbug/1227877): Move support details to the UI. -const char kSupportDetails[] = "https://support.google.com/a/answer/1279090"; +const char kSupportDetails[] = "https://support.9oo91e.qjz9zk/a/answer/1279090"; - const base::TimeDelta kTimeoutAfterHostResolution = - base::TimeDelta::FromSeconds(10); + const base::TimeDelta kTimeoutAfterHostResolution = base::Seconds(10); -diff --git a/chrome/browser/chromeos/u2f_notification.cc b/chrome/browser/chromeos/u2f_notification.cc ---- a/chrome/browser/chromeos/u2f_notification.cc -+++ b/chrome/browser/chromeos/u2f_notification.cc + VideoConferencingRoutine::VideoConferencingRoutine() +diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc +index 89173f0506c1f..60fbe34c27f4f 100644 +--- a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc ++++ b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc +@@ -107,7 +107,7 @@ class PluginVmDiagnostics : public base::RefCounted { + entry.SetFail( + IDS_VM_STATUS_PAGE_EPHEMERAL_PROFILE_EXPLANATION, + /*learn_more_link=*/ +- GURL("https://support.google.com/chromebook?p=ephemeral_mode")); ++ GURL("https://support.9oo91e.qjz9zk/chromebook?p=ephemeral_mode")); + break; + case ProfileSupported::kErrorNotSupported: + entry.SetFail(IDS_VM_STATUS_PAGE_UNSUPPORTED_PROFILE_EXPLANATION); +@@ -212,7 +212,7 @@ class PluginVmDiagnostics : public base::RefCounted { + l10n_util::GetStringUTF16(IDS_PLUGIN_VM_APP_NAME)), + /*learn_more_link=*/ + GURL( +- "https://support.google.com/chromebook?p=parallels_setup")); ++ "https://support.9oo91e.qjz9zk/chromebook?p=parallels_setup")); + } else { + // Everything is good. Do nothing. + } +diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc +index 6bf3cde15c809..039095d26975a 100644 +--- a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc ++++ b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc +@@ -34,8 +34,8 @@ namespace plugin_vm { + namespace { + + constexpr char kValidationOAuth2Scope[] = +- "https://www.googleapis.com/auth/applicense.bytebot"; +-constexpr char kValidationEndpoint[] = "https://bytebot.googleapis.com/"; ++ "https://www.9oo91eapis.qjz9zk/auth/applicense.bytebot"; ++constexpr char kValidationEndpoint[] = "https://bytebot.9oo91eapis.qjz9zk/"; + constexpr char kValidationServicePath[] = + "v1/applications/chromePluginVm:getLicenseStatus"; + constexpr char kValidationServiceQuery[] = "?checkOnly=true&access_token="; +diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc +index 65e1037ad9fb2..8ca0690c4f523 100644 +--- a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc ++++ b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc +@@ -110,7 +110,7 @@ void RemoveDriveDownloadDirectoryIfExists() { + absl::optional GetIdFromDriveUrl(const GURL& url) { + const std::string& spec = url.spec(); + +- const std::string kOpenUrlBase = "https://drive.google.com/open?"; ++ const std::string kOpenUrlBase = "https://drive.9oo91e.qjz9zk/open?"; + if (base::StartsWith(spec, kOpenUrlBase, + base::CompareCase::INSENSITIVE_ASCII)) { + // e.g. https://drive.google.com/open?id=[ID] +@@ -122,9 +122,9 @@ absl::optional GetIdFromDriveUrl(const GURL& url) { + + // These will match some invalid URLs, which is fine. + const std::string kViewUrlPatternWithDomain = +- "https://drive.google.com/a/*/file/d/*/view*"; ++ "https://drive.9oo91e.qjz9zk/a/*/file/d/*/view*"; + const std::string kViewUrlPatternWithoutDomain = +- "https://drive.google.com/file/d/*/view*"; ++ "https://drive.9oo91e.qjz9zk/file/d/*/view*"; + if (base::MatchPattern(spec, kViewUrlPatternWithDomain) || + base::MatchPattern(spec, kViewUrlPatternWithoutDomain)) { + // e.g. https://drive.google.com/a/example.org/file/d/[ID]/view?usp=sharing +diff --git a/chrome/browser/ash/policy/dlp/dlp_clipboard_bubble_constants.h b/chrome/browser/ash/policy/dlp/dlp_clipboard_bubble_constants.h +index 746c81a339dfb..5e49bf9a75441 100644 +--- a/chrome/browser/ash/policy/dlp/dlp_clipboard_bubble_constants.h ++++ b/chrome/browser/ash/policy/dlp/dlp_clipboard_bubble_constants.h +@@ -38,7 +38,7 @@ constexpr int kClipboardDlpWarnDurationMs = 16000; + + // Link to the Help Center article about Data Leak Prevention. + constexpr char kDlpLearnMoreUrl[] = +- "https://support.google.com/chrome/a/?p=chromeos_datacontrols"; ++ "https://support.9oo91e.qjz9zk/chrome/a/?p=chromeos_datacontrols"; + + } // namespace policy + +diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc +index f5f24251a31dc..3efe03739a369 100644 +--- a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc ++++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc +@@ -140,7 +140,7 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", + "execs.com", + "exemail.com.au", + "f-m.fm", +- "facebook.com", ++ "f8c3b00k.qjz9zk", + "fast-email.com", + "fast-mail.org", + "fastem.com", +@@ -179,9 +179,9 @@ const char* const kKnownConsumerDomains[] = {"123mail.org", + "gardener.com", + "geologist.com", + "germanymail.com", +- "gmail.com", ++ "9ma1l.qjz9zk", + "gmx.com", +- "googlemail.com", ++ "9oo91email.qjz9zk", + "graduate.org", + "graphic-designer.com", + "greenmail.net", +diff --git a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc +index c01fa9d5d8f94..c916328e54be6 100644 +--- a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc ++++ b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc +@@ -53,7 +53,7 @@ const gfx::VectorIcon& kNotificationIcon = vector_icons::kBusinessIcon; + constexpr mc::SystemNotificationWarningLevel kNotificationLevel = + mc::SystemNotificationWarningLevel::NORMAL; + const char kNotificationLearnMoreLink[] = +- "https://support.google.com/chromebook?p=factory_reset"; ++ "https://support.9oo91e.qjz9zk/chromebook?p=factory_reset"; + + std::u16string GetEnterpriseManager() { + policy::BrowserPolicyConnectorAsh* connector = +diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc +index b446a5ab90700..9a137a28b1009 100644 +--- a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc ++++ b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc +@@ -33,11 +33,11 @@ namespace { + + // OAuth2 Token scopes + constexpr char kCloudDevicesOAuth2Scope[] = +- "https://www.googleapis.com/auth/clouddevices"; ++ "https://www.9oo91eapis.qjz9zk/auth/clouddevices"; + constexpr char kChromotingRemoteSupportOAuth2Scope[] = +- "https://www.googleapis.com/auth/chromoting.remote.support"; ++ "https://www.9oo91eapis.qjz9zk/auth/chromoting.remote.support"; + constexpr char kTachyonOAuth2Scope[] = +- "https://www.googleapis.com/auth/tachyon"; ++ "https://www.9oo91eapis.qjz9zk/auth/tachyon"; + + // Job parameters fields: + +diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc +index 0cb11d74145e5..aacaab15cce0e 100644 +--- a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc ++++ b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc +@@ -29,11 +29,11 @@ const char kHeartbeatGCMAppID[] = "com.google.chromeos.monitoring"; + + // The default destination we send our GCM messages to. + const char kHeartbeatGCMDestinationID[] = "1013309121859"; +-const char kHeartbeatGCMSenderSuffix[] = "@google.com"; ++const char kHeartbeatGCMSenderSuffix[] = "@9oo91e.qjz9zk"; + + // Destination of upstream notification sign up message. + const char kUpstreamNotificationSignUpDestinationID[] = +- "https://gcm.googleapis.com/gcm/gcm.event_tracker"; ++ "https://gcm.9oo91eapis.qjz9zk/gcm/gcm.event_tracker"; + + // A bit mask, listening events of upstream notification. + const char kUpstreamNotificationSignUpListeningEvents[] = +diff --git a/chrome/browser/ash/u2f_notification.cc b/chrome/browser/ash/u2f_notification.cc +index 8359ba83d2675..62e34f6a9ac10 100644 +--- a/chrome/browser/ash/u2f_notification.cc ++++ b/chrome/browser/ash/u2f_notification.cc @@ -34,7 +34,7 @@ namespace { constexpr char kU2FNotificationId[] = "chrome://u2f_notification"; @@ -5258,7 +5157,272 @@ diff --git a/chrome/browser/chromeos/u2f_notification.cc b/chrome/browser/chrome "u2f-ecdsa-vulnerability"; // Notification button identifiers. +diff --git a/chrome/browser/ash/web_applications/terminal_source.cc b/chrome/browser/ash/web_applications/terminal_source.cc +index 7754c73b27e91..a425abc41314b 100644 +--- a/chrome/browser/ash/web_applications/terminal_source.cc ++++ b/chrome/browser/ash/web_applications/terminal_source.cc +@@ -156,8 +156,8 @@ std::string TerminalSource::GetContentSecurityPolicy( + switch (directive) { + case network::mojom::CSPDirectiveName::ConnectSrc: + return "connect-src 'self' " +- "https://*.corp.google.com:* wss://*.corp.google.com:* " +- "https://*.r.ext.google.com:* wss://*.r.ext.google.com:*;"; ++ "https://*.corp.9oo91e.qjz9zk:* wss://*.corp.9oo91e.qjz9zk:* " ++ "https://*.r.ext.9oo91e.qjz9zk:* wss://*.r.ext.9oo91e.qjz9zk:*;"; + case network::mojom::CSPDirectiveName::FrameAncestors: + return "frame-ancestors 'self';"; + case network::mojom::CSPDirectiveName::FrameSrc: +diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser/autofill/autofill_gstatic_reader.cc +index 31f6ccd80a6f8..042e425ff6ef3 100644 +--- a/chrome/browser/autofill/autofill_gstatic_reader.cc ++++ b/chrome/browser/autofill/autofill_gstatic_reader.cc +@@ -27,9 +27,9 @@ static const char kTokenizationBinRangeAllowlistKey[] = + static const char kTokenizationMerchantAllowlistKey[] = + "cpan_eligible_merchant_wl"; + static const char kTokenizationBinRangeAllowlistURL[] = +- "https://www.gstatic.com/autofill/hourly/bins.json"; ++ "https://www.95tat1c.qjz9zk/autofill/hourly/bins.json"; + static const char kTokenizationMerchantAllowlistURL[] = +- "https://www.gstatic.com/autofill/weekly/merchants.json"; ++ "https://www.95tat1c.qjz9zk/autofill/weekly/merchants.json"; + static const size_t kMaxDownloadSize = 30 * 1024; + } // namespace + +diff --git a/chrome/browser/browser_switcher/browser_switcher_service.cc b/chrome/browser/browser_switcher/browser_switcher_service.cc +index 1b8cc8e8db88a..de1ac7e7cb92e 100644 +--- a/chrome/browser/browser_switcher/browser_switcher_service.cc ++++ b/chrome/browser/browser_switcher/browser_switcher_service.cc +@@ -52,7 +52,7 @@ constexpr net::NetworkTrafficAnnotationTag traffic_annotation = + "an alternative browser. This is often on the organization's " + "intranet. For more information on Internet Explorer's Enterprise " + "Mode, see: " +- "https://docs.microsoft.com/internet-explorer/ie11-deploy-guide" ++ "https://docs.m1cr050ft.qjz9zk/internet-explorer/ie11-deploy-guide" + "/what-is-enterprise-mode" + trigger: + "1 minute after browser startup, and then refreshes every 30 " +diff --git a/chrome/browser/buildflags.gni b/chrome/browser/buildflags.gni +index 22671f3404d3d..f7da5eb176cb8 100644 +--- a/chrome/browser/buildflags.gni ++++ b/chrome/browser/buildflags.gni +@@ -16,7 +16,7 @@ declare_args() { + # TODO(crbug.com/1054060) + enable_chromium_updater = false + +- # TODO(stahon@microsoft.com) Remove this when app_session_service is enabled ++ # TODO(stahon@m1cr050ft.qjz9zk) Remove this when app_session_service is enabled + # across the board. Until then, this buildflag allows some platforms to use + # app_session_service and some not. + enable_app_session_service = !is_android && !is_chromecast +diff --git a/chrome/browser/cart/cart_discount_fetcher.cc b/chrome/browser/cart/cart_discount_fetcher.cc +index fe03274c48330..77422f7ce5a52 100644 +--- a/chrome/browser/cart/cart_discount_fetcher.cc ++++ b/chrome/browser/cart/cart_discount_fetcher.cc +@@ -32,7 +32,7 @@ const char kAcceptLanguageKey[] = "Accept-Language"; + const char kClientDataHeader[] = "X-Client-Data"; + + const char kFetchDiscountsEndpoint[] = +- "https://memex-pa.googleapis.com/v1/shopping/cart/discounts"; ++ "https://memex-pa.9oo91eapis.qjz9zk/v1/shopping/cart/discounts"; + const int64_t kTimeoutMs = 30000; + + const char kCartDiscountFetcherEndpointParam[] = +diff --git a/chrome/browser/cart/cart_discount_link_fetcher.cc b/chrome/browser/cart/cart_discount_link_fetcher.cc +index 7a421762fe07b..ab2dedb1a6ea8 100644 +--- a/chrome/browser/cart/cart_discount_link_fetcher.cc ++++ b/chrome/browser/cart/cart_discount_link_fetcher.cc +@@ -22,7 +22,7 @@ const char kPostMethod[] = "POST"; + const char kContentType[] = "application/json; charset=UTF-8"; + + const char kFetchDiscountLinkEndpoint[] = +- "https://memex-pa.googleapis.com/v1/shopping/cart/discounted"; ++ "https://memex-pa.9oo91eapis.qjz9zk/v1/shopping/cart/discounted"; + const int64_t kTimeoutMs = 30000; + } // namespace + +diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_service.cc +index 2a3ed4002539e..b066b7aab35ab 100644 +--- a/chrome/browser/cart/cart_service.cc ++++ b/chrome/browser/cart/cart_service.cc +@@ -489,7 +489,7 @@ void CartService::AddCartsWithFakeData() { + // Polulate and add some carts with fake data. + double time_now = base::Time::Now().ToDoubleT(); + cart_db::ChromeCartContentProto dummy_proto1; +- GURL dummy_url1 = GURL("https://shopping.google.com"); ++ GURL dummy_url1 = GURL("https://shopping.9oo91e.qjz9zk"); + dummy_proto1.set_key(std::string(kFakeDataPrefix) + eTLDPlusOne(dummy_url1)); + dummy_proto1.set_merchant("Cart Foo"); + dummy_proto1.set_merchant_cart_url(dummy_url1.spec()); +@@ -498,17 +498,17 @@ void CartService::AddCartsWithFakeData() { + l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, + u"15%")); + dummy_proto1.add_product_image_urls( +- "https://encrypted-tbn3.gstatic.com/" ++ "https://encrypted-tbn3.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" + "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" + "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); + dummy_proto1.add_product_image_urls( +- "https://encrypted-tbn0.gstatic.com/" ++ "https://encrypted-tbn0.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" + "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" + "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); + dummy_proto1.add_product_image_urls( +- "https://encrypted-tbn1.gstatic.com/" ++ "https://encrypted-tbn1.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" + "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" + "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); +@@ -526,12 +526,12 @@ void CartService::AddCartsWithFakeData() { + l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, + u"20%")); + dummy_proto2.add_product_image_urls( +- "https://encrypted-tbn3.gstatic.com/" ++ "https://encrypted-tbn3.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" + "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" + "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); + dummy_proto2.add_product_image_urls( +- "https://encrypted-tbn0.gstatic.com/" ++ "https://encrypted-tbn0.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" + "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" + "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); +@@ -549,7 +549,7 @@ void CartService::AddCartsWithFakeData() { + l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT, + u"$50")); + dummy_proto3.add_product_image_urls( +- "https://encrypted-tbn3.gstatic.com/" ++ "https://encrypted-tbn3.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" + "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" + "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); +@@ -564,12 +564,12 @@ void CartService::AddCartsWithFakeData() { + dummy_proto4.set_merchant_cart_url(dummy_url4.spec()); + dummy_proto4.set_timestamp(time_now + 3); + dummy_proto4.add_product_image_urls( +- "https://encrypted-tbn0.gstatic.com/" ++ "https://encrypted-tbn0.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" + "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" + "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); + dummy_proto4.add_product_image_urls( +- "https://encrypted-tbn1.gstatic.com/" ++ "https://encrypted-tbn1.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" + "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" + "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); +@@ -584,7 +584,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( +- "https://encrypted-tbn3.gstatic.com/" ++ "https://encrypted-tbn3.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" + "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" + "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); +@@ -599,17 +599,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( +- "https://encrypted-tbn3.gstatic.com/" ++ "https://encrypted-tbn3.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" + "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" + "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); + dummy_proto6.add_product_image_urls( +- "https://encrypted-tbn0.gstatic.com/" ++ "https://encrypted-tbn0.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" + "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" + "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); + dummy_proto6.add_product_image_urls( +- "https://encrypted-tbn1.gstatic.com/" ++ "https://encrypted-tbn1.95tat1c.qjz9zk/" + "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" + "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" + "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); +diff --git a/chrome/browser/cart/fetch_discount_worker.cc b/chrome/browser/cart/fetch_discount_worker.cc +index b4d7d561bb103..ed6f8865368ed 100644 +--- a/chrome/browser/cart/fetch_discount_worker.cc ++++ b/chrome/browser/cart/fetch_discount_worker.cc +@@ -28,7 +28,7 @@ + + namespace { + const char kOauthName[] = "rbd"; +-const char kOauthScopes[] = "https://www.googleapis.com/auth/chromememex"; ++const char kOauthScopes[] = "https://www.9oo91eapis.qjz9zk/auth/chromememex"; + const char kEmptyToken[] = ""; + } // namespace + +diff --git a/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json b/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json +index 2e6f1f2987daa..057d7ca229f3f 100644 +--- a/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json ++++ b/chrome/browser/cart/resources/cart_domain_cart_url_mapping.json +@@ -63,7 +63,7 @@ + "lululemon.com": "https://shop.lululemon.com/shop/mybag", + "lulus.com": "https://www.lulus.com/checkout/bag", + "macys.com": "https://www.macys.com/my-bag", +-"microsoft.com": "https://www.microsoft.com/en-us/store/cart", ++"m1cr050ft.qjz9zk": "https://www.m1cr050ft.qjz9zk/en-us/store/cart", + "midwayusa.com": "https://www.midwayusa.com/cart", + "neimanmarcus.com": "https://www.neimanmarcus.com/checkout/cart.jsp", + "newegg.com": "https://secure.newegg.com/shop/cart", +diff --git a/chrome/browser/cart/resources/cart_domain_name_mapping.json b/chrome/browser/cart/resources/cart_domain_name_mapping.json +index cd8aad9a500ad..97d9f59026e2e 100644 +--- a/chrome/browser/cart/resources/cart_domain_name_mapping.json ++++ b/chrome/browser/cart/resources/cart_domain_name_mapping.json +@@ -63,7 +63,7 @@ + "lululemon.com": "lululemon", + "lulus.com": "Lulus", + "macys.com": "Macy's", +-"microsoft.com": "Microsoft", ++"m1cr050ft.qjz9zk": "Microsoft", + "midwayusa.com": "MidwayUSA", + "neimanmarcus.com": "Neiman Marcus", + "newegg.com": "Newegg", +diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm +index 07d9bc3d9fa43..a7e2a63db789c 100644 +--- a/chrome/browser/chrome_browser_application_mac.mm ++++ b/chrome/browser/chrome_browser_application_mac.mm +@@ -153,7 +153,7 @@ std::string DescriptionForNSEvent(NSEvent* event) { + + //////////////////////////////////////////////////////////////////////////////// + // HISTORICAL COMMENT (by viettrungluu, from +-// http://codereview.chromium.org/1520006 with mild editing): ++// http://codereview.ch40m1um.qjz9zk/1520006 with mild editing): + // + // A quick summary of the state of things (before the changes to shutdown): + // +diff --git a/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc b/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc +index e7c491efc17d1..ccb78470007be 100644 +--- a/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc ++++ b/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc +@@ -29,7 +29,7 @@ const char kEcheAppFromWebWithoudButtonNotifierId[] = + + // 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"; + + namespace { + +diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +index 3a7bdf747d0ee..ce5c165239725 100644 +--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc ++++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +@@ -87,7 +87,7 @@ namespace { + + using api::file_manager_private::ProfileInfo; + +-const char kCWSScope[] = "https://www.googleapis.com/auth/chromewebstore"; ++const char kCWSScope[] = "https://www.9oo91eapis.qjz9zk/auth/chromewebstore"; + + // Thresholds for mountCrostini() API. + constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold = diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc +index a5ce683534547..8d4c4b458db27 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -222,11 +222,11 @@ void ProtocolHandlerRegistry::InstallDefaultsForChromeOS() { @@ -5276,6 +5440,7 @@ diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrom NOTREACHED(); // this method should only ever be called in chromeos. #endif diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc b/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc +index 0055f66267f23..2eb186dd7b3f8 100644 --- a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc +++ b/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc @@ -67,7 +67,7 @@ void DeletePreviewsOptOutDatabaseOnDBThread( @@ -5297,6 +5462,7 @@ diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_set prefs->ClearPref(proxy_config::prefs::kProxy); diff --git a/chrome/browser/devtools/url_constants.cc b/chrome/browser/devtools/url_constants.cc +index bab37d36dd14f..7f06dfe62b601 100644 --- a/chrome/browser/devtools/url_constants.cc +++ b/chrome/browser/devtools/url_constants.cc @@ -4,7 +4,7 @@ @@ -5310,6 +5476,7 @@ diff --git a/chrome/browser/devtools/url_constants.cc b/chrome/browser/devtools/ + "https://chrome-devtools-frontend.8pp2p8t.qjz9zk/"; const char kRemoteFrontendPath[] = "serve_file"; diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome/browser/download/mixed_content_download_blocking.cc +index ff6f0b69b97bc..948823e89091c 100644 --- a/chrome/browser/download/mixed_content_download_blocking.cc +++ b/chrome/browser/download/mixed_content_download_blocking.cc @@ -322,7 +322,7 @@ void PrintConsoleMessage(const MixedContentDownloadData& data, @@ -5322,9 +5489,10 @@ diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome " 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 +index a1e2235affd07..62a33707089dc 100644 --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -113,7 +113,7 @@ const char kServiceProviderConfig[] = R"({ +@@ -155,7 +155,7 @@ const char kServiceProviderConfig[] = R"({ "version": { "1": { "analysis": { @@ -5333,7 +5501,7 @@ diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome "supported_tags": [ { "name": "malware", -@@ -166,7 +166,7 @@ const char kServiceProviderConfig[] = R"({ +@@ -208,7 +208,7 @@ const char kServiceProviderConfig[] = R"({ ] }, "reporting": { @@ -5342,7 +5510,39 @@ diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome } } } +diff --git a/chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc b/chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc +index 54ad2fa78d43a..3c9d290b03c92 100644 +--- a/chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc ++++ b/chrome/browser/enterprise/connectors/file_system/browsertest_helper.cc +@@ -20,7 +20,7 @@ namespace enterprise_connectors { + std::string GetAllAllowedTestPolicy(const char* enterprise_id) { + const char kConnectorPolicyString[] = R"PREFIX( + [ { +- "domain": "google.com", ++ "domain": "9oo91e.qjz9zk", + "enable": [ { + "mime_types": [ "*" ], + "url_list": [ "*" ] +@@ -36,7 +36,7 @@ std::string GetTestPolicyWithEnabledFilter(const char* enterprise_id, + const char* include_mime) { + const char kConnectorPolicyString[] = R"PREFIX( + [ { +- "domain": "google.com", ++ "domain": "9oo91e.qjz9zk", + "enable": [ { + "mime_types": [ "%s" ], + "url_list": [ "%s" ] +@@ -53,7 +53,7 @@ std::string GetTestPolicyWithDisabledFilter(const char* enterprise_id, + const char* exclude_mime) { + const char kConnectorPolicyString[] = R"PREFIX( + [ { +- "domain": "google.com", ++ "domain": "9oo91e.qjz9zk", + "enable": [ { + "mime_types": [ "*" ], + "url_list": [ "*" ] diff --git a/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc b/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc +index 796c7061dcc42..80bf48f5105c4 100644 --- a/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc +++ b/chrome/browser/enterprise/connectors/file_system/signin_dialog_delegate.cc @@ -49,7 +49,7 @@ const char kOAuthConsumerName[] = "file_system_signin_dialog"; @@ -5355,6 +5555,7 @@ diff --git a/chrome/browser/enterprise/connectors/file_system/signin_dialog_dele } // namespace diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc b/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc +index 94a7f4dc8f2b2..806f6561d126d 100644 --- a/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc +++ b/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc @@ -29,7 +29,7 @@ constexpr char kInstalledNotificationId[] = "extension_installed_notificaiton"; @@ -5375,22 +5576,23 @@ diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_req // TODO(crbug.com/1187930): Eliminate the use of `gfx::kChromeIconGrey` and // instead retrieve the icon color via a ui::ColorProvider once message center // has been updated to use the ColorProvider infrastructure. -diff --git a/chrome/browser/enterprise/signals/context_info_fetcher.cc b/chrome/browser/enterprise/signals/context_info_fetcher.cc ---- a/chrome/browser/enterprise/signals/context_info_fetcher.cc -+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -292,9 +292,9 @@ absl::optional ContextInfoFetcher::GetChromeCleanupEnabled() { - } - - bool ContextInfoFetcher::GetChromeRemoteDesktopAppBlocked() { -- return IsURLBlocked(GURL("https://remotedesktop.google.com"), -+ return IsURLBlocked(GURL("https://remotedesktop.9oo91e.qjz9zk"), - browser_context_) || -- IsURLBlocked(GURL("https://remotedesktop.corp.google.com"), -+ IsURLBlocked(GURL("https://remotedesktop.corp.9oo91e.qjz9zk"), - browser_context_); +diff --git a/chrome/browser/enterprise/signals/signals_utils.cc b/chrome/browser/enterprise/signals/signals_utils.cc +index b64402f20a59f..fbf8e3cc0081e 100644 +--- a/chrome/browser/enterprise/signals/signals_utils.cc ++++ b/chrome/browser/enterprise/signals/signals_utils.cc +@@ -85,8 +85,8 @@ absl::optional GetChromeCleanupEnabled(PrefService* local_state) { + + bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service) { + DCHECK(service); +- return IsURLBlocked(GURL("https://remotedesktop.google.com"), service) || +- IsURLBlocked(GURL("https://remotedesktop.corp.google.com"), service); ++ return IsURLBlocked(GURL("https://remotedesktop.9oo91e.qjz9zk"), service) || ++ IsURLBlocked(GURL("https://remotedesktop.corp.9oo91e.qjz9zk"), service); } + } // namespace utils diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc b/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc +index 2271aa8dc2d7a..5b4fb3e114baa 100644 --- a/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc +++ b/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc @@ -25,9 +25,9 @@ @@ -5406,9 +5608,10 @@ diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor_non } // namespace diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +index 02bdea187ad4a..2372fc251cd67 100644 --- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc -@@ -44,10 +44,10 @@ namespace api { +@@ -50,10 +50,10 @@ namespace api { namespace { @@ -5422,7 +5625,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|. -@@ -290,7 +290,7 @@ CryptotokenPrivateCanMakeU2fApiRequestFunction::Run() { +@@ -311,7 +311,7 @@ CryptotokenPrivateCanMakeU2fApiRequestFunction::Run() { } frame->AddMessageToConsole( blink::mojom::ConsoleMessageLevel::kWarning, @@ -5432,6 +5635,7 @@ diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_priva blink::TrialTokenValidator validator; const net::HttpResponseHeaders* response_headers = diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc +index 95d0b3b0be621..7ca778f25d507 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc @@ -50,7 +50,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( @@ -5444,6 +5648,7 @@ diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_p #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc b/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc +index be763a94df5fe..44decc5f0c044 100644 --- a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc +++ b/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc @@ -17,7 +17,7 @@ namespace extensions { @@ -5456,6 +5661,7 @@ diff --git a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flo } // namespace diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +index c2f13fd63269e..6912a567e3fc0 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc @@ -81,7 +81,7 @@ namespace { @@ -5468,6 +5674,7 @@ diff --git a/chrome/browser/extensions/api/management/chrome_management_api_dele #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc +index 4d9cd07c724b0..b6eaeb0786c90 100644 --- a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc +++ b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc @@ -71,7 +71,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( @@ -5480,6 +5687,7 @@ diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc b/ #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/chrome/browser/extensions/chrome_extension_browser_constants.cc b/chrome/browser/extensions/chrome_extension_browser_constants.cc +index 8060d14c59d36..27b02f91db922 100644 --- a/chrome/browser/extensions/chrome_extension_browser_constants.cc +++ b/chrome/browser/extensions/chrome_extension_browser_constants.cc @@ -8,6 +8,6 @@ namespace chrome_extension_constants { @@ -5491,9 +5699,10 @@ diff --git a/chrome/browser/extensions/chrome_extension_browser_constants.cc b/c } // namespace chrome_extension_constants diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc +index 1f90565e687aa..de9d80d6b59a2 100644 --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc -@@ -330,7 +330,7 @@ void ExternalPrefLoader::LoadOnFileThread() { +@@ -331,7 +331,7 @@ void ExternalPrefLoader::LoadOnFileThread() { if (!prefs->DictEmpty()) LOG(WARNING) << "You are using an old-style extension deployment method " "(external_extensions.json), which will soon be " @@ -5503,6 +5712,7 @@ diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/ ReadStandaloneExtensionPrefFiles(prefs.get()); diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extensions/install_signer.cc +index ba68262a7ce56..a031998d5e601 100644 --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc @@ -67,7 +67,7 @@ const int kSignatureFormatVersion = 2; @@ -5515,6 +5725,7 @@ diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extens const char kPublicKeyPEM[] = \ "-----BEGIN PUBLIC KEY-----" \ diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc +index a7fb02e8cc289..d3dd1fee7306d 100644 --- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc +++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc @@ -49,7 +49,7 @@ ChromeExtensionDownloaderFactory::CreateForURLLoaderFactory( @@ -5527,9 +5738,10 @@ diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_facto } diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/chrome/browser/extensions/updater/chrome_update_client_config.cc +index 2c3e10b07a2bc..52ab11ce701ee 100644 --- a/chrome/browser/extensions/updater/chrome_update_client_config.cc +++ b/chrome/browser/extensions/updater/chrome_update_client_config.cc -@@ -216,7 +216,7 @@ ChromeUpdateClientConfig::GetNetworkFetcherFactory() { +@@ -219,7 +219,7 @@ ChromeUpdateClientConfig::GetNetworkFetcherFactory() { // from chrome.google.com, so send cookies if and only if that is // the download domain. base::BindRepeating([](const GURL& url) { @@ -5539,6 +5751,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/ } return network_fetcher_factory_; diff --git a/chrome/browser/federated_learning/floc_remote_permission_service.cc b/chrome/browser/federated_learning/floc_remote_permission_service.cc +index f56e60a05897b..565dd568f596c 100644 --- a/chrome/browser/federated_learning/floc_remote_permission_service.cc +++ b/chrome/browser/federated_learning/floc_remote_permission_service.cc @@ -24,7 +24,7 @@ namespace federated_learning { @@ -5551,18 +5764,28 @@ diff --git a/chrome/browser/federated_learning/floc_remote_permission_service.cc // The maximum number of retries for the SimpleURLLoader requests. const size_t kMaxRetries = 1; diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc +index 6b489b8614b24..6f29ebd320601 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -193,7 +193,7 @@ const char kU2FSecurityKeyAPIDescription[] = +@@ -205,7 +205,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 " +- "https://groups.google.com/a/chromium.org/g/blink-dev/c/xHC3AtU_65A"; ++ "https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/g/blink-dev/c/xHC3AtU_65A"; + + #if BUILDFLAG(ENABLE_SUPERVISED_USERS) + const char kWebFilterInterstitialRefreshName[] = +@@ -220,7 +220,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 " - "https://groups.google.com/a/chromium.org/g/blink-dev/c/xHC3AtU_65A"; + "https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/g/blink-dev/c/xHC3AtU_65A"; - const char kUseLookalikesForNavigationSuggestionsName[] = - "Use lookalike URL suggestions for navigation suggestions"; -@@ -613,7 +613,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = + const char kUpcomingSharingFeaturesName[] = "Enable upcoming sharing features."; + const char kUpcomingSharingFeaturesDescription[] = +@@ -667,7 +667,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = "Detect target embedding domains as lookalikes."; const char kDetectTargetEmbeddingLookalikesDescription[] = "Shows a lookalike interstitial when navigating to target embedding domains" @@ -5571,7 +5794,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDisableProcessReuse[] = "Disable subframe process reuse"; const char kDisableProcessReuseDescription[] = -@@ -2215,7 +2215,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; +@@ -2231,7 +2231,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. " @@ -5580,7 +5803,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = -@@ -2232,7 +2232,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2248,7 +2248,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 " @@ -5590,6 +5813,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kSafetyTipName[] = "Show Safety Tip UI when visiting low-reputation websites"; diff --git a/chrome/browser/importer/edge_importer_browsertest_win.cc b/chrome/browser/importer/edge_importer_browsertest_win.cc +index 33461915e6644..6916d66ea759f 100644 --- a/chrome/browser/importer/edge_importer_browsertest_win.cc +++ b/chrome/browser/importer/edge_importer_browsertest_win.cc @@ -171,7 +171,7 @@ IN_PROC_BROWSER_TEST_F(EdgeImporterBrowserTest, EdgeImporter) { @@ -5625,6 +5849,7 @@ diff --git a/chrome/browser/importer/edge_importer_browsertest_win.cc b/chrome/b kEdgeFaviconGroup, kEdgeFaviconGroup + base::size(kEdgeFaviconGroup)); diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc +index e819cf5d661a4..8d80381e7fdce 100644 --- a/chrome/browser/importer/ie_importer_browsertest_win.cc +++ b/chrome/browser/importer/ie_importer_browsertest_win.cc @@ -59,7 +59,7 @@ const BookmarkInfo kIEBookmarks[] = { @@ -5707,6 +5932,7 @@ diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/bro struct BadBinaryData { const char* data; diff --git a/chrome/browser/lacros/lacros_startup_infobar_delegate.cc b/chrome/browser/lacros/lacros_startup_infobar_delegate.cc +index 96df1fca00bd9..5072346f1fd28 100644 --- a/chrome/browser/lacros/lacros_startup_infobar_delegate.cc +++ b/chrome/browser/lacros/lacros_startup_infobar_delegate.cc @@ -27,9 +27,9 @@ @@ -5722,6 +5948,7 @@ diff --git a/chrome/browser/lacros/lacros_startup_infobar_delegate.cc b/chrome/b // Returns the single main profile, or nullptr if none is found. Profile* GetMainProfile() { diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/chrome/browser/local_discovery/service_discovery_client_mac.mm +index 3b5b63bddd77c..8b75bfda86f3e 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac.mm +++ b/chrome/browser/local_discovery/service_discovery_client_mac.mm @@ -401,7 +401,7 @@ void ParseNetService(NSNetService* service, ServiceDescription& description) { @@ -5743,6 +5970,7 @@ diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/ch _service.reset(); } diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc +index ab65a5b3a6f0d..d44975ed6c895 100644 --- a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc +++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc @@ -31,9 +31,9 @@ constexpr char kLoggerComponent[] = "CastMediaRouteProvider"; @@ -5759,6 +5987,7 @@ diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provide // Returns a list of origins that are valid for |source_id|. An empty list diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc +index 34fe9acf6f9b1..4eea0b7c2dae4 100644 --- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc +++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc @@ -695,15 +695,15 @@ std::vector DialMediaRouteProvider::GetOrigins( @@ -5787,6 +6016,7 @@ diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provide {"Pandora", {CreateOrigin("https://www.pandora.com")}}, {"Radio", {CreateOrigin("https://www.pandora.com")}}, diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc b/chrome/browser/media/webrtc/webrtc_browsertest_common.cc +index 23e2ccb508364..c88df274d12a4 100644 --- a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc +++ b/chrome/browser/media/webrtc/webrtc_browsertest_common.cc @@ -37,7 +37,7 @@ const char kAdviseOnGclientSolution[] = @@ -5799,6 +6029,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc b/chrome/b "}\n" "and run gclient sync. This will download the required ref files."; diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +index 6c7da79172e3f..a001b4027eca4 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -125,7 +125,7 @@ void OnURLLoadUploadProgress(uint64_t current, uint64_t total) { @@ -5811,6 +6042,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/b WebRtcEventLogUploaderImpl::Factory::Factory( scoped_refptr task_runner) diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc +index e0dfe119b6987..dde00c2b64de8 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc @@ -469,7 +469,7 @@ void WebRtcLogUploader::UploadCompressedLog( @@ -5823,6 +6055,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser resource_request->url = !upload_url_for_testing_.is_empty() ? upload_url_for_testing_ diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.cc b/chrome/browser/nacl_host/nacl_infobar_delegate.cc +index 63dfeb982a010..024061e82e6cc 100644 --- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc @@ -33,7 +33,7 @@ std::u16string NaClInfoBarDelegate::GetLinkText() const { @@ -5835,6 +6068,7 @@ diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.cc b/chrome/browser/ std::u16string NaClInfoBarDelegate::GetMessageText() const { diff --git a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc b/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc +index 92c27c987f313..7adbfeb6e45a4 100644 --- a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc +++ b/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc @@ -31,7 +31,7 @@ namespace { @@ -5856,6 +6090,7 @@ diff --git a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc b/ // Creates the full Nearby Share v1 URL for endpoint to the API with // |request_path|. diff --git a/chrome/browser/nearby_sharing/instantmessaging/constants.h b/chrome/browser/nearby_sharing/instantmessaging/constants.h +index 2a073b1432c29..6393281a60a5f 100644 --- a/chrome/browser/nearby_sharing/instantmessaging/constants.h +++ b/chrome/browser/nearby_sharing/instantmessaging/constants.h @@ -6,10 +6,10 @@ @@ -5872,6 +6107,7 @@ diff --git a/chrome/browser/nearby_sharing/instantmessaging/constants.h b/chrome // Template for optional OAuth2 authorization HTTP header. const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s"; diff --git a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc b/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc +index 6e26b8fa07047..f28eb596909e6 100644 --- a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc +++ b/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc @@ -19,7 +19,7 @@ @@ -5901,6 +6137,7 @@ diff --git a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher. std::vector default_servers; default_servers.push_back(std::move(ice_server)); diff --git a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc +index f25b01625d197..212adfb6a2a38 100644 --- a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc +++ b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc @@ -33,7 +33,7 @@ namespace { @@ -5930,6 +6167,7 @@ diff --git a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc b/chrom std::vector default_servers; default_servers.push_back(std::move(ice_server)); diff --git a/chrome/browser/new_tab_page/modules/drive/drive_service.cc b/chrome/browser/new_tab_page/modules/drive/drive_service.cc +index e50a7aa736570..7ac5b5107e436 100644 --- a/chrome/browser/new_tab_page/modules/drive/drive_service.cc +++ b/chrome/browser/new_tab_page/modules/drive/drive_service.cc @@ -55,7 +55,7 @@ constexpr char kRequestBody[] = R"({ @@ -5969,29 +6207,41 @@ diff --git a/chrome/browser/new_tab_page/modules/drive/drive_service.cc b/chrome "title": "baz slides", "mimeType": "application/vnd.google-apps.presentation" diff --git a/chrome/browser/new_tab_page/modules/photos/photos_service.cc b/chrome/browser/new_tab_page/modules/photos/photos_service.cc +index 799a0ba9fb5ac..410c2d79b62b5 100644 --- a/chrome/browser/new_tab_page/modules/photos/photos_service.cc +++ b/chrome/browser/new_tab_page/modules/photos/photos_service.cc -@@ -16,13 +16,13 @@ - namespace { - // The scope required for an access token in order to query Memories. - constexpr char kPhotosScope[] = -- "https://www.googleapis.com/auth/photos.firstparty.readonly"; -+ "https://www.9oo91eapis.qjz9zk/auth/photos.firstparty.readonly"; - constexpr char kPhotosImgScope[] = -- "https://www.googleapis.com/auth/photos.image.readonly"; -+ "https://www.9oo91eapis.qjz9zk/auth/photos.image.readonly"; +@@ -27,7 +27,7 @@ namespace { // Maximum accepted size of an API response. 1MB. constexpr int kMaxResponseSize = 1024 * 1024; const char server_url[] = -- "https://photosfirstparty-pa.googleapis.com/chrome_ntp/" -+ "https://photosfirstparty-pa.9oo91eapis.qjz9zk/chrome_ntp/" - "read_reminiscing_content"; +- "https://photosfirstparty-pa.googleapis.com/v1/ntp/memories:read"; ++ "https://photosfirstparty-pa.9oo91eapis.qjz9zk/v1/ntp/memories:read"; constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation = net::DefineNetworkTrafficAnnotation("photos_service", R"( + semantics { +@@ -73,7 +73,7 @@ constexpr char kMemoryTemplate[] = R"( + "subheader": "" + }, + "coverMediaKey": "coverKey%d", +- "coverDatUrl": "https://lh3.googleusercontent.com/proxy/CyeQrfWvSkJ-4wjGmm1zVIP4XZKL4oAjywWcPh8lhrwtizOY4kGsDtVa3nk984qJB5q2-r7aInfG25UFjfwyu7QEraqepTlbsDdKX1yeenhh7EGeAR2Hp1QcbO24C7WyU8bLPx8o_2HA-opm6cqZ8f4ehEXCxMEbR79A44jcWpacTLfYERPGeVrljo2vAl2LyFMHrA" ++ "coverDatUrl": "https://lh3.9oo91eusercontent.qjz9zk/proxy/CyeQrfWvSkJ-4wjGmm1zVIP4XZKL4oAjywWcPh8lhrwtizOY4kGsDtVa3nk984qJB5q2-r7aInfG25UFjfwyu7QEraqepTlbsDdKX1yeenhh7EGeAR2Hp1QcbO24C7WyU8bLPx8o_2HA-opm6cqZ8f4ehEXCxMEbR79A44jcWpacTLfYERPGeVrljo2vAl2LyFMHrA" + })"; + } // namespace + +@@ -313,7 +313,7 @@ void PhotosService::OnJsonParsed( + mojo_memory->id = *memory_id; + mojo_memory->title = *title; + mojo_memory->item_url = +- GURL("https://photos.google.com/memory/featured/" + *memory_id + ++ GURL("https://photos.9oo91e.qjz9zk/memory/featured/" + *memory_id + + "/photo/" + *cover_id + "?referrer=CHROME_NTP"); + if (cover_url) { + mojo_memory->cover_url = GURL(*cover_url + "?access_token=" + token); diff --git a/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc +index 09a53e4604324..05da002fcf176 100644 --- a/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc +++ b/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc -@@ -97,7 +97,7 @@ const char kHistogramNoServiceWorkerFirstContentfulPaintDocs[] = +@@ -94,7 +94,7 @@ const char kHistogramNoServiceWorkerFirstContentfulPaintDocs[] = namespace { bool IsDocsSite(const GURL& url) { @@ -6001,6 +6251,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/service_worker_page_load bool IsForwardBackLoad(ui::PageTransition transition) { diff --git a/chrome/browser/performance_hints/performance_hints_features.cc b/chrome/browser/performance_hints/performance_hints_features.cc +index 9085eb4a3898b..560594abf0c83 100644 --- a/chrome/browser/performance_hints/performance_hints_features.cc +++ b/chrome/browser/performance_hints/performance_hints_features.cc @@ -19,7 +19,7 @@ const base::Feature kPerformanceHintsHandleRewrites{ @@ -6013,6 +6264,7 @@ diff --git a/chrome/browser/performance_hints/performance_hints_features.cc b/ch constexpr base::FeatureParam kUseFastHostHints{ &kPerformanceHintsObserver, "use_fast_host_hints", true}; diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc +index 622cf8eb31eb4..34794908bfc00 100644 --- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc +++ b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc @@ -30,7 +30,7 @@ using QuietUiReason = permissions::PermissionUiSelector::QuietUiReason; @@ -6025,9 +6277,10 @@ diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_andr } // namespace diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.cc b/chrome/browser/platform_keys/extension_key_permissions_service.cc +index 033cf9866e8ca..bd095b90bffc3 100644 --- a/chrome/browser/platform_keys/extension_key_permissions_service.cc +++ b/chrome/browser/platform_keys/extension_key_permissions_service.cc -@@ -135,7 +135,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( +@@ -136,7 +136,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( // implemented for secondary profiles in Lacros. CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile()) << "Attempted to use an incorrect profile. Please file a bug at " @@ -6037,6 +6290,7 @@ diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.cc b ->GetRemote() .get(); diff --git a/chrome/browser/platform_keys/extension_platform_keys_service.cc b/chrome/browser/platform_keys/extension_platform_keys_service.cc +index 2a561a0281095..e2a79dd8779b8 100644 --- a/chrome/browser/platform_keys/extension_platform_keys_service.cc +++ b/chrome/browser/platform_keys/extension_platform_keys_service.cc @@ -165,7 +165,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService( @@ -6049,9 +6303,10 @@ diff --git a/chrome/browser/platform_keys/extension_platform_keys_service.cc b/c ->GetRemote() .get(); diff --git a/chrome/browser/policy/extension_force_install_mixin.cc b/chrome/browser/policy/extension_force_install_mixin.cc +index dc937617066ed..2eecf20898a27 100644 --- a/chrome/browser/policy/extension_force_install_mixin.cc +++ b/chrome/browser/policy/extension_force_install_mixin.cc -@@ -72,7 +72,7 @@ constexpr char kUpdateManifestFileNameTemplate[] = "%s.xml"; +@@ -71,7 +71,7 @@ constexpr char kUpdateManifestFileNameTemplate[] = "%s.xml"; // Template for the update manifest contents. constexpr char kUpdateManifestTemplate[] = R"( @@ -6061,6 +6316,7 @@ diff --git a/chrome/browser/policy/extension_force_install_mixin.cc b/chrome/bro diff --git a/chrome/browser/policy/policy_test_utils.h b/chrome/browser/policy/policy_test_utils.h +index 50a99e00f2546..d93090b72f995 100644 --- a/chrome/browser/policy/policy_test_utils.h +++ b/chrome/browser/policy/policy_test_utils.h @@ -87,7 +87,7 @@ class PolicyTest : public PlatformBrowserTest { @@ -6073,6 +6329,7 @@ diff --git a/chrome/browser/policy/policy_test_utils.h b/chrome/browser/policy/p static void CheckYouTubeRestricted(int youtube_restrict_mode, const net::HttpRequestHeaders& headers); diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc +index 68cad0bbe6bdb..b934e1fcea0c1 100644 --- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc +++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc @@ -46,7 +46,7 @@ GURL PrefetchProxyProxyHost() { @@ -6084,7 +6341,7 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/c } std::string PrefetchProxyProxyHeaderKey() { -@@ -158,7 +158,7 @@ GURL PrefetchProxyTLSCanaryCheckURL() { +@@ -156,7 +156,7 @@ GURL PrefetchProxyTLSCanaryCheckURL() { if (url.is_valid()) { return url; } @@ -6093,7 +6350,7 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/c } GURL PrefetchProxyDNSCanaryCheckURL() { -@@ -167,7 +167,7 @@ GURL PrefetchProxyDNSCanaryCheckURL() { +@@ -165,7 +165,7 @@ GURL PrefetchProxyDNSCanaryCheckURL() { if (url.is_valid()) { return url; } @@ -6103,6 +6360,7 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/c base::TimeDelta PrefetchProxyCanaryCheckCacheLifetime() { diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc +index 443884520bbff..09bc807518259 100644 --- a/chrome/browser/profiles/profile_avatar_downloader.cc +++ b/chrome/browser/profiles/profile_avatar_downloader.cc @@ -20,7 +20,7 @@ @@ -6115,6 +6373,7 @@ diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/brows ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index, diff --git a/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc +index a317fe5edd6ae..0820372661e90 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc @@ -63,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(ProfileShortcutManagerBrowserTest, @@ -6127,6 +6386,7 @@ diff --git a/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc // Standard size of a Gaia account picture. const int kGaiaPictureSize = 256; diff --git a/chrome/browser/push_messaging/push_messaging_constants.cc b/chrome/browser/push_messaging/push_messaging_constants.cc +index bd0d33d6134f6..d65db67068774 100644 --- a/chrome/browser/push_messaging/push_messaging_constants.cc +++ b/chrome/browser/push_messaging/push_messaging_constants.cc @@ -5,7 +5,7 @@ @@ -6139,6 +6399,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_constants.cc b/chrome/ const char kPushMessagingForcedNotificationTag[] = "user_visible_auto_notification"; diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc +index c75d44494b48f..83c686c6e0688 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc @@ -93,7 +93,7 @@ const char kSilentPushUnsupportedMessage[] = @@ -6151,6 +6412,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chro // Message displayed in the console (as an error) when a GCM Sender ID is used // to create a subscription, which is unsupported. The subscription request will diff --git a/chrome/browser/resources/PRESUBMIT.py b/chrome/browser/resources/PRESUBMIT.py +index 8e59700f3ed1c..fd78d43abf84c 100644 --- a/chrome/browser/resources/PRESUBMIT.py +++ b/chrome/browser/resources/PRESUBMIT.py @@ -4,7 +4,7 @@ @@ -6163,6 +6425,7 @@ diff --git a/chrome/browser/resources/PRESUBMIT.py b/chrome/browser/resources/PR """ diff --git a/chrome/browser/resources/about_sys/about_sys.js b/chrome/browser/resources/about_sys/about_sys.js +index c76da23966814..bcf98cef538df 100644 --- a/chrome/browser/resources/about_sys/about_sys.js +++ b/chrome/browser/resources/about_sys/about_sys.js @@ -18,7 +18,7 @@ const MAX_FILE_SIZE = 10485760; @@ -6175,6 +6438,7 @@ diff --git a/chrome/browser/resources/about_sys/about_sys.js b/chrome/browser/re function getValueDivForButton(button) { diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/browser/resources/chromeos/about_os_credits.html +index 273562d29584b..1f08a6d293be4 100644 --- a/chrome/browser/resources/chromeos/about_os_credits.html +++ b/chrome/browser/resources/chromeos/about_os_credits.html @@ -13,11 +13,11 @@ body { @@ -6193,9 +6457,10 @@ diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/br a device-dependent about_os_credits.html when a CrOS image is built.

diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js +index a0a56ed6f7f30..dbc5bf782dc9c 100644 --- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js +++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js -@@ -88,7 +88,7 @@ export class Magnifier { +@@ -95,7 +95,7 @@ export class Magnifier { this.isInitializing_ = false; }, Magnifier.IGNORE_FOCUS_UPDATES_INITIALIZATION_MS); @@ -6205,6 +6470,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_commo if (enabled) { this.magnifierDebugDrawRect_ = true; diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js +index 43a7ed4302038..fd3d844bfe51b 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js @@ -212,7 +212,7 @@ CommandHandler.onCommand = function(command) { @@ -6216,9 +6482,9 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -1551,13 +1551,13 @@ CommandHandler.init = function() { - } - }); +@@ -1520,13 +1520,13 @@ CommandHandler.skipLabelOrDescriptionFor_ = function(current, dir) { + CommandHandler.init = function() { + ChromeVoxKbHandler.commandHandler = CommandHandler.onCommand; - chrome.commandLinePrivate.hasSwitch( + ch40me.qjz9zkmandLinePrivate.hasSwitch( @@ -6233,6 +6499,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun (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 +index 30f0ce4307f26..1ddb990cc681c 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css @@ -2,7 +2,7 @@ @@ -6245,6 +6512,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/options/o body { margin: 0 0 20px 0; diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/tools/webstore_extension_util.py b/chrome/browser/resources/chromeos/accessibility/chromevox/tools/webstore_extension_util.py +index aa5cd87514901..ed65d5da258b9 100755 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/tools/webstore_extension_util.py +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/tools/webstore_extension_util.py @@ -18,7 +18,7 @@ import webbrowser @@ -6281,6 +6549,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/tools/web return { 'Authorization': 'Bearer %(access_token)s' % access_token, diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox_manifest.json.jinja2 b/chrome/browser/resources/chromeos/accessibility/chromevox_manifest.json.jinja2 +index 9df4557d02273..1e6eb009e7ca9 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox_manifest.json.jinja2 +++ b/chrome/browser/resources/chromeos/accessibility/chromevox_manifest.json.jinja2 @@ -31,14 +31,14 @@ @@ -6303,6 +6572,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox_manifest. "all_frames": true, "js": [ diff --git a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js +index 95301e1f508f4..38ae33871cedd 100644 --- a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js +++ b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js @@ -162,7 +162,7 @@ E2ETestBase = class extends testing.Test { @@ -6315,6 +6585,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_ // The below block handles opening a url either in a Lacros tab or // Ash tab. For Lacros, we re-use an already open Lacros tab. For diff --git a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js +index deafe18702d2f..2610fc1f756ef 100644 --- a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js +++ b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js @@ -705,15 +705,15 @@ Polymer({ @@ -6337,6 +6608,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chr ]; for (const resource of resources) { diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css +index 858742894317a..011e435158820 100644 --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css @@ -2,7 +2,7 @@ @@ -6349,6 +6621,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/opt body { margin: 0 0 20px 0; diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html +index 1091e2bb3cf75..e5710e69e1509 100644 --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.html @@ -58,7 +58,7 @@ @@ -6361,6 +6634,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/opt msgid="options_natural_voices_explanation_more"> diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js b/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js +index b05f0f7cb0eb7..13c7f106eb722 100644 --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js @@ -23,7 +23,7 @@ const SelectToSpeakState = chrome.accessibilityPrivate.SelectToSpeakState; @@ -6393,6 +6667,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/sel }, (tabs) => { diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak_manifest.json.jinja2 b/chrome/browser/resources/chromeos/accessibility/select_to_speak_manifest.json.jinja2 +index d6d13f711beb6..c6ce5f5057743 100644 --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak_manifest.json.jinja2 +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak_manifest.json.jinja2 @@ -20,8 +20,8 @@ @@ -6418,6 +6693,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak_man "js": [ "common/gdocs_script.js" diff --git a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js +index 3324fb488a731..73723ea4dcf01 100644 --- a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js +++ b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js @@ -61,7 +61,7 @@ export class SwitchAccess { @@ -6430,6 +6706,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/switch_access/switc this.enableImprovedTextInput_ = result; }); diff --git a/chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 b/chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 +index 890a5cc377b7d..53c7f3ee1a2ef 100644 --- a/chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 +++ b/chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 @@ -28,8 +28,8 @@ @@ -6444,6 +6721,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/switch_access_manif "js": [ "common/gdocs_script.js" diff --git a/chrome/browser/resources/chromeos/add_supervision/add_supervision_ui.js b/chrome/browser/resources/chromeos/add_supervision/add_supervision_ui.js +index 69e66f02d58e9..9819a3f95d192 100644 --- a/chrome/browser/resources/chromeos/add_supervision/add_supervision_ui.js +++ b/chrome/browser/resources/chromeos/add_supervision/add_supervision_ui.js @@ -16,15 +16,15 @@ import {AddSupervisionAPIServer} from './add_supervision_api_server.js'; @@ -6471,6 +6749,7 @@ diff --git a/chrome/browser/resources/chromeos/add_supervision/add_supervision_u /** diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrome/browser/resources/chromeos/arc_support/background.js +index 7c18bc98b80e0..e30b90643c7ce 100644 --- a/chrome/browser/resources/chromeos/arc_support/background.js +++ b/chrome/browser/resources/chromeos/arc_support/background.js @@ -333,7 +333,7 @@ class TermsOfServicePage { @@ -6500,7 +6779,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrom this.fastLocation_ + '/about/play-terms/'; } else { this.termsView_.src = defaultLocation; -@@ -573,7 +573,7 @@ class TermsOfServicePage { +@@ -575,7 +575,7 @@ class TermsOfServicePage { // In case we failed with fast location let retry default scheme. if (this.fastLocation_) { this.fastLocation_ = undefined; @@ -6509,7 +6788,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrom return; } this.onTermsViewLoadAborted_( -@@ -945,7 +945,7 @@ function showURLOverlay(url) { +@@ -947,7 +947,7 @@ function showURLOverlay(url) { */ function showPrivacyPolicyOverlay() { var defaultLink = @@ -6518,7 +6797,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrom if (termsPage.isManaged_) { showURLOverlay(defaultLink); return; -@@ -1034,7 +1034,7 @@ chrome.app.runtime.onLaunched.addListener(function() { +@@ -1036,7 +1036,7 @@ chrome.app.runtime.onLaunched.addListener(function() { }); overlayWebview.addContentScripts([{ name: 'postProcess', @@ -6528,6 +6807,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrom run_at: 'document_end' }]); diff --git a/chrome/browser/resources/chromeos/arc_support/playstore.js b/chrome/browser/resources/chromeos/arc_support/playstore.js +index 3335d977e9ead..076c0715da4aa 100644 --- a/chrome/browser/resources/chromeos/arc_support/playstore.js +++ b/chrome/browser/resources/chromeos/arc_support/playstore.js @@ -56,7 +56,7 @@ function navigateToLanguageAndCountryCode(language, countryCode) { @@ -6558,6 +6838,7 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/playstore.js b/chrome if (!language) { language = navigator.language; diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js +index 6a4e75a617ab4..4ed5473b70566 100644 --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js @@ -66,7 +66,7 @@ Polymer({ @@ -6579,6 +6860,7 @@ diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related this.i18n('assistantScreenContextTitle')))); this.equalWeightButtons_ = data['equalWeightButtons']; diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +index 46c672bf669bd..7ae685605be08 100644 --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js @@ -76,7 +76,7 @@ Polymer({ @@ -6591,6 +6873,7 @@ diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_p /** * Whether try to reload with the default url when a 404 error occurred. diff --git a/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json b/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json +index 65355f34f15d3..f1b81674c657c 100644 --- a/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json +++ b/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json @@ -40,8 +40,8 @@ @@ -6605,6 +6888,7 @@ diff --git a/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest "app": { "background": { diff --git a/chrome/browser/resources/chromeos/echo/manifest.json b/chrome/browser/resources/chromeos/echo/manifest.json +index 86be1060f28fa..38d31c8e1ef1c 100644 --- a/chrome/browser/resources/chromeos/echo/manifest.json +++ b/chrome/browser/resources/chromeos/echo/manifest.json @@ -5,7 +5,7 @@ @@ -6870,6 +7154,7 @@ diff --git a/chrome/browser/resources/chromeos/echo/manifest.json b/chrome/brows } } diff --git a/chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_ui.js b/chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_ui.js +index 93a20170d4405..1ff8204e99cdc 100644 --- a/chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_ui.js +++ b/chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_ui.js @@ -143,7 +143,7 @@ Polymer({ @@ -6882,6 +7167,7 @@ diff --git a/chrome/browser/resources/chromeos/edu_coexistence/edu_coexistence_u // Hide the GAIA Buttons. this.showGaiaButtons_ = false; diff --git a/chrome/browser/resources/chromeos/emoji_picker/icons.html b/chrome/browser/resources/chromeos/emoji_picker/icons.html +index f886ed87d3af1..a0b124e23fe3c 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/icons.html +++ b/chrome/browser/resources/chromeos/emoji_picker/icons.html @@ -2,7 +2,7 @@ @@ -6894,6 +7180,7 @@ diff --git a/chrome/browser/resources/chromeos/emoji_picker/icons.html b/chrome/ diff --git a/chrome/browser/resources/chromeos/emulator/icons.html b/chrome/browser/resources/chromeos/emulator/icons.html +index 1ec003650b3fe..a7c7817279dde 100644 --- a/chrome/browser/resources/chromeos/emulator/icons.html +++ b/chrome/browser/resources/chromeos/emulator/icons.html @@ -3,7 +3,7 @@ @@ -6906,6 +7193,7 @@ diff --git a/chrome/browser/resources/chromeos/emulator/icons.html b/chrome/brow diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json b/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json +index f313d4d0a66d9..6e5a90cfe6c37 100644 --- a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json +++ b/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json @@ -12,10 +12,10 @@ @@ -6933,6 +7221,7 @@ diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest. "js": [ "chos_inject-debug.js" diff --git a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js b/chrome/browser/resources/chromeos/login/arc_terms_of_service.js +index 73a3e63b3376d..b33af6b1547cf 100644 --- a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js +++ b/chrome/browser/resources/chromeos/login/arc_terms_of_service.js @@ -188,7 +188,7 @@ Polymer({ @@ -6953,10 +7242,24 @@ diff --git a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js b/c self.getCurrentLanguage_() + '/policies/privacy/'; self.showUrlOverlay(defaultLink); } +diff --git a/chrome/browser/resources/chromeos/login/consolidated_consent.js b/chrome/browser/resources/chromeos/login/consolidated_consent.js +index 36da3439d7907..7175d0187c058 100644 +--- a/chrome/browser/resources/chromeos/login/consolidated_consent.js ++++ b/chrome/browser/resources/chromeos/login/consolidated_consent.js +@@ -130,7 +130,7 @@ Polymer({ + * The hostname of the url where the terms of service will be fetched. + * Overwritten by tests to load terms of service from local test server. + */ +- termsOfServiceHostName_: 'https://play.google.com', ++ termsOfServiceHostName_: 'https://play.9oo91e.qjz9zk', + + /** + * Online URLs diff --git a/chrome/browser/resources/chromeos/login/debug/debug.js b/chrome/browser/resources/chromeos/login/debug/debug.js +index 9e365869efe69..6379ebfb305c6 100644 --- a/chrome/browser/resources/chromeos/login/debug/debug.js +++ b/chrome/browser/resources/chromeos/login/debug/debug.js -@@ -602,7 +602,7 @@ cr.define('cr.ui.login.debug', function() { +@@ -616,7 +616,7 @@ cr.define('cr.ui.login.debug', function() { // Password and email mismatch error message. id: 'offline-login-password-mismatch', trigger: (screen) => { @@ -6965,10 +7268,11 @@ diff --git a/chrome/browser/resources/chromeos/login/debug/debug.js b/chrome/bro screen.proceedToPasswordPage(); screen.showPasswordMismatchMessage(); }, -diff --git a/chrome/browser/resources/chromeos/login/marketing_opt_in.html b/chrome/browser/resources/chromeos/login/marketing_opt_in.html ---- a/chrome/browser/resources/chromeos/login/marketing_opt_in.html -+++ b/chrome/browser/resources/chromeos/login/marketing_opt_in.html -@@ -132,7 +132,7 @@ +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 +index 110d43b3fbfa9..0689c4cbafb60 100644 +--- a/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html ++++ b/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html +@@ -134,7 +134,7 @@
Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA
@@ -6978,6 +7282,7 @@ diff --git a/chrome/browser/resources/chromeos/login/marketing_opt_in.html b/chr diff --git a/chrome/browser/resources/chromeos/login/screens/login/offline_login.html b/chrome/browser/resources/chromeos/login/screens/login/offline_login.html +index ae17072855bf9..e41c775f7915a 100644 --- a/chrome/browser/resources/chromeos/login/screens/login/offline_login.html +++ b/chrome/browser/resources/chromeos/login/screens/login/offline_login.html @@ -38,7 +38,7 @@ @@ -6990,6 +7295,7 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/login/offline_login 'focus' - focuses current screen (email input or password input); 'setEmail' - accepts an argument |email|. If |email| is empty it sets diff --git a/chrome/browser/resources/chromeos/login/screens/login/offline_login.js b/chrome/browser/resources/chromeos/login/screens/login/offline_login.js +index 14589664fbc16..975abfc3064aa 100644 --- a/chrome/browser/resources/chromeos/login/screens/login/offline_login.js +++ b/chrome/browser/resources/chromeos/login/screens/login/offline_login.js @@ -4,7 +4,7 @@ @@ -7002,6 +7308,7 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/login/offline_login const LOGIN_SECTION = { diff --git a/chrome/browser/resources/chromeos/multidevice_internals/browser_tabs_metadata_form.js b/chrome/browser/resources/chromeos/multidevice_internals/browser_tabs_metadata_form.js +index c6f96bd9ecc1b..36c26e38d6884 100644 --- a/chrome/browser/resources/chromeos/multidevice_internals/browser_tabs_metadata_form.js +++ b/chrome/browser/resources/chromeos/multidevice_internals/browser_tabs_metadata_form.js @@ -34,7 +34,7 @@ Polymer({ @@ -7014,6 +7321,7 @@ diff --git a/chrome/browser/resources/chromeos/multidevice_internals/browser_tab /** @private */ diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json b/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json +index a7ae8aa8e3063..cefcb5eecde9a 100644 --- a/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json +++ b/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json @@ -21,7 +21,7 @@ @@ -7026,9 +7334,10 @@ diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json b ], "app": { diff --git a/chrome/browser/resources/cryptotoken/enroller.js b/chrome/browser/resources/cryptotoken/enroller.js +index ed75e755bbcce..0316c41bc0b9b 100644 --- a/chrome/browser/resources/cryptotoken/enroller.js +++ b/chrome/browser/resources/cryptotoken/enroller.js -@@ -860,7 +860,7 @@ Enroller.prototype.sendEnrollRequestToHelper_ = function() { +@@ -861,7 +861,7 @@ Enroller.prototype.sendEnrollRequestToHelper_ = function() { }; const googleCorpAppId = @@ -7038,6 +7347,7 @@ diff --git a/chrome/browser/resources/cryptotoken/enroller.js b/chrome/browser/r /** * Proxies the registration request over the WebAuthn API. diff --git a/chrome/browser/resources/default_apps/external_extensions.json b/chrome/browser/resources/default_apps/external_extensions.json +index a6a44c04b157a..0917d7ad32616 100644 --- a/chrome/browser/resources/default_apps/external_extensions.json +++ b/chrome/browser/resources/default_apps/external_extensions.json @@ -3,37 +3,37 @@ @@ -7086,6 +7396,7 @@ diff --git a/chrome/browser/resources/default_apps/external_extensions.json b/ch } diff --git a/chrome/browser/resources/discards/graph_doc_template.html b/chrome/browser/resources/discards/graph_doc_template.html +index bcdb842d0c07b..6ae52e8bc7a7f 100644 --- a/chrome/browser/resources/discards/graph_doc_template.html +++ b/chrome/browser/resources/discards/graph_doc_template.html @@ -78,7 +78,7 @@ URL. As result, this document needs to be self-contained, hence inline scripts. @@ -7098,6 +7409,7 @@ diff --git a/chrome/browser/resources/discards/graph_doc_template.html b/chrome/ crossorigin="anonymous"> diff --git a/chrome/browser/resources/downloads/icons.html b/chrome/browser/resources/downloads/icons.html +index 5315618cea58c..584e51cf493c1 100644 --- a/chrome/browser/resources/downloads/icons.html +++ b/chrome/browser/resources/downloads/icons.html @@ -3,7 +3,7 @@ @@ -7110,6 +7422,7 @@ diff --git a/chrome/browser/resources/downloads/icons.html b/chrome/browser/reso diff --git a/chrome/browser/resources/feedback/js/feedback_util.js b/chrome/browser/resources/feedback/js/feedback_util.js +index 97be1c0b80cce..301d9d4f9764c 100644 --- a/chrome/browser/resources/feedback/js/feedback_util.js +++ b/chrome/browser/resources/feedback/js/feedback_util.js @@ -6,29 +6,29 @@ @@ -7148,6 +7461,7 @@ diff --git a/chrome/browser/resources/feedback/js/feedback_util.js b/chrome/brow /** * Opens the supplied url in an app window. It uses the url as the window ID. diff --git a/chrome/browser/resources/feedback_webui/js/feedback_util.js b/chrome/browser/resources/feedback_webui/js/feedback_util.js +index 82246ce56988f..338151b3d419e 100644 --- a/chrome/browser/resources/feedback_webui/js/feedback_util.js +++ b/chrome/browser/resources/feedback_webui/js/feedback_util.js @@ -6,30 +6,30 @@ @@ -7187,6 +7501,7 @@ diff --git a/chrome/browser/resources/feedback_webui/js/feedback_util.js b/chrom /** * Opens the supplied url in an app window. It uses the url as the window ID. diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/browser/resources/gaia_auth_host/authenticator.js +index 8d8e281cfd712..0235c074e4d95 100644 --- a/chrome/browser/resources/gaia_auth_host/authenticator.js +++ b/chrome/browser/resources/gaia_auth_host/authenticator.js @@ -719,7 +719,7 @@ cr.define('cr.login', function() { @@ -7199,6 +7514,7 @@ diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/b '&access_type=offline'); diff --git a/chrome/browser/resources/gaia_auth_host/saml_password_attributes.js b/chrome/browser/resources/gaia_auth_host/saml_password_attributes.js +index 4fecfd13b10ff..87e227e18be70 100644 --- a/chrome/browser/resources/gaia_auth_host/saml_password_attributes.js +++ b/chrome/browser/resources/gaia_auth_host/saml_password_attributes.js @@ -24,7 +24,7 @@ cr.define('samlPasswordAttributes', function() { @@ -7211,6 +7527,7 @@ diff --git a/chrome/browser/resources/gaia_auth_host/saml_password_attributes.js /** @const @private {string} Schema name for password modified timestamp. */ const PASSWORD_MODIFIED_TIMESTAMP = 'passwordmodifiedtimestamp'; diff --git a/chrome/browser/resources/hangout_services/manifest.json b/chrome/browser/resources/hangout_services/manifest.json +index 556c6046a3623..2b9deb2a7735b 100644 --- a/chrome/browser/resources/hangout_services/manifest.json +++ b/chrome/browser/resources/hangout_services/manifest.json @@ -9,7 +9,7 @@ @@ -7223,6 +7540,7 @@ diff --git a/chrome/browser/resources/hangout_services/manifest.json b/chrome/br }, "background": { diff --git a/chrome/browser/resources/identity_scope_approval_dialog/manifest.json b/chrome/browser/resources/identity_scope_approval_dialog/manifest.json +index 89cb20dd27d98..671f8a15b8f90 100644 --- a/chrome/browser/resources/identity_scope_approval_dialog/manifest.json +++ b/chrome/browser/resources/identity_scope_approval_dialog/manifest.json @@ -24,6 +24,6 @@ @@ -7234,6 +7552,7 @@ diff --git a/chrome/browser/resources/identity_scope_approval_dialog/manifest.js } } diff --git a/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js b/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js +index c0c67900f0986..b4cbb7262cb86 100644 --- a/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js +++ b/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js @@ -23,7 +23,7 @@ function loadAuthUrlAndShowWindow(url, win, partition) { @@ -7260,6 +7579,7 @@ diff --git a/chrome/browser/resources/identity_scope_approval_dialog/scope_appro } diff --git a/chrome/browser/resources/inspect/inspect.html b/chrome/browser/resources/inspect/inspect.html +index 91fa7545b2f53..8e555264e6bae 100644 --- a/chrome/browser/resources/inspect/inspect.html +++ b/chrome/browser/resources/inspect/inspect.html @@ -46,7 +46,7 @@ found in the LICENSE file. @@ -7281,6 +7601,7 @@ diff --git a/chrome/browser/resources/inspect/inspect.html b/chrome/browser/reso
diff --git a/chrome/browser/resources/internals/query_tiles/query_tiles_internals.html b/chrome/browser/resources/internals/query_tiles/query_tiles_internals.html +index 5a4d0907d4997..3040851fc9be9 100644 --- a/chrome/browser/resources/internals/query_tiles/query_tiles_internals.html +++ b/chrome/browser/resources/internals/query_tiles/query_tiles_internals.html @@ -24,7 +24,7 @@ @@ -7293,6 +7614,7 @@ diff --git a/chrome/browser/resources/internals/query_tiles/query_tiles_internal diff --git a/chrome/browser/resources/internals/query_tiles/query_tiles_internals.js b/chrome/browser/resources/internals/query_tiles/query_tiles_internals.js +index 3e7875498c6a2..fcb3316706f70 100644 --- a/chrome/browser/resources/internals/query_tiles/query_tiles_internals.js +++ b/chrome/browser/resources/internals/query_tiles/query_tiles_internals.js @@ -43,11 +43,11 @@ function initialize() { @@ -7310,6 +7632,7 @@ diff --git a/chrome/browser/resources/internals/query_tiles/query_tiles_internal $('set-url').onclick = function() { diff --git a/chrome/browser/resources/media/mei_preload/manifest.json b/chrome/browser/resources/media/mei_preload/manifest.json +index d7cb343850efb..40c6e735b8cb6 100644 --- a/chrome/browser/resources/media/mei_preload/manifest.json +++ b/chrome/browser/resources/media/mei_preload/manifest.json @@ -3,6 +3,6 @@ @@ -7322,6 +7645,7 @@ diff --git a/chrome/browser/resources/media/mei_preload/manifest.json b/chrome/b } \ No newline at end of file diff --git a/chrome/browser/resources/media/webrtc_logs.js b/chrome/browser/resources/media/webrtc_logs.js +index e4029e5d8392d..1be11aaed4db6 100644 --- a/chrome/browser/resources/media/webrtc_logs.js +++ b/chrome/browser/resources/media/webrtc_logs.js @@ -85,7 +85,7 @@ function updateWebRtcTextLogsList(textLogsList, version) { @@ -7334,6 +7658,7 @@ diff --git a/chrome/browser/resources/media/webrtc_logs.js b/chrome/browser/reso href = appendParam(href, param, params[param]); } diff --git a/chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js b/chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js +index a91ba0c4ac789..404f99b545baa 100644 --- a/chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js +++ b/chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js @@ -278,7 +278,7 @@ Polymer({ @@ -7346,6 +7671,7 @@ diff --git a/chrome/browser/resources/nearby_share/shared/nearby_contact_visibil checked: false, }); diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html b/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html +index 9e6ab98921006..a0b573dc1561f 100644 --- a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html +++ b/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html @@ -5,7 +5,7 @@ @@ -7367,6 +7693,7 @@ diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.ht diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html b/chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html +index b85d2608e641e..df4f6a14d1960 100644 --- a/chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html +++ b/chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html @@ -5,7 +5,7 @@ @@ -7379,6 +7706,7 @@ diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_share_ty diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/resources/net_internals/index.html +index d2db8fa6dcb78..d47d140f99514 100644 --- a/chrome/browser/resources/net_internals/index.html +++ b/chrome/browser/resources/net_internals/index.html @@ -20,7 +20,7 @@ found in the LICENSE file. @@ -7402,6 +7730,7 @@ diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/

Add HSTS domain

diff --git a/chrome/browser/resources/network_speech_synthesis/manifest.json b/chrome/browser/resources/network_speech_synthesis/manifest.json +index e4835edb53168..835db49f4f262 100644 --- a/chrome/browser/resources/network_speech_synthesis/manifest.json +++ b/chrome/browser/resources/network_speech_synthesis/manifest.json @@ -10,7 +10,7 @@ @@ -7414,6 +7743,7 @@ diff --git a/chrome/browser/resources/network_speech_synthesis/manifest.json b/c "tts_engine": { "voices": [ diff --git a/chrome/browser/resources/network_speech_synthesis/tts_extension.js b/chrome/browser/resources/network_speech_synthesis/tts_extension.js +index 3790880568af1..c9f89de9b7253 100644 --- a/chrome/browser/resources/network_speech_synthesis/tts_extension.js +++ b/chrome/browser/resources/network_speech_synthesis/tts_extension.js @@ -30,7 +30,7 @@ TtsExtension.prototype = { @@ -7426,6 +7756,7 @@ diff --git a/chrome/browser/resources/network_speech_synthesis/tts_extension.js /** diff --git a/chrome/browser/resources/new_tab_page/doodle_share_dialog.js b/chrome/browser/resources/new_tab_page/doodle_share_dialog.js +index c4bd001f0b36e..afab4b23c72aa 100644 --- a/chrome/browser/resources/new_tab_page/doodle_share_dialog.js +++ b/chrome/browser/resources/new_tab_page/doodle_share_dialog.js @@ -51,7 +51,7 @@ class DoodleShareDialogElement extends mixinBehaviors @@ -7438,6 +7769,7 @@ diff --git a/chrome/browser/resources/new_tab_page/doodle_share_dialog.js b/chro `&href=${encodeURIComponent(this.url.url)}` + `&hashtag=${encodeURIComponent('#GoogleDoodle')}`; diff --git a/chrome/browser/resources/new_tab_page/modules/drive/module.js b/chrome/browser/resources/new_tab_page/modules/drive/module.js +index 8be13bd44cdbc..30e3c53c8c4ea 100644 --- a/chrome/browser/resources/new_tab_page/modules/drive/module.js +++ b/chrome/browser/resources/new_tab_page/modules/drive/module.js @@ -77,7 +77,7 @@ class DriveModuleElement extends mixinBehaviors @@ -7450,6 +7782,7 @@ diff --git a/chrome/browser/resources/new_tab_page/modules/drive/module.js b/chr } diff --git a/chrome/browser/resources/new_tab_page/modules/drive_v2/module.js b/chrome/browser/resources/new_tab_page/modules/drive_v2/module.js +index e72d276967c16..2145098c9ec25 100644 --- a/chrome/browser/resources/new_tab_page/modules/drive_v2/module.js +++ b/chrome/browser/resources/new_tab_page/modules/drive_v2/module.js @@ -41,7 +41,7 @@ class DriveModuleElement extends mixinBehaviors @@ -7461,7 +7794,21 @@ diff --git a/chrome/browser/resources/new_tab_page/modules/drive_v2/module.js b/ file.mimeType; } +diff --git a/chrome/browser/resources/new_tab_page/modules/photos/module.html b/chrome/browser/resources/new_tab_page/modules/photos/module.html +index 2d79c1ed2b367..392f2cbd13d5c 100644 +--- a/chrome/browser/resources/new_tab_page/modules/photos/module.html ++++ b/chrome/browser/resources/new_tab_page/modules/photos/module.html +@@ -376,7 +376,7 @@ + + +