From 6c2d2ee368490330c65276995714fde70f9f3bb2 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 27 May 2022 11:25:38 +0200 Subject: [PATCH] Patches for v102 --- build/LASTCHANGE | 2 +- build/RELEASE | 2 +- build/RELEASE_COMMIT | 2 +- build/bromite_patches_list.txt | 17 +- .../AImageReader-CFI-crash-mitigations.patch | 12 +- build/patches/AV1-codec-support.patch | 26 +- .../Add-AllowUserCertificates-flag.patch | 14 +- .../Add-IsCleartextPermitted-flag.patch | 8 +- .../Add-a-proxy-configuration-page.patch | 28 +- .../Add-an-always-incognito-mode.patch | 242 +- .../Add-bookmark-import-export-actions.patch | 52 +- ...dd-custom-tab-intents-privacy-option.patch | 12 +- build/patches/Add-exit-menu-item.patch | 10 +- ...g-for-omnibox-autocomplete-filtering.patch | 4 +- .../Add-flag-for-save-data-header.patch | 56 +- ...nfigure-maximum-connections-per-host.patch | 16 +- ...ontrol-video-playback-resume-feature.patch | 8 +- .../Add-flag-to-disable-IPv6-probes.patch | 12 +- ...-to-disable-external-intent-requests.patch | 16 +- .../Add-flag-to-disable-vibration.patch | 12 +- ...Add-lifetime-options-for-permissions.patch | 58 +- .../Add-menu-item-to-bookmark-all-tabs.patch | 36 +- .../Add-menu-item-to-view-source.patch | 8 +- .../Add-option-to-force-tablet-UI.patch | 14 +- ...-to-not-persist-tabs-across-sessions.patch | 4 +- .../Add-option-to-use-home-page-as-NTP.patch | 8 +- build/patches/Add-site-engagement-flag.patch | 8 +- ...-support-for-ISupportHelpAndFeedback.patch | 2 +- build/patches/Add-webGL-site-setting.patch | 34 +- build/patches/Add-webRTC-site-settings.patch | 22 +- ...ow-building-without-enable_reporting.patch | 24 +- ...ow-building-without-supervised-users.patch | 2 +- .../Ask-user-before-closing-all-tabs.patch | 18 +- ...ioBuffer-AnalyserNode-fp-mitigations.patch | 4 +- .../Automated-domain-substitution.patch | 5786 ++++++++++------- ...Block-gateway-attacks-via-websockets.patch | 6 +- .../Block-qjz9zk-or-trk-requests.patch | 8 +- .../Bookmarks-select-all-menu-entry.patch | 2 +- .../Bromite-AdBlockUpdaterService.patch | 56 +- build/patches/Bromite-auto-updater.patch | 20 +- build/patches/Client-hints-overrides.patch | 108 +- .../Content-settings-infrastructure.patch | 10 +- ...tionary-suggestions-for-the-Omnibox.patch} | 6 +- build/patches/Disable-AGSA-by-default.patch | 8 +- ...ble-Accessibility-service-by-default.patch | 2 +- .../patches/Disable-AsyncDNS-by-default.patch | 2 +- ...DRM-media-origin-IDs-preprovisioning.patch | 2 +- .../Disable-FLoC-and-privacy-sandbox.patch | 6 +- build/patches/Disable-TLS-resumption.patch | 22 +- build/patches/Disable-UA-full-version.patch | 6 +- .../patches/Disable-all-predictors-code.patch | 39 +- build/patches/Disable-all-promo-dialogs.patch | 4 +- .../Disable-conversion-measurement-api.patch | 183 +- .../Disable-feeds-support-by-default.patch | 2 +- ...Disable-fetching-of-all-field-trials.patch | 12 +- build/patches/Disable-idle-detection.patch | 2 +- ...media-router-and-remoting-by-default.patch | 22 +- .../patches/Disable-plugins-enumeration.patch | 2 +- build/patches/Disable-safe-browsing.patch | 274 +- build/patches/Disable-safety-check.patch | 28 +- .../Disable-smart-selection-by-default.patch | 8 +- ...isable-some-signed-exchange-features.patch | 4 +- ...ble-support-for-RAR-files-inspection.patch | 2 +- .../Disable-text-fragments-by-default.patch | 24 +- ...sable-third-party-cookies-by-default.patch | 2 +- .../Disable-third-party-origin-trials.patch | 16 +- build/patches/Disable-various-metrics.patch | 16 +- .../Do-not-build-API-keys-infobar.patch | 2 +- .../Do-not-hide-component-extensions.patch | 2 +- .../patches/Do-not-link-with-libatomic.patch | 2 +- .../Do-not-store-passwords-by-default.patch | 2 +- build/patches/DoH-improvements.patch | 2 +- .../Enable-Certificate-Transparency.patch | 28 +- ...BlockExternalFormRedirectsNoGesture.patch} | 2 +- ...-SPPI-for-devices-with-enough-memory.patch | 2 +- ...ctOriginIsolation-and-SitePerProcess.patch | 8 +- ...e-darken-websites-checkbox-in-themes.patch | 2 +- ...fwrapv-in-Clang-for-non-UBSan-builds.patch | 2 +- .../Enable-native-Android-autofill.patch | 82 +- .../Enable-network-isolation-features.patch | 4 +- ...-prefetch-privacy-changes-by-default.patch | 2 +- build/patches/Enable-share-intent.patch | 24 +- .../Enable-user-agent-freeze-by-default.patch | 2 +- .../Experimental-user-scripts-support.patch | 84 +- ...ing-against-incognito-mode-detection.patch | 2 +- .../patches/Hide-passwords-manager-link.patch | 6 +- ...story-number-of-days-privacy-setting.patch | 18 +- ...ripts-for-AMP-tracking-ads-and-video.patch | 14 +- build/patches/JIT-site-settings.patch | 6 +- .../Keep-empty-tabs-between-sessions.patch | 4 +- ...-allow-screenshots-in-Incognito-mode.patch | 2 +- build/patches/Logcat-crash-reports-UI.patch | 4 +- .../patches/Modify-default-preferences.patch | 172 +- .../Move-navigation-bar-to-bottom.patch | 134 +- ...nt-settings-back-to-privacy-settings.patch | 2 +- .../Multiple-fingerprinting-mitigations.patch | 50 +- .../Open-YouTube-links-in-Bromite.patch | 2 +- build/patches/OpenSearch-miscellaneous.patch | 8 +- ...tition-DNS-requests-by-top-frame-NIK.patch | 74 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 8 +- ...Reintroduce-override_build_timestamp.patch | 2 +- .../Remove-binary-blob-integrations.patch | 233 +- ...cklisted-URLs-upon-bookmark-creation.patch | 10 +- .../Remove-contextual-search-manager.patch | 96 +- build/patches/Remove-help-menu-item.patch | 2 +- ...-mremap-from-seccomp-baseline-policy.patch | 4 +- .../patches/Remove-signin-integrations.patch | 228 +- ...weblayer-dependency-on-Play-Services.patch | 2 +- ...ce-DoH-probe-domain-with-RIPE-domain.patch | 2 +- .../Restore-Search-Ready-Omnibox-flag.patch | 48 +- .../Restore-Simplified-NTP-launch.patch | 34 +- .../Restore-offline-indicator-v2-flag.patch | 255 +- ...vert-Permit-blocking-of-view-source.patch} | 43 +- ...emove-disable-pull-to-refresh-effect.patch | 12 +- ...vert-flags-remove-num-raster-threads.patch | 8 +- ...moval-of-an-option-to-block-autoplay.patch | 28 +- build/patches/Site-setting-for-images.patch | 4 +- .../Switch-to-fstack-protector-strong.patch | 4 +- build/patches/Timezone-customization.patch | 38 +- build/patches/Unexpire-tab-groups-flags.patch | 8 +- build/patches/Update-i18n-zh_CN-support.patch | 8 +- .../Use-4-tile-rows-never-show-logo.patch | 6 +- build/patches/User-agent-customization.patch | 54 +- build/patches/Welcome-screen.patch | 138 +- ...n-to-play-protected-media-by-default.patch | 2 +- build/patches/autofill-miscellaneous.patch | 10 +- ...build-remove-calling-untrusted-hooks.patch | 10 +- build/patches/disable-AdsBlockedInfoBar.patch | 4 +- .../disable-appending-variations-header.patch | 2 +- .../disable-background-sync-by-default.patch | 2 +- ...h => disable-battery-status-updater.patch} | 2 +- ...disable-browser-autologin-by-default.patch | 2 +- ...bile-identity-consistency-by-default.patch | 22 - ...nsors-access-site-setting-by-default.patch | 2 +- ...IPv6-connectivity-probes-to-RIPE-DNS.patch | 2 +- .../enable-ftrivial-auto-var-init-zero.patch | 2 +- ...solated-sandboxed-iframes-by-default.patch | 2 +- ...t_run-deactivate-autoupdate-globally.patch | 2 +- ...et-cert-increase-default-key-length.patch} | 2 +- ...nH264-enable-ARM-ARM64-optimizations.patch | 2 +- ...lways-prompt-for-download-directory.patch} | 4 +- ...efs-disable-signinallowed-by-default.patch | 2 +- ...file-resetter-disable-send-settings.patch} | 2 +- ...-chromium-Disable-intranet-detector.patch} | 2 +- ...gled-chromium-Disable-profile-avatar.patch | 2 +- ...romium-Disable-translate-integration.patch | 2 +- ...ed-chromium-Disable-untraceable-URLs.patch | 4 +- ...chromium-Disable-webRTC-log-uploader.patch | 4 +- ...RTC-do-not-expose-local-IP-addresses.patch | 4 +- 149 files changed, 5563 insertions(+), 4041 deletions(-) rename build/patches/{Revert-Disable-Dictionary-suggestions-for-the-Omnibox.patch => Dictionary-suggestions-for-the-Omnibox.patch} (99%) rename build/patches/{Enable-IntentBlockExternalFormRedirectsNoGesture-by-default.patch => Enable-IntentBlockExternalFormRedirectsNoGesture.patch} (93%) rename build/patches/{Revert-Permit-blocking-of-view-source-with-URLBlocklist.patch => Revert-Permit-blocking-of-view-source.patch} (83%) rename build/patches/{battery_status_service-disable-more-privacy-nightmares.patch => disable-battery-status-updater.patch} (95%) delete mode 100644 build/patches/disable-mobile-identity-consistency-by-default.patch rename build/patches/{net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch => net-cert-increase-default-key-length.patch} (90%) rename build/patches/{prefs-always-prompt-for-download-directory-by-default.patch => prefs-always-prompt-for-download-directory.patch} (93%) rename build/patches/{profile-resetter-do-not-tick-send-settings-by-default.patch => profile-resetter-disable-send-settings.patch} (94%) rename build/patches/{ungoogled-chromium-Disable-intranet-redirect-detector.patch => ungoogled-chromium-Disable-intranet-detector.patch} (94%) diff --git a/build/LASTCHANGE b/build/LASTCHANGE index dc4a0d40..8d79ea74 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -f441c1f02214920ad09ab14ca8be3eaa4b5a942a- \ No newline at end of file +e2f81b1dde1b1797abac2016085412a9f5cd16b0- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index 86e95044..fbcb94c1 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -101.0.4951.69 \ No newline at end of file +102.0.5005.67 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index 271067ff..67f6fbfa 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -3b19d1cba55608c5382ebd24ffdfa28d937c9e37 \ No newline at end of file +56d61c35a8cc36f6c7e4a47b81ffbcad0b7bc405 \ No newline at end of file diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index e7d1d95e..332e8672 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -9,7 +9,7 @@ Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch Bromite-package-name.patch Restore-classic-new-tab-page.patch Always-use-new-tab-page-for-default-home-page.patch -battery_status_service-disable-more-privacy-nightmares.patch +disable-battery-status-updater.patch Battery-API-return-nothing.patch updater-disable-updater-pings.patch Remove-EV-certificates.patch @@ -26,7 +26,7 @@ ungoogled-chromium-Disable-webRTC-log-uploader.patch ungoogled-chromium-Disable-untraceable-URLs.patch ungoogled-chromium-Disable-translate-integration.patch ungoogled-chromium-Disable-profile-avatar.patch -ungoogled-chromium-Disable-intranet-redirect-detector.patch +ungoogled-chromium-Disable-intranet-detector.patch ungoogled-chromium-no-special-hosts-domains.patch ungoogled-chromium-Disable-Gaia.patch ungoogled-chromium-Disable-Network-Time-Tracker.patch @@ -63,10 +63,10 @@ Disable-FLoC-and-privacy-sandbox.patch History-number-of-days-privacy-setting.patch Disable-fetching-of-all-field-trials.patch Disable-plugins-enumeration.patch -net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch +net-cert-increase-default-key-length.patch dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch Add-flag-to-disable-IPv6-probes.patch -profile-resetter-do-not-tick-send-settings-by-default.patch +profile-resetter-disable-send-settings.patch Do-not-build-API-keys-infobar.patch autofill-miscellaneous.patch Enable-native-Android-autofill.patch @@ -86,7 +86,7 @@ Enable-SPPI-for-devices-with-enough-memory.patch Enable-StrictOriginIsolation-and-SitePerProcess.patch Use-64-bit-WebView-processes.patch prefs-disable-signinallowed-by-default.patch -prefs-always-prompt-for-download-directory-by-default.patch +prefs-always-prompt-for-download-directory.patch Disable-offline-pages-in-CCT.patch disable-payment-support-by-default.patch disable-background-sync-by-default.patch @@ -142,7 +142,7 @@ Add-AllowUserCertificates-flag.patch Add-IsCleartextPermitted-flag.patch Unexpire-tab-groups-flags.patch Add-flag-for-omnibox-autocomplete-filtering.patch -Enable-IntentBlockExternalFormRedirectsNoGesture-by-default.patch +Enable-IntentBlockExternalFormRedirectsNoGesture.patch Add-flag-to-disable-external-intent-requests.patch Logcat-crash-reports-UI.patch Add-support-for-ISupportHelpAndFeedback.patch @@ -168,11 +168,10 @@ Reintroduce-override_build_timestamp.patch enable-ftrivial-auto-var-init-zero.patch disable-appending-variations-header.patch Make-HTTPS-only-mode-the-default.patch -disable-mobile-identity-consistency-by-default.patch Disable-idle-detection.patch Allow-building-without-supervised-users.patch Disable-minidump-upload-scheduling.patch -Revert-Permit-blocking-of-view-source-with-URLBlocklist.patch +Revert-Permit-blocking-of-view-source.patch Disable-safety-check.patch Disable-all-predictors-code.patch OpenSearch-miscellaneous.patch @@ -180,7 +179,7 @@ Enable-Certificate-Transparency.patch Update-i18n-zh_CN-support.patch Add-flag-for-save-data-header.patch Disable-UA-full-version.patch -Revert-Disable-Dictionary-suggestions-for-the-Omnibox.patch +Dictionary-suggestions-for-the-Omnibox.patch Disable-AsyncDNS-by-default.patch Add-lifetime-options-for-permissions.patch Disable-crash-reporting.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index c3881e65..f59377c6 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -82,7 +82,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2287,9 +2287,9 @@ +@@ -2243,9 +2243,9 @@ "expiry_milestone": 106 }, { @@ -98,7 +98,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js 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 -@@ -3198,6 +3198,22 @@ +@@ -3199,6 +3199,22 @@ "dont_delete_source_texture_for_egl_image" ] }, @@ -150,7 +150,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc --- a/gpu/config/gpu_util.cc +++ b/gpu/config/gpu_util.cc -@@ -117,6 +117,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( +@@ -120,6 +120,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( #if !BUILDFLAG(IS_ANDROID) return kGpuFeatureStatusDisabled; #else @@ -160,7 +160,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; -@@ -330,6 +333,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { +@@ -343,6 +346,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] = kGpuFeatureStatusBlocklisted; } @@ -229,7 +229,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 -@@ -687,6 +687,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -711,6 +711,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}; @@ -243,7 +243,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 -@@ -215,6 +215,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; +@@ -223,6 +223,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 f91a6c1f..2935c2ae 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -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 -@@ -655,6 +655,11 @@ aom_rc_interface_sources = [ +@@ -652,6 +652,11 @@ aom_rc_interface_sources = [ "//third_party/libaom/source/libaom/test/yuv_video_source.h", ] @@ -75,9 +75,9 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RATECTRL_LOG equ 0 CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 - CONFIG_REALTIME_ONLY equ 1 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 @@ -87,9 +87,9 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RATECTRL_LOG 0 #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 - #define CONFIG_REALTIME_ONLY 1 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 @@ -99,9 +99,9 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RATECTRL_LOG equ 0 CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 - CONFIG_REALTIME_ONLY equ 1 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 @@ -111,9 +111,9 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RATECTRL_LOG 0 #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 - #define CONFIG_REALTIME_ONLY 1 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 @@ -123,9 +123,9 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RATECTRL_LOG equ 0 CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 - CONFIG_REALTIME_ONLY equ 1 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 @@ -135,9 +135,9 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RATECTRL_LOG 0 #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 - #define CONFIG_REALTIME_ONLY 1 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 @@ -147,9 +147,9 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RATECTRL_LOG equ 0 CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 - CONFIG_REALTIME_ONLY equ 1 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 @@ -159,9 +159,9 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RATECTRL_LOG 0 #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 - #define CONFIG_REALTIME_ONLY 1 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 @@ -171,9 +171,9 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 + CONFIG_RATECTRL_LOG equ 0 CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 - CONFIG_REALTIME_ONLY equ 1 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 @@ -183,9 +183,9 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RATECTRL_LOG 0 #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 - #define CONFIG_REALTIME_ONLY 1 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 @@ -195,9 +195,9 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ %define CONFIG_PARTITION_SEARCH_ORDER 0 -%define CONFIG_PIC 0 +%define CONFIG_PIC 1 + %define CONFIG_RATECTRL_LOG 0 %define CONFIG_RD_COMMAND 0 %define CONFIG_RD_DEBUG 0 - %define CONFIG_REALTIME_ONLY 1 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 @@ -207,8 +207,8 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 + #define CONFIG_RATECTRL_LOG 0 #define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 - #define CONFIG_REALTIME_ONLY 1 -- 2.25.1 diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index ae4e6ae2..fa9b73a6 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -18,7 +18,7 @@ Subject: Add AllowUserCertificates flag diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -232,6 +232,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -231,6 +231,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.common.ContentSwitches; @@ -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; -@@ -995,6 +996,8 @@ public abstract class ChromeActivity +@@ -994,6 +995,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java -@@ -95,6 +95,7 @@ public class ChromeCachedFlags { +@@ -94,6 +94,7 @@ public class ChromeCachedFlags { .GIVE_JAVA_UI_THREAD_DEFAULT_TASK_TRAITS_USER_BLOCKING_PRIORITY); add(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS); add(ChromeFeatureList.IMMERSIVE_UI_MODE); @@ -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 -@@ -3076,7 +3076,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3220,7 +3220,11 @@ const FeatureEntry kFeatureEntries[] = { {"enable-container-queries", flag_descriptions::kCSSContainerQueriesName, flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, @@ -93,7 +93,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 -@@ -147,6 +147,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -144,6 +144,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedLoadingPlaceholder, &feed::kInterestFeedContentSuggestions, &feed::kInterestFeedSpinnerAlwaysAnimate, @@ -101,7 +101,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -406,6 +407,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ +@@ -399,6 +400,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -141,9 +141,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /* Alphabetical: */ + public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates"; + public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 = - "AdaptiveButtonInTopToolbarCustomizationV2"; diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java --- a/net/android/java/src/org/chromium/net/X509Util.java +++ b/net/android/java/src/org/chromium/net/X509Util.java diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index 6d663caf..bcd080e7 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 -@@ -8171,6 +8171,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8201,6 +8201,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRequestDesktopSiteExceptionsName, flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, @@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1538,6 +1538,10 @@ const char kHttpsOnlyModeDescription[] = +@@ -1477,6 +1477,10 @@ const char kHttpsOnlyModeDescription[] = "Adds a setting under chrome://settings/security to opt-in to HTTPS-First " "Mode."; @@ -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 -@@ -873,6 +873,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; +@@ -834,6 +834,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; extern const char kHttpsOnlyModeName[]; extern const char kHttpsOnlyModeDescription[]; @@ -55,7 +55,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -95,6 +95,9 @@ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData", +@@ -115,6 +115,9 @@ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData", const base::Feature kEncryptedClientHello{"EncryptedClientHello", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index d7f0c697..1c4b9f0e 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -114,10 +114,10 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr #include +#include "base/logging.h" - #include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" -@@ -15,6 +16,9 @@ + #include "build/chromeos_buildflags.h" +@@ -14,6 +15,9 @@ #include "content/public/browser/browser_thread.h" #include "net/proxy_resolution/configured_proxy_resolution_service.h" #include "net/proxy_resolution/proxy_config_service.h" @@ -127,7 +127,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" -@@ -73,7 +77,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( +@@ -72,7 +76,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( return std::make_unique( profile_prefs, local_state_prefs, nullptr); #else @@ -149,7 +149,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr #endif // BUILDFLAG(IS_CHROMEOS_ASH) } -@@ -89,3 +106,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( +@@ -88,3 +105,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( nullptr); #endif // BUILDFLAG(IS_CHROMEOS_ASH) } @@ -181,7 +181,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -158,6 +158,8 @@ +@@ -161,6 +161,8 @@ #include "printing/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h" @@ -190,7 +190,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 -@@ -967,6 +969,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -994,6 +996,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { chrome::enterprise_util::RegisterLocalStatePrefs(registry); component_updater::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -635,7 +635,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 -@@ -274,6 +274,8 @@ static_library("ui") { +@@ -281,6 +281,8 @@ static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -647,15 +647,15 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -55,6 +55,7 @@ +@@ -56,6 +56,7 @@ #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h" #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" #include "chrome/browser/ui/webui/policy/policy_ui.h" +#include "chrome/browser/ui/webui/proxy_config_ui.h" #include "chrome/browser/ui/webui/predictors/predictors_ui.h" + #include "chrome/browser/ui/webui/profiles/profile_internals_ui.h" #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h" - #include "chrome/browser/ui/webui/signin_internals_ui.h" -@@ -763,6 +764,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -778,6 +779,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -1126,7 +1126,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 -@@ -39,6 +39,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; +@@ -48,6 +48,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; const char kChromeUICertificateViewerURL[] = "chrome://view-cert/"; const char kChromeUIChromeSigninHost[] = "chrome-signin"; const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/"; @@ -1135,7 +1135,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"; -@@ -409,6 +411,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -421,6 +423,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { kChromeUIMobileSetupHost, kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, @@ -1143,7 +1143,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIOobeHost, kChromeUIOSCreditsHost, kChromeUIOSSettingsHost, -@@ -651,6 +654,7 @@ const char* const kChromeHostURLs[] = { +@@ -672,6 +675,7 @@ const char* const kChromeHostURLs[] = { #if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1154,7 +1154,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -129,6 +129,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -132,6 +132,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 651a895b..68cb03e0 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -33,14 +33,16 @@ See also: https://github.com/bromite/bromite/pull/1427 .../chrome/browser/history/HistoryPage.java | 16 ++ .../browser/init/StartupTabPreloader.java | 14 +- .../native_page/NativePageFactory.java | 4 +- - .../chrome/browser/ntp/RecentTabsManager.java | 8 +- + .../chrome/browser/ntp/RecentTabsManager.java | 3 +- .../privacy/settings/IncognitoSettings.java | 160 ++++++++++++++++++ .../browser/settings/SettingsActivity.java | 4 + - .../browser/tab/HistoricalTabSaver.java | 6 +- + .../HistoricalTabModelObserver.java | 8 +- + .../tab/tab_restore/HistoricalTabSaver.java | 2 +- + .../tab_restore/HistoricalTabSaverImpl.java | 12 +- .../tabbed_mode/TabbedRootUiCoordinator.java | 5 +- .../browser/tabmodel/ChromeTabCreator.java | 5 +- .../tabmodel/TabModelSelectorImpl.java | 3 + - .../browser/tabmodel/TabPersistentStore.java | 15 +- + .../browser/tabmodel/TabPersistentStore.java | 10 ++ .../webapps/WebappIntentDataProvider.java | 14 ++ chrome/browser/about_flags.cc | 4 + .../browser/android/historical_tab_saver.cc | 21 ++- @@ -78,7 +80,7 @@ See also: https://github.com/bromite/bromite/pull/1427 .../omnibox/browser/base_search_provider.cc | 2 +- components/omnibox/browser/search_provider.cc | 4 +- .../host_content_settings_map_factory.cc | 1 + - 62 files changed, 682 insertions(+), 72 deletions(-) + 64 files changed, 686 insertions(+), 74 deletions(-) create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java @@ -87,7 +89,7 @@ See also: https://github.com/bromite/bromite/pull/1427 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -708,6 +708,7 @@ chrome_java_resources = [ +@@ -695,6 +695,7 @@ chrome_java_resources = [ "java/res/xml/main_preferences.xml", "java/res/xml/manage_sync_preferences.xml", "java/res/xml/phone_as_a_security_key_accessory_filter.xml", @@ -106,7 +108,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", "java/src/org/chromium/chrome/browser/ActivityTabProvider.java", "java/src/org/chromium/chrome/browser/ActivityUtils.java", -@@ -967,6 +968,7 @@ chrome_java_sources = [ +@@ -973,6 +974,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", @@ -240,7 +242,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; -@@ -1826,8 +1827,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1959,6 +1960,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -348,7 +350,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType; -@@ -409,6 +410,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -418,6 +419,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { boolean hasSaveImage = false; mShowEphemeralTabNewLabel = null; @@ -358,7 +360,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr List> groupedItems = new ArrayList<>(); if (mParams.isAnchor()) { -@@ -427,6 +431,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -436,6 +440,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP)); } } @@ -366,7 +368,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) { linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB)); } -@@ -451,7 +456,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -460,7 +465,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -639,27 +641,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/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 -@@ -73,16 +73,16 @@ public class RecentTabsManager implements AccountsChangeObserver { +@@ -73,7 +73,8 @@ public class RecentTabsManager implements AccountsChangeObserver { */ public RecentTabsManager(Tab tab, TabModelSelector tabModelSelector, Profile profile, Context context, Runnable showHistoryManager) { - mProfile = profile; + mProfile = profile.getOriginalProfile(); ++ profile = mProfile; mActiveTab = tab; mTabModelSelector = tabModelSelector; mShowHistoryManager = showHistoryManager; -- mForeignSessionHelper = new ForeignSessionHelper(profile); -- mPrefs = new RecentTabsPagePrefs(profile); -+ mForeignSessionHelper = new ForeignSessionHelper(mProfile); -+ mPrefs = new RecentTabsPagePrefs(mProfile); - mFaviconHelper = new FaviconHelper(); - mRecentlyClosedTabManager = sRecentlyClosedTabManagerForTests != null - ? sRecentlyClosedTabManagerForTests -- : new RecentlyClosedBridge(profile); -+ : new RecentlyClosedBridge(mProfile); - - mRecentlyClosedTabManager.setTabsUpdatedRunnable(this::updateRecentlyClosedTabs); - updateRecentlyClosedTabs(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java new file mode 100644 --- /dev/null @@ -836,7 +827,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; -@@ -254,6 +255,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -252,6 +253,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity if (fragment instanceof AdPersonalizationRemovedFragment) { ((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager()); } @@ -846,30 +837,96 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin } @Override -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 -@@ -29,10 +29,10 @@ public class HistoricalTabSaver { - /** - * Creates a historical tab from a tab being closed. +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java +@@ -15,6 +15,8 @@ import java.util.ArrayList; + import java.util.HashMap; + import java.util.List; + ++import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; ++ + /** + * A tab model observer for managing bulk closures. + */ +@@ -47,7 +49,8 @@ public class HistoricalTabModelObserver implements TabModelObserver { + if (tabs.isEmpty()) return; + + if (tabs.size() == 1) { +- mHistoricalTabSaver.createHistoricalTab(tabs.get(0)); ++ boolean is_always_incognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito(); ++ mHistoricalTabSaver.createHistoricalTab(tabs.get(0), is_always_incognito); + return; + } + +@@ -59,8 +62,9 @@ public class HistoricalTabModelObserver implements TabModelObserver { + * identical to what occurred prior to {@link ChromeFeatureList.BULK_TAB_RESTORE}. */ -- public static void createHistoricalTab(Tab tab) { -+ public static void createHistoricalTab(Tab tab, boolean is_always_incognito) { + private void legacyCreateHistoricalTabs(List tabs) { ++ boolean is_always_incognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito(); + for (Tab tab : tabs) { +- mHistoricalTabSaver.createHistoricalTab(tab); ++ mHistoricalTabSaver.createHistoricalTab(tab, is_always_incognito); + } + } + +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaver.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaver.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaver.java +@@ -16,7 +16,7 @@ public interface HistoricalTabSaver { + * Creates a Tab entry in TabRestoreService. + * @param tab The {@link Tab} to create an entry for. + */ +- void createHistoricalTab(Tab tab); ++ void createHistoricalTab(Tab tab, boolean is_always_incognito); + + /** + * Creates a Group or Tab entry in TabRestoreService. +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java +@@ -46,10 +46,10 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { + + // HistoricalTabSaver implementation. + @Override +- public void createHistoricalTab(Tab tab) { ++ public void createHistoricalTab(Tab tab, boolean is_always_incognito) { if (!shouldSave(tab)) return; -- HistoricalTabSaverJni.get().createHistoricalTab(tab); -+ HistoricalTabSaverJni.get().createHistoricalTab(tab, is_always_incognito); +- createHistoricalTabInternal(tab); ++ createHistoricalTabInternal(tab, is_always_incognito); + } + + @Override +@@ -90,7 +90,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { + + // If there is only a single valid tab remaining save it individually. + if (validEntries.size() == 1 && validEntries.get(0).isSingleTab()) { +- createHistoricalTabInternal(allTabs.get(0)); ++ createHistoricalTabInternal(allTabs.get(0), false); + return; + } + +@@ -107,8 +107,8 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { + CollectionUtil.integerListToIntArray(perTabGroupId), allTabs.toArray(new Tab[0])); + } + +- private void createHistoricalTabInternal(Tab tab) { +- HistoricalTabSaverImplJni.get().createHistoricalTab(tab); ++ private void createHistoricalTabInternal(Tab tab, boolean is_always_incognito) { ++ HistoricalTabSaverImplJni.get().createHistoricalTab(tab, is_always_incognito); } /** -@@ -72,6 +72,6 @@ public class HistoricalTabSaver { +@@ -194,7 +194,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver { @NativeMethods interface Natives { - void createHistoricalTab(Tab tab); + void createHistoricalTab(Tab tab, boolean is_always_incognito); - } - } + void createHistoricalGroup(TabModel model, String title, Tab[] tabs); + void createHistoricalBulkClosure( + TabModel model, int[] groupIds, String[] titles, int[] perTabGroupId, Tab[] tabs); 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 @@ -882,7 +939,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. -@@ -495,11 +497,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -493,11 +495,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { // TODO(twellington): Supply TabModelSelector as well and move initialization earlier. if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { @@ -928,8 +985,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.flags.ActivityType; - import org.chromium.chrome.browser.profiles.Profile; -@@ -107,6 +108,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod + import org.chromium.chrome.browser.ntp.RecentlyClosedBridge; +@@ -108,6 +109,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod public void onNativeLibraryReady(TabContentManager tabContentProvider) { assert mTabContentManager == null : "onNativeLibraryReady called twice!"; @@ -949,7 +1006,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import org.chromium.base.FeatureList; import org.chromium.base.Log; import org.chromium.base.ObserverList; -@@ -59,6 +60,8 @@ import org.chromium.content_public.browser.LoadUrlParams; +@@ -58,6 +59,8 @@ import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.UiThreadTaskTraits; import org.chromium.url.GURL; @@ -958,19 +1015,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; -@@ -190,7 +193,10 @@ public class TabPersistentStore { - @Override - public void didCloseTab(Tab tab) { - PersistedTabData.onTabClose(tab); -- if (!tab.isIncognito()) HistoricalTabSaver.createHistoricalTab(tab); -+ boolean is_always_incognito = -+ AlwaysIncognitoLinkInterceptor.isAlwaysIncognito(); -+ if (!tab.isIncognito() || is_always_incognito) -+ HistoricalTabSaver.createHistoricalTab(tab, is_always_incognito); - removeTabFromQueues(tab); - } - -@@ -741,6 +747,13 @@ public class TabPersistentStore { +@@ -739,6 +742,13 @@ public class TabPersistentStore { } } } @@ -1032,7 +1077,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4232,6 +4232,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4373,6 +4373,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOfflinePagesLivePageSharingName, flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, @@ -1040,13 +1085,13 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + flag_descriptions::kOfflinePagesAutoSaveFeatureName, + flag_descriptions::kOfflinePagesAutoSaveFeatureDescription, kOsAndroid, + FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesAutoSaveFeature)}, - {"offline-indicator-v2", flag_descriptions::kOfflineIndicatorV2Name, - flag_descriptions::kOfflineIndicatorV2Description, kOsAndroid, - FEATURE_VALUE_TYPE(chrome::android::kOfflineIndicatorV2)}, + {"query-tiles", flag_descriptions::kQueryTilesName, + flag_descriptions::kQueryTilesDescription, kOsAndroid, + FEATURE_WITH_PARAMS_VALUE_TYPE(query_tiles::features::kQueryTiles, diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/android/historical_tab_saver.cc --- a/chrome/browser/android/historical_tab_saver.cc +++ b/chrome/browser/android/historical_tab_saver.cc -@@ -14,13 +14,18 @@ +@@ -24,6 +24,11 @@ #include "components/sessions/core/tab_restore_service.h" #include "content/public/browser/web_contents.h" @@ -1056,17 +1101,18 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and +#include "historical_tab_saver.h" + using base::android::JavaParamRef; + using base::android::ScopedJavaLocalRef; - namespace historical_tab_saver { - - namespace { +@@ -34,7 +39,7 @@ namespace { + // Defined in TabGroupModelFilter.java + constexpr int kInvalidGroupId = -1; -void CreateHistoricalTab(TabAndroid* tab_android) { +void CreateHistoricalTab(TabAndroid* tab_android, bool is_always_incognito) { if (!tab_android) { return; } -@@ -30,9 +35,14 @@ void CreateHistoricalTab(TabAndroid* tab_android) { +@@ -44,9 +49,14 @@ void CreateHistoricalTab(TabAndroid* tab_android) { return; } @@ -1083,9 +1129,9 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and if (!service) { return; } -@@ -77,8 +87,9 @@ std::unique_ptr ScopedWebContents::CreateForTab( +@@ -176,8 +186,9 @@ std::unique_ptr ScopedWebContents::CreateForTab( // static - static void JNI_HistoricalTabSaver_CreateHistoricalTab( + static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab( JNIEnv* env, - const JavaParamRef& jtab_android) { - CreateHistoricalTab(TabAndroid::GetNativeTab(env, jtab_android)); @@ -1094,7 +1140,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and + CreateHistoricalTab(TabAndroid::GetNativeTab(env, jtab_android), is_always_incognito); } - } // namespace historical_tab_saver + // static 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 @@ -1172,7 +1218,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3421,6 +3421,12 @@ const char kOfflinePagesLivePageSharingDescription[] = +@@ -3338,6 +3338,12 @@ const char kOfflinePagesLivePageSharingDescription[] = "Enables to share current loaded page as offline page by saving as MHTML " "first."; @@ -1188,7 +1234,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 -@@ -1956,6 +1956,9 @@ extern const char kOfflineIndicatorV2Description[]; +@@ -1896,6 +1896,9 @@ extern const char kNotificationPermissionRationaleDescription[]; extern const char kOfflinePagesLivePageSharingName[]; extern const char kOfflinePagesLivePageSharingDescription[]; @@ -1201,7 +1247,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 -@@ -482,8 +482,8 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", +@@ -475,8 +475,8 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1291,7 +1337,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrome/browser/offline_pages/android/offline_page_bridge.cc --- a/chrome/browser/offline_pages/android/offline_page_bridge.cc +++ b/chrome/browser/offline_pages/android/offline_page_bridge.cc -@@ -48,6 +48,9 @@ +@@ -47,6 +47,9 @@ #include "content/public/browser/web_contents.h" #include "net/base/filename_util.h" #include "url/android/gurl_android.h" @@ -1301,7 +1347,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom using base::android::ConvertJavaStringToUTF8; using base::android::ConvertUTF16ToJavaString; -@@ -157,7 +160,13 @@ void ValidateFileCallback( +@@ -156,7 +159,13 @@ void ValidateFileCallback( int64_t offline_id, const GURL& url, const base::FilePath& file_path, @@ -1315,7 +1361,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom // If trusted, the launch url will be the http/https url of the offline // page. If the file path is content URI, directly open it. Otherwise, the // launch url will be the file URL pointing to the archive file of the offline -@@ -788,7 +797,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone( +@@ -787,7 +796,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone( if (offline_page_model_->IsArchiveInInternalDir(offline_page->file_path)) { ValidateFileCallback(launch_location, j_callback_obj, offline_page->offline_id, offline_page->url, @@ -1324,7 +1370,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom return; } -@@ -798,7 +807,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone( +@@ -797,7 +806,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone( offline_page->file_size, offline_page->digest), base::BindOnce(&ValidateFileCallback, launch_location, j_callback_obj, offline_page->offline_id, offline_page->url, @@ -1336,7 +1382,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc b/chrome/browser/offline_pages/android/offline_page_model_factory.cc --- a/chrome/browser/offline_pages/android/offline_page_model_factory.cc +++ b/chrome/browser/offline_pages/android/offline_page_model_factory.cc -@@ -26,6 +26,9 @@ +@@ -25,6 +25,9 @@ #include "components/keyed_service/core/simple_dependency_manager.h" #include "components/offline_pages/core/model/offline_page_model_taskified.h" #include "components/offline_pages/core/offline_page_metadata_store.h" @@ -1346,7 +1392,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc namespace offline_pages { -@@ -48,6 +51,7 @@ OfflinePageModel* OfflinePageModelFactory::GetForKey(SimpleFactoryKey* key) { +@@ -47,6 +50,7 @@ OfflinePageModel* OfflinePageModelFactory::GetForKey(SimpleFactoryKey* key) { OfflinePageModel* OfflinePageModelFactory::GetForBrowserContext( content::BrowserContext* browser_context) { Profile* profile = Profile::FromBrowserContext(browser_context); @@ -1354,7 +1400,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc return GetForKey(profile->GetProfileKey()); } -@@ -56,13 +60,15 @@ std::unique_ptr OfflinePageModelFactory::BuildServiceInstanceFor( +@@ -55,13 +59,15 @@ std::unique_ptr OfflinePageModelFactory::BuildServiceInstanceFor( scoped_refptr background_task_runner = base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()}); @@ -1372,7 +1418,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc // If base::PathService::Get returns false, the temporary_archives_dir will be // empty, and no temporary pages will be saved during this chrome lifecycle. base::FilePath temporary_archives_dir; -@@ -71,7 +77,6 @@ std::unique_ptr OfflinePageModelFactory::BuildServiceInstanceFor( +@@ -70,7 +76,6 @@ std::unique_ptr OfflinePageModelFactory::BuildServiceInstanceFor( temporary_archives_dir.Append(chrome::kOfflinePageArchivesDirname); } @@ -1380,7 +1426,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc auto archive_manager = std::make_unique( temporary_archives_dir, persistent_archives_dir, DownloadPrefs::GetDefaultDownloadDirectory(), background_task_runner, -@@ -91,4 +96,14 @@ std::unique_ptr OfflinePageModelFactory::BuildServiceInstanceFor( +@@ -90,4 +95,14 @@ std::unique_ptr OfflinePageModelFactory::BuildServiceInstanceFor( return model; } @@ -1398,7 +1444,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc b/chrome/browser/offline_pages/android/request_coordinator_factory.cc --- a/chrome/browser/offline_pages/android/request_coordinator_factory.cc +++ b/chrome/browser/offline_pages/android/request_coordinator_factory.cc -@@ -30,6 +30,11 @@ +@@ -29,6 +29,11 @@ #include "components/offline_pages/core/offline_page_feature.h" #include "content/public/browser/web_contents.h" @@ -1410,7 +1456,7 @@ diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc namespace network { class NetworkQualityTracker; } -@@ -115,4 +120,16 @@ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor( +@@ -114,4 +119,16 @@ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor( return request_coordinator; } @@ -1441,7 +1487,7 @@ diff --git a/chrome/browser/offline_pages/offline_page_model_factory.h b/chrome/ 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 -@@ -29,6 +29,11 @@ +@@ -28,6 +28,11 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/navigation_handle.h" @@ -1453,7 +1499,7 @@ diff --git a/chrome/browser/offline_pages/recent_tab_helper.cc b/chrome/browser/ namespace { class DefaultRecentTabHelperDelegate : public offline_pages::RecentTabHelper::Delegate { -@@ -181,6 +186,14 @@ bool RecentTabHelper::EnsureInitialized() { +@@ -180,6 +185,14 @@ bool RecentTabHelper::EnsureInitialized() { // WebContents with its origin as well. snapshots_enabled_ = !tab_id_.empty() && !web_contents()->GetBrowserContext()->IsOffTheRecord(); @@ -1468,7 +1514,7 @@ diff --git a/chrome/browser/offline_pages/recent_tab_helper.cc b/chrome/browser/ if (snapshots_enabled_) { page_model_ = OfflinePageModelFactory::GetForBrowserContext( -@@ -457,7 +470,11 @@ void RecentTabHelper::ContinueSnapshotWithIdsToPurge( +@@ -456,7 +469,11 @@ void RecentTabHelper::ContinueSnapshotWithIdsToPurge( void RecentTabHelper::ContinueSnapshotAfterPurge( SnapshotProgressInfo* snapshot_info, OfflinePageModel::DeletePageResult result) { @@ -1484,7 +1530,7 @@ diff --git a/chrome/browser/offline_pages/recent_tab_helper.cc b/chrome/browser/ diff --git a/chrome/browser/offline_pages/recent_tab_helper.h b/chrome/browser/offline_pages/recent_tab_helper.h --- a/chrome/browser/offline_pages/recent_tab_helper.h +++ b/chrome/browser/offline_pages/recent_tab_helper.h -@@ -142,6 +142,9 @@ class RecentTabHelper +@@ -145,6 +145,9 @@ class RecentTabHelper // Not page-specific. bool snapshots_enabled_ = false; @@ -1509,7 +1555,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -218,6 +218,7 @@ +@@ -221,6 +221,7 @@ #include "components/feed/core/shared_prefs/pref_names.h" #if BUILDFLAG(IS_ANDROID) @@ -1517,7 +1563,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" -@@ -1333,6 +1334,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1368,6 +1369,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); @@ -1592,7 +1638,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 -@@ -1109,6 +1109,37 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1113,6 +1113,37 @@ Your Google account may have other forms of browsing history like searches and a Clears history from all synced devices. @@ -1676,7 +1722,7 @@ new file mode 100644 diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -3281,6 +3281,12 @@ const char kShowCaretBrowsingDialog[] = +@@ -3323,6 +3323,12 @@ const char kShowCaretBrowsingDialog[] = const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -1692,7 +1738,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 -@@ -1167,6 +1167,8 @@ extern const char kDiscountConsentShowInterestIn[]; +@@ -1178,6 +1178,8 @@ extern const char kDiscountConsentShowInterestIn[]; #if BUILDFLAG(IS_ANDROID) extern const char kWebXRImmersiveArEnabled[]; @@ -1701,7 +1747,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1203,6 +1205,10 @@ extern const char kPrivacyGuideViewed[]; +@@ -1214,6 +1216,10 @@ extern const char kPrivacyGuideViewed[]; extern const char kCorsNonWildcardRequestHeadersSupport[]; @@ -1715,7 +1761,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc -@@ -107,10 +107,12 @@ void PrefProvider::RegisterProfilePrefs( +@@ -110,10 +110,12 @@ void PrefProvider::RegisterProfilePrefs( PrefProvider::PrefProvider(PrefService* prefs, bool off_the_record, @@ -1728,7 +1774,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov store_last_modified_(store_last_modified), clock_(base::DefaultClock::GetInstance()) { TRACE_EVENT_BEGIN("startup", "PrefProvider::PrefProvider"); -@@ -144,7 +146,9 @@ PrefProvider::PrefProvider(PrefService* prefs, +@@ -147,7 +149,9 @@ PrefProvider::PrefProvider(PrefService* prefs, content_settings_prefs_.insert(std::make_pair( info->type(), std::make_unique( info->type(), prefs_, &pref_change_registrar_, @@ -1761,7 +1807,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc -@@ -238,6 +238,7 @@ const char* ContentSettingToString(ContentSetting setting) { +@@ -239,6 +239,7 @@ const char* ContentSettingToString(ContentSetting setting) { HostContentSettingsMap::HostContentSettingsMap( PrefService* prefs, bool is_off_the_record, @@ -1769,7 +1815,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. bool store_last_modified, bool restore_session) : RefcountedKeyedService(base::ThreadTaskRunnerHandle::Get()), -@@ -246,6 +247,7 @@ HostContentSettingsMap::HostContentSettingsMap( +@@ -247,6 +248,7 @@ HostContentSettingsMap::HostContentSettingsMap( #endif prefs_(prefs), is_off_the_record_(is_off_the_record), @@ -1777,7 +1823,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. store_last_modified_(store_last_modified), allow_invalid_secondary_pattern_for_testing_(false) { TRACE_EVENT0("startup", "HostContentSettingsMap::HostContentSettingsMap"); -@@ -257,7 +259,7 @@ HostContentSettingsMap::HostContentSettingsMap( +@@ -258,7 +260,7 @@ HostContentSettingsMap::HostContentSettingsMap( policy_provider->AddObserver(this); auto pref_provider_ptr = std::make_unique( @@ -1844,7 +1890,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/compon diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h --- a/components/omnibox/browser/autocomplete_provider_client.h +++ b/components/omnibox/browser/autocomplete_provider_client.h -@@ -131,6 +131,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client { +@@ -130,6 +130,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client { virtual signin::IdentityManager* GetIdentityManager() const = 0; virtual bool IsOffTheRecord() const = 0; diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index fc6eb0b3..1d1edf37 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -374,7 +374,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + // check for permissions + if (uriExists) { + AlertDialog.Builder alert = -+ new AlertDialog.Builder(context, R.style.Theme_Chromium_AlertDialog); ++ new AlertDialog.Builder(context, R.style.ThemeOverlay_BrowserUI_AlertDialog); + AlertDialog alertDialog = + alert.setTitle(R.string.export_bookmarks_alert_title) + .setMessage(context.getString(R.string.export_bookmarks_alert_message, actualFilePath)) @@ -701,7 +701,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 -@@ -1835,6 +1835,13 @@ static_library("browser") { +@@ -1845,6 +1845,13 @@ static_library("browser") { "webid/federated_identity_sharing_permission_context_factory.h", ] @@ -715,7 +715,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -2984,6 +2991,8 @@ static_library("browser") { +@@ -3003,6 +3010,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", @@ -724,7 +724,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "browser_process_platform_part_android.cc", "browser_process_platform_part_android.h", "chrome_browser_field_trials_mobile.cc", -@@ -3595,8 +3604,6 @@ static_library("browser") { +@@ -3621,8 +3630,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -736,7 +736,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -8213,6 +8213,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8246,6 +8246,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, #endif @@ -1156,7 +1156,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 -@@ -27,6 +27,7 @@ +@@ -26,6 +26,7 @@ #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h" @@ -1164,7 +1164,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" -@@ -235,7 +236,12 @@ class Writer : public base::RefCountedThreadSafe { +@@ -234,7 +235,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; @@ -1248,8 +1248,8 @@ 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 -@@ -5897,6 +5897,11 @@ const char kWebKioskEnableLacrosDescription[] = - "Chrome OS. When disabled, the Ash-chrome will be used"; +@@ -5872,6 +5872,11 @@ const char kWebKioskEnableLacrosDescription[] = + "ChromeOS. When disabled, the Ash-chrome will be used"; #endif // BUILDFLAG(IS_CHROMEOS_ASH) +const char kBookmarksExportUseSafName[] = "Use saf for bookmarks export"; @@ -1263,7 +1263,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 -@@ -3423,6 +3423,9 @@ extern const char kWebKioskEnableLacrosName[]; +@@ -3404,6 +3404,9 @@ extern const char kWebKioskEnableLacrosName[]; extern const char kWebKioskEnableLacrosDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1277,14 +1277,14 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -174,6 +174,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kAppToWebAttribution, - &kBackgroundThreadPool, - &kBookmarkBottomSheet, -+ &kBookmarksExportUseSaf, + &kBulkTabRestore, &kCastDeviceFilter, &kCloseAllTabsModalDialog, ++ &kBookmarksExportUseSaf, &kCloseTabSuggestions, -@@ -872,6 +873,10 @@ const base::Feature kWebApkInstallCompleteNotification{ + &kCriticalPersistedTabData, + &kCCTBackgroundTab, +@@ -854,6 +855,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService", const base::Feature kWebApkTrampolineOnInitialIntent{ "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1298,7 +1298,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 -@@ -160,6 +160,7 @@ extern const base::Feature kToolbarMicIphAndroid; +@@ -154,6 +154,7 @@ extern const base::Feature kToolbarMicIphAndroid; extern const base::Feature kToolbarUseHardwareBitmapDraw; extern const base::Feature kTrustedWebActivityLocationDelegation; extern const base::Feature kTrustedWebActivityNewDisclosure; @@ -1309,8 +1309,8 @@ 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 -@@ -563,6 +563,7 @@ public abstract class ChromeFeatureList { - "WebApkTrampolineOnInitialIntent"; +@@ -557,6 +557,7 @@ public abstract class ChromeFeatureList { + public static final String WEB_APK_INSTALL_SERVICE = "WebApkInstallService"; public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; public static final String WEB_OTP_CROSS_DEVICE_SIMPLE_STRING = "WebOtpCrossDeviceSimpleString"; + public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf"; @@ -1378,7 +1378,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 -@@ -103,6 +103,8 @@ public final class ChromePreferenceKeys { +@@ -99,6 +99,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"; @@ -1387,8 +1387,8 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -1020,6 +1022,7 @@ public final class ChromePreferenceKeys { - ATTRIBUTION_PROVIDER_LAST_BROWSER_START, +@@ -1017,6 +1019,7 @@ public final class ChromePreferenceKeys { + ASSISTANT_VOICE_SEARCH_ENABLED, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, + BOOKMARKS_LAST_EXPORT_URI, @@ -1398,7 +1398,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 -@@ -242,6 +242,24 @@ CHAR_LIMIT guidelines: +@@ -243,6 +243,24 @@ CHAR_LIMIT guidelines: Sites @@ -1426,7 +1426,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 -@@ -382,6 +382,9 @@ static_library("common") { +@@ -383,6 +383,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1448,8 +1448,8 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/external_process_importer_bridge.cc", -@@ -189,6 +187,11 @@ static_library("utility") { - } +@@ -196,6 +194,11 @@ static_library("utility") { + ] } + sources += [ @@ -1640,7 +1640,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/strings/android_ui_strings.grd --- a/ui/android/java/strings/android_ui_strings.grd +++ b/ui/android/java/strings/android_ui_strings.grd -@@ -177,6 +177,9 @@ +@@ -178,6 +178,9 @@ Failed to open selected file diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index b5d0c7f3..34f76e91 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -46,6 +46,7 @@ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge; +@@ -44,6 +44,7 @@ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; import org.chromium.chrome.browser.searchwidget.SearchActivity; import org.chromium.chrome.browser.tab.Tab; @@ -48,7 +48,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis import org.chromium.chrome.browser.translate.TranslateIntentHandler; import org.chromium.chrome.browser.util.AndroidTaskUtils; import org.chromium.chrome.browser.vr.VrModuleProvider; -@@ -59,6 +60,8 @@ import java.lang.annotation.Retention; +@@ -57,6 +58,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Set; @@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis /** * Dispatches incoming intents to the appropriate activity based on the current configuration and * Intent fired. -@@ -279,6 +282,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -273,6 +276,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega */ public static boolean isCustomTabIntent(Intent intent) { if (intent == null) return false; @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent) || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) { return false; -@@ -298,6 +304,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -292,6 +298,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega newIntent.setData(uri); newIntent.setClassName(context, CustomTabActivity.class.getName()); @@ -78,7 +78,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis // Since configureIntentForResizableCustomTab() might change the componenet/class // associated with the passed intent, it needs to be called after #setClassName(context, // CustomTabActivity.class.getName()); -@@ -417,6 +427,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -411,6 +421,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega if (Intent.ACTION_VIEW.equals(newIntent.getAction()) && !IntentHandler.wasIntentSenderChrome(newIntent)) { @@ -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 -@@ -4616,6 +4616,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 34ac4a0e..a7e23b15 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -214,6 +214,8 @@ import java.util.HashSet; +@@ -215,6 +215,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -66,7 +66,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. -@@ -2110,6 +2112,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2393,6 +2394,11 @@ public abstract class ChromeActivity return true; } @@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -3331,6 +3331,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Dark theme diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index dee7124a..0e7e41f9 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -38,8 +38,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = { {"mode", "always-none"}}; const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = { -@@ -3714,7 +3730,11 @@ const FeatureEntry kFeatureEntries[] = { - kOsMac | kOsLinux | kOsWin, +@@ -3868,7 +3884,11 @@ const FeatureEntry kFeatureEntries[] = { + kOsMac | kOsLinux | kOsLacros | kOsWin, FEATURE_VALUE_TYPE(features::kSystemNotifications)}, #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_ANDROID) diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 5b669a71..13ba7f16 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -3,18 +3,18 @@ Date: Mon, 1 Feb 2021 19:18:55 +0200 Subject: Add flag for save-data-header --- - chrome/browser/about_flags.cc | 5 ++++- - chrome/browser/flag_descriptions.cc | 4 ++++ - chrome/browser/flag_descriptions.h | 3 +++ - content/browser/loader/browser_initiated_resource_request.cc | 5 +++-- - services/network/public/cpp/features.cc | 5 +++++ - services/network/public/cpp/features.h | 2 ++ - 6 files changed, 21 insertions(+), 3 deletions(-) + chrome/browser/about_flags.cc | 5 ++++- + chrome/browser/flag_descriptions.cc | 4 ++++ + chrome/browser/flag_descriptions.h | 3 +++ + .../browser/loader/browser_initiated_resource_request.cc | 8 ++++++++ + services/network/public/cpp/features.cc | 5 +++++ + services/network/public/cpp/features.h | 3 ++- + 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4313,7 +4313,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4443,7 +4443,10 @@ const FeatureEntry kFeatureEntries[] = { {"force-text-direction", flag_descriptions::kForceTextDirectionName, flag_descriptions::kForceTextDirectionDescription, kOsAll, MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, @@ -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 -@@ -1140,6 +1140,10 @@ const char kDisableKeepaliveFetchDescription[] = +@@ -1099,6 +1099,10 @@ const char kDisableKeepaliveFetchDescription[] = "Disable fetch with keepalive set " "(https://fetch.spec.whatwg.org/#request-keepalive-flag)."; @@ -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 -@@ -609,6 +609,9 @@ extern const char kDiagnosticsAppNavigationDescription[]; +@@ -583,6 +583,9 @@ extern const char kDeprecateAltBasedSixPackDescription[]; extern const char kDisableKeepaliveFetchName[]; extern const char kDisableKeepaliveFetchDescription[]; @@ -56,16 +56,27 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/content/browser/loader/browser_initiated_resource_request.cc --- a/content/browser/loader/browser_initiated_resource_request.cc +++ b/content/browser/loader/browser_initiated_resource_request.cc -@@ -40,9 +40,10 @@ void UpdateAdditionalHeadersForBrowserInitiatedRequest( +@@ -4,6 +4,9 @@ - // Set the Save-Data header if appropriate. - // https://tools.ietf.org/html/draft-grigorik-http-client-hints-03#section-7 -- if (GetContentClient()->browser()->IsDataSaverEnabled(browser_context) && -+ if ((GetContentClient()->browser()->IsDataSaverEnabled(browser_context) && - !base::GetFieldTrialParamByFeatureAsBool(features::kDataSaverHoldback, -- "holdback_web", false)) { -+ "holdback_web", false)) || -+ base::FeatureList::IsEnabled(network::features::kEnableSaveDataHeader)) { + #include "content/browser/loader/browser_initiated_resource_request.h" + ++#include "base/feature_list.h" ++#include "services/network/public/cpp/features.h" ++ + #include "content/public/browser/browser_context.h" + #include "content/public/browser/browser_thread.h" + #include "content/public/browser/content_browser_client.h" +@@ -37,8 +40,13 @@ void UpdateAdditionalHeadersForBrowserInitiatedRequest( + // Save-Data was previously included in hints for workers, thus we cannot + // remove it for the time being. If you're reading this, consider building + // permissions policies for workers and/or deprecating this inclusion. ++ bool setHeader = false; + if (is_for_worker_script && + GetContentClient()->browser()->IsDataSaverEnabled(browser_context)) { ++ setHeader = true; ++ } ++ setHeader |= base::FeatureList::IsEnabled(network::features::kEnableSaveDataHeader); ++ if (setHeader) { if (should_update_existing_headers) { headers->RemoveHeader("Save-Data"); } @@ -87,12 +98,13 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h --- a/services/network/public/cpp/features.h +++ b/services/network/public/cpp/features.h -@@ -47,6 +47,8 @@ extern const base::Feature kDisableKeepaliveFetch; +@@ -47,7 +47,8 @@ COMPONENT_EXPORT(NETWORK_CPP) + extern const base::Feature kDisableKeepaliveFetch; COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kOpaqueResponseBlockingV01; - -+extern const base::Feature kEnableSaveDataHeader; +- +COMPONENT_EXPORT(NETWORK_CPP) ++extern const base::Feature kEnableSaveDataHeader; COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kTrustTokens; 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 3676f106..600aa8ff 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,8 +19,8 @@ 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 -@@ -884,6 +884,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { - net::kEffectiveConnectionType4G}, +@@ -882,6 +882,11 @@ const FeatureEntry::FeatureVariation + std::size(kIsolatedPrerenderPrefetchLimitFifteen), nullptr}, }; +const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = { @@ -28,10 +28,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"}, +}; + - // 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 == -@@ -4290,6 +4295,9 @@ const FeatureEntry kFeatureEntries[] = { + const FeatureEntry::Choice kMemlogModeChoices[] = { + {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, + {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode, +@@ -4417,6 +4422,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 -@@ -1661,6 +1661,10 @@ const char kUnthrottledNestedTimeoutDescription[] = +@@ -1600,6 +1600,10 @@ const char kUnthrottledNestedTimeoutDescription[] = "websites abusing the API will still eventually have their setTimeouts " "clamped."; @@ -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 -@@ -942,6 +942,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -903,6 +903,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kUnthrottledNestedTimeoutName[]; extern const char kUnthrottledNestedTimeoutDescription[]; diff --git a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch index 514747b8..1d483176 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 -@@ -3024,6 +3024,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3168,6 +3168,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 -@@ -1228,6 +1228,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1183,6 +1183,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 -@@ -675,6 +675,9 @@ extern const char kEnablePortalsDescription[]; +@@ -646,6 +646,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 -@@ -284,11 +284,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", +@@ -276,11 +276,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", // when in background. const base::Feature kResumeBackgroundVideo { "resume-background-video", diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index cd91450b..ae0a669d 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 -@@ -5251,6 +5251,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5333,6 +5333,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName, flag_descriptions::kReaderModeInCCTDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3086,6 +3086,10 @@ const char kCCTResizableForThirdPartiesName[] = +@@ -3017,6 +3017,10 @@ const char kCCTResizableForThirdPartiesName[] = const char kCCTResizableForThirdPartiesDescription[] = "Enable bottom sheet Custom Tabs for third party apps."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -744,6 +744,9 @@ extern const char kEnableWasmLazyCompilationName[]; +@@ -715,6 +715,9 @@ extern const char kEnableWasmLazyCompilationName[]; extern const char kEnableWasmLazyCompilationDescription[]; extern const char kEnableWasmTieringName[]; @@ -100,7 +100,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 -@@ -103,6 +103,7 @@ +@@ -104,6 +104,7 @@ #include "net/log/net_log_event_type.h" #include "net/log/net_log_source.h" #include "net/log/net_log_source_type.h" @@ -108,7 +108,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" -@@ -3937,8 +3938,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -4129,8 +4130,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { @@ -141,7 +141,7 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h --- a/services/network/public/cpp/features.h +++ b/services/network/public/cpp/features.h -@@ -17,6 +17,8 @@ extern const base::Feature kExpectCTReporting; +@@ -18,6 +18,8 @@ extern const base::Feature kExpectCTReporting; COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kNetworkErrorLogging; COMPONENT_EXPORT(NETWORK_CPP) 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 69b23387..3f09bd2e 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -11,10 +11,10 @@ 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 -@@ -3009,6 +3009,9 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWebrtcCaptureMultiChannelApmName, - flag_descriptions::kWebrtcCaptureMultiChannelApmDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kWebRtcEnableCaptureMultiChannelApm)}, +@@ -3148,6 +3148,9 @@ const FeatureEntry kFeatureEntries[] = { + {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, + flag_descriptions::kUiPartialSwapDescription, kOsAll, + SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, + {"disable-external-intent-requests", flag_descriptions::kDisableExternalIntentRequestsName, + flag_descriptions::kDisableExternalIntentRequestsDescription, kOsAll, + SINGLE_DISABLE_VALUE_TYPE("disable-external-intent-requests")}, @@ -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 -@@ -3481,6 +3481,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; +@@ -3391,6 +3391,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; const char kPhotoPickerVideoSupportDescription[] = "Enables video files to be shown in the Photo Picker dialog"; @@ -40,9 +40,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2003,6 +2003,9 @@ extern const char kQueryTilesNTPDescription[]; - extern const char kQueryTilesOmniboxName[]; - extern const char kQueryTilesOmniboxDescription[]; +@@ -1938,6 +1938,9 @@ extern const char kQueryTilesDescription[]; + extern const char kQueryTilesNTPName[]; + extern const char kQueryTilesNTPDescription[]; extern const char kQueryTilesSingleTierName[]; +extern const char kDisableExternalIntentRequestsName[]; +extern const char kDisableExternalIntentRequestsDescription[]; diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index 9d7ff679..df65514a 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 -@@ -6636,6 +6636,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6670,6 +6670,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -32,7 +32,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 -@@ -5670,6 +5670,9 @@ const char kDefaultCalculatorWebAppDescription[] = +@@ -5608,6 +5608,9 @@ const char kDefaultCalculatorWebAppDescription[] = "chrome app."; #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -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 -@@ -3428,6 +3428,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; +@@ -3406,6 +3406,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; extern const char kWebUITabStripTabDragIntegrationDescription[]; #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) @@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -99,6 +99,7 @@ void SetRuntimeFeatureDefaultsForPlatform( +@@ -100,6 +100,7 @@ void SetRuntimeFeatureDefaultsForPlatform( #if BUILDFLAG(IS_ANDROID) if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) WebRuntimeFeatures::EnableMediaSession(false); @@ -82,7 +82,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -315,6 +315,8 @@ CONTENT_EXPORT extern const base::FeatureParam +@@ -318,6 +318,8 @@ CONTENT_EXPORT extern const base::FeatureParam kCompositorLockTimeout; #endif // BUILDFLAG(IS_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 -@@ -1673,6 +1673,10 @@ +@@ -1668,6 +1668,10 @@ name: "OrientationEvent", status: {"Android": "stable"}, }, diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch index e708d5c0..cafabd1a 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -183,7 +183,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -367,10 +367,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -372,10 +372,7 @@ void ChromeBrowserMainExtraPartsProfiles:: InstantServiceFactory::GetInstance(); #endif LanguageModelManagerFactory::GetInstance(); @@ -198,7 +198,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -459,6 +459,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -481,6 +481,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { web_contents); } video_tutorials::VideoTutorialTabHelper::CreateForWebContents(web_contents); @@ -347,7 +347,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd --- a/components/browser_ui/strings/android/browser_ui_strings.grd +++ b/components/browser_ui/strings/android/browser_ui_strings.grd -@@ -589,6 +589,11 @@ +@@ -590,6 +590,11 @@ URL truncated @@ -426,7 +426,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.h b diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc -@@ -823,7 +823,7 @@ void HostContentSettingsMap::AddSettingsForOneType( +@@ -824,7 +824,7 @@ void HostContentSettingsMap::AddSettingsForOneType( settings->emplace_back(rule.primary_pattern, rule.secondary_pattern, std::move(value), kProviderNamesSourceMap[provider_type].provider_name, @@ -438,7 +438,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -146,13 +146,15 @@ ContentSettingPatternSource::ContentSettingPatternSource( +@@ -156,13 +156,15 @@ ContentSettingPatternSource::ContentSettingPatternSource( base::Value setting_value, const std::string& source, bool incognito, @@ -456,7 +456,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo ContentSettingPatternSource::ContentSettingPatternSource() : incognito(false) {} -@@ -169,6 +171,7 @@ ContentSettingPatternSource& ContentSettingPatternSource::operator=( +@@ -179,6 +181,7 @@ ContentSettingPatternSource& ContentSettingPatternSource::operator=( expiration = other.expiration; source = other.source; incognito = other.incognito; @@ -615,7 +615,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -980,6 +980,8 @@ void PageInfo::PresentSitePermissions() { +@@ -982,6 +982,8 @@ void PageInfo::PresentSitePermissions() { permission_info.source = info.source; permission_info.is_one_time = (info.session_model == content_settings::SessionModel::OneTime); @@ -627,7 +627,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h --- a/components/page_info/page_info.h +++ b/components/page_info/page_info.h -@@ -173,6 +173,7 @@ class PageInfo { +@@ -174,6 +174,7 @@ class PageInfo { content_settings::SettingSource source = content_settings::SETTING_SOURCE_NONE; bool is_one_time = false; @@ -864,7 +864,7 @@ diff --git a/components/permissions/android/permission_prompt_android.h b/compon diff --git a/components/permissions/android/permissions_android_strings.grd b/components/permissions/android/permissions_android_strings.grd --- a/components/permissions/android/permissions_android_strings.grd +++ b/components/permissions/android/permissions_android_strings.grd -@@ -263,6 +263,23 @@ +@@ -264,6 +264,23 @@ Unknown or unsupported device (%1$sA1:B2:C3:D4:E5:F6) @@ -891,7 +891,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc --- a/components/permissions/contexts/geolocation_permission_context_android.cc +++ b/components/permissions/contexts/geolocation_permission_context_android.cc -@@ -158,6 +158,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -157,6 +157,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( ContentSetting content_setting, bool is_one_time) { DCHECK(!is_one_time); @@ -911,7 +911,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (content_setting == CONTENT_SETTING_ALLOW && !location_settings_->IsSystemLocationSettingEnabled()) { -@@ -170,7 +183,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -169,7 +182,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( if (IsInLocationSettingsBackOff(is_default_search)) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -921,7 +921,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LogLocationSettingsMetric( kLocationSettingsSuppressMetricBase, is_default_search, LocationSettingsBackOffLevel(is_default_search)); -@@ -195,7 +209,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -194,7 +208,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( !location_settings_dialog_callback_.is_null()) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -931,7 +931,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr // This case should be very rare, so just pretend it was a denied prompt // for metrics purposes. LogLocationSettingsMetric( -@@ -212,12 +227,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -211,12 +226,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( base::BindOnce( &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown, weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin, @@ -947,7 +947,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr } PermissionResult -@@ -384,6 +400,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -383,6 +399,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( const GURL& embedding_origin, bool persist, ContentSetting content_setting, @@ -955,7 +955,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LocationSettingsDialogOutcome prompt_outcome) { bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (prompt_outcome == GRANTED) { -@@ -411,7 +428,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -410,7 +427,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( FinishNotifyPermissionSet( location_settings_dialog_request_id_, requesting_origin, embedding_origin, @@ -965,7 +965,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr location_settings_dialog_request_id_ = PermissionRequestID(0, 0, PermissionRequestID::RequestLocalId()); -@@ -423,10 +441,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( +@@ -422,10 +440,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( const GURL& embedding_origin, BrowserPermissionCallback callback, bool persist, @@ -1020,7 +1020,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc --- a/components/permissions/permission_context_base.cc +++ b/components/permissions/permission_context_base.cc -@@ -243,6 +243,20 @@ PermissionContextBase::CreatePermissionRequest( +@@ -244,6 +244,20 @@ PermissionContextBase::CreatePermissionRequest( std::move(delete_callback)); } @@ -1041,7 +1041,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm PermissionResult PermissionContextBase::GetPermissionStatus( content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, -@@ -435,7 +449,8 @@ void PermissionContextBase::PermissionDecided( +@@ -436,7 +450,8 @@ void PermissionContextBase::PermissionDecided( const GURL& embedding_origin, BrowserPermissionCallback callback, ContentSetting content_setting, @@ -1051,7 +1051,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm DCHECK(content_setting == CONTENT_SETTING_ALLOW || content_setting == CONTENT_SETTING_BLOCK || content_setting == CONTENT_SETTING_DEFAULT); -@@ -443,9 +458,9 @@ void PermissionContextBase::PermissionDecided( +@@ -444,9 +459,9 @@ void PermissionContextBase::PermissionDecided( content_setting); bool persist = content_setting != CONTENT_SETTING_DEFAULT; @@ -1063,7 +1063,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm } content::BrowserContext* PermissionContextBase::browser_context() const { -@@ -495,11 +510,26 @@ void PermissionContextBase::NotifyPermissionSet( +@@ -496,11 +511,26 @@ void PermissionContextBase::NotifyPermissionSet( bool persist, ContentSetting content_setting, bool is_one_time) { @@ -1091,7 +1091,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm } UpdateTabContext(id, requesting_origin, -@@ -520,6 +550,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, +@@ -521,6 +551,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, const GURL& embedding_origin, ContentSetting content_setting, bool is_one_time) { @@ -1107,7 +1107,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm DCHECK_EQ(requesting_origin, requesting_origin.DeprecatedGetOriginAsURL()); DCHECK_EQ(embedding_origin, embedding_origin.DeprecatedGetOriginAsURL()); DCHECK(content_setting == CONTENT_SETTING_ALLOW || -@@ -531,8 +570,7 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, +@@ -532,8 +571,7 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, ->SetContentSettingDefaultScope( requesting_origin, embedding_origin, content_settings_type_, content_setting, @@ -1308,7 +1308,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p request->RequestFinished(); return; } -@@ -234,7 +234,7 @@ void PermissionRequestManager::AddRequest( +@@ -238,7 +238,7 @@ void PermissionRequestManager::AddRequest( if (auto_approval_origin) { if (url::Origin::Create(request->requesting_origin()) == auto_approval_origin.value()) { @@ -1317,7 +1317,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } request->RequestFinished(); return; -@@ -493,12 +493,13 @@ void PermissionRequestManager::Accept() { +@@ -498,12 +498,13 @@ void PermissionRequestManager::Accept() { for (requests_iter = requests_.begin(); requests_iter != requests_.end(); requests_iter++) { PermissionGrantedIncludingDuplicates(*requests_iter, @@ -1333,7 +1333,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p if (ignore_callbacks_from_prompt_) return; DCHECK(view_); -@@ -506,12 +507,22 @@ void PermissionRequestManager::AcceptThisTime() { +@@ -511,12 +512,22 @@ void PermissionRequestManager::AcceptThisTime() { for (requests_iter = requests_.begin(); requests_iter != requests_.end(); requests_iter++) { PermissionGrantedIncludingDuplicates(*requests_iter, @@ -1357,7 +1357,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p if (ignore_callbacks_from_prompt_) return; DCHECK(view_); -@@ -533,7 +544,7 @@ void PermissionRequestManager::Deny() { +@@ -538,7 +549,7 @@ void PermissionRequestManager::Deny() { std::vector::iterator requests_iter; for (requests_iter = requests_.begin(); requests_iter != requests_.end(); requests_iter++) { @@ -1366,7 +1366,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } FinalizeCurrentRequests(PermissionAction::DENIED); } -@@ -886,25 +897,26 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest( +@@ -890,25 +901,26 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest( void PermissionRequestManager::PermissionGrantedIncludingDuplicates( PermissionRequest* request, @@ -1399,7 +1399,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } void PermissionRequestManager::CancelledIncludingDuplicates( -@@ -1075,7 +1087,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) { +@@ -1084,7 +1096,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) { void PermissionRequestManager::DoAutoResponseForTesting() { switch (auto_response_for_test_) { case ACCEPT_ONCE: @@ -1423,7 +1423,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe void Dismiss() override; void Ignore() override; bool WasCurrentRequestAlreadyDisplayed() override; -@@ -268,9 +270,12 @@ class PermissionRequestManager +@@ -272,9 +274,12 @@ class PermissionRequestManager // Calls PermissionGranted on a request and all its duplicates. void PermissionGrantedIncludingDuplicates(PermissionRequest* request, diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index c17ce7f6..d9d052aa 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -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; -@@ -2123,6 +2125,8 @@ public class ChromeTabbedActivity extends ChromeActivity getTabModelSelector().closeAllTabs(), /*isIncognito=*/false); RecordUserAction.record("MobileMenuCloseAllTabs"); @@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct } else if (id == R.id.close_all_incognito_tabs_menu_id) { // Close only incognito tabs CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(), -@@ -2175,6 +2179,28 @@ public class ChromeTabbedActivity extends ChromeActivity { +@@ -190,6 +190,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); -@@ -202,7 +204,9 @@ class Writer : public base::RefCountedThreadSafe { +@@ -201,7 +203,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; } -@@ -467,6 +471,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() { +@@ -466,6 +470,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() { BookmarkModelFactory::GetForBrowserContext(profile_)->other_node()); ExtractUrls( BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node()); @@ -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 -@@ -3404,6 +3404,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Track prices @@ -385,7 +385,7 @@ diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_stri diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc --- a/components/bookmarks/browser/bookmark_codec.cc +++ b/components/bookmarks/browser/bookmark_codec.cc -@@ -33,6 +33,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar"; +@@ -34,6 +34,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar"; const char BookmarkCodec::kOtherBookmarkFolderNameKey[] = "other"; // The value is left as 'synced' for historical reasons. const char BookmarkCodec::kMobileBookmarkFolderNameKey[] = "synced"; @@ -393,7 +393,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar const char BookmarkCodec::kVersionKey[] = "version"; const char BookmarkCodec::kChecksumKey[] = "checksum"; const char BookmarkCodec::kIdKey[] = "id"; -@@ -74,7 +75,8 @@ BookmarkCodec::~BookmarkCodec() = default; +@@ -75,7 +76,8 @@ BookmarkCodec::~BookmarkCodec() = default; base::Value BookmarkCodec::Encode(BookmarkModel* model, std::string sync_metadata_str) { return Encode(model->bookmark_bar_node(), model->other_node(), @@ -403,7 +403,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar std::move(sync_metadata_str)); } -@@ -82,6 +84,7 @@ base::Value BookmarkCodec::Encode( +@@ -83,6 +85,7 @@ base::Value BookmarkCodec::Encode( const BookmarkNode* bookmark_bar_node, const BookmarkNode* other_folder_node, const BookmarkNode* mobile_folder_node, @@ -411,7 +411,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar const BookmarkNode::MetaInfoMap* model_meta_info_map, std::string sync_metadata_str) { ids_reassigned_ = false; -@@ -103,6 +106,7 @@ base::Value BookmarkCodec::Encode( +@@ -104,6 +107,7 @@ base::Value BookmarkCodec::Encode( roots.SetKey(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node)); roots.SetKey(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node)); roots.SetKey(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node)); @@ -419,7 +419,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar if (model_meta_info_map) roots.SetKey(kMetaInfo, EncodeMetaInfo(*model_meta_info_map)); FinalizeChecksum(); -@@ -119,6 +123,7 @@ bool BookmarkCodec::Decode(const base::Value& value, +@@ -120,6 +124,7 @@ bool BookmarkCodec::Decode(const base::Value& value, BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -427,7 +427,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar int64_t* max_id, std::string* sync_metadata_str) { ids_.clear(); -@@ -126,7 +131,8 @@ bool BookmarkCodec::Decode(const base::Value& value, +@@ -127,7 +132,8 @@ bool BookmarkCodec::Decode(const base::Value& value, base::GUID::ParseLowercase(BookmarkNode::kBookmarkBarNodeGuid), base::GUID::ParseLowercase(BookmarkNode::kOtherBookmarksNodeGuid), base::GUID::ParseLowercase(BookmarkNode::kMobileBookmarksNodeGuid), @@ -437,7 +437,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar ids_reassigned_ = false; guids_reassigned_ = false; ids_valid_ = true; -@@ -134,12 +140,13 @@ bool BookmarkCodec::Decode(const base::Value& value, +@@ -135,12 +141,13 @@ bool BookmarkCodec::Decode(const base::Value& value, stored_checksum_.clear(); InitializeChecksum(); bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node, @@ -452,7 +452,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar *max_id = maximum_id_ + 1; return success; } -@@ -189,6 +196,7 @@ base::Value BookmarkCodec::EncodeMetaInfo( +@@ -190,6 +197,7 @@ base::Value BookmarkCodec::EncodeMetaInfo( bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, BookmarkNode* other_folder_node, BookmarkNode* mobile_folder_node, @@ -460,7 +460,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar const base::Value& value, std::string* sync_metadata_str) { if (!value.is_dict()) -@@ -220,6 +228,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, +@@ -221,6 +229,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, return false; DecodeNode(*bb_value, nullptr, bb_node); @@ -473,7 +473,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar DecodeNode(*other_folder_value, nullptr, other_folder_node); DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node); -@@ -455,11 +469,13 @@ void BookmarkCodec::DecodeMetaInfoHelper( +@@ -456,11 +470,13 @@ void BookmarkCodec::DecodeMetaInfoHelper( void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node, BookmarkNode* other_node, @@ -674,7 +674,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks/browser/model_loader.cc --- a/components/bookmarks/browser/model_loader.cc +++ b/components/bookmarks/browser/model_loader.cc -@@ -55,7 +55,8 @@ void LoadBookmarks(const base::FilePath& path, +@@ -54,7 +54,8 @@ void LoadBookmarks(const base::FilePath& path, std::string sync_metadata_str; BookmarkCodec codec; codec.Decode(*root, details->bb_node(), details->other_folder_node(), @@ -687,7 +687,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/components/sync_bookmarks/bookmark_specifics_conversions.cc --- a/components/sync_bookmarks/bookmark_specifics_conversions.cc +++ b/components/sync_bookmarks/bookmark_specifics_conversions.cc -@@ -406,6 +406,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode( +@@ -419,6 +419,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode( case bookmarks::BookmarkNode::BOOKMARK_BAR: case bookmarks::BookmarkNode::OTHER_NODE: case bookmarks::BookmarkNode::MOBILE: diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index b30bae5c..75b07598 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -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 -@@ -2149,6 +2149,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2518,6 +2518,11 @@ public abstract class ChromeActivity return true; } @@ -110,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -305,6 +305,10 @@ CHAR_LIMIT guidelines: +@@ -306,6 +306,10 @@ CHAR_LIMIT guidelines: Chrome tips diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 5ca5b97f..afbabb16 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -18,7 +18,7 @@ Subject: Add option to force tablet UI 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 -@@ -443,6 +443,7 @@ public final class ChromePreferenceKeys { +@@ -441,6 +441,7 @@ public final class ChromePreferenceKeys { AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM; public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; @@ -40,7 +40,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 -@@ -356,7 +356,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse +@@ -365,7 +365,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse // OmniboxSuggestionsDropdownEmbedder implementation @Override public boolean isTablet() { @@ -52,7 +52,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 -@@ -1355,6 +1355,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1359,6 +1359,12 @@ Your Google account may have other forms of browsing history like searches and a Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps @@ -94,7 +94,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -43,7 +43,7 @@ if (is_ios) { +@@ -44,7 +44,7 @@ if (is_ios) { # Omit Lacros because it allows //components to depend on //chrome, which in # turn depends on //extensions. @@ -103,7 +103,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn disallowed_extension_deps_ = [ # Components should largely not depend on //extensions. Since // extensions # is not a component target and is linked with //chrome, depending on most -@@ -618,7 +618,7 @@ test("components_unittests") { +@@ -630,7 +630,7 @@ test("components_unittests") { # On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -112,7 +112,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn assert_no_deps = [ "//chrome/*" ] assert_no_deps += disallowed_extension_deps_ } -@@ -893,7 +893,7 @@ if (!is_ios) { +@@ -910,7 +910,7 @@ if (!is_ios) { # dependency. On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -173,7 +173,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn -@@ -360,6 +360,8 @@ android_library("ui_no_recycler_view_java") { +@@ -362,6 +362,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 4c1997e4..d83eca20 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 @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1236,8 +1236,10 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

IMAGE diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch index 26805ff4..04c03550 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 @@ -132,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -451,6 +451,7 @@ public final class ChromePreferenceKeys { +@@ -449,6 +449,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"; @@ -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 -@@ -1170,6 +1170,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1174,6 +1174,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour @@ -179,7 +179,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -56,6 +56,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; +@@ -60,6 +60,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; // A boolean specifying whether the New Tab page is the home page or not. const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage"; @@ -193,7 +193,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 -@@ -363,6 +363,7 @@ extern const char kSettingsShowOSBanner[]; +@@ -368,6 +368,7 @@ extern const char kSettingsShowOSBanner[]; extern const char kUsedPolicyCertificates[]; #endif // BUILDFLAG(IS_CHROMEOS) extern const char kShowHomeButton[]; diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index e633f9af..7200a152 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -18,7 +18,7 @@ Enabled 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 -@@ -134,6 +134,7 @@ +@@ -132,6 +132,7 @@ #include "components/security_state/core/security_state.h" #include "components/send_tab_to_self/features.h" #include "components/services/heap_profiling/public/cpp/switches.h" @@ -26,7 +26,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/shared_highlighting/core/common/shared_highlighting_features.h" #include "components/signin/core/browser/dice_account_reconcilor_delegate.h" #include "components/signin/public/base/signin_buildflags.h" -@@ -8463,6 +8464,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8500,6 +8501,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kReduceUserAgentMinorVersionDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kReduceUserAgentMinorVersion)}, @@ -41,7 +41,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 -@@ -3015,6 +3015,11 @@ const char kReduceUserAgentMinorVersionDescription[] = +@@ -2953,6 +2953,11 @@ const char kReduceUserAgentMinorVersionDescription[] = "The Chrome version in the User-Agent string will be reported as " "Chrome/.0.0.0."; @@ -56,7 +56,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 -@@ -1728,6 +1728,9 @@ extern const char kDurableClientHintsCacheDescription[]; +@@ -1680,6 +1680,9 @@ extern const char kDurableClientHintsCacheDescription[]; extern const char kReduceUserAgentMinorVersionName[]; extern const char kReduceUserAgentMinorVersionDescription[]; diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index 22fb223f..00fa7cf3 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer; -@@ -335,9 +336,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -333,9 +334,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finish(); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 32040fa8..8e4121f4 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -172,7 +172,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd --- a/components/browser_ui/strings/android/browser_ui_strings.grd +++ b/components/browser_ui/strings/android/browser_ui_strings.grd -@@ -173,6 +173,7 @@ +@@ -174,6 +174,7 @@ @@ -206,7 +206,7 @@ new file mode 100644 diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -334,6 +334,7 @@ +@@ -336,6 +336,7 @@ @@ -217,7 +217,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -667,6 +667,20 @@ void ContentSettingsRegistry::Init() { +@@ -677,6 +677,20 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -253,8 +253,8 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -195,7 +195,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( - content_type == ContentSettingsType::POPUPS || +@@ -204,7 +204,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( + content_type == ContentSettingsType::AUTOPLAY || content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || - content_type == ContentSettingsType::TIMEZONE_OVERRIDE; @@ -262,11 +262,11 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo + content_type == ContentSettingsType::WEBGL; } - RendererContentSettingRules::RendererContentSettingRules() {} + void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h --- a/components/content_settings/core/common/content_settings.h +++ b/components/content_settings/core/common/content_settings.h -@@ -85,6 +85,7 @@ struct RendererContentSettingRules { +@@ -97,6 +97,7 @@ struct RendererContentSettingRules { ContentSettingsForOneType auto_dark_content_rules; ContentSettingsForOneType timezone_override_rules; std::string timezone_override_value; @@ -314,7 +314,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -284,6 +284,8 @@ enum class ContentSettingsType : int32_t { +@@ -287,6 +287,8 @@ enum class ContentSettingsType : int32_t { // site instead of the mobile one. REQUEST_DESKTOP_SITE, @@ -326,7 +326,7 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -477,6 +477,15 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() { +@@ -455,6 +455,15 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() { cached_script_permissions_.clear(); } @@ -335,7 +335,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc + return false; + blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); + return CONTENT_SETTING_ALLOW == GetContentSettingFromRules( -+ content_setting_rules_->webgl_rules, frame, ++ content_setting_rules_->webgl_rules, + url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL()); +} + @@ -345,7 +345,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h --- a/components/content_settings/renderer/content_settings_agent_impl.h +++ b/components/content_settings/renderer/content_settings_agent_impl.h -@@ -101,6 +101,7 @@ class ContentSettingsAgentImpl +@@ -94,6 +94,7 @@ class ContentSettingsAgentImpl bool AllowAutoplay(bool default_value) override; bool AllowPopupsAndRedirects(bool default_value) override; bool ShouldAutoupgradeMixedContent() override; @@ -401,7 +401,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -96,6 +96,7 @@ class SecurityOrigin; +@@ -97,6 +97,7 @@ class SecurityOrigin; class ScriptState; class ScriptWrappable; class TrustedTypePolicyFactory; @@ -409,7 +409,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context enum ReasonForCallingCanExecuteScripts { kAboutToExecuteScript, -@@ -104,6 +105,10 @@ enum ReasonForCallingCanExecuteScripts { +@@ -105,6 +106,10 @@ enum ReasonForCallingCanExecuteScripts { enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag }; @@ -423,7 +423,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -216,6 +216,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( +@@ -242,6 +242,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( } } @@ -437,7 +437,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() { MutexLocker locker(WebGLContextLimitMutex()); DCHECK(webgl_context_limits_initialized_); -@@ -462,25 +469,6 @@ static String ExtractWebGLContextCreationError( +@@ -488,25 +495,6 @@ static String ExtractWebGLContextCreationError( const Platform::GraphicsInfo& info) { StringBuilder builder; builder.Append("Could not create a WebGL context"); @@ -463,7 +463,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(), builder); builder.Append('.'); -@@ -548,6 +536,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( +@@ -574,6 +562,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( const CanvasContextCreationAttributesCore& attributes, Platform::ContextType context_type, Platform::GraphicsInfo* graphics_info) { @@ -479,7 +479,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h -@@ -1826,6 +1826,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, +@@ -1771,6 +1771,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, DOMArrayBufferView* pixels, int64_t offset); diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index a2ba2613..ae5b5af4 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -170,7 +170,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd --- a/components/browser_ui/strings/android/browser_ui_strings.grd +++ b/components/browser_ui/strings/android/browser_ui_strings.grd -@@ -174,6 +174,7 @@ +@@ -175,6 +175,7 @@ @@ -204,7 +204,7 @@ new file mode 100644 diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -335,6 +335,7 @@ +@@ -337,6 +337,7 @@ @@ -215,7 +215,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -681,6 +681,20 @@ void ContentSettingsRegistry::Init() { +@@ -691,6 +691,20 @@ void ContentSettingsRegistry::Init() { /*show_into_info_page*/ true, /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL, /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE); @@ -251,7 +251,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -196,7 +196,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -205,7 +205,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::TIMEZONE_OVERRIDE || @@ -260,11 +260,11 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo + content_type == ContentSettingsType::WEBRTC; } - RendererContentSettingRules::RendererContentSettingRules() {} + void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h --- a/components/content_settings/core/common/content_settings.h +++ b/components/content_settings/core/common/content_settings.h -@@ -86,6 +86,7 @@ struct RendererContentSettingRules { +@@ -98,6 +98,7 @@ struct RendererContentSettingRules { ContentSettingsForOneType timezone_override_rules; std::string timezone_override_value; ContentSettingsForOneType webgl_rules; @@ -312,7 +312,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -286,6 +286,8 @@ enum class ContentSettingsType : int32_t { +@@ -289,6 +289,8 @@ enum class ContentSettingsType : int32_t { WEBGL, @@ -324,7 +324,7 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -486,6 +486,15 @@ bool ContentSettingsAgentImpl::AllowWebgl(bool enabled_per_settings) { +@@ -464,6 +464,15 @@ bool ContentSettingsAgentImpl::AllowWebgl(bool enabled_per_settings) { url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL()); } @@ -333,7 +333,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc + return false; + blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); + return CONTENT_SETTING_ALLOW == GetContentSettingFromRules( -+ content_setting_rules_->webrtc_rules, frame, ++ content_setting_rules_->webrtc_rules, + url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL()); +} + @@ -343,7 +343,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h --- a/components/content_settings/renderer/content_settings_agent_impl.h +++ b/components/content_settings/renderer/content_settings_agent_impl.h -@@ -102,6 +102,7 @@ class ContentSettingsAgentImpl +@@ -95,6 +95,7 @@ class ContentSettingsAgentImpl bool AllowPopupsAndRedirects(bool default_value) override; bool ShouldAutoupgradeMixedContent() override; bool AllowWebgl(bool enabled_per_settings) override; @@ -366,7 +366,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc -@@ -756,6 +756,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -762,6 +762,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( // origin. WebRTCIPHandlingPolicy policy = GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy); diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 62254208..698567d8 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -23,7 +23,7 @@ Subject: Allow building without enable_reporting diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc --- a/content/browser/devtools/protocol/network_handler.cc +++ b/content/browser/devtools/protocol/network_handler.cc -@@ -1290,6 +1290,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { +@@ -1289,6 +1289,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { } } @@ -31,7 +31,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { std::vector urls; base::queue queue; -@@ -1307,6 +1308,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { +@@ -1306,6 +1307,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { } return urls; } @@ -174,7 +174,7 @@ diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/ne diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -11243,6 +11243,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( +@@ -11437,6 +11437,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( void RenderFrameHostImpl::MaybeGenerateCrashReport( base::TerminationStatus status, int exit_code) { @@ -182,7 +182,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b if (!last_committed_url_.SchemeIsHTTPOrHTTPS()) return; -@@ -11292,6 +11293,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -11486,6 +11487,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( /*type=*/"crash", /*group=*/"default", last_committed_url_, GetReportingSource(), isolation_info_.network_isolation_key(), absl::nullopt /* user_agent */, std::move(body)); @@ -223,7 +223,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 -@@ -211,6 +211,12 @@ class ReportingServiceImpl : public ReportingService { +@@ -212,6 +212,12 @@ class ReportingServiceImpl : public ReportingService { std::unique_ptr body, int depth, base::TimeTicks queued_ticks) { @@ -239,7 +239,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic diff --git a/services/network/network_context.h b/services/network/network_context.h --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -440,10 +440,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -459,10 +459,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const absl::optional& reporting_source, const net::NetworkIsolationKey& network_isolation_key, const absl::optional& user_agent, @@ -255,7 +255,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 -@@ -961,7 +961,6 @@ mojom("mojom") { +@@ -963,7 +963,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -293,7 +293,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" -@@ -2297,9 +2298,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { +@@ -2334,9 +2335,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { return base::UnguessableToken::Null(); } @@ -308,9 +308,9 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -34,9 +34,9 @@ - #include "base/gtest_prod_util.h" +@@ -35,9 +35,9 @@ #include "base/time/default_tick_clock.h" + #include "base/time/time.h" #include "base/unguessable_token.h" -#include "build/build_config.h" #include "mojo/public/cpp/bindings/pending_associated_receiver.h" @@ -319,7 +319,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" -@@ -550,9 +550,9 @@ class CORE_EXPORT LocalFrame final +@@ -561,9 +561,9 @@ class CORE_EXPORT LocalFrame final } SmoothScrollSequencer& GetSmoothScrollSequencer(); @@ -386,7 +386,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ const String& type = report->type(); if (!(type == ReportType::kCSPViolation || type == ReportType::kDeprecation || type == ReportType::kPermissionsPolicyViolation || -@@ -225,6 +233,7 @@ void ReportingContext::SendToReportingAPI(Report* report, +@@ -227,6 +235,7 @@ void ReportingContext::SendToReportingAPI(Report* report, url, endpoint, body->featureId(), body->disposition(), body->message(), body->sourceFile(), line_number, column_number); } diff --git a/build/patches/Allow-building-without-supervised-users.patch b/build/patches/Allow-building-without-supervised-users.patch index 427efd68..b0eedfb4 100644 --- a/build/patches/Allow-building-without-supervised-users.patch +++ b/build/patches/Allow-building-without-supervised-users.patch @@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/C diff --git a/chrome/browser/startup_data.cc b/chrome/browser/startup_data.cc --- a/chrome/browser/startup_data.cc +++ b/chrome/browser/startup_data.cc -@@ -33,9 +33,6 @@ +@@ -32,9 +32,6 @@ #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" #include "chrome/browser/profiles/pref_service_builder_utils.h" #include "chrome/browser/profiles/profile_key.h" diff --git a/build/patches/Ask-user-before-closing-all-tabs.patch b/build/patches/Ask-user-before-closing-all-tabs.patch index f0cb9559..b1ee562c 100644 --- a/build/patches/Ask-user-before-closing-all-tabs.patch +++ b/build/patches/Ask-user-before-closing-all-tabs.patch @@ -9,16 +9,16 @@ Subject: Ask user before closing all tabs 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 -@@ -461,8 +461,8 @@ const base::Feature kConditionalTabStripAndroid{ - const base::Feature kCastDeviceFilter{"CastDeviceFilter", - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -457,8 +457,8 @@ const base::Feature kCastDeviceFilter{"CastDeviceFilter", + const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog", + base::FEATURE_ENABLED_BY_DEFAULT}; --const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog", -- base::FEATURE_DISABLED_BY_DEFAULT}; -+const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog", // Enabled by default in Bromite -+ base::FEATURE_ENABLED_BY_DEFAULT}; +-const base::Feature kCloseTabSuggestions{"CloseTabSuggestions", +- base::FEATURE_DISABLED_BY_DEFAULT}; ++const base::Feature kCloseTabSuggestions{"CloseTabSuggestions", // Enabled by default in Bromite ++ base::FEATURE_ENABLED_BY_DEFAULT}; - const base::Feature kCloseTabSuggestions{"CloseTabSuggestions", - base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kCriticalPersistedTabData{ + "CriticalPersistedTabData", base::FEATURE_DISABLED_BY_DEFAULT}; -- 2.25.1 diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index e214bf91..0d0471e1 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 -@@ -462,7 +462,9 @@ double AudioContext::baseLatency() const { +@@ -492,7 +492,9 @@ double AudioContext::baseLatency() const { DCHECK(IsMainThread()); DCHECK(destination()); @@ -56,6 +56,6 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir + return double(l)/100; } - MediaElementAudioSourceNode* AudioContext::createMediaElementSource( + double AudioContext::outputLatency() const { -- 2.25.1 diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index dffb249d..035eb016 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -4,7 +4,7 @@ Subject: Automated domain substitution --- PRESUBMIT.py | 70 +- - .../cts_config/webview_cts_gcs_path.json | 20 +- + .../cts_config/webview_cts_gcs_path.json | 28 +- android_webview/tools/generate_flag_labels.py | 2 +- android_webview/tools/record_netlog.py | 6 +- .../tools/remove_preinstalled_webview.py | 2 +- @@ -18,6 +18,7 @@ Subject: Automated domain substitution .../device_activity_controller.cc | 2 +- ash/components/drivefs/drivefs_auth.cc | 2 +- .../simple_geolocation_provider.cc | 2 +- + .../multidevice/stub_multidevice_util.cc | 2 +- ash/components/phonehub/url_constants.cc | 2 +- ash/components/timezone/timezone_request.cc | 2 +- .../trial_group/trial_group_checker.cc | 2 +- @@ -36,14 +37,15 @@ Subject: Automated domain substitution .../resources/js/lib/analytics.js | 14 +- .../resources/strings/camera_strings.grd | 2 +- ash/webui/common/resources/PRESUBMIT.py | 2 +- + ash/webui/diagnostics_ui/diagnostics_ui.cc | 2 +- .../diagnostics_ui/resources/PRESUBMIT.py | 2 +- - .../resources/keyboard_tester.html | 2 +- .../diagnostics_ui/resources/network_card.js | 2 +- .../resources/routine_section.js | 2 +- .../firmware_update_ui/resources/PRESUBMIT.py | 2 +- .../help_app_kids_magazine_untrusted_ui.cc | 2 +- ash/webui/media_app_ui/media_app_guest_ui.cc | 2 +- - .../os_feedback_ui/resources/fake_data.js | 10 +- + .../backend/help_content_provider.cc | 4 +- + .../os_feedback_ui/resources/fake_data.js | 14 +- .../personalization_app_ui.cc | 2 +- .../print_management/resources/PRESUBMIT.py | 2 +- .../projector_app/projector_xhr_sender.cc | 8 +- @@ -88,6 +90,7 @@ Subject: Automated domain substitution build/config/chromeos/args.gni | 4 +- build/config/chromeos/rules.gni | 6 +- build/config/compiler/compiler.gni | 4 +- + build/config/locales.gni | 2 +- build/config/nacl/rules.gni | 2 +- build/config/ozone.gni | 2 +- build/config/sanitizers/sanitizers.gni | 2 +- @@ -114,7 +117,7 @@ Subject: Automated domain substitution .../manifest/maps_go_manifest_config.json | 10 +- chrome/app/PRESUBMIT.py | 8 +- chrome/app/chromium_strings.grd | 22 +- - chrome/app/generated_resources.grd | 250 +- + chrome/app/generated_resources.grd | 262 +- chrome/app/google_chrome_strings.grd | 22 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- @@ -130,6 +133,7 @@ Subject: Automated domain substitution 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 +- + .../arc/input_overlay/ui/input_menu_view.cc | 2 +- .../browser/ash/assistant/assistant_util.cc | 4 +- .../ash/attestation/attestation_ca_client.cc | 8 +- chrome/browser/ash/borealis/borealis_util.cc | 2 +- @@ -142,8 +146,8 @@ Subject: Automated domain substitution .../file_manager/file_manager_string_util.cc | 12 +- chrome/browser/ash/file_manager/file_tasks.cc | 4 +- chrome/browser/ash/hats/hats_dialog.cc | 2 +- - .../assistive_suggester_client_filter.cc | 16 +- - .../ash/input_method/ime_rules_config.h | 6 +- + .../assistive_suggester_client_filter.cc | 20 +- + .../ash/input_method/ime_rules_config.h | 14 +- .../easy_unlock/easy_unlock_key_names.cc | 2 +- .../ash/login/gaia_reauth_token_fetcher.cc | 2 +- .../ash/login/marketing_backend_connector.cc | 4 +- @@ -241,7 +245,7 @@ Subject: Automated domain substitution .../select_to_speak/options.html | 2 +- .../select_to_speak/select_to_speak.js | 8 +- .../select_to_speak_manifest.json.jinja2 | 8 +- - .../switch_access/switch_access.js | 4 +- + .../switch_access/switch_access.js | 2 +- .../switch_access_manifest.json.jinja2 | 4 +- .../add_supervision/add_supervision_ui.js | 16 +- .../chromeos/arc_support/background.js | 12 +- @@ -332,12 +336,12 @@ Subject: Automated domain substitution .../kids_chrome_management_client.cc | 2 +- .../supervised_user_block_interstitial.html | 2 +- .../supervised_user_service.cc | 2 +- - .../supervised_user_url_filter.cc | 10 +- + .../supervised_user_url_filter.cc | 12 +- .../strings/android_chrome_strings.grd | 40 +- .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- + .../ui/app_list/search/common/string_util.cc | 2 +- .../search/files/item_suggest_cache.h | 2 +- .../ui/app_list/search/omnibox_provider.cc | 2 +- - .../ui/app_list/search/open_tab_result.cc | 2 +- .../ui/ash/ambient/ambient_client_impl.cc | 8 +- .../ui/ash/calendar/calendar_keyed_service.cc | 2 +- .../browser/ui/ash/chrome_shell_delegate.cc | 2 +- @@ -364,7 +368,7 @@ Subject: Automated domain substitution .../plugin_vm/plugin_vm_installer_view.cc | 2 +- .../ui/views/session_crashed_bubble_view.cc | 2 +- chrome/browser/ui/webui/PRESUBMIT.py | 2 +- - .../app_management_page_handler.cc | 2 +- + .../app_management_page_handler.cc | 6 +- .../internals_ui_handler.cc | 2 +- .../add_supervision/add_supervision_ui.cc | 4 +- .../edu_coexistence_login_handler_chromeos.cc | 2 +- @@ -373,7 +377,7 @@ Subject: Automated domain substitution chrome/browser/ui/webui/feed/feed_ui.cc | 2 +- .../ui/webui/interstitials/interstitial_ui.cc | 2 +- .../ui/webui/media_router/cast_feedback_ui.cc | 4 +- - .../quick_pair/quick_pair_handler.cc | 2 +- + .../quick_pair/quick_pair_handler.cc | 4 +- .../ui/webui/new_tab_page/foo/foo_handler.cc | 8 +- chrome/browser/ui/webui/ntp/new_tab_ui.cc | 2 +- .../ui/webui/ntp/ntp_resource_cache.cc | 8 +- @@ -422,7 +426,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 | 252 +- + chrome/common/url_constants.cc | 244 +- .../gaiacp/associated_user_validator.cc | 2 +- .../gaiacp/gaia_credential_base.cc | 8 +- .../credential_provider/gaiacp/gcp_utils.cc | 4 +- @@ -477,7 +481,6 @@ Subject: Automated domain substitution .../setup/google_chrome_behaviors.cc | 2 +- chrome/renderer/cart/commerce_hint_agent.cc | 2 +- chrome/renderer/media/flash_embed_rewrite.cc | 2 +- - .../cart/cart_domain_cart_url_regex.json | 2 +- ...ip_add_to_cart_request_domain_mapping.json | 2 +- .../extensions/identity_custom_bindings.js | 2 +- .../mac_notification_service_ns.mm | 2 +- @@ -499,7 +502,6 @@ Subject: Automated domain substitution chromecast/crash/linux/minidump_uploader.cc | 2 +- chromecast/net/connectivity_checker_impl.h | 4 +- chromeos/chromeos_strings.grd | 6 +- - .../multidevice/stub_multidevice_util.cc | 2 +- .../translation_result_loader.cc | 2 +- chromeos/dbus/rmad/fake_rmad_client.cc | 2 +- chromeos/printing/ppd_provider.h | 2 +- @@ -521,9 +523,6 @@ Subject: Automated domain substitution .../printing/uri_fuzzer_seed_corpus/uri5.txt | 2 +- .../assistant_manager_service_impl.cc | 2 +- chromeos/services/assistant/service.cc | 2 +- - .../virtual_driver/win/install/setup.cc | 2 +- - .../virtual_driver_setup_resources.grd | 2 +- - .../win/port_monitor/port_monitor.cc | 2 +- .../error_page_populator.cc | 2 +- .../predictor_config_definitions.cc | 2 +- components/autofill/PRESUBMIT.py | 2 +- @@ -548,7 +547,7 @@ Subject: Automated domain substitution .../core/history_notice_utils.cc | 4 +- .../core/captive_portal_detector.cc | 2 +- .../data/log_list.json | 20 +- - .../common/cloud_devices_urls.cc | 4 +- + .../resources/cart_domain_cart_url_regex.json | 2 +- .../components_google_chrome_strings.grd | 2 +- .../notes/core/server/notes_repository.cc | 2 +- .../notes/core/server/notes_server_base.cc | 4 +- @@ -562,7 +561,7 @@ Subject: Automated domain substitution .../core/html/dom_distiller_viewer.html | 2 +- .../core/javascript/dom_distiller_viewer.js | 2 +- components/dom_distiller/core/viewer.cc | 6 +- - .../domain_reliability/bake_in_configs.py | 286 +-- + .../domain_reliability/bake_in_configs.py | 286 +- components/drive/service/drive_api_service.cc | 6 +- .../error_page/common/localized_error.cc | 2 +- .../favicon/core/large_icon_service_impl.cc | 2 +- @@ -649,7 +648,7 @@ Subject: Automated domain substitution .../omnibox_pedal_concepts_desktop_vi.json | 4 +- .../omnibox_pedal_concepts_desktop_zh-CN.json | 24 +- .../omnibox_pedal_concepts_desktop_zh-TW.json | 24 +- - .../resources/omnibox_pedal_synonyms.grd | 86 +- + .../resources/omnibox_pedal_synonyms.grd | 88 +- .../page_content_annotations_model_manager.cc | 2 +- .../core/optimization_guide_constants.cc | 4 +- .../core/page_entities_model_executor_impl.cc | 2 +- @@ -682,7 +681,7 @@ Subject: Automated domain substitution .../core/browser/browser_policy_connector.cc | 10 +- ...cloud_signin_restriction_policy_fetcher.cc | 2 +- .../core/common/policy_loader_common.cc | 4 +- - .../policy/resources/policy_templates.json | 2276 ++++++++--------- + .../policy/resources/policy_templates.json | 2306 ++++++++--------- .../request_handler_for_policy.cc | 2 +- .../policy/test_support/signature_provider.h | 4 +- .../syntax_check_policy_template_json.py | 2 +- @@ -796,8 +795,10 @@ Subject: Automated domain substitution .../attribution_reporting/PRESUBMIT.py | 2 +- .../indexed_db/indexed_db_backing_store.cc | 2 +- .../indexed_db/indexed_db_reporting.cc | 2 +- + .../interest_group_update_manager.cc | 2 +- .../portal/portal_navigation_throttle.cc | 2 +- .../renderer_host/navigation_request.cc | 4 +- + content/browser/renderer_host/navigator.cc | 2 +- .../renderer_host/render_frame_host_impl.cc | 2 +- content/browser/resources/PRESUBMIT.py | 2 +- content/browser/resources/gpu/info_view.js | 2 +- @@ -876,6 +877,7 @@ Subject: Automated domain substitution .../try/cast_shell_linux_dbg/properties.json | 2 +- .../properties.json | 2 +- .../properties.json | 2 +- + .../properties.json | 2 +- .../chromeos-arm-generic-rel/properties.json | 2 +- .../properties.json | 2 +- .../try/chromeos-kevin-rel/properties.json | 2 +- @@ -927,9 +929,9 @@ Subject: Automated domain substitution ios/build/bots/scripts/test_result_util.py | 6 +- ios/build/bots/scripts/xcode_util.py | 4 +- ios/build/chrome_build.gni | 2 +- - .../app/strings/ios_chromium_strings.grd | 16 +- - .../app/strings/ios_google_chrome_strings.grd | 16 +- - ios/chrome/app/strings/ios_strings.grd | 28 +- + .../app/strings/ios_chromium_strings.grd | 18 +- + .../app/strings/ios_google_chrome_strings.grd | 18 +- + ios/chrome/app/strings/ios_strings.grd | 32 +- ios/chrome/browser/autofill/BUILD.gn | 4 +- .../autofill/automation/automation_action.mm | 2 +- ...chrome_browser_state_removal_controller.mm | 2 +- @@ -941,7 +943,7 @@ Subject: Automated domain substitution .../activity_services/activity_type_util.mm | 2 +- .../ui/bookmarks/bookmark_earl_grey.mm | 2 +- .../new_tab_page_app_interface.mm | 4 +- - .../content_suggestions/ntp_home_mediator.mm | 6 +- + .../content_suggestions/ntp_home_mediator.mm | 8 +- .../browser/ui/main/scene_controller.mm | 2 +- .../browser/ui/ntp/discover_feed_constants.mm | 2 +- ios/chrome/browser/ui/ntp/incognito_view.mm | 2 +- @@ -973,8 +975,8 @@ Subject: Automated domain substitution ios/web_view/internal/cwv_web_view.mm | 2 +- media/PRESUBMIT.py | 4 +- media/base/win/mf_initializer.cc | 2 +- - .../native_pixmap_handle_mojom_traits.cc | 4 +- - ...stable_video_decoder_types_mojom_traits.cc | 150 +- + .../native_pixmap_handle_mojom_traits.cc | 12 +- + ...stable_video_decoder_types_mojom_traits.cc | 178 +- mojo/PRESUBMIT.py | 2 +- native_client_sdk/PRESUBMIT.py | 2 +- .../src/build_tools/build_paths.py | 2 +- @@ -1094,7 +1096,7 @@ Subject: Automated domain substitution .../unexpected_passes_common/data_types.py | 2 +- testing/unexpected_passes_common/queries.py | 2 +- testing/variations/PRESUBMIT.py | 2 +- - .../variations/fieldtrial_testing_config.json | 18 +- + .../variations/fieldtrial_testing_config.json | 16 +- .../markdown/extensions/smarty.py | 2 +- .../Python-Markdown/markdown/pep562.py | 2 +- .../abseil-cpp/absl/abseil.podspec.gen.py | 2 +- @@ -1208,12 +1210,9 @@ Subject: Automated domain substitution .../public/mojom/web_feature/PRESUBMIT.py | 2 +- .../blink/public/strings/blink_strings.grd | 8 +- .../blink/renderer/bindings/PRESUBMIT.py | 2 +- - .../bindings/scripts/blink_idl_lexer.py | 2 +- - .../bindings/scripts/blink_idl_parser.py | 2 +- .../renderer/bindings/scripts/utilities.py | 2 +- .../build/scripts/update_css_ranking.py | 4 +- .../core/css/remote_font_face_source.cc | 2 +- - third_party/blink/renderer/core/css/svg.css | 2 +- .../renderer/core/dom/events/event_target.cc | 4 +- .../blink/renderer/core/events/touch_event.cc | 2 +- .../blink/renderer/core/events/wheel_event.cc | 2 +- @@ -1235,7 +1234,6 @@ Subject: Automated domain substitution .../modules/geolocation/geolocation.cc | 2 +- .../play_app_url_manifest.json | 2 +- .../modules/payments/payment_request.cc | 6 +- - .../peerconnection/rtc_peer_connection.cc | 2 +- .../modules/vibration/vibration_controller.cc | 4 +- .../modules/webaudio/audio_context.cc | 4 +- .../modules/webmidi/navigator_web_midi.cc | 2 +- @@ -1264,6 +1262,7 @@ Subject: Automated domain substitution .../tools/blinkpy/w3c/pr_cleanup_tool.py | 2 +- .../blink/tools/blinkpy/w3c/test_exporter.py | 4 +- .../blink/tools/blinkpy/w3c/test_importer.py | 10 +- + .../blinkpy/w3c/wpt_results_processor.py | 2 +- .../blink/tools/blinkpy/w3c/wpt_uploader.py | 8 +- .../blink/tools/commit_stats/org-list.txt | 10 +- .../print_stale_test_expectations_entries.py | 2 +- @@ -1464,8 +1463,59 @@ Subject: Automated domain substitution .../pycoverage/coverage/htmlfiles/pyfile.html | 2 +- .../src/benchmarks/chromium.linux.json | 152 +- third_party/pyjson5/src/setup.py | 2 +- + third_party/rust/aho_corasick/v0_7/BUILD.gn | 2 +- + third_party/rust/ansi_term/v0_11/BUILD.gn | 2 +- + third_party/rust/atty/v0_2/BUILD.gn | 2 +- + third_party/rust/autocxx/v0_17/BUILD.gn | 2 +- + .../rust/autocxx_bindgen/v0_59/BUILD.gn | 4 +- + .../rust/autocxx_engine/v0_17/BUILD.gn | 2 +- third_party/rust/autocxx_gen/v0_17/BUILD.gn | 2 +- + third_party/rust/autocxx_macro/v0_17/BUILD.gn | 2 +- + .../rust/autocxx_parser/v0_17/BUILD.gn | 2 +- + third_party/rust/bindgen/v0_59/BUILD.gn | 4 +- + third_party/rust/clap/v2/BUILD.gn | 2 +- + third_party/rust/cxx/v1/BUILD.gn | 2 +- + third_party/rust/cxx_gen/v0_7/BUILD.gn | 2 +- + third_party/rust/cxxbridge_cmd/v1/BUILD.gn | 4 +- + third_party/rust/cxxbridge_macro/v1/BUILD.gn | 2 +- + third_party/rust/fastrand/v1/BUILD.gn | 2 +- + third_party/rust/heck/v0_4/BUILD.gn | 2 +- + third_party/rust/indoc/v1/BUILD.gn | 2 +- + third_party/rust/itoa/v0_4/BUILD.gn | 2 +- + third_party/rust/itoa/v1/BUILD.gn | 2 +- + third_party/rust/lazy_static/v1/BUILD.gn | 2 +- + third_party/rust/link_cplusplus/v1/BUILD.gn | 2 +- + third_party/rust/memchr/v2/BUILD.gn | 2 +- + .../rust/minimal_lexical/v0_2/BUILD.gn | 2 +- + third_party/rust/moveit/v0_4/BUILD.gn | 2 +- + third_party/rust/once_cell/v1/BUILD.gn | 2 +- + .../rust/peeking_take_while/v0_1/BUILD.gn | 2 +- + third_party/rust/proc_macro2/v1/BUILD.gn | 2 +- + third_party/rust/quote/v1/BUILD.gn | 2 +- + third_party/rust/remove_dir_all/v0_5/BUILD.gn | 2 +- + third_party/rust/rstest/v0_12/BUILD.gn | 2 +- .../v0_12/crate/docs/head/COPYRIGHT.txt | 2 +- + third_party/rust/rustc_version/v0_4/BUILD.gn | 2 +- + third_party/rust/rustversion/v1/BUILD.gn | 2 +- + third_party/rust/ryu/v1/BUILD.gn | 2 +- + third_party/rust/semver/v1/BUILD.gn | 2 +- + third_party/rust/serde/v1/BUILD.gn | 2 +- + third_party/rust/serde_derive/v1/BUILD.gn | 2 +- + third_party/rust/serde_json/v1/BUILD.gn | 2 +- + .../rust/serde_json_lenient/v0_1/BUILD.gn | 2 +- + third_party/rust/shlex/v1/BUILD.gn | 2 +- + third_party/rust/strsim/v0_8/BUILD.gn | 2 +- + third_party/rust/strum_macros/v0_24/BUILD.gn | 2 +- + third_party/rust/syn/v1/BUILD.gn | 4 +- + third_party/rust/tempfile/v3/BUILD.gn | 2 +- + third_party/rust/termcolor/v1/BUILD.gn | 2 +- + third_party/rust/unicode_width/v0_1/BUILD.gn | 2 +- + third_party/rust/unicode_xid/v0_2/BUILD.gn | 2 +- + third_party/rust/unindent/v0_1/BUILD.gn | 2 +- + third_party/rust/vec_map/v0_8/BUILD.gn | 2 +- + third_party/rust/which/v4/BUILD.gn | 2 +- + third_party/rust/winapi/v0_3/BUILD.gn | 2 +- + third_party/rust/winapi_util/v0_1/BUILD.gn | 2 +- .../tensorflow_text/core/ops/rouge_l_op.cc | 2 +- .../metrics/text_similarity_metric_ops.py | 2 +- .../updater/chrome_mac_universal/3pp/fetch.py | 2 +- @@ -1516,7 +1566,7 @@ Subject: Automated domain substitution .../libsupersize/viewer/static/viewer.html | 8 +- .../libsupersize/viewer/upload_html_viewer.py | 2 +- tools/binary_size/libsupersize/zip_util.py | 2 +- - .../binary_size/trybot_commit_size_checker.py | 2 +- + .../binary_size/trybot_commit_size_checker.py | 4 +- tools/bisect-builds.py | 28 +- tools/bisect_repackage/bisect_repackage.py | 4 +- .../bisect_repackage_utils.py | 4 +- @@ -1535,7 +1585,7 @@ Subject: Automated domain substitution tools/clang/scripts/package.py | 2 +- tools/clang/scripts/update.py | 2 +- tools/code_coverage/coverage.py | 8 +- - tools/coverity/coverity.py | 2 +- + .../create_js_source_maps/PRESUBMIT.py | 2 +- tools/cr/cr/base/android.py | 2 +- tools/cr/main.py | 2 +- tools/crbug/crbug.js | 8 +- @@ -1568,7 +1618,7 @@ Subject: Automated domain substitution tools/json_schema_compiler/js_util.py | 2 +- tools/json_schema_compiler/preview.py | 2 +- tools/json_to_struct/PRESUBMIT.py | 2 +- - tools/licenses.py | 36 +- + tools/licenses.py | 38 +- tools/linux/PRESUBMIT.py | 2 +- tools/mac/download_symbols.py | 4 +- tools/mac/power/scenarios.py | 10 +- @@ -1620,6 +1670,7 @@ Subject: Automated domain substitution tools/usb_gadget/gadget.py | 2 +- tools/usb_gadget/msos20_descriptors.py | 2 +- tools/variations/bisect_variations.py | 2 +- + tools/visual_debugger/app.html | 2 +- tools/web_dev_style/css_checker.py | 6 +- tools/web_dev_style/html_checker.py | 2 +- tools/web_dev_style/js_checker.py | 8 +- @@ -1664,7 +1715,7 @@ Subject: Automated domain substitution url/third_party/mozilla/LICENSE.txt | 4 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1661 files changed, 5126 insertions(+), 5126 deletions(-) + 1712 files changed, 5238 insertions(+), 5238 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -1759,7 +1810,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1030,7 +1030,7 @@ _DEPRECATED_MOJO_TYPES : Sequence[BanRule] = ( +@@ -1017,7 +1017,7 @@ _BANNED_MOJOM_PATTERNS : Sequence[BanRule] = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -1768,7 +1819,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1163,9 +1163,9 @@ _KNOWN_ROBOTS = set( +@@ -1156,9 +1156,9 @@ _KNOWN_ROBOTS = set( 'infra-try-recipes-tester', 'lacros-tracking-roller') ) | set('%s@skia-public.iam.gserviceaccount.com' % s for s in ('chromium-autoroll', 'chromium-release-autoroll') @@ -1780,7 +1831,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('swarming-tasks',)) _INVALID_GRD_FILE_LINE = [ -@@ -1558,7 +1558,7 @@ def CheckNoDEPSGIT(input_api, output_api): +@@ -1551,7 +1551,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' @@ -1789,7 +1840,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information') ] -@@ -1790,7 +1790,7 @@ def CheckNoPragmaOnce(input_api, output_api): +@@ -1741,7 +1741,7 @@ def CheckNoPragmaOnce(input_api, output_api): return [ output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -1798,7 +1849,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files) ] return [] -@@ -2030,7 +2030,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -1981,7 +1981,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): @@ -1807,7 +1858,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2150,7 +2150,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2101,7 +2101,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): output_api.PresubmitError( 'The name of PNG files should not have abbreviations. \n' 'Use _hover.png, _center.png, instead of _h.png, _c.png.\n' @@ -1816,7 +1867,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -2948,7 +2948,7 @@ def CheckSecurityOwners(input_api, output_api): +@@ -2898,7 +2898,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. @@ -1825,7 +1876,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. -@@ -3262,7 +3262,7 @@ def _CheckAndroidToastUsage(input_api, output_api): +@@ -3213,7 +3213,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' @@ -1834,7 +1885,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3401,7 +3401,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3352,7 +3352,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): results.append( output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -1843,7 +1894,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3433,7 +3433,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3384,7 +3384,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): output_api.PresubmitPromptWarning( 'The newly created files include Test classes that inherits from base' ' class. Please do not use inheritance in JUnit4 tests or add new' @@ -1852,7 +1903,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3458,7 +3458,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3409,7 +3409,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.' @@ -1861,7 +1912,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3480,7 +3480,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3431,7 +3431,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' @@ -1870,7 +1921,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -4082,7 +4082,7 @@ def CheckGnGlobForward(input_api, output_api): +@@ -4033,7 +4033,7 @@ def CheckGnGlobForward(input_api, output_api): 'The variables "visibilty" and "test_only" should be ' 'explicitly listed in forward_variables_from(). For more ' 'details, see:\n' @@ -1879,7 +1930,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'build/docs/writing_gn_templates.md' '#Using-forward_variables_from')) ] -@@ -4250,7 +4250,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): +@@ -4201,7 +4201,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 ' @@ -1888,7 +1939,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % (', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER)) -@@ -4288,7 +4288,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4239,7 +4239,7 @@ def _CheckNewImagesWarning(input_api, output_api): output_api.PresubmitPromptWarning( 'It looks like you are trying to commit some images. If these are ' 'non-test-only images, please make sure to read and apply the tips in ' @@ -1897,7 +1948,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 -@@ -4504,7 +4504,7 @@ _NON_INCLUSIVE_TERMS = ( +@@ -4455,7 +4455,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', @@ -1906,7 +1957,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py True),) def ChecksCommon(input_api, output_api): -@@ -4775,7 +4775,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4728,7 +4728,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): def CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -1915,7 +1966,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) -@@ -5056,9 +5056,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): +@@ -5014,9 +5014,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): 'You are adding/modifying code' 'related to technologies which will soon be deprecated (Chrome Apps, NaCl,' ' PNaCl, PPAPI). See this blog post for more details:\n' @@ -1927,7 +1978,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py '\n'.join(problems)) ] -@@ -5112,7 +5112,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -5070,7 +5070,7 @@ def CheckChangeOnCommit(input_api, output_api): input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -1936,7 +1987,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5461,7 +5461,7 @@ def CheckStrings(input_api, output_api): +@@ -5419,7 +5419,7 @@ def CheckStrings(input_api, output_api): results.append( output_api.PresubmitPromptWarning( 'ICU syntax errors were found in the following strings (problems or ' @@ -1945,7 +1996,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py items=icu_syntax_errors)) return results -@@ -5772,7 +5772,7 @@ def CheckMPArchApiUsage(input_api, output_api): +@@ -5732,7 +5732,7 @@ def CheckMPArchApiUsage(input_api, output_api): if not used_apis: return [] @@ -1954,7 +2005,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py message = ('This change uses API(s) that are ambiguous in the presence of ' 'MPArch features such as bfcache, prerendering, and fenced ' 'frames.') -@@ -5783,8 +5783,8 @@ def CheckMPArchApiUsage(input_api, output_api): +@@ -5743,8 +5743,8 @@ def CheckMPArchApiUsage(input_api, output_api): 'navigation. See this doc [1] and the comments on the individual APIs ' 'for guidance and this doc [2] for context. The MPArch review ' 'watchlist has been CC\'d on this change to help identify any issues.\n' @@ -2043,10 +2094,40 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/Q/10_r5/" } }, +@@ -209,12 +209,12 @@ + "arch": { + "arm64": { + "filename": "arm64/R/android-cts-arm64-11_r7.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-11_r7-linux_x86-arm.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-11_r7-linux_x86-arm.zip", + "unzip_dir": "arm64/R/11_r7/" + }, + "x86": { + "filename": "x86/R/android-cts-x86-11_r7.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-11_r7-linux_x86-x86.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-11_r7-linux_x86-x86.zip", + "unzip_dir": "x86/R/11_r7/" + } + }, +@@ -231,12 +231,12 @@ + "arch": { + "arm64": { + "filename": "arm64/S/android-cts-arm64-12_r3.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-12_r3-linux_x86-arm.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-12_r3-linux_x86-arm.zip", + "unzip_dir": "arm64/R/12_r3/" + }, + "x86": { + "filename": "x86/S/android-cts-x86-12_r3.zip", +- "_origin": "https://dl.google.com/dl/android/cts/android-cts-12_r3-linux_x86-x86.zip", ++ "_origin": "https://dl.9oo91e.qjz9zk/dl/android/cts/android-cts-12_r3-linux_x86-x86.zip", + "unzip_dir": "x86/R/12_r3/" + } + }, diff --git a/android_webview/tools/generate_flag_labels.py b/android_webview/tools/generate_flag_labels.py --- a/android_webview/tools/generate_flag_labels.py +++ b/android_webview/tools/generate_flag_labels.py -@@ -251,7 +251,7 @@ double-check this picked the correct labels for your new features (labels are +@@ -259,7 +259,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: @@ -2145,7 +2226,7 @@ diff --git a/ash/app_list/PRESUBMIT.py b/ash/app_list/PRESUBMIT.py diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd -@@ -658,7 +658,7 @@ This file contains the strings for ash. +@@ -666,7 +666,7 @@ This file contains the strings for ash. other {Update device within # seconds}} @@ -2154,7 +2235,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -683,7 +683,7 @@ This file contains the strings for ash. +@@ -691,7 +691,7 @@ This file contains the strings for ash. other {Change device to previous version within # seconds}} @@ -2163,7 +2244,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -693,10 +693,10 @@ This file contains the strings for ash. +@@ -701,10 +701,10 @@ This file contains the strings for ash. Update overdue @@ -2176,8 +2257,8 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -730,10 +730,10 @@ This file contains the strings for ash. - This update requires powerwashing your $1Chromebook. All data will be deleted. Learn more about the latest $2Chromium OS update. +@@ -738,10 +738,10 @@ This file contains the strings for ash. + This update requires powerwashing your $1Chromebook. All data will be deleted. Learn more about the latest $2ChromiumOS update. - $1google.com is rolling back your $2Chromebook. Your device will reset and all data will be deleted. @@ -2188,8 +2269,8 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd + $19oo91e.qjz9zk requires you to roll back your $2Chromebook. Your device will reset and all data will be deleted. - $1Learn more about the latest Chromium OS update. This Chromebook needs to restart to apply an update. This can take up to 1 minute. -@@ -827,7 +827,7 @@ This file contains the strings for ash. + $1Learn more about the latest ChromiumOS update. This Chromebook needs to restart to apply an update. This can take up to 1 minute. +@@ -835,7 +835,7 @@ This file contains the strings for ash. @@ -2198,7 +2279,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -1348,7 +1348,7 @@ This file contains the strings for ash. +@@ -1236,7 +1236,7 @@ This file contains the strings for ash. Supervised user @@ -2207,25 +2288,25 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1641,7 +1641,7 @@ This file contains the strings for ash. +@@ -1529,7 +1529,7 @@ This file contains the strings for ash. Tap to configure - Browser tab $11 of $22. $3Google, $4https://google.com + Browser tab $11 of $22. $3Google, $4https://9oo91e.qjz9zk - + Connected devices settings -@@ -3211,7 +3211,7 @@ This file contains the strings for ash. - Save $1Pixel Buds +@@ -3105,7 +3105,7 @@ This file contains the strings for ash. + Save your $1Pixel Buds -- Save $1Pixel Buds to $2alisha123@gmail.com for faster pairing to your other devices -+ Save $1Pixel Buds to $2alisha123@9ma1l.qjz9zk for faster pairing to your other devices +- Save your $1Pixel Buds to $2alisha123@gmail.com for faster pairing to your other devices ++ Save your $1Pixel Buds to $2alisha123@9ma1l.qjz9zk for faster pairing to your other devices Settings -@@ -3244,7 +3244,7 @@ This file contains the strings for ash. +@@ -3138,7 +3138,7 @@ This file contains the strings for ash. Connect $1Pixel Buds to this Chromebook @@ -2234,7 +2315,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Cancel -@@ -3370,7 +3370,7 @@ This file contains the strings for ash. +@@ -3264,7 +3264,7 @@ This file contains the strings for ash. Multiple sign-in has been disabled @@ -2243,14 +2324,14 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3873,7 +3873,7 @@ Here are some things you can try to get started. +@@ -3767,7 +3767,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action - + - Unlock device as $1example@gmail.com to perform the notification action + Unlock device as $1example@9ma1l.qjz9zk to perform the notification action - + To see notifications on your lock screen, unlock to change the setting diff --git a/ash/assistant/PRESUBMIT.py b/ash/assistant/PRESUBMIT.py --- a/ash/assistant/PRESUBMIT.py @@ -2353,6 +2434,18 @@ diff --git a/ash/components/geolocation/simple_geolocation_provider.cc b/ash/com } // namespace +diff --git a/ash/components/multidevice/stub_multidevice_util.cc b/ash/components/multidevice/stub_multidevice_util.cc +--- a/ash/components/multidevice/stub_multidevice_util.cc ++++ b/ash/components/multidevice/stub_multidevice_util.cc +@@ -20,7 +20,7 @@ namespace ash::multidevice { + namespace { + + // Attributes of the default stub device. +-const char kStubDeviceUserId[] = "example@gmail.com"; ++const char kStubDeviceUserId[] = "example@9ma1l.qjz9zk"; + const char kStubDevicePiiFreeName[] = "no-pii device"; + const char kStubDevicePSK[] = "remote device psk"; + const int64_t kStubDeviceLastUpdateTimeMillis = 0L; diff --git a/ash/components/phonehub/url_constants.cc b/ash/components/phonehub/url_constants.cc --- a/ash/components/phonehub/url_constants.cc +++ b/ash/components/phonehub/url_constants.cc @@ -2556,15 +2649,15 @@ diff --git a/ash/system/usb_peripheral/usb_peripheral_notification_controller.cc diff --git a/ash/wallpaper/test_wallpaper_controller_client.cc b/ash/wallpaper/test_wallpaper_controller_client.cc --- a/ash/wallpaper/test_wallpaper_controller_client.cc +++ b/ash/wallpaper/test_wallpaper_controller_client.cc -@@ -105,7 +105,7 @@ void TestWallpaperControllerClient::FetchGooglePhotosPhoto( - } else { - std::move(callback).Run(personalization_app::mojom::GooglePhotosPhoto::New( - id, "test_name", base::TimeFormatFriendlyDate(time), -- GURL("https://google.com/picture.png"))); -+ GURL("https://9oo91e.qjz9zk/picture.png"))); +@@ -112,7 +112,7 @@ void TestWallpaperControllerClient::FetchGooglePhotosPhoto( + std::move(callback).Run( + personalization_app::mojom::GooglePhotosPhoto::New( + id, "test_name", base::TimeFormatFriendlyDate(time), +- GURL("https://google.com/picture.png"), "home"), ++ GURL("https://9oo91e.qjz9zk/picture.png"), "home"), + /*success=*/true); } } - diff --git a/ash/webui/camera_app_ui/camera_app_untrusted_ui.cc b/ash/webui/camera_app_ui/camera_app_untrusted_ui.cc --- a/ash/webui/camera_app_ui/camera_app_untrusted_ui.cc +++ b/ash/webui/camera_app_ui/camera_app_untrusted_ui.cc @@ -2623,7 +2716,7 @@ diff --git a/ash/webui/camera_app_ui/resources/js/lib/analytics.js b/ash/webui/c diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings.grd b/ash/webui/camera_app_ui/resources/strings/camera_strings.grd --- a/ash/webui/camera_app_ui/resources/strings/camera_strings.grd +++ b/ash/webui/camera_app_ui/resources/strings/camera_strings.grd -@@ -320,7 +320,7 @@ +@@ -322,7 +322,7 @@ Copy text @@ -2644,6 +2737,18 @@ diff --git a/ash/webui/common/resources/PRESUBMIT.py b/ash/webui/common/resource for more details about the presubmit API built into depot_tools. """ +diff --git a/ash/webui/diagnostics_ui/diagnostics_ui.cc b/ash/webui/diagnostics_ui/diagnostics_ui.cc +--- a/ash/webui/diagnostics_ui/diagnostics_ui.cc ++++ b/ash/webui/diagnostics_ui/diagnostics_ui.cc +@@ -100,7 +100,7 @@ base::Value::Dict GetDataSourceUpdate() { + update.Set( + "keyboardTesterHelpLink", + base::Value(GetLinkLabel(IDS_INPUT_DIAGNOSTICS_KEYBOARD_TESTER_HELP_LINK, +- "https://support.google.com/chromebook/"))); ++ "https://support.9oo91e.qjz9zk/chromebook/"))); + return update; + } + diff --git a/ash/webui/diagnostics_ui/resources/PRESUBMIT.py b/ash/webui/diagnostics_ui/resources/PRESUBMIT.py --- a/ash/webui/diagnostics_ui/resources/PRESUBMIT.py +++ b/ash/webui/diagnostics_ui/resources/PRESUBMIT.py @@ -2656,18 +2761,6 @@ diff --git a/ash/webui/diagnostics_ui/resources/PRESUBMIT.py b/ash/webui/diagnos for more details about the presubmit API built into depot_tools. """ -diff --git a/ash/webui/diagnostics_ui/resources/keyboard_tester.html b/ash/webui/diagnostics_ui/resources/keyboard_tester.html ---- a/ash/webui/diagnostics_ui/resources/keyboard_tester.html -+++ b/ash/webui/diagnostics_ui/resources/keyboard_tester.html -@@ -49,7 +49,7 @@ - TODO(crbug.com/1207678): update this link when the Help Center is - ready. - --> -- Help Center -+ Help Center -

- -
diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diagnostics_ui/resources/network_card.js --- a/ash/webui/diagnostics_ui/resources/network_card.js +++ b/ash/webui/diagnostics_ui/resources/network_card.js @@ -2719,7 +2812,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 --- a/ash/webui/media_app_ui/media_app_guest_ui.cc +++ b/ash/webui/media_app_ui/media_app_guest_ui.cc -@@ -107,7 +107,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( +@@ -106,7 +106,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( // Allow calls to Maps reverse geocoding API for loading metadata. source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ConnectSrc, @@ -2728,48 +2821,78 @@ 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/os_feedback_ui/backend/help_content_provider.cc b/ash/webui/os_feedback_ui/backend/help_content_provider.cc +--- a/ash/webui/os_feedback_ui/backend/help_content_provider.cc ++++ b/ash/webui/os_feedback_ui/backend/help_content_provider.cc +@@ -39,9 +39,9 @@ using ::ash::os_feedback_ui::mojom::SearchResponse; + using ::ash::os_feedback_ui::mojom::SearchResponsePtr; + + constexpr char kHelpContentProviderUrl[] = +- "https://scone-pa.clients6.google.com/v1/search/list?key="; ++ "https://scone-pa.clients6.9oo91e.qjz9zk/v1/search/list?key="; + +-constexpr char kGoogleSupportSiteUrl[] = "https://support.google.com"; ++constexpr char kGoogleSupportSiteUrl[] = "https://support.9oo91e.qjz9zk"; + + // Response with 5 items takes ~7KB. A loose upper bound of 64KB is chosen to + // avoid breaking the flow in case the response is longer. diff --git a/ash/webui/os_feedback_ui/resources/fake_data.js b/ash/webui/os_feedback_ui/resources/fake_data.js --- a/ash/webui/os_feedback_ui/resources/fake_data.js +++ b/ash/webui/os_feedback_ui/resources/fake_data.js -@@ -14,29 +14,29 @@ import {HelpContentList, HelpContentType, SearchRequest, SearchResponse} from '. +@@ -14,12 +14,12 @@ import {FeedbackContext, HelpContentList, HelpContentType, SearchRequest, Search + export const fakePopularHelpContentList = [ + { + title: stringToMojoString16('fake article'), +- url: {url: 'https://support.google.com/chromebook/?q=article'}, ++ url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=article'}, + contentType: HelpContentType.kArticle + }, + { + title: stringToMojoString16('fake forum'), +- url: {url: 'https://support.google.com/chromebook/?q=forum'}, ++ url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=forum'}, + contentType: HelpContentType.kForum + } + ]; +@@ -28,29 +28,29 @@ export const fakePopularHelpContentList = [ export const fakeHelpContentList = [ { title: stringToMojoString16('Fix connection problems'), - url: {url: 'https://support.google.com/chromebook/?q=6318213'}, + url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=6318213'}, - content_type: HelpContentType.kArticle + contentType: HelpContentType.kArticle }, { title: stringToMojoString16( 'Why won\'t my wireless mouse with a USB piece wor...?'), - url: {url: 'https://support.google.com/chromebook/?q=123920509'}, + url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=123920509'}, - content_type: HelpContentType.kForum + contentType: HelpContentType.kForum }, { title: stringToMojoString16('Wifi Issues - only on Chromebooks'), - url: {url: 'https://support.google.com/chromebook/?q=114174470'}, + url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=114174470'}, - content_type: HelpContentType.kForum + contentType: HelpContentType.kForum }, { title: stringToMojoString16('Network Connectivity Fault'), - url: {url: 'https://support.google.com/chromebook/?q=131459420'}, + url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=131459420'}, - content_type: HelpContentType.kForum + contentType: HelpContentType.kForum }, { title: stringToMojoString16( 'Connected to WiFi but can\'t connect to the internet'), - url: {url: 'https://support.google.com/chromebook/?q=22864239'}, + url: {url: 'https://support.9oo91e.qjz9zk/chromebook/?q=22864239'}, - content_type: HelpContentType.kForum + contentType: HelpContentType.kUnknown } ]; diff --git a/ash/webui/personalization_app/personalization_app_ui.cc b/ash/webui/personalization_app/personalization_app_ui.cc --- a/ash/webui/personalization_app/personalization_app_ui.cc +++ b/ash/webui/personalization_app/personalization_app_ui.cc -@@ -27,7 +27,7 @@ namespace ash { +@@ -29,7 +29,7 @@ namespace personalization_app { namespace { @@ -2811,7 +2934,7 @@ diff --git a/ash/webui/projector_app/projector_xhr_sender.cc b/ash/webui/project diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/projector_app/untrusted_projector_ui.cc --- a/ash/webui/projector_app/untrusted_projector_ui.cc +++ b/ash/webui/projector_app/untrusted_projector_ui.cc -@@ -45,24 +45,24 @@ content::WebUIDataSource* CreateProjectorHTMLSource( +@@ -45,13 +45,13 @@ content::WebUIDataSource* CreateProjectorHTMLSource( // Allow fonts. source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::FontSrc, @@ -2822,12 +2945,13 @@ diff --git a/ash/webui/projector_app/untrusted_projector_ui.cc b/ash/webui/proje network::mojom::CSPDirectiveName::StyleSrc, - "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com;"); + "style-src 'self' 'unsafe-inline' https://f0ntz.9oo91e8p1.qjz9zk;"); + std::string mediaCSP = +- std::string("media-src 'self' https://*.drive.google.com ") + ++ std::string("media-src 'self' https://*.drive.9oo91e.qjz9zk ") + + kChromeUIUntrustedProjectorPwaUrl + ";"; source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::MediaSrc, - // Allows streaming video. -- "media-src 'self' https://*.drive.google.com " -+ "media-src 'self' https://*.drive.9oo91e.qjz9zk " - "https://projector.apps.chrome;"); +@@ -60,11 +60,11 @@ content::WebUIDataSource* CreateProjectorHTMLSource( // Allow images to also handle data urls. source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ImgSrc, @@ -2881,7 +3005,7 @@ diff --git a/ash/webui/scanning/resources/scanning_app.js b/ash/webui/scanning/r diff --git a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js --- a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js +++ b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js -@@ -232,7 +232,7 @@ export class OnboardingEnterRsuWpDisableCodePage extends +@@ -230,7 +230,7 @@ export class OnboardingEnterRsuWpDisableCodePage extends */ computeRsuChallengeLinkText_() { const unlockPageUrl = @@ -3055,7 +3179,7 @@ diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py -@@ -381,7 +381,7 @@ def _OptimizeWithR8(options, +@@ -359,7 +359,7 @@ def _OptimizeWithR8(options, # Python will print the original exception as well. raise Exception( 'R8 failed. Please see ' @@ -3064,7 +3188,7 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py 'android/docs/java_optimization.md#Debugging-common-failures') from e base_has_imported_lib = False -@@ -520,7 +520,7 @@ out/Release/apks/YourApk.apk > dex.txt +@@ -498,7 +498,7 @@ out/Release/apks/YourApk.apk > dex.txt stderr += """ You may need to update build configs to run FragmentActivityReplacer for additional targets. See @@ -3189,7 +3313,7 @@ diff --git a/build/android/pylib/local/device/local_device_monkey_test_run.py b/ diff --git a/build/android/pylib/local/emulator/avd.py b/build/android/pylib/local/emulator/avd.py --- a/build/android/pylib/local/emulator/avd.py +++ b/build/android/pylib/local/emulator/avd.py -@@ -771,7 +771,7 @@ class _AvdInstance: +@@ -775,7 +775,7 @@ class _AvdInstance: """Return the snapshot name to load/save. Emulator has a different snapshot process when '-writable-system' flag is @@ -3302,7 +3426,7 @@ diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py diff --git a/build/android/test_runner.py b/build/android/test_runner.py --- a/build/android/test_runner.py +++ b/build/android/test_runner.py -@@ -1080,7 +1080,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): +@@ -1066,7 +1066,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, @@ -3374,7 +3498,7 @@ diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -1724,7 +1724,7 @@ if (enable_java_templates) { +@@ -1738,7 +1738,7 @@ if (enable_java_templates) { # * public.txt # * annotations.zip # * assets/ @@ -3400,7 +3524,7 @@ diff --git a/build/config/chromeos/args.gni b/build/config/chromeos/args.gni diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni --- a/build/config/chromeos/rules.gni +++ b/build/config/chromeos/rules.gni -@@ -126,7 +126,7 @@ if (cros_sdk_version != "") { +@@ -247,7 +247,7 @@ template("generate_skylab_deps") { # (e.g. amd64-generic), but tests on a different board (e.g. eve). # tast_vars: A list of "key=value" runtime variable pairs to pass to invoke # the Tast tests. For more details, please see: @@ -3409,7 +3533,7 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni template("generate_runner_script") { forward_variables_from(invoker, [ -@@ -373,7 +373,7 @@ template("tast_test") { +@@ -494,7 +494,7 @@ template("tast_test") { if (!defined(tast_attr_expr) && !defined(tast_tests)) { # The following expression filters out all non-critical tests. See the link # below for more details: @@ -3418,19 +3542,19 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni tast_attr_expr = "\"group:mainline\" && \"dep:chrome\"" if (defined(enable_tast_informational_tests) && -@@ -459,7 +459,7 @@ template("lacros_tast_tests") { - # use it for testing. To support running lacros tast tests from Chromium CI, - # a Var is added to support pointing the tast tests to use a specified - # pre-deployed lacros-chrome. The location is decided by: -- # https://source.chromium.org/chromium/chromium/src/+/main:third_party/chromite/scripts/deploy_chrome.py;l=80;drc=86f1234a4be8e9574442e076cdc835897f7bea61 -+ # https://source.ch40m1um.qjz9zk/chromium/chromium/src/+/main:third_party/chromite/scripts/deploy_chrome.py;l=80;drc=86f1234a4be8e9574442e076cdc835897f7bea61 - tast_vars = [ "lacrosDeployedBinary=/usr/local/lacros-chrome" ] +@@ -608,7 +608,7 @@ template("lacros_tast_tests") { + # use it for testing. To support running lacros tast tests from Chromium CI, + # a Var is added to support pointing the tast tests to use a specified + # pre-deployed lacros-chrome. The location is decided by: +- # https://source.chromium.org/chromium/chromium/src/+/main:third_party/chromite/scripts/deploy_chrome.py;l=80;drc=86f1234a4be8e9574442e076cdc835897f7bea61 ++ # https://source.ch40m1um.qjz9zk/chromium/chromium/src/+/main:third_party/chromite/scripts/deploy_chrome.py;l=80;drc=86f1234a4be8e9574442e076cdc835897f7bea61 + tast_vars = [ "lacrosDeployedBinary=/usr/local/lacros-chrome" ] - data_deps = [ + data_deps = _lacros_data_deps diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni --- a/build/config/compiler/compiler.gni +++ b/build/config/compiler/compiler.gni -@@ -114,7 +114,7 @@ declare_args() { +@@ -133,7 +133,7 @@ declare_args() { # Technology (CET). If Windows version and hardware supports the feature and # it's enabled by OS then additional validation of return address will be # performed as mitigation against Return-oriented programming (ROP). @@ -3439,7 +3563,7 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler enable_cet_shadow_stack = target_cpu == "x64" } -@@ -239,7 +239,7 @@ declare_args() { +@@ -238,7 +238,7 @@ declare_args() { # results independent of the checkout and build directory names, which # in turn is important for goma compile hit rate. # Setting this to true may make it harder to debug binaries on Linux, see @@ -3448,6 +3572,18 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler # It's not clear if the crash server will correctly handle dSYMs with relative # 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/locales.gni b/build/config/locales.gni +--- a/build/config/locales.gni ++++ b/build/config/locales.gni +@@ -158,7 +158,7 @@ extended_locales = [ + # Chrome locales not on Android. + # These locales have not yet been tested yet. Specifically, AOSP has not been + # translated to Welsh at the time of writing (April 2022): +-# https://cs.android.com/android/platform/superproject/+/master:build/make/target/product/languages_default.mk ++# https://cs.8n6r01d.qjz9zk/android/platform/superproject/+/master:build/make/target/product/languages_default.mk + # Due to this, the only way a user could see Welsh strings - assuming they were + # built - would be to manually switch their "Chrome language" in Chrome's + # language settings to Welsh, so Welsh usage would probably be very low. diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni --- a/build/config/nacl/rules.gni +++ b/build/config/nacl/rules.gni @@ -3511,7 +3647,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 --- a/build/fuchsia/binary_sizes.py +++ b/build/fuchsia/binary_sizes.py -@@ -98,7 +98,7 @@ def CreateTestResults(test_status, timestamp): +@@ -95,7 +95,7 @@ def CreateTestResults(test_status, timestamp): """Create test results data to write to JSON test results file. The JSON data format is defined in @@ -3547,7 +3683,7 @@ diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroo diff --git a/build/mac_toolchain.py b/build/mac_toolchain.py --- a/build/mac_toolchain.py +++ b/build/mac_toolchain.py -@@ -92,7 +92,7 @@ def RequestCipdAuthentication(): +@@ -88,7 +88,7 @@ def RequestCipdAuthentication(): print() print('and follow the instructions.') print() @@ -3595,7 +3731,7 @@ diff --git a/build/toolchain/cros_toolchain.gni b/build/toolchain/cros_toolchain diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni --- a/build/toolchain/gcc_toolchain.gni +++ b/build/toolchain/gcc_toolchain.gni -@@ -706,7 +706,7 @@ template("gcc_toolchain") { +@@ -712,7 +712,7 @@ template("gcc_toolchain") { rust_sysroot_relative_to_out = rebase_path(rust_sysroot, root_out_dir) rustc_wrapper = rebase_path("//build/rust/rustc_wrapper.py") @@ -3830,7 +3966,7 @@ diff --git a/chrome/app/PRESUBMIT.py b/chrome/app/PRESUBMIT.py diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd -@@ -419,7 +419,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> +@@ -424,7 +424,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> To send a number from here to your Android phone, sign in to Chromium on both devices. @@ -3839,17 +3975,17 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd Make sure you are signed in to Chromium on your $1Pixel XL and then try sending again. -@@ -477,14 +477,14 @@ Chromium is unable to recover your settings. +@@ -482,14 +482,14 @@ Chromium is unable to recover your settings. - - + + -If you want to use this account one-time only, you can use Guest mode in Chromium browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://google.com/">add a new person</a> to your $2Chromebook. +If you want to use this account one-time only, you can use Guest mode in Chromium browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://9oo91e.qjz9zk/">add a new person</a> to your $2Chromebook. -Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. +Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://9oo91e.qjz9zk/">Settings</a>. - + -If you want to use this account one-time only, you can use <a id="guestModeLink" href="#">Guest mode</a> in Chromium browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://google.com/">add a new person</a> to your $2Chromebook. +If you want to use this account one-time only, you can use <a id="guestModeLink" href="#">Guest mode</a> in Chromium browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://9oo91e.qjz9zk/">add a new person</a> to your $2Chromebook. @@ -3858,7 +3994,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -676,7 +676,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -716,7 +716,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -3867,7 +4003,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -779,10 +779,10 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -819,10 +819,10 @@ Permissions you've already given to websites and apps may apply to this account. You're signed in to Chromium! @@ -3880,16 +4016,16 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd Someone previously signed in to Chromium on this computer as $1user@example.com. Please create a new Chromium user to keep your information separate. -@@ -832,7 +832,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -872,7 +872,7 @@ Permissions you've already given to websites and apps may apply to this account. - + - $1foo@gmail.com was previously using Chromium + $1foo@9ma1l.qjz9zk was previously using Chromium -@@ -851,10 +851,10 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -891,10 +891,10 @@ Permissions you've already given to websites and apps may apply to this account. $1Elisa is already signed in to this Chromium profile. To keep your browsing separate, Chromium can create your own profile for you. @@ -3905,7 +4041,7 @@ 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 --- 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 @@ -3926,7 +4062,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This file -@@ -609,7 +609,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -613,7 +613,7 @@ are declared in tools/grit/grit_rule.gni. Open link as @@ -3935,7 +4071,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -782,7 +782,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -786,7 +786,7 @@ are declared in tools/grit/grit_rule.gni. Search images with $1Google Lens @@ -3944,7 +4080,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -857,7 +857,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -864,7 +864,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -3953,7 +4089,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -1042,7 +1042,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1049,7 +1049,7 @@ are declared in tools/grit/grit_rule.gni. Search Images with $1Google Lens @@ -3962,16 +4098,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1268,7 +1268,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1281,7 +1281,7 @@ are declared in tools/grit/grit_rule.gni. - + - Move window to $1User name ($2john@google.com) + Move window to $1User name ($2john@9oo91e.qjz9zk) -@@ -1405,7 +1405,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1418,7 +1418,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -3980,7 +4116,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -2901,10 +2901,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -3078,10 +3078,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -3993,7 +4129,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -2913,7 +2913,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3090,7 +3090,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -4002,7 +4138,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -2925,28 +2925,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -3102,28 +3102,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -4038,7 +4174,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -2967,19 +2967,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -3144,19 +3144,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -4063,7 +4199,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -2991,7 +2991,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3168,7 +3168,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -4072,7 +4208,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -3000,7 +3000,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3177,7 +3177,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -4081,7 +4217,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -3124,7 +3124,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3301,7 +3301,7 @@ are declared in tools/grit/grit_rule.gni. @@ -4090,7 +4226,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3633,13 +3633,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3816,13 +3816,13 @@ are declared in tools/grit/grit_rule.gni. @@ -4107,7 +4243,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3648,7 +3648,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3831,7 +3831,7 @@ are declared in tools/grit/grit_rule.gni. Stop sharing @@ -4116,7 +4252,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Switch to capturing tab -@@ -3854,16 +3854,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -4037,16 +4037,16 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -4137,7 +4273,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -3872,7 +3872,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4055,7 +4055,7 @@ are declared in tools/grit/grit_rule.gni. Plugin Broker: $1Unknown Plugin @@ -4146,7 +4282,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Spare Renderer -@@ -3908,22 +3908,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4091,22 +4091,22 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -4175,7 +4311,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources App: $1com.android.systemui -@@ -4145,7 +4145,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4328,7 +4328,7 @@ are declared in tools/grit/grit_rule.gni. "$1Gmail Checker" @@ -4184,7 +4320,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources The extension "$1Gmail Checker" was blocked by your administrator -@@ -4157,10 +4157,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4340,10 +4340,10 @@ are declared in tools/grit/grit_rule.gni. @@ -4197,7 +4333,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -4299,22 +4299,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4482,22 +4482,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -4226,7 +4362,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4323,10 +4323,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4506,10 +4506,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -4239,7 +4375,18 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4720,7 +4720,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4903,16 +4903,16 @@ are declared in tools/grit/grit_rule.gni. + This can read and change site data + + +- You previously chose to allow all extensions on $1google.com ++ You previously chose to allow all extensions on $19oo91e.qjz9zk + + +- You previously chose to not allow any extensions on $1google.com ++ You previously chose to not allow any extensions on $19oo91e.qjz9zk + + When you click the extension @@ -4248,7 +4395,18 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4776,7 +4776,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4965,16 +4965,16 @@ are declared in tools/grit/grit_rule.gni. + This Can Read and Change Site Data + + +- You Previously Chose To Allow All Extensions On $1google.com ++ You Previously Chose To Allow All Extensions On $19oo91e.qjz9zk + + +- You Previously Chose To Not Allow Any Extensions On $1google.com ++ You Previously Chose To Not Allow Any Extensions On $19oo91e.qjz9zk + + When You Click the Extension @@ -4257,7 +4415,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -5081,7 +5081,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5279,7 +5279,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -4265,8 +4423,8 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources + The "$2Some New Search" extension changed search to use $19oo91e.qjz9zk - -@@ -5156,22 +5156,22 @@ Keep your key file in a safe place. You will need it to create new versions of y + +@@ -5372,25 +5372,25 @@ Keep your key file in a safe place. You will need it to create new versions of y Permissions @@ -4277,6 +4435,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - Requested to read and change $1google.com + Requested to read and change $19oo91e.qjz9zk + + To allow an extension, change your default setting below. + - No extensions have requested to read and change $1google.com + No extensions have requested to read and change $19oo91e.qjz9zk @@ -4294,7 +4455,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Customize permissions for each extension -@@ -5446,10 +5446,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5665,10 +5665,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -4307,23 +4468,29 @@ 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 -@@ -5458,13 +5458,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5677,7 +5677,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + Google Password Manager + + +- You can use saved passwords on any device. They're saved to $1Google Password Manager for $2user@gmail.com ++ You can use saved passwords on any device. They're saved to $1Google Password Manager for $2user@9ma1l.qjz9zk + + + Passwords are saved to $1Google Password Manager on this device +@@ -5689,10 +5689,10 @@ Keep your key file in a safe place. You will need it to create new versions of y You can view and manage saved passwords in Google Password Manager - To Google Password Manager for $1user@gmail.com + To Google Password Manager for $1user@9ma1l.qjz9zk - - To Google Password Manager on this device - - In Google Password Manager for $1user@gmail.com + In Google Password Manager for $1user@9ma1l.qjz9zk - - In Google Password Manager on this device -@@ -5811,7 +5811,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + + +@@ -6128,7 +6128,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4332,7 +4499,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -5822,7 +5822,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6139,7 +6139,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4341,7 +4508,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -5832,7 +5832,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6149,7 +6149,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4350,7 +4517,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -5841,16 +5841,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6158,16 +6158,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -4370,7 +4537,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -6277,7 +6277,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6594,7 +6594,7 @@ Keep your key file in a safe place. You will need it to create new versions of y memories from Google Photos @@ -4379,7 +4546,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources <br> <br> You can manage settings for this card from the card menu or see more options in Customize Chrome. -@@ -6329,10 +6329,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6646,10 +6646,10 @@ Keep your key file in a safe place. You will need it to create new versions of y About this card @@ -4392,7 +4559,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6659,14 +6659,14 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6987,7 +6987,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -4401,15 +4568,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open in app +@@ -6997,7 +6997,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - + - + Always use the $1YouTube app to open supported web links? -@@ -6790,7 +6790,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7121,7 +7121,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 @@ -4418,7 +4586,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -6946,7 +6946,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7284,7 +7284,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. @@ -4427,7 +4595,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6983,7 +6983,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7321,7 +7321,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. @@ -4436,12 +4604,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7200,13 +7200,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7535,16 +7535,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Suggest strong password - Password will be saved in your Google Account, $1user@gmail.com. You won’t have to remember it. + Password will be saved in your Google Account, $1user@9ma1l.qjz9zk. You won’t have to remember it. + + +- You won’t need to remember this password. It will be saved to Google Password Manager for $1user@gmail.com. ++ You won’t need to remember this password. It will be saved to Google Password Manager for $1user@9ma1l.qjz9zk. Confirm your username @@ -4450,9 +4622,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources - Passwords are saved in your Google Account (%1$suser@gmail.com) so you can use them on any device + Passwords are saved in your Google Account (%1$suser@9ma1l.qjz9zk) so you can use them on any device - - -@@ -7390,7 +7390,7 @@ Keep your key file in a safe place. You will need it to create new versions of y + + Never for this site +@@ -7731,7 +7731,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Clear browsing data @@ -4461,7 +4633,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -7400,7 +7400,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7741,7 +7741,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4470,7 +4642,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -7621,7 +7621,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7962,7 +7962,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Uploading ($127%)... @@ -4479,7 +4651,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8063,7 +8063,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8411,7 +8411,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4488,7 +4660,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8071,10 +8071,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8419,10 +8419,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Sign in to Security Device @@ -4501,7 +4673,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -8396,7 +8396,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8731,7 +8731,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 @@ -4510,7 +4682,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9234,7 +9234,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9578,7 +9578,7 @@ Keep your key file in a safe place. You will need it to create new versions of y This will separate your browsing from $1bob@example.com @@ -4519,7 +4691,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9249,10 +9249,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9593,10 +9593,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Can't sign in @@ -4532,7 +4704,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -9277,13 +9277,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9621,13 +9621,13 @@ Keep your key file in a safe place. You will need it to create new versions of y This wasn't me. @@ -4548,7 +4720,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -9338,7 +9338,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9682,7 +9682,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Open $1Adobe Acrobat? @@ -4557,7 +4729,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -9349,8 +9349,8 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -9693,8 +9693,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Cancel @@ -4566,9 +4738,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources + + Always allow $1https://9oo91e.qjz9zk to open links of this type in the associated app - + -@@ -9960,7 +9960,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10304,7 +10304,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -4577,7 +4749,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10387,7 +10387,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10731,7 +10731,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -4586,7 +4758,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -10430,7 +10430,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10774,7 +10774,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from having full control of MIDI devices. @@ -4595,7 +4767,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 -@@ -10518,7 +10518,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10862,7 +10862,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -4604,7 +4776,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10550,10 +10550,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10894,10 +10894,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -4617,7 +4789,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10664,19 +10664,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11008,19 +11008,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -4640,7 +4812,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -10704,7 +10704,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11043,7 +11043,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -4649,7 +4821,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -10731,7 +10731,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11070,7 +11070,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -4658,7 +4830,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10932,7 +10932,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11271,7 +11271,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. @@ -4667,7 +4839,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share system audio -@@ -11052,8 +11052,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11391,8 +11391,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -4678,7 +4850,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -11267,7 +11267,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11606,7 +11606,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4687,7 +4859,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -11379,7 +11379,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11718,7 +11718,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4696,7 +4868,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -11419,7 +11419,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11758,7 +11758,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4705,7 +4877,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -11504,7 +11504,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11843,7 +11843,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4714,7 +4886,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -11625,7 +11625,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11964,7 +11964,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4723,9 +4895,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources wants to see the make and model of your Security Key -@@ -11812,13 +11812,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12151,13 +12151,13 @@ Please help our engineers fix this problem. Tell us what happened right before y - + - Use your security key with $1google.com + Use your security key with $19oo91e.qjz9zk @@ -4739,7 +4911,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -11912,7 +11912,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12251,7 +12251,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4748,7 +4920,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Didn't get it? -@@ -11927,7 +11927,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12266,7 +12266,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Security key request @@ -4757,7 +4929,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Add a new Android phone -@@ -12023,7 +12023,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12362,7 +12362,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4766,7 +4938,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -12039,7 +12039,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12378,7 +12378,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 @@ -4775,7 +4947,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. -@@ -12048,13 +12048,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12387,13 +12387,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -4791,7 +4963,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -12383,7 +12383,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12716,7 +12716,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4803,7 +4975,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 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd -@@ -447,7 +447,7 @@ chromium_strings.grd. --> +@@ -452,7 +452,7 @@ chromium_strings.grd. --> To send a number from here to your Android phone, sign in to Chrome on both devices. @@ -4812,17 +4984,17 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str Make sure you are signed in to Chrome on your $1Pixel XL and then try sending again. -@@ -512,14 +512,14 @@ Google Chrome is unable to recover your settings. +@@ -517,14 +517,14 @@ Google Chrome is unable to recover your settings. - - + + -If you want to use this account one-time only, you can use Guest mode in Chrome browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://google.com/">add a new person</a> to your $2Chromebook. +If you want to use this account one-time only, you can use Guest mode in Chrome browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://9oo91e.qjz9zk/">add a new person</a> to your $2Chromebook. -Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. +Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <a id="osSettingsLink" href="$3https://9oo91e.qjz9zk/">Settings</a>. - + -If you want to use this account one-time only, you can use <a id="guestModeLink" href="#">Guest mode</a> in Chrome browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://google.com/">add a new person</a> to your $2Chromebook. +If you want to use this account one-time only, you can use <a id="guestModeLink" href="#">Guest mode</a> in Chrome browser. If you want to add an account for someone else, <a target="_blank" id="newPersonLink" href="$1https://9oo91e.qjz9zk/">add a new person</a> to your $2Chromebook. @@ -4831,7 +5003,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -713,7 +713,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -753,7 +753,7 @@ Permissions you've already given to websites and apps may apply to this account. @@ -4840,7 +5012,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -823,10 +823,10 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -863,10 +863,10 @@ Permissions you've already given to websites and apps may apply to this account. You're signed in to Chrome! @@ -4853,16 +5025,16 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str Someone previously signed in to Chrome on this computer as $1user@example.com. Please create a new Chrome user to keep your information separate. -@@ -876,7 +876,7 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -916,7 +916,7 @@ Permissions you've already given to websites and apps may apply to this account. - + - $1foo@gmail.com was previously using Chrome + $1foo@9ma1l.qjz9zk was previously using Chrome -@@ -895,10 +895,10 @@ Permissions you've already given to websites and apps may apply to this account. +@@ -935,10 +935,10 @@ Permissions you've already given to websites and apps may apply to this account. $1Elisa is already signed in to this Chrome profile. To keep your browsing separate, Chrome can create your own profile for you. @@ -4878,7 +5050,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 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd -@@ -167,12 +167,12 @@ +@@ -168,12 +168,12 @@ @@ -4893,9 +5065,9 @@ diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/loc -@@ -182,18 +182,18 @@ +@@ -183,18 +183,18 @@ - + - https://support.google.com/chromebook/answer/183084?hl=[GRITLANGCODE] + https://support.9oo91e.qjz9zk/chromebook/answer/183084?hl=[GRITLANGCODE] @@ -4933,7 +5105,7 @@ diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4045,7 +4045,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4179,7 +4179,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( syncer::kSyncServiceURL, @@ -4942,7 +5114,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !BUILDFLAG(IS_ANDROID) {"block-migrated-default-chrome-app-sync", flag_descriptions::kBlockMigratedDefaultChromeAppSyncName, -@@ -4337,7 +4337,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4467,7 +4467,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -4990,7 +5162,7 @@ diff --git a/chrome/browser/android/vr/PRESUBMIT.py b/chrome/browser/android/vr/ diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/android/webapk/webapk_installer.cc --- a/chrome/browser/android/webapk/webapk_installer.cc +++ b/chrome/browser/android/webapk/webapk_installer.cc -@@ -550,7 +550,7 @@ void WebApkInstaller::OnHaveSufficientSpaceForInstall() { +@@ -526,7 +526,7 @@ void WebApkInstaller::OnHaveSufficientSpaceForInstall() { "apps on Android so that they show up in the user's app drawer and " "optionally home screen. Web apps installed in this way are called " "WebAPKs. See " @@ -4999,7 +5171,7 @@ diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/ "for more details. WebAPKs are created on a Google server on " "behalf of the Chrome client and the requesting app. In order for " "the server to create a WebAPK, it first needs to know metadata " -@@ -627,7 +627,7 @@ void WebApkInstaller::OnGotIconMurmur2Hashes( +@@ -603,7 +603,7 @@ void WebApkInstaller::OnGotIconMurmur2Hashes( "Android so that they show up in the user's app drawer and " "optionally home screen. Web apps installed in this way are called " "WebAPKs. See " @@ -5121,6 +5293,18 @@ 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/arc/input_overlay/ui/input_menu_view.cc b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc +--- a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc ++++ b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc +@@ -58,7 +58,7 @@ constexpr int kTitleFontSize = 20; + constexpr int kBodyFontSize = 13; + + constexpr char kFeedbackUrl[] = +- "https://docs.google.com/forms/d/e/" ++ "https://docs.9oo91e.qjz9zk/forms/d/e/" + "1FAIpQLSfL3ttPmopJj65P4EKr--SA18Sc9bbQVMnd0oueMhJu_42TbA/" + "viewform?usp=pp_url"; + // Entry for the survey form from above link. diff --git a/chrome/browser/ash/assistant/assistant_util.cc b/chrome/browser/ash/assistant/assistant_util.cc --- a/chrome/browser/ash/assistant/assistant_util.cc +++ b/chrome/browser/ash/assistant/assistant_util.cc @@ -5161,7 +5345,7 @@ diff --git a/chrome/browser/ash/attestation/attestation_ca_client.cc b/chrome/br diff --git a/chrome/browser/ash/borealis/borealis_util.cc b/chrome/browser/ash/borealis/borealis_util.cc --- a/chrome/browser/ash/borealis/borealis_util.cc +++ b/chrome/browser/ash/borealis/borealis_util.cc -@@ -44,7 +44,7 @@ namespace { +@@ -43,7 +43,7 @@ namespace { // Base feedback form URL, without query parameters for prefilling. static constexpr char kFeedbackUrl[] = @@ -5197,7 +5381,7 @@ diff --git a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_ diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/crostini/crostini_util.cc --- a/chrome/browser/ash/crostini/crostini_util.cc +++ b/chrome/browser/ash/crostini/crostini_util.cc -@@ -65,7 +65,7 @@ const char kCrostiniDefaultVmName[] = "termina"; +@@ -64,7 +64,7 @@ const char kCrostiniDefaultVmName[] = "termina"; const char kCrostiniDefaultContainerName[] = "penguin"; const char kCrostiniDefaultUsername[] = "emperor"; const char kCrostiniDefaultImageServerUrl[] = @@ -5221,7 +5405,7 @@ diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome diff --git a/chrome/browser/ash/eche_app/eche_app_notification_controller.cc b/chrome/browser/ash/eche_app/eche_app_notification_controller.cc --- a/chrome/browser/ash/eche_app/eche_app_notification_controller.cc +++ b/chrome/browser/ash/eche_app/eche_app_notification_controller.cc -@@ -39,10 +39,10 @@ const char kEcheAppDisabledByPhoneNotifierId[] = +@@ -36,10 +36,10 @@ const char kEcheAppFromWebWithoudButtonNotifierId[] = // TODO(crbug.com/1241352): This should probably have a ?p= at // some point. @@ -5284,7 +5468,7 @@ diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrom diff --git a/chrome/browser/ash/file_manager/file_tasks.cc b/chrome/browser/ash/file_manager/file_tasks.cc --- a/chrome/browser/ash/file_manager/file_tasks.cc +++ b/chrome/browser/ash/file_manager/file_tasks.cc -@@ -354,13 +354,13 @@ class WebDriveOfficeValidationHelper { +@@ -355,13 +355,13 @@ class WebDriveOfficeValidationHelper { disabled_actions_.emplace(web_drive_office_action_id_); EndAdjustTasks(); return; @@ -5303,7 +5487,7 @@ diff --git a/chrome/browser/ash/file_manager/file_tasks.cc b/chrome/browser/ash/ diff --git a/chrome/browser/ash/hats/hats_dialog.cc b/chrome/browser/ash/hats/hats_dialog.cc --- 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"; +@@ -52,7 +52,7 @@ const char kClientActionUnhandledError[] = "survey-loading-error"; const char kClientSmileySelected[] = "smiley-selected-"; constexpr char kCrOSHaTSURL[] = @@ -5315,53 +5499,71 @@ diff --git a/chrome/browser/ash/hats/hats_dialog.cc b/chrome/browser/ash/hats/ha diff --git a/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc b/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc --- a/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc +++ b/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc -@@ -24,24 +24,24 @@ namespace { - - const char* kAllowedDomainsForPersonalInfoSuggester[] = { - "discord.com", "messenger.com", "web.whatsapp.com", -- "web.skype.com", "duo.google.com", "hangouts.google.com", -- "chat.google.com", "messages.google.com", "web.telegram.org", -- "voice.google.com", -+ "web.skype.com", "duo.9oo91e.qjz9zk", "hangouts.9oo91e.qjz9zk", -+ "chat.9oo91e.qjz9zk", "messages.9oo91e.qjz9zk", "web.telegram.org", -+ "voice.9oo91e.qjz9zk", +@@ -23,27 +23,27 @@ namespace { + const char* kAllowedDomainAndPathsForPersonalInfoSuggester[][2] = { + {"discord.com", ""}, {"messenger.com", ""}, + {"web.whatsapp.com", ""}, {"web.skype.com", ""}, +- {"duo.google.com", ""}, {"hangouts.google.com", ""}, +- {"messages.google.com", ""}, {"web.telegram.org", ""}, +- {"voice.google.com", ""}, {"mail.google.com", "/chat"}, ++ {"duo.9oo91e.qjz9zk", ""}, {"hangouts.9oo91e.qjz9zk", ""}, ++ {"messages.9oo91e.qjz9zk", ""}, {"web.telegram.org", ""}, ++ {"voice.9oo91e.qjz9zk", ""}, {"mail.9oo91e.qjz9zk", "/chat"}, }; - const char* kAllowedDomainsForEmojiSuggester[] = { - "discord.com", "messenger.com", "web.whatsapp.com", -- "web.skype.com", "duo.google.com", "hangouts.google.com", -- "chat.google.com", "messages.google.com", "web.telegram.org", -- "voice.google.com", -+ "web.skype.com", "duo.9oo91e.qjz9zk", "hangouts.9oo91e.qjz9zk", -+ "chat.9oo91e.qjz9zk", "messages.9oo91e.qjz9zk", "web.telegram.org", -+ "voice.9oo91e.qjz9zk", + const char* kAllowedDomainAndPathsForEmojiSuggester[][2] = { + {"discord.com", ""}, {"messenger.com", ""}, + {"web.whatsapp.com", ""}, {"web.skype.com", ""}, +- {"duo.google.com", ""}, {"hangouts.google.com", ""}, +- {"messages.google.com", ""}, {"web.telegram.org", ""}, +- {"voice.google.com", ""}, {"mail.google.com", "/chat"}, ++ {"duo.9oo91e.qjz9zk", ""}, {"hangouts.9oo91e.qjz9zk", ""}, ++ {"messages.9oo91e.qjz9zk", ""}, {"web.telegram.org", ""}, ++ {"voice.9oo91e.qjz9zk", ""}, {"mail.9oo91e.qjz9zk", "/chat"}, }; // TODO(b/3339115): Add web.skype.com back to the list after compatibility // issues are solved. - const char* kAllowedDomainsForMultiWordSuggester[] = { - "discord.com", "messenger.com", "web.whatsapp.com", -- "duo.google.com", "hangouts.google.com", "chat.google.com", -- "messages.google.com", "web.telegram.org", "voice.google.com", -+ "duo.9oo91e.qjz9zk", "hangouts.9oo91e.qjz9zk", "chat.9oo91e.qjz9zk", -+ "messages.9oo91e.qjz9zk", "web.telegram.org", "voice.9oo91e.qjz9zk", + const char* kAllowedDomainAndPathsForMultiWordSuggester[][2] = { + {"discord.com", ""}, {"messenger.com", ""}, +- {"web.whatsapp.com", ""}, {"duo.google.com", ""}, +- {"hangouts.google.com", ""}, {"messages.google.com", ""}, +- {"web.telegram.org", ""}, {"voice.google.com", ""}, +- {"mail.google.com", "/chat"}, ++ {"web.whatsapp.com", ""}, {"duo.9oo91e.qjz9zk", ""}, ++ {"hangouts.9oo91e.qjz9zk", ""}, {"messages.9oo91e.qjz9zk", ""}, ++ {"web.telegram.org", ""}, {"voice.9oo91e.qjz9zk", ""}, ++ {"mail.9oo91e.qjz9zk", "/chat"}, }; const char* kTestUrls[] = { diff --git a/chrome/browser/ash/input_method/ime_rules_config.h b/chrome/browser/ash/input_method/ime_rules_config.h --- a/chrome/browser/ash/input_method/ime_rules_config.h +++ b/chrome/browser/ash/input_method/ime_rules_config.h -@@ -49,10 +49,10 @@ class ImeRulesConfig { - std::vector rule_auto_correct_domain_denylist_; +@@ -50,19 +50,19 @@ class ImeRulesConfig { // The default denylist of domains that will turn off auto_correct feature. std::vector default_auto_correct_domain_denylist_{ -- "amazon.com", "b.corp.google.com", "classroom.google.com", -- "desmos.com", "docs.google.com", "facebook.com", -+ "amazon.com", "b.corp.9oo91e.qjz9zk", "classroom.9oo91e.qjz9zk", -+ "desmos.com", "docs.9oo91e.qjz9zk", "f8c3b00k.qjz9zk", - "instagram.com", "outlook.live.com", "outlook.office.com", -- "quizlet.com", "whatsapp.com", "youtube.com", -+ "quizlet.com", "whatsapp.com", "y0u1ub3.qjz9zk", + "amazon.com", +- "b.corp.google.com", +- "buganizer.corp.google.com", +- "cider.corp.google.com", +- "classroom.google.com", ++ "b.corp.9oo91e.qjz9zk", ++ "buganizer.corp.9oo91e.qjz9zk", ++ "cider.corp.9oo91e.qjz9zk", ++ "classroom.9oo91e.qjz9zk", + "desmos.com", +- "docs.google.com", +- "facebook.com", ++ "docs.9oo91e.qjz9zk", ++ "f8c3b00k.qjz9zk", + "instagram.com", + "outlook.live.com", + "outlook.office.com", + "quizlet.com", + "whatsapp.com", +- "youtube.com", ++ "y0u1ub3.qjz9zk", }; }; @@ -5420,7 +5622,7 @@ diff --git a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc b/chro 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 --- 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 -@@ -40,10 +40,10 @@ namespace ash { +@@ -39,10 +39,10 @@ namespace ash { namespace { constexpr const char kGetAppListUrl[] = @@ -5565,7 +5767,7 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc b/chrome/ 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 -@@ -112,7 +112,7 @@ void RemoveDriveDownloadDirectoryIfExists() { +@@ -111,7 +111,7 @@ void RemoveDriveDownloadDirectoryIfExists() { absl::optional GetIdFromDriveUrl(const GURL& url) { const std::string& spec = url.spec(); @@ -5574,7 +5776,7 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash if (base::StartsWith(spec, kOpenUrlBase, base::CompareCase::INSENSITIVE_ASCII)) { // e.g. https://drive.google.com/open?id=[ID] -@@ -124,9 +124,9 @@ absl::optional GetIdFromDriveUrl(const GURL& url) { +@@ -123,9 +123,9 @@ absl::optional GetIdFromDriveUrl(const GURL& url) { // These will match some invalid URLs, which is fine. const std::string kViewUrlPatternWithDomain = @@ -5660,7 +5862,7 @@ diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc b/chrome diff --git a/chrome/browser/ash/u2f_notification.cc b/chrome/browser/ash/u2f_notification.cc --- a/chrome/browser/ash/u2f_notification.cc +++ b/chrome/browser/ash/u2f_notification.cc -@@ -34,7 +34,7 @@ namespace { +@@ -33,7 +33,7 @@ namespace { constexpr char kU2FNotificationId[] = "chrome://u2f_notification"; constexpr char kU2FAdvisoryURL[] = @@ -5672,7 +5874,7 @@ diff --git a/chrome/browser/ash/u2f_notification.cc b/chrome/browser/ash/u2f_not diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc --- a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc +++ b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc -@@ -51,17 +51,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; +@@ -53,17 +53,17 @@ constexpr char kProtoMimeType[] = "application/x-protobuf"; // The url to download the proto of the complete list of wallpaper collections. constexpr char kBackdropCollectionsUrl[] = @@ -5693,7 +5895,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom "image?rt=b"; // The label used to return exclusive content or filter unwanted images. -@@ -72,12 +72,12 @@ constexpr char kGoogleDeviceFilteringLabel[] = "google_branded_chromebook"; +@@ -74,12 +74,12 @@ constexpr char kGoogleDeviceFilteringLabel[] = "google_branded_chromebook"; // The URL to download an album's photos from a user's Google Photos library. constexpr char kGooglePhotosAlbumUrl[] = @@ -5708,7 +5910,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom "userCollections:read"; constexpr net::NetworkTrafficAnnotationTag -@@ -105,7 +105,7 @@ constexpr net::NetworkTrafficAnnotationTag +@@ -107,7 +107,7 @@ constexpr net::NetworkTrafficAnnotationTag // The URL to download the number of photos in a user's Google Photos library. constexpr char kGooglePhotosCountUrl[] = @@ -5717,7 +5919,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom constexpr net::NetworkTrafficAnnotationTag kGooglePhotosCountTrafficAnnotation = net::DefineNetworkTrafficAnnotation("wallpaper_google_photos_count", -@@ -129,7 +129,7 @@ constexpr net::NetworkTrafficAnnotationTag kGooglePhotosCountTrafficAnnotation = +@@ -131,7 +131,7 @@ constexpr net::NetworkTrafficAnnotationTag kGooglePhotosCountTrafficAnnotation = // The URL to download whether the user is allowed to access Google Photos data. constexpr char kGooglePhotosEnabledUrl[] = @@ -5726,7 +5928,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom constexpr net::NetworkTrafficAnnotationTag kGooglePhotosEnabledTrafficAnnotation = -@@ -155,11 +155,11 @@ constexpr net::NetworkTrafficAnnotationTag +@@ -157,11 +157,11 @@ constexpr net::NetworkTrafficAnnotationTag // The URL to download a photo from a user's Google Photos library. constexpr char kGooglePhotosPhotoUrl[] = @@ -5743,7 +5945,7 @@ diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrom diff --git a/chrome/browser/ash/web_applications/terminal_source.cc b/chrome/browser/ash/web_applications/terminal_source.cc --- a/chrome/browser/ash/web_applications/terminal_source.cc +++ b/chrome/browser/ash/web_applications/terminal_source.cc -@@ -158,8 +158,8 @@ std::string TerminalSource::GetContentSecurityPolicy( +@@ -157,8 +157,8 @@ std::string TerminalSource::GetContentSecurityPolicy( switch (directive) { case network::mojom::CSPDirectiveName::ConnectSrc: return "connect-src 'self' " @@ -5772,7 +5974,7 @@ diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser 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 -@@ -54,7 +54,7 @@ constexpr net::NetworkTrafficAnnotationTag traffic_annotation = +@@ -55,7 +55,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: " @@ -5808,7 +6010,7 @@ diff --git a/chrome/browser/cart/cart_discount_link_fetcher.cc b/chrome/browser/ 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 -@@ -616,17 +616,17 @@ void CartService::AddCartsWithFakeData() { +@@ -617,17 +617,17 @@ void CartService::AddCartsWithFakeData() { u"15%")); dummy_proto1.mutable_discount_info()->set_has_coupons(true); dummy_proto1.add_product_image_urls( @@ -5829,7 +6031,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); -@@ -657,12 +657,12 @@ void CartService::AddCartsWithFakeData() { +@@ -658,12 +658,12 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, u"20%")); dummy_proto2.add_product_image_urls( @@ -5844,7 +6046,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-" "EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-" "8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY"); -@@ -680,7 +680,7 @@ void CartService::AddCartsWithFakeData() { +@@ -681,7 +681,7 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT, u"$50")); dummy_proto3.add_product_image_urls( @@ -5853,9 +6055,9 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); -@@ -695,12 +695,12 @@ void CartService::AddCartsWithFakeData() { +@@ -696,12 +696,12 @@ void CartService::AddCartsWithFakeData() { dummy_proto4.set_merchant_cart_url(dummy_url4.spec()); - dummy_proto4.set_timestamp(time_now + 3); + dummy_proto4.set_timestamp(time_now + 5); dummy_proto4.add_product_image_urls( - "https://encrypted-tbn0.gstatic.com/" + "https://encrypted-tbn0.95tat1c.qjz9zk/" @@ -5868,7 +6070,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_" "tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-" "EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY"); -@@ -715,7 +715,7 @@ void CartService::AddCartsWithFakeData() { +@@ -716,7 +716,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( @@ -5877,7 +6079,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv "shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_" "ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_" "DFNeumI-LMPJMYjW-BOSaA&usqp=CAY"); -@@ -730,17 +730,17 @@ void CartService::AddCartsWithFakeData() { +@@ -731,17 +731,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( @@ -5949,7 +6151,7 @@ diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/c diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1130,7 +1130,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1136,7 +1136,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -5958,7 +6160,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch "https://chromeenterprise.google/policies/" "#SandboxExternalProtocolBlocked"); return; -@@ -1146,7 +1146,7 @@ void LaunchURL(base::WeakPtr client, +@@ -1152,7 +1152,7 @@ void LaunchURL(base::WeakPtr client, "'allow-top-navigation-by-user-activation', " "'allow-top-navigation', or " "'allow-popups'. See " @@ -6094,7 +6296,7 @@ diff --git a/chrome/browser/enterprise/connectors/file_system/signin_dialog_dele diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc b/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc --- a/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc +++ b/chrome/browser/enterprise/reporting/extension_request/extension_request_notification.cc -@@ -29,7 +29,7 @@ constexpr char kInstalledNotificationId[] = "extension_installed_notificaiton"; +@@ -30,7 +30,7 @@ constexpr char kInstalledNotificationId[] = "extension_installed_notificaiton"; constexpr char kExtensionRequestNotifierId[] = "chrome_browser_cloud_management_extension_request"; constexpr char kChromeWebstoreUrl[] = @@ -6103,15 +6305,15 @@ diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_req // The elements order of array below must match the order in enum // ExtensionRequestNotification::NotifyType. -@@ -68,7 +68,7 @@ void ExtensionRequestNotification::Show(NotificationCloseCallback callback) { +@@ -69,7 +69,7 @@ void ExtensionRequestNotification::Show(NotificationCloseCallback callback) { kNotificationTitles[notify_type_], extension_ids_.size()); const std::u16string body = l10n_util::GetPluralStringFUTF16( kNotificationBodies[notify_type_], extension_ids_.size()); - GURL original_url("https://chrome.google.com/webstore"); + GURL original_url("https://chrome.9oo91e.qjz9zk/webstore"); - // 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. + auto icon = ui::ImageModel::FromVectorIcon(vector_icons::kBusinessIcon, + ui::kColorIcon, + message_center::kSmallImageSize); diff --git a/chrome/browser/enterprise/signals/signals_utils.cc b/chrome/browser/enterprise/signals/signals_utils.cc --- a/chrome/browser/enterprise/signals/signals_utils.cc +++ b/chrome/browser/enterprise/signals/signals_utils.cc @@ -6194,7 +6396,7 @@ diff --git a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flo diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc -@@ -83,7 +83,7 @@ namespace { +@@ -82,7 +82,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS_ASH) const char kPlayIntentPrefix[] = @@ -6206,7 +6408,7 @@ diff --git a/chrome/browser/extensions/api/management/chrome_management_api_dele diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc --- 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( +@@ -78,7 +78,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 " @@ -6277,7 +6479,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -190,7 +190,7 @@ const char kU2FPermissionPromptDescription[] = +@@ -189,7 +189,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 " @@ -6286,7 +6488,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti #if BUILDFLAG(ENABLE_SUPERVISED_USERS) const char kWebFilterInterstitialRefreshName[] = -@@ -205,7 +205,7 @@ const char kU2FSecurityKeyAPIDescription[] = +@@ -204,7 +204,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 " @@ -6295,7 +6497,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kUpcomingSharingFeaturesName[] = "Enable upcoming sharing features."; const char kUpcomingSharingFeaturesDescription[] = -@@ -1109,7 +1109,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = +@@ -1072,7 +1072,7 @@ const char kBlockInsecurePrivateNetworkRequestsName[] = const char kBlockInsecurePrivateNetworkRequestsDescription[] = "Prevents non-secure contexts from making subresource requests to " "more-private IP addresses. See also: " @@ -6304,7 +6506,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessSendPreflightsName[] = "Send Private Network Access preflights"; -@@ -1117,7 +1117,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] = +@@ -1080,7 +1080,7 @@ const char kPrivateNetworkAccessSendPreflightsDescription[] = "Enables sending Private Network Access preflights ahead of requests to " "more-private IP addresses. Failed preflights display warnings in DevTools " "without failing entire request. See also: " @@ -6313,7 +6515,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kPrivateNetworkAccessRespectPreflightResultsName[] = "Respect the result of Private Network Access preflights"; -@@ -1125,7 +1125,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] = +@@ -1088,7 +1088,7 @@ const char kPrivateNetworkAccessRespectPreflightResultsDescription[] = "Enables sending Private Network Access preflights ahead of requests to " "more-private IP addresses. These preflight requests must succeed in order " "for the request to proceed. See also: " @@ -6322,7 +6524,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDeprecateAltClickName[] = "Enable Alt+Click deprecation notifications"; -@@ -2294,7 +2294,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; +@@ -2220,7 +2220,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. " @@ -6331,7 +6533,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = -@@ -2311,7 +2311,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2237,7 +2237,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 " @@ -6525,7 +6727,7 @@ diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_ 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 --- 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"; +@@ -30,9 +30,9 @@ constexpr char kLoggerComponent[] = "CastMediaRouteProvider"; // List of origins allowed to use a PresentationRequest to initiate mirroring. constexpr std::array kPresentationApiAllowlist = { @@ -6593,7 +6795,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/b diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc --- 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( +@@ -468,7 +468,7 @@ void WebRtcLogUploader::UploadCompressedLog( "Not implemented, it would be good to do so." })"); @@ -6954,7 +7156,7 @@ diff --git a/chrome/browser/resources/about_sys/about_sys.js b/chrome/browser/re --- 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; - // + // // Link to markdown doc with documentation for Chrome OS. const CROS_MD_DOC_URL = - 'https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/debugd/docs/log_entries.md'; @@ -6969,10 +7171,10 @@ diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/br

Placeholder

--

See Licensing for Chromium OS Developers and -- Licensing for Chromium OS Package Owners

-+

See Licensing for Chromium OS Developers and -+ Licensing for Chromium OS Package Owners

+-

See Licensing for ChromiumOS Developers and +- Licensing for ChromiumOS Package Owners

++

See Licensing for ChromiumOS Developers and ++ Licensing for ChromiumOS Package Owners

If you need to change styles, fonts, layout, etc of chrome://os_credits page, -edit chromite/licensing/about_credits.tmpl. @@ -7007,7 +7209,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_commo diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js -@@ -209,7 +209,7 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -222,7 +222,7 @@ export class CommandHandler extends CommandHandlerInterface { QueueMode.FLUSH); return false; case 'reportIssue': @@ -7016,7 +7218,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -1498,13 +1498,13 @@ export class CommandHandler extends CommandHandlerInterface { +@@ -1511,13 +1511,13 @@ export class CommandHandler extends CommandHandlerInterface { init() { ChromeVoxKbHandler.commandHandler = this.onCommand.bind(this); @@ -7105,15 +7307,15 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox_manifest. 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 --- a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js +++ b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js -@@ -180,7 +180,7 @@ E2ETestBase = class extends testing.Test { - chrome.automation.getDesktop((desktop) => { +@@ -229,7 +229,7 @@ E2ETestBase = class extends AccessibilityTestBase { const url = opt_params.url || DocUtils.createUrlForDoc(doc); -- chrome.commandLinePrivate.hasSwitch( -+ ch40me.qjz9zkmandLinePrivate.hasSwitch( - 'lacros-chrome-path', hasLacrosChromePath => { - // 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 + const hasLacrosChromePath = await new Promise( +- r => chrome.commandLinePrivate.hasSwitch('lacros-chrome-path', r)); ++ r => ch40me.qjz9zkmandLinePrivate.hasSwitch('lacros-chrome-path', r)); + // 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 Ash, we use + // the chrome.tabs api. diff --git a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js --- a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js +++ b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js @@ -7220,21 +7422,15 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak_man diff --git a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js --- a/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js +++ b/chrome/browser/resources/chromeos/accessibility/switch_access/switch_access.js -@@ -64,12 +64,12 @@ export class SwitchAccess { - /** @private {boolean} */ - this.enableMultistepAutomationFeatures_ = false; +@@ -61,7 +61,7 @@ export class SwitchAccess { + */ + this.enableImprovedTextInput_ = false; - chrome.commandLinePrivate.hasSwitch( + ch40me.qjz9zkmandLinePrivate.hasSwitch( 'enable-experimental-accessibility-switch-access-text', (result) => { this.enableImprovedTextInput_ = result; }); - -- chrome.commandLinePrivate.hasSwitch( -+ ch40me.qjz9zkmandLinePrivate.hasSwitch( - 'enable-experimental-accessibility-switch-access-multistep-automation', - (enabled) => { - this.enableMultistepAutomationFeatures_ = enabled; diff --git a/chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 b/chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 --- a/chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 +++ b/chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 @@ -7366,16 +7562,16 @@ diff --git a/chrome/browser/resources/chromeos/arc_support/playstore.js b/chrome diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js --- 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({ - * @private {string} - */ - urlTemplate_: -- 'https://www.gstatic.com/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html', -+ 'https://www.95tat1c.qjz9zk/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html', +@@ -81,7 +81,7 @@ class AssistantRelatedInfo extends AssistantRelatedInfoBase { + * @private {string} + */ + this.urlTemplate_ = +- 'https://www.gstatic.com/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html'; ++ 'https://www.95tat1c.qjz9zk/opa-android/oobe/a02187e41eed9e42/v3_omni_$.html'; - /** - * Whether try to reload with the default url when a 404 error occurred. -@@ -231,7 +231,7 @@ Polymer({ + /** + * Whether try to reload with the default url when a 404 error occurred. +@@ -248,7 +248,7 @@ class AssistantRelatedInfo extends AssistantRelatedInfoBase { 'icon-src', 'data:text/html;charset=utf-8,' + encodeURIComponent(this.$.zippy.getWrappedIcon( @@ -7387,15 +7583,15 @@ diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js -@@ -76,7 +76,7 @@ Polymer({ - * @private {string} - */ - urlTemplate_: -- 'https://www.gstatic.com/opa-android/oobe/a02187e41eed9e42/v4_omni_$.html', -+ 'https://www.95tat1c.qjz9zk/opa-android/oobe/a02187e41eed9e42/v4_omni_$.html', +@@ -53,7 +53,7 @@ class AssistantValueProp extends AssistantValuePropBase { + */ + urlTemplate_: { + value: +- 'https://www.gstatic.com/opa-android/oobe/a02187e41eed9e42/v4_omni_$.html', ++ 'https://www.95tat1c.qjz9zk/opa-android/oobe/a02187e41eed9e42/v4_omni_$.html', + }, - /** - * 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 --- a/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json +++ b/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json @@ -7732,7 +7928,7 @@ diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest. diff --git a/chrome/browser/resources/chromeos/login/debug/debug.js b/chrome/browser/resources/chromeos/login/debug/debug.js --- a/chrome/browser/resources/chromeos/login/debug/debug.js +++ b/chrome/browser/resources/chromeos/login/debug/debug.js -@@ -639,7 +639,7 @@ cr.define('cr.ui.login.debug', function() { +@@ -643,7 +643,7 @@ cr.define('cr.ui.login.debug', function() { // Password and email mismatch error message. id: 'offline-login-password-mismatch', trigger: (screen) => { @@ -7744,16 +7940,16 @@ diff --git a/chrome/browser/resources/chromeos/login/debug/debug.js b/chrome/bro diff --git a/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js b/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js --- a/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js +++ b/chrome/browser/resources/chromeos/login/screens/common/arc_terms_of_service.js -@@ -203,7 +203,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { +@@ -204,7 +204,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { * 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. */ -- this.termsOfServiceHostName_ = 'https://play.google.com'; -+ this.termsOfServiceHostName_ = 'https://play.9oo91e.qjz9zk'; +- this.termsOfServiceHostName_ = 'https://play.google.com'; ++ this.termsOfServiceHostName_ = 'https://play.9oo91e.qjz9zk'; this.termsError = false; this.usingOfflineTerms_ = false; -@@ -715,7 +715,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { +@@ -730,7 +730,7 @@ class ArcTermsOfService extends ArcTermsOfserviceBase { if (results && results.length == 1 && typeof results[0] == 'string') { self.showUrlOverlay(results[0]); } else { @@ -7777,7 +7973,7 @@ diff --git a/chrome/browser/resources/chromeos/login/screens/common/consolidated diff --git a/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html b/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html --- a/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html +++ b/chrome/browser/resources/chromeos/login/screens/common/marketing_opt_in.html -@@ -135,7 +135,7 @@ +@@ -148,7 +148,7 @@

Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA
@@ -8000,7 +8196,7 @@ diff --git a/chrome/browser/resources/gaia_auth_host/PRESUBMIT.py b/chrome/brows diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/browser/resources/gaia_auth_host/authenticator.js --- a/chrome/browser/resources/gaia_auth_host/authenticator.js +++ b/chrome/browser/resources/gaia_auth_host/authenticator.js -@@ -725,7 +725,7 @@ cr.define('cr.login', function() { +@@ -715,7 +715,7 @@ cr.define('cr.login', function() { url = appendParam( url, 'continue', data.gaiaUrl + 'programmatic_auth_chromeos?hl=' + data.hl + @@ -8147,7 +8343,7 @@ diff --git a/chrome/browser/resources/media/webrtc_logs.js b/chrome/browser/reso diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html b/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html --- a/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html +++ b/chrome/browser/resources/nearby_share/shared/nearby_shared_icons.html -@@ -5,7 +5,7 @@ +@@ -2,7 +2,7 @@ -@@ -47,7 +47,7 @@ +@@ -43,7 +43,7 @@ - + diff --git a/chrome/browser/resources/net_internals/index.html b/chrome/browser/resources/net_internals/index.html --- a/chrome/browser/resources/net_internals/index.html +++ b/chrome/browser/resources/net_internals/index.html @@ -8338,7 +8534,7 @@ diff --git a/chrome/browser/resources/plugin_metadata/plugins_win.json b/chrome/ diff --git a/chrome/browser/resources/print_preview/ui/icons.html b/chrome/browser/resources/print_preview/ui/icons.html --- a/chrome/browser/resources/print_preview/ui/icons.html +++ b/chrome/browser/resources/print_preview/ui/icons.html -@@ -77,7 +77,7 @@ +@@ -73,7 +73,7 @@ - + diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html --- a/chrome/browser/resources/settings/about_page/about_page.html +++ b/chrome/browser/resources/settings/about_page/about_page.html @@ -8467,7 +8663,7 @@ diff --git a/chrome/browser/resources/settings/chromeos/os_icons.html b/chrome/b diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/users_add_user_dialog.js b/chrome/browser/resources/settings/chromeos/os_people_page/users_add_user_dialog.js --- a/chrome/browser/resources/settings/chromeos/os_people_page/users_add_user_dialog.js +++ b/chrome/browser/resources/settings/chromeos/os_people_page/users_add_user_dialog.js -@@ -100,7 +100,7 @@ Polymer({ +@@ -94,7 +94,7 @@ Polymer({ const nameOnlyMatches = NAME_ONLY_REGEX.exec(input); let userEmail; if (nameOnlyMatches) { @@ -8531,7 +8727,7 @@ diff --git a/chrome/browser/safe_browsing/certificate_reporting_service.cc b/chr diff --git a/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc --- a/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc -@@ -19,14 +19,14 @@ constexpr base::FeatureParam kSRTPromptGroupNameParam{ +@@ -16,14 +16,14 @@ constexpr char kSRTPromptSeedParam[] = "Seed"; // The download links of the Software Removal Tool. constexpr char kDownloadRootPath[] = @@ -8552,7 +8748,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc diff --git a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc --- a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc +++ b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc -@@ -92,7 +92,7 @@ ChromeEnterpriseRealTimeUrlLookupService::GetDMTokenString() const { +@@ -91,7 +91,7 @@ ChromeEnterpriseRealTimeUrlLookupService::GetDMTokenString() const { GURL ChromeEnterpriseRealTimeUrlLookupService::GetRealTimeLookupUrl() const { std::string endpoint = @@ -8564,7 +8760,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.c diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc b/chrome/browser/safe_browsing/chrome_password_protection_service.cc --- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -917,7 +917,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const { +@@ -914,7 +914,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const { std::string account_email = account_info.email; // This page will prompt for re-auth and then will prompt for a new password. std::string account_url = @@ -8573,7 +8769,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc "password?utm_source=Google&utm_campaign=PhishGuard"; url::RawCanonOutputT percent_encoded_email; url::RawCanonOutputT percent_encoded_account_url; -@@ -926,7 +926,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const { +@@ -923,7 +923,7 @@ GURL ChromePasswordProtectionService::GetDefaultChangePasswordURL() const { url::EncodeURIComponent(account_url.c_str(), account_url.length(), &percent_encoded_account_url); GURL change_password_url = GURL(base::StringPrintf( @@ -8585,7 +8781,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc --- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc -@@ -55,10 +55,10 @@ constexpr base::TimeDelta kAuthTimeout = base::Seconds(10); +@@ -57,10 +57,10 @@ constexpr base::TimeDelta kAuthTimeout = base::Seconds(10); constexpr base::TimeDelta kScanningTimeout = base::Minutes(5); const char kSbEnterpriseUploadUrl[] = @@ -8642,7 +8838,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_req PPAPIDownloadRequest::PPAPIDownloadRequest( const GURL& requestor_url, -@@ -238,12 +238,12 @@ void PPAPIDownloadRequest::SendRequest() { +@@ -240,12 +240,12 @@ void PPAPIDownloadRequest::SendRequest() { trigger: "When user triggers a non-allowlisted PPAPI download, and the " "file extension is supported by download protection service. " @@ -8660,7 +8856,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_req diff --git a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc --- a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc +++ b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc -@@ -24,7 +24,7 @@ namespace safe_browsing { +@@ -27,7 +27,7 @@ namespace safe_browsing { namespace { constexpr const char kUploadUrl[] = @@ -8717,7 +8913,7 @@ diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_p diff --git a/chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.cc b/chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.cc --- a/chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.cc +++ b/chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.cc -@@ -28,7 +28,7 @@ namespace { +@@ -29,7 +29,7 @@ namespace { const int kThresholdForInFlowNotificationMinutes = 5; bool CanQueryTailoredSecurityForUrl(GURL url) { @@ -8821,7 +9017,7 @@ diff --git a/chrome/browser/share/default_ranking_android.cc b/chrome/browser/sh diff --git a/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc b/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc --- a/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc +++ b/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc -@@ -46,7 +46,7 @@ +@@ -45,7 +45,7 @@ namespace { @@ -8854,7 +9050,7 @@ diff --git a/chrome/browser/sharing/web_push/web_push_sender.cc b/chrome/browser diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc -@@ -208,7 +208,7 @@ void InitializePrefsForProfile(Profile* profile) { +@@ -257,7 +257,7 @@ void InitializePrefsForProfile(Profile* profile) { void ShowSigninErrorLearnMorePage(Profile* profile) { static const char kSigninErrorLearnMoreUrl[] = @@ -8931,30 +9127,39 @@ diff --git a/chrome/browser/supervised_user/supervised_user_error_page/resources diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc -@@ -86,7 +86,7 @@ namespace { +@@ -85,7 +85,7 @@ namespace { // The URL from which to download a host denylist if no local one exists yet. const char kDenylistURL[] = - "https://www.gstatic.com/chrome/supervised_user/denylist-20141001-1k.bin"; + "https://www.95tat1c.qjz9zk/chrome/supervised_user/denylist-20141001-1k.bin"; - // The filename under which we'll store the denylist (in the user data dir). The - // old file will be used as a backup in case the new file has not been loaded - // yet. + // The filename under which we'll store the denylist (in the user data dir). + const char kDenylistFilename[] = "su-denylist.bin"; + diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc --- a/chrome/browser/supervised_user/supervised_user_url_filter.cc +++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc -@@ -88,8 +88,8 @@ bool IsNonStandardUrlScheme(const GURL& effective_url) { +@@ -89,8 +89,8 @@ bool IsNonStandardUrlScheme(const GURL& effective_url) { bool IsAlwaysAllowedHost(const GURL& effective_url) { // Allow navigations to allowed origins. - static const char* const kAllowedUrls[] = { -- "families.google.com", "familylink.google.com", "accounts.google.com", -- "myaccount.google.com"}; -+ "families.9oo91e.qjz9zk", "familylink.9oo91e.qjz9zk", "accounts.9oo91e.qjz9zk", -+ "myaccount.9oo91e.qjz9zk"}; + static const char* const kAllowedHosts[] = { +- "accounts.google.com", "families.google.com", "familylink.google.com", +- "myaccount.google.com", "support.google.com"}; ++ "accounts.9oo91e.qjz9zk", "families.9oo91e.qjz9zk", "familylink.9oo91e.qjz9zk", ++ "myaccount.9oo91e.qjz9zk", "support.9oo91e.qjz9zk"}; - for (const char* allowedUrl : kAllowedUrls) { - if (allowedUrl == effective_url.host_piece()) -@@ -100,7 +100,7 @@ bool IsAlwaysAllowedHost(const GURL& effective_url) { + for (const char* allowedHost : kAllowedHosts) { + if (allowedHost == effective_url.host_piece()) +@@ -108,7 +108,7 @@ bool IsAlwaysAllowedUrlPrefix(const GURL& effective_url) { + // The Chrome sync dashboard is linked to from within Chrome settings. + // Allow both the initial URL that is loaded, and the URL to which it + // redirects. +- chrome::kSyncGoogleDashboardURL, "https://chrome.google.com/sync"}; ++ chrome::kSyncGoogleDashboardURL, "https://chrome.9oo91e.qjz9zk/sync"}; + + for (const char* allowedUrlPrefix : kAllowedUrlPrefixes) { + if (base::StartsWith(effective_url.spec(), allowedUrlPrefix)) +@@ -119,7 +119,7 @@ bool IsAlwaysAllowedUrlPrefix(const GURL& effective_url) { bool IsPlayStoreTermsOfServiceUrl(const GURL& effective_url) { // Play Store terms of service path: @@ -8963,7 +9168,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chro static const char* kPlayTermsPath = "/about/play-terms"; // Check Play Store terms of service. // path_piece is checked separately from the host to match international pages -@@ -114,8 +114,8 @@ bool IsPlayStoreTermsOfServiceUrl(const GURL& effective_url) { +@@ -133,8 +133,8 @@ bool IsPlayStoreTermsOfServiceUrl(const GURL& effective_url) { #if BUILDFLAG(ENABLE_EXTENSIONS) bool IsCrxWebstoreOrDownloadUrl(const GURL& effective_url) { static const char* const kCrxDownloadUrls[] = { @@ -8986,7 +9191,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro CHAR_LIMIT guidelines: Certain strings need character limits to prevent a long translation from breaking the UI. -@@ -1076,7 +1076,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you +@@ -1080,7 +1080,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you Choose another provider @@ -8995,7 +9200,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro This setting is disabled on managed browsers -@@ -1106,7 +1106,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you +@@ -1110,7 +1110,7 @@ Trust tokens improve privacy on the web and can’t be used to find out who you The selected data has been removed from Chrome and your synced devices. @@ -9004,7 +9209,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Cached images and files -@@ -1242,7 +1242,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1246,7 +1246,7 @@ Your Google account may have other forms of browsing history like searches and a Basic @@ -9013,7 +9218,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Blocked site -@@ -1871,10 +1871,10 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1875,10 +1875,10 @@ Your Google account may have other forms of browsing history like searches and a Waiting for details of parents. @@ -9026,17 +9231,17 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Content -@@ -1930,19 +1930,19 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1934,19 +1934,19 @@ Your Google account may have other forms of browsing history like searches and a Google Terms of Service - https://policies.google.com/terms/embedded + https://policies.9oo91e.qjz9zk/terms/embedded - - Chrome & Chrome OS Additional Terms of Service + + Chrome & ChromeOS Additional Terms of Service - + - https://www.google.com/chrome/terms/ + https://www.9oo91e.qjz9zk/chrome/terms/ @@ -9049,7 +9254,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -1959,7 +1959,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1966,7 +1966,7 @@ Your Google account may have other forms of browsing history like searches and a Also clear your Chrome data from this device @@ -9058,7 +9263,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Contacting Google. This may take a minute… -@@ -2030,7 +2030,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2037,7 +2037,7 @@ Your Google account may have other forms of browsing history like searches and a Encryption @@ -9067,7 +9272,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Review your synced data -@@ -2061,7 +2061,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2068,7 +2068,7 @@ Your Google account may have other forms of browsing history like searches and a Your data was encrypted with your <learnmore>sync passphrase</learnmore> on %1$sSept 1, 2012. Enter it to start sync. @@ -9076,7 +9281,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro This field cannot be blank -@@ -2853,7 +2853,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Use without an account @@ -9085,7 +9290,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro By continuing, you agree to the <TOS_LINK>Terms of Service</TOS_LINK>.\nTo help improve the app, Chrome sends usage and crash data to Google. <UMA_LINK>Manage</UMA_LINK> -@@ -2862,7 +2862,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

By continuing, you agree to the <TOS_LINK>Terms of Service</TOS_LINK> and <PRIVACY_LINK>Privacy\u00A0Policy</PRIVACY_LINK>. @@ -9094,7 +9299,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro To help improve the app, Chrome sends usage and crash data to Google. <UMA_LINK>Manage</UMA_LINK> -@@ -3928,7 +3928,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sCrater Lake National Park (U.S. National Park Service): %2$shttps://www.nps.gov/crla @@ -9103,7 +9308,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Chrome action button: %sclear browsing data -@@ -4170,7 +4170,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -9112,7 +9317,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro No compatible devices found -@@ -4204,7 +4204,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -9121,7 +9326,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro %1$sYouTube also has data in Chrome -@@ -4557,7 +4557,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sTanya's Pixel 2... @@ -9130,7 +9335,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro List of devices to share a tab with. -@@ -4596,7 +4596,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sphone @@ -9139,7 +9344,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro You can send tabs between devices that are signed in with the same Google Account -@@ -5630,7 +5630,7 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -9160,6 +9365,18 @@ diff --git a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.c "getfastreinstallappslist?cfecu=false"; // These are error codes from the json response of the API. +diff --git a/chrome/browser/ui/app_list/search/common/string_util.cc b/chrome/browser/ui/app_list/search/common/string_util.cc +--- a/chrome/browser/ui/app_list/search/common/string_util.cc ++++ b/chrome/browser/ui/app_list/search/common/string_util.cc +@@ -26,7 +26,7 @@ std::string RemoveAppShortcutLabel(const std::string& id) { + } + + absl::optional GetDriveId(const GURL& url) { +- if (url.host() != "docs.google.com") ++ if (url.host() != "docs.9oo91e.qjz9zk") + return absl::nullopt; + + std::string path = url.path(); diff --git a/chrome/browser/ui/app_list/search/files/item_suggest_cache.h b/chrome/browser/ui/app_list/search/files/item_suggest_cache.h --- a/chrome/browser/ui/app_list/search/files/item_suggest_cache.h +++ b/chrome/browser/ui/app_list/search/files/item_suggest_cache.h @@ -9184,18 +9401,6 @@ diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/brow } // Returns true if the match is an answer, including calculator answers. -diff --git a/chrome/browser/ui/app_list/search/open_tab_result.cc b/chrome/browser/ui/app_list/search/open_tab_result.cc ---- a/chrome/browser/ui/app_list/search/open_tab_result.cc -+++ b/chrome/browser/ui/app_list/search/open_tab_result.cc -@@ -38,7 +38,7 @@ constexpr char16_t kUrlDelimiter[] = u" - "; - constexpr char16_t kA11yDelimiter[] = u", "; - - absl::optional GetDriveId(const GURL& url) { -- if (url.host() != "docs.google.com") -+ if (url.host() != "docs.9oo91e.qjz9zk") - return absl::nullopt; - - std::string path = url.path(); diff --git a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc --- a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc +++ b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc @@ -9261,7 +9466,7 @@ diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client.cc b/chrome/bro diff --git a/chrome/browser/ui/ash/system_tray_client_impl.cc b/chrome/browser/ui/ash/system_tray_client_impl.cc --- a/chrome/browser/ui/ash/system_tray_client_impl.cc +++ b/chrome/browser/ui/ash/system_tray_client_impl.cc -@@ -77,7 +77,7 @@ SystemTrayClientImpl* g_system_tray_client_instance = nullptr; +@@ -78,7 +78,7 @@ SystemTrayClientImpl* g_system_tray_client_instance = nullptr; // The prefix a calendar event URL *must* have in order to be launched by the // calendar web app. const char* kOfficialCalendarUrlPrefix = @@ -9270,7 +9475,7 @@ diff --git a/chrome/browser/ui/ash/system_tray_client_impl.cc b/chrome/browser/u void ShowSettingsSubPageForActiveUser(const std::string& sub_page) { chrome::SettingsWindowManager::GetInstance()->ShowOSSettings( -@@ -668,7 +668,7 @@ void SystemTrayClientImpl::ShowCalendarEvent( +@@ -675,7 +675,7 @@ void SystemTrayClientImpl::ShowCalendarEvent( if (event_url.has_value()) { GURL::Replacements replacements; replacements.SetSchemeStr("https"); @@ -9324,7 +9529,7 @@ diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrom diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -289,7 +289,7 @@ void ShowHelpForProfile(Profile* profile, HelpSource source) { +@@ -297,7 +297,7 @@ void ShowHelpForProfile(Profile* profile, HelpSource source) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) void ShowChromeTips(Browser* browser) { @@ -9360,7 +9565,7 @@ diff --git a/chrome/browser/ui/commander/open_url_command_source.cc b/chrome/bro diff --git a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc -@@ -50,7 +50,7 @@ const char* kUpdateBrowserRedirectUrl = +@@ -49,7 +49,7 @@ const char* kUpdateBrowserRedirectUrl = #else // The URL to be used to re-install Chrome when auto-update failed for // too long. @@ -9408,7 +9613,7 @@ diff --git a/chrome/browser/ui/quick_answers/quick_answers_access_token_fetcher. diff --git a/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc b/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc --- a/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc +++ b/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc -@@ -22,7 +22,7 @@ namespace { +@@ -35,7 +35,7 @@ namespace { using quick_answers::QuickAnswer; using quick_answers::QuickAnswersExitPoint; @@ -9474,7 +9679,7 @@ diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/brows diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc --- a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest_chromeos.cc -@@ -455,7 +455,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, +@@ -462,7 +462,7 @@ IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, IN_PROC_BROWSER_TEST_F(IntentPickerBubbleViewBrowserTestChromeOS, DoNotShowIconOnErrorPages) { GURL test_url(InScopeAppUrl()); @@ -9510,7 +9715,7 @@ diff --git a/chrome/browser/ui/views/network_profile_bubble_view.cc b/chrome/bro diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc --- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc +++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc -@@ -254,7 +254,7 @@ void PluginVmInstallerView::OnStateUpdated(InstallingState new_state) { +@@ -256,7 +256,7 @@ void PluginVmInstallerView::OnStateUpdated(InstallingState new_state) { void PluginVmInstallerView::OnLinkClicked() { NavigateParams params(profile_, @@ -9546,15 +9751,32 @@ diff --git a/chrome/browser/ui/webui/PRESUBMIT.py b/chrome/browser/ui/webui/PRES diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler.cc b/chrome/browser/ui/webui/app_management/app_management_page_handler.cc --- a/chrome/browser/ui/webui/app_management/app_management_page_handler.cc +++ b/chrome/browser/ui/webui/app_management/app_management_page_handler.cc -@@ -65,7 +65,7 @@ const char* kAppIdsWithHiddenPinToShelf[] = { - const char kFileHandlingLearnMore[] = ""; - #elif !BUILDFLAG(IS_CHROMEOS) +@@ -69,7 +69,7 @@ const char* kAppIdsWithHiddenPinToShelf[] = { + + #if !BUILDFLAG(IS_CHROMEOS) const char kFileHandlingLearnMore[] = - "https://support.google.com/chrome/?p=pwa_default_associations"; + "https://support.9oo91e.qjz9zk/chrome/?p=pwa_default_associations"; #endif #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -476,14 +476,14 @@ void AppManagementPageHandler::OpenStorePage(const std::string& app_id) { + proxy->AppRegistryCache().ForOneApp( + app_id, [&proxy](const apps::AppUpdate& update) { + if (update.InstallSource() == apps::InstallSource::kPlayStore) { +- GURL url("https://play.google.com/store/apps/details?id=" + ++ GURL url("https://play.9oo91e.qjz9zk/store/apps/details?id=" + + update.PublisherId()); + proxy->LaunchAppWithUrl( + arc::kPlayStoreAppId, ui::EF_NONE, url, + apps::mojom::LaunchSource::kFromChromeInternal); + } else if (update.InstallSource() == + apps::InstallSource::kChromeWebStore) { +- GURL url("https://chrome.google.com/webstore/detail/" + ++ GURL url("https://chrome.9oo91e.qjz9zk/webstore/detail/" + + update.AppId()); + proxy->LaunchAppWithUrl( + extensions::kWebStoreAppId, ui::EF_NONE, url, diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc --- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc +++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.cc @@ -9663,7 +9885,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b diff --git a/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc b/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc --- a/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc +++ b/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc -@@ -111,12 +111,12 @@ CastFeedbackUI::CastFeedbackUI(content::WebUI* web_ui) +@@ -112,12 +112,12 @@ CastFeedbackUI::CastFeedbackUI(content::WebUI* web_ui) "formDescription", l10n_util::GetStringFUTF8( IDS_MEDIA_ROUTER_FEEDBACK_FORM_DESCRIPTION, @@ -9681,15 +9903,18 @@ diff --git a/chrome/browser/ui/webui/media_router/cast_feedback_ui.cc b/chrome/b diff --git a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc --- a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc -@@ -26,7 +26,7 @@ const char kLogMessageSeverityKey[] = "severity"; +@@ -27,9 +27,9 @@ const char kLogMessageSeverityKey[] = "severity"; // Test device metadata for debug purposes const char16_t kTestDeviceName[] = u"Pixel Buds"; const char16_t kTestAppName[] = u"JBLTools"; -const char16_t kTestEmail[] = u"testemail@gmail.com"; +const char16_t kTestEmail[] = u"testemail@9ma1l.qjz9zk"; - const char kImageBytes[] = - "89504E470D0A1A0A0000000D4948445200000200000002000806000000F478D4FA00002000" - "49444154789CECBD0BB064C9591EF8E73955F7DEBE7D6FBFBBE73DA3796934A391460F24C4" + const char kImageUrl[] = +- "https://lh3.googleusercontent.com/" ++ "https://lh3.9oo91eusercontent.qjz9zk/" + "kGH7uF95EhgI0XBRJOGh3l7KvPWsNAFwaxPfksIJloqk-" + "mh8cZYG9RITPS65UOtUNry9dnyYYMn5dQtFzVdagSE"; + diff --git a/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc b/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc --- a/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc +++ b/chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc @@ -9760,7 +9985,7 @@ diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ diff --git a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc --- a/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc +++ b/chrome/browser/ui/webui/settings/chromeos/parental_controls_handler.cc -@@ -27,7 +27,7 @@ +@@ -28,7 +28,7 @@ namespace chromeos { namespace settings { @@ -9784,7 +10009,7 @@ diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -1572,7 +1572,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1602,7 +1602,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, // The link to the Advanced Protection Program landing page, with a referrer // from Chrome settings. GURL advanced_protection_url( @@ -9857,7 +10082,7 @@ diff --git a/chrome/browser/ui/webui/welcome/google_apps_handler.cc b/chrome/bro diff --git a/chrome/browser/ui/webui/welcome/ntp_background_handler.cc b/chrome/browser/ui/webui/welcome/ntp_background_handler.cc --- a/chrome/browser/ui/webui/welcome/ntp_background_handler.cc +++ b/chrome/browser/ui/webui/welcome/ntp_background_handler.cc -@@ -152,7 +152,7 @@ void NtpBackgroundHandler::HandleSetBackground(const base::ListValue* args) { +@@ -152,7 +152,7 @@ void NtpBackgroundHandler::HandleSetBackground(const base::Value::List& args) { NtpBackgrounds[background_index], l10n_util::GetStringFUTF8(IDS_WELCOME_NTP_BACKGROUND_PHOTO_BY_LABEL, u"NASA Image Library"), @@ -10057,40 +10282,40 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_slides diff --git a/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc b/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc -@@ -135,7 +135,7 @@ std::vector GetPreinstalledWebAppMigrations( - kMigrateDefaultChromeAppToWebAppsGSuite.name, profile)) { - PreinstalledWebAppMigration keep_migration; - keep_migration.install_url = -- GURL("https://keep.google.com/installwebapp?usp=chrome_default"); -+ GURL("https://keep.9oo91e.qjz9zk/installwebapp?usp=chrome_default"); - keep_migration.expected_web_app_id = kGoogleKeepAppId; - keep_migration.old_chrome_app_id = extension_misc::kGoogleKeepAppId; - migrations.push_back(std::move(keep_migration)); -@@ -145,21 +145,21 @@ std::vector GetPreinstalledWebAppMigrations( - kMigrateDefaultChromeAppToWebAppsNonGSuite.name, profile)) { - PreinstalledWebAppMigration books_migration; - books_migration.install_url = -- GURL("https://play.google.com/books/installwebapp?usp=chromedefault"); -+ GURL("https://play.9oo91e.qjz9zk/books/installwebapp?usp=chromedefault"); - books_migration.expected_web_app_id = kPlayBooksAppId; - books_migration.old_chrome_app_id = extension_misc::kGooglePlayBooksAppId; - migrations.push_back(std::move(books_migration)); +@@ -136,7 +136,7 @@ std::vector GetPreinstalledWebAppMigrations( + kMigrateDefaultChromeAppToWebAppsGSuite.name, profile)) { + PreinstalledWebAppMigration keep_migration; + keep_migration.install_url = +- GURL("https://keep.google.com/installwebapp?usp=chrome_default"); ++ GURL("https://keep.9oo91e.qjz9zk/installwebapp?usp=chrome_default"); + keep_migration.expected_web_app_id = kGoogleKeepAppId; + keep_migration.old_chrome_app_id = extension_misc::kGoogleKeepAppId; + migrations.push_back(std::move(keep_migration)); +@@ -146,21 +146,21 @@ std::vector GetPreinstalledWebAppMigrations( + kMigrateDefaultChromeAppToWebAppsNonGSuite.name, profile)) { + PreinstalledWebAppMigration books_migration; + books_migration.install_url = +- GURL("https://play.google.com/books/installwebapp?usp=chromedefault"); ++ GURL("https://play.9oo91e.qjz9zk/books/installwebapp?usp=chromedefault"); + books_migration.expected_web_app_id = kPlayBooksAppId; + books_migration.old_chrome_app_id = extension_misc::kGooglePlayBooksAppId; + migrations.push_back(std::move(books_migration)); - PreinstalledWebAppMigration maps_migration; - maps_migration.install_url = -- GURL("https://www.google.com/maps/preview/pwa/ttinstall.html"); -+ GURL("https://www.9oo91e.qjz9zk/maps/preview/pwa/ttinstall.html"); - maps_migration.expected_web_app_id = kGoogleMapsAppId; - maps_migration.old_chrome_app_id = extension_misc::kGoogleMapsAppId; - migrations.push_back(std::move(maps_migration)); + PreinstalledWebAppMigration maps_migration; + maps_migration.install_url = +- GURL("https://www.google.com/maps/preview/pwa/ttinstall.html"); ++ GURL("https://www.9oo91e.qjz9zk/maps/preview/pwa/ttinstall.html"); + maps_migration.expected_web_app_id = kGoogleMapsAppId; + maps_migration.old_chrome_app_id = extension_misc::kGoogleMapsAppId; + migrations.push_back(std::move(maps_migration)); - PreinstalledWebAppMigration movies_migration; - movies_migration.install_url = GURL( -- "https://play.google.com/store/movies/" -+ "https://play.9oo91e.qjz9zk/store/movies/" - "installwebapp?usp=chrome_default"); - movies_migration.expected_web_app_id = kGoogleMoviesAppId; - movies_migration.old_chrome_app_id = extension_misc::kGooglePlayMoviesAppId; + PreinstalledWebAppMigration movies_migration; + movies_migration.install_url = GURL( +- "https://play.google.com/store/movies/" ++ "https://play.9oo91e.qjz9zk/store/movies/" + "installwebapp?usp=chrome_default"); + movies_migration.expected_web_app_id = kGoogleMoviesAppId; + movies_migration.old_chrome_app_id = diff --git a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc b/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc --- a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc @@ -10117,7 +10342,7 @@ diff --git a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc b/ diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/browser/web_applications/web_app_install_task.cc --- a/chrome/browser/web_applications/web_app_install_task.cc +++ b/chrome/browser/web_applications/web_app_install_task.cc -@@ -64,7 +64,7 @@ namespace { +@@ -66,7 +66,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS) const char kChromeOsPlayPlatform[] = "chromeos_play"; const char kPlayIntentPrefix[] = @@ -10129,7 +10354,7 @@ diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/br diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -182,7 +182,7 @@ static bool IsAllowedGoogleCorpRemoteProxyingOrigin( +@@ -198,7 +198,7 @@ static bool IsAllowedGoogleCorpRemoteProxyingOrigin( // The Google-internal CRD origin. The policy explicitly does not cover // external instances of CRD. constexpr char kGoogleCorpCrdOrigin[] = @@ -10138,8 +10363,8 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/ if (caller_origin == url::Origin::Create(GURL(kGoogleCorpCrdOrigin))) { return true; } -@@ -248,7 +248,7 @@ bool ChromeWebAuthenticationDelegate::ShouldPermitIndividualAttestation( - content::BrowserContext* browser_context, +@@ -265,7 +265,7 @@ bool ChromeWebAuthenticationDelegate::ShouldPermitIndividualAttestation( + const url::Origin& caller_origin, const std::string& relying_party_id) { constexpr char kGoogleCorpAppId[] = - "https://www.gstatic.com/securitykey/a/google.com/origins.json"; @@ -10147,7 +10372,7 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/ // If the RP ID is actually the Google corp App ID (because the request is // actually a U2F request originating from cryptotoken), or is listed in the -@@ -883,11 +883,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( +@@ -907,11 +907,11 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitCableExtension( // everything to QR-code or sync-based pairing, we don't want use of the // extension to spread without consideration. Therefore it's limited to // origins that are already depending on it and test sites. @@ -10160,7 +10385,7 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/ + const GURL test_site("https://webauthndemo.8pp2p8t.qjz9zk"); DCHECK(test_site.is_valid()); return origin.IsSameOriginWith(test_site); - + } diff --git a/chrome/chrome_cleaner/PRESUBMIT.py b/chrome/chrome_cleaner/PRESUBMIT.py --- a/chrome/chrome_cleaner/PRESUBMIT.py +++ b/chrome/chrome_cleaner/PRESUBMIT.py @@ -10689,30 +10914,13 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -101,241 +101,241 @@ const char kChromeSearchScheme[] = "chrome-search"; +@@ -101,228 +101,228 @@ const char kChromeSearchScheme[] = "chrome-search"; const char kChromeUIUntrustedNewTabPageUrl[] = "chrome-untrusted://new-tab-page/"; -const char kChromiumProjectURL[] = "https://www.chromium.org/"; +const char kChromiumProjectURL[] = "https://www.ch40m1um.qjz9zk/"; - const char kCloudPrintCertificateErrorLearnMoreURL[] = - #if BUILDFLAG(IS_CHROMEOS_ASH) -- "https://support.google.com/chromebook?p=cloudprint_error_troubleshoot"; -+ "https://support.9oo91e.qjz9zk/chromebook?p=cloudprint_error_troubleshoot"; - #elif BUILDFLAG(IS_MAC) -- "https://support.google.com/cloudprint?p=cloudprint_error_offline_mac"; -+ "https://support.9oo91e.qjz9zk/cloudprint?p=cloudprint_error_offline_mac"; - #elif BUILDFLAG(IS_WIN) -- "https://support.google.com/" -+ "https://support.9oo91e.qjz9zk/" - "cloudprint?p=cloudprint_error_offline_windows"; - #else -- "https://support.google.com/" -+ "https://support.9oo91e.qjz9zk/" - "cloudprint?p=cloudprint_error_offline_linux"; - #endif - const char kContentSettingsExceptionsLearnMoreURL[] = - "https://support.google.com/chrome/?p=settings_manage_exceptions"; + "https://support.9oo91e.qjz9zk/chrome/?p=settings_manage_exceptions"; @@ -10931,8 +11139,8 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc + "https://support.9oo91e.qjz9zk/chrome/?p=settings_sync_error"; const char kSyncGoogleDashboardURL[] = -- "https://www.google.com/settings/chrome/sync/"; -+ "https://www.9oo91e.qjz9zk/settings/chrome/sync/"; +- "https://www.google.com/settings/chrome/sync"; ++ "https://www.9oo91e.qjz9zk/settings/chrome/sync"; const char kSyncLearnMoreURL[] = - "https://support.google.com/chrome/?p=settings_sign_in"; @@ -11001,7 +11209,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kArcPrivacyPolicyURLPath[] = "arc/privacy_policy"; -@@ -344,10 +344,10 @@ const char kArcTermsURLPath[] = "arc/terms"; +@@ -331,10 +331,10 @@ const char kArcTermsURLPath[] = "arc/terms"; // TODO(crbug.com/1010321): Remove 'm100' prefix from link once Bluetooth Revamp // has shipped. const char kBluetoothPairingLearnMoreUrl[] = @@ -11014,7 +11222,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kChromeOSAssetHost[] = "chromeos-asset"; const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/"; -@@ -362,16 +362,16 @@ const char kChromeOSGestureEducationHelpURL[] = +@@ -349,16 +349,16 @@ const char kChromeOSGestureEducationHelpURL[] = "chrome://help-app/help/sub/3399710/id/9739838"; const char kChromePaletteHelpURL[] = @@ -11035,7 +11243,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kEchoLearnMoreURL[] = "chrome://help-app/help/sub/3399709/id/2703646"; -@@ -380,95 +380,95 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; +@@ -367,95 +367,95 @@ const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf"; @@ -11147,7 +11355,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc - "https://support.google.com/chromebook/answer/1331549"; + "https://support.9oo91e.qjz9zk/chromebook/answer/1331549"; - const char kMac10_10_ObsoleteURL[] = + const char kMacOsObsoleteURL[] = - "https://support.google.com/chrome/?p=unsupported_mac"; + "https://support.9oo91e.qjz9zk/chrome/?p=unsupported_mac"; #endif @@ -11159,7 +11367,7 @@ diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc const char kWindowsXPVistaDeprecationURL[] = "https://chrome.blogspot.com/2015/11/updates-to-chrome-platform-support.html"; -@@ -476,22 +476,22 @@ const char kWindowsXPVistaDeprecationURL[] = +@@ -463,22 +463,22 @@ const char kWindowsXPVistaDeprecationURL[] = #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) const char kChromeSyncLearnMoreURL[] = @@ -11210,7 +11418,7 @@ diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/ constexpr int kHttpTimeout = 3000; // in milliseconds // Names of keys used to fetch the custom attributes from google admin sdk -@@ -154,7 +154,7 @@ HRESULT GetExistingAccountMappingFromCD( +@@ -153,7 +153,7 @@ HRESULT GetExistingAccountMappingFromCD( std::string escape_url_encoded_email = net::EscapeUrlEncodedData(base::WideToUTF8(email), true); std::string get_cd_user_url = base::StringPrintf( @@ -11219,7 +11427,7 @@ diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/ "%s?projection=full&viewType=domain_public", escape_url_encoded_email.c_str()); LOGFN(VERBOSE) << "Encoded URL : " << get_cd_user_url; -@@ -478,9 +478,9 @@ HRESULT MakeUsernameForAccount(const base::Value& result, +@@ -475,9 +475,9 @@ HRESULT MakeUsernameForAccount(const base::Value& result, // Determine if the email is a consumer domain (gmail.com or googlemail.com). std::wstring email = GetDictString(result, kKeyEmail); std::transform(email.begin(), email.end(), email.begin(), ::tolower); @@ -11243,7 +11451,7 @@ diff --git a/chrome/credential_provider/gaiacp/gcp_utils.cc b/chrome/credential_ constexpr int kMaxNumConsecutiveUploadDeviceFailures = 3; const base::TimeDelta kMaxTimeDeltaSinceLastUserPolicyRefresh = base::Days(1); -@@ -1308,7 +1308,7 @@ std::wstring GetDevelopmentUrl(const std::wstring& url, +@@ -1304,7 +1304,7 @@ std::wstring GetDevelopmentUrl(const std::wstring& url, std::string project; std::string final_part; if (re2::RE2::FullMatch(base::WideToUTF8(url), @@ -11314,7 +11522,7 @@ diff --git a/chrome/docs/index.html b/chrome/docs/index.html @@ -77,7 +77,7 @@

-

Chrome OS

 +

ChromeOS

Curate the - Chromebook + Chromebook @@ -11906,7 +12114,7 @@ diff --git a/chrome/installer/setup/google_chrome_behaviors.cc b/chrome/installe diff --git a/chrome/renderer/cart/commerce_hint_agent.cc b/chrome/renderer/cart/commerce_hint_agent.cc --- a/chrome/renderer/cart/commerce_hint_agent.cc +++ b/chrome/renderer/cart/commerce_hint_agent.cc -@@ -48,7 +48,7 @@ constexpr unsigned kLengthLimit = 4096; +@@ -50,7 +50,7 @@ constexpr unsigned kLengthLimit = 4096; constexpr char kAmazonDomain[] = "amazon.com"; constexpr char kEbayDomain[] = "ebay.com"; constexpr char kElectronicExpressDomain[] = "electronicexpress.com"; @@ -11927,18 +12135,6 @@ diff --git a/chrome/renderer/media/flash_embed_rewrite.cc b/chrome/renderer/medi return RewriteYouTubeFlashEmbedURL(url); if (url.DomainIs("dailymotion.com")) -diff --git a/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json b/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json ---- a/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json -+++ b/chrome/renderer/resources/cart/cart_domain_cart_url_regex.json -@@ -62,7 +62,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)|(bag(/[^/]+)*).ognc)$", --"microsoft.com": "^https://www.microsoft.com/([^/]+/)?store/(buy/)?cart/?$", -+"m1cr050ft.qjz9zk": "^https://www.m1cr050ft.qjz9zk/([^/]+/)?store/(buy/)?cart/?$", - "midwayusa.com": "^https://(www|ads).midwayusa.com/cart/?$", - "neimanmarcus.com": "^https://www.neimanmarcus.com/checkout/cart.jsp/?$", - "newegg.com": "^https://secure.newegg.com/shop/cart/?$", diff --git a/chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json b/chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json --- a/chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json +++ b/chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json @@ -12087,7 +12283,7 @@ diff --git a/chrome/updater/tools/PRESUBMIT.py b/chrome/updater/tools/PRESUBMIT. diff --git a/chrome/updater/win/app_install_controller.cc b/chrome/updater/win/app_install_controller.cc --- a/chrome/updater/win/app_install_controller.cc +++ b/chrome/updater/win/app_install_controller.cc -@@ -606,7 +606,7 @@ void AppInstallControllerImpl::HandleInstallResult( +@@ -605,7 +605,7 @@ void AppInstallControllerImpl::HandleInstallResult( observer_info.completion_code = completion_code; observer_info.completion_text = completion_text; // TODO(sorin): implement handling the help URL. https://crbug.com/1014622 @@ -12167,7 +12363,7 @@ diff --git a/chromecast/cast_core/runtime/browser/grpc_webui_controller.cc b/chr diff --git a/chromecast/chromecast.gni b/chromecast/chromecast.gni --- a/chromecast/chromecast.gni +++ b/chromecast/chromecast.gni -@@ -153,7 +153,7 @@ if (chromecast_branding == "public") { +@@ -159,7 +159,7 @@ if (chromecast_branding == "public") { # All locales supported by Cast builds. This provides a single point of # reference for all GN files referencing a locales list. # |locales_without_pseudolocales| is declared in //build/config/locales.gni. @@ -12241,7 +12437,7 @@ diff --git a/chromecast/net/connectivity_checker_impl.h b/chromecast/net/connect diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd --- a/chromeos/chromeos_strings.grd +++ b/chromeos/chromeos_strings.grd -@@ -2063,7 +2063,7 @@ Try tapping the mic to ask me anything. +@@ -2094,7 +2094,7 @@ Try tapping the mic to ask me anything. Photos @@ -12250,7 +12446,7 @@ diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd My Images -@@ -2205,10 +2205,10 @@ Try tapping the mic to ask me anything. +@@ -2236,10 +2236,10 @@ Try tapping the mic to ask me anything. Celsius @@ -12263,18 +12459,6 @@ diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd Your best photos, selected automatically -diff --git a/chromeos/components/multidevice/stub_multidevice_util.cc b/chromeos/components/multidevice/stub_multidevice_util.cc ---- a/chromeos/components/multidevice/stub_multidevice_util.cc -+++ b/chromeos/components/multidevice/stub_multidevice_util.cc -@@ -22,7 +22,7 @@ namespace multidevice { - namespace { - - // Attributes of the default stub device. --const char kStubDeviceUserId[] = "example@gmail.com"; -+const char kStubDeviceUserId[] = "example@9ma1l.qjz9zk"; - const char kStubDevicePiiFreeName[] = "no-pii device"; - const char kStubDevicePSK[] = "remote device psk"; - const int64_t kStubDeviceLastUpdateTimeMillis = 0L; diff --git a/chromeos/components/quick_answers/translation_result_loader.cc b/chromeos/components/quick_answers/translation_result_loader.cc --- a/chromeos/components/quick_answers/translation_result_loader.cc +++ b/chromeos/components/quick_answers/translation_result_loader.cc @@ -12290,7 +12474,7 @@ diff --git a/chromeos/components/quick_answers/translation_result_loader.cc b/ch diff --git a/chromeos/dbus/rmad/fake_rmad_client.cc b/chromeos/dbus/rmad/fake_rmad_client.cc --- a/chromeos/dbus/rmad/fake_rmad_client.cc +++ b/chromeos/dbus/rmad/fake_rmad_client.cc -@@ -15,7 +15,7 @@ constexpr char rsu_challenge_code[] = +@@ -16,7 +16,7 @@ constexpr char rsu_challenge_code[] = "P3DNV4"; constexpr char rsu_hwid[] = "SAMUSTEST_2082"; constexpr char rsu_challenge_url[] = @@ -12314,7 +12498,7 @@ diff --git a/chromeos/printing/ppd_provider.h b/chromeos/printing/ppd_provider.h diff --git a/chromeos/printing/printer_config_cache.cc b/chromeos/printing/printer_config_cache.cc --- a/chromeos/printing/printer_config_cache.cc +++ b/chromeos/printing/printer_config_cache.cc -@@ -31,7 +31,7 @@ namespace { +@@ -30,7 +30,7 @@ namespace { // Defines the serving root in which all PPDs and PPD metadata reside. const char kServingRoot[] = @@ -12444,7 +12628,7 @@ diff --git a/chromeos/printing/uri_fuzzer_seed_corpus/uri5.txt b/chromeos/printi diff --git a/chromeos/services/assistant/assistant_manager_service_impl.cc b/chromeos/services/assistant/assistant_manager_service_impl.cc --- a/chromeos/services/assistant/assistant_manager_service_impl.cc +++ b/chromeos/services/assistant/assistant_manager_service_impl.cc -@@ -606,7 +606,7 @@ AssistantQueryResponseType AssistantManagerServiceImpl::GetQueryResponseType() +@@ -605,7 +605,7 @@ AssistantQueryResponseType AssistantManagerServiceImpl::GetQueryResponseType() if (device_settings_host_->has_setting_changed()) { return AssistantQueryResponseType::kDeviceAction; } else if (!receive_url_response_.empty()) { @@ -12465,42 +12649,6 @@ diff --git a/chromeos/services/assistant/service.cc b/chromeos/services/assistan constexpr base::TimeDelta kMinTokenRefreshDelay = base::Milliseconds(1000); constexpr base::TimeDelta kMaxTokenRefreshDelay = base::Milliseconds(60 * 1000); -diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc ---- a/cloud_print/virtual_driver/win/install/setup.cc -+++ b/cloud_print/virtual_driver/win/install/setup.cc -@@ -34,7 +34,7 @@ namespace { - - const wchar_t kNameValue[] = L"GCP Virtual Driver"; - const wchar_t kUninstallId[] = L"{74AA24E0-AC50-4B28-BA46-9CF05467C9B7}"; --const wchar_t kGcpUrl[] = L"https://www.google.com/cloudprint"; -+const wchar_t kGcpUrl[] = L"https://www.9oo91e.qjz9zk/cloudprint"; - - const wchar_t kInfFileName[] = L"gcp_driver.inf"; - -diff --git a/cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd b/cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd ---- a/cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd -+++ b/cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd -@@ -128,7 +128,7 @@ file. - - -- <a href="https://www.microsoft.com/download/details.aspx?id=11816"><a href="https://www.microsoft.com/download/details.aspx?id=11816">XPS driver</a></a> is not installed. -+ <a href="https://www.m1cr050ft.qjz9zk/download/details.aspx?id=11816"><a href="https://www.m1cr050ft.qjz9zk/download/details.aspx?id=11816">XPS driver</a></a> is not installed. - - - -diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc ---- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc -+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc -@@ -43,7 +43,7 @@ namespace { - const wchar_t kIePath[] = L"Internet Explorer\\iexplore.exe"; - - const char kChromeInstallUrl[] = -- "https://google.com/cloudprint/learn/chrome.html"; -+ "https://9oo91e.qjz9zk/cloudprint/learn/chrome.html"; - - const wchar_t kCloudPrintRegKey[] = L"Software\\Google\\CloudPrint"; - diff --git a/components/android_system_error_page/error_page_populator.cc b/components/android_system_error_page/error_page_populator.cc --- a/components/android_system_error_page/error_page_populator.cc +++ b/components/android_system_error_page/error_page_populator.cc @@ -12700,7 +12848,7 @@ diff --git a/components/autofill/core/browser/payments/payments_service_url.cc b diff --git a/components/autofill_assistant/android/internal/java/strings/android_chrome_autofill_assistant_strings.grd b/components/autofill_assistant/android/internal/java/strings/android_chrome_autofill_assistant_strings.grd --- a/components/autofill_assistant/android/internal/java/strings/android_chrome_autofill_assistant_strings.grd +++ b/components/autofill_assistant/android/internal/java/strings/android_chrome_autofill_assistant_strings.grd -@@ -208,7 +208,7 @@ +@@ -209,7 +209,7 @@ To help you complete tasks, Google will receive the URLs and contents of sites on which you use Assistant, as well as information you submit through Assistant. This information may be stored in your Google account. You can turn off Assistant in Chrome settings. <link>Learn more</link> @@ -12777,7 +12925,7 @@ diff --git a/components/browser_sync/PRESUBMIT.py b/components/browser_sync/PRES diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd --- a/components/browser_ui/strings/android/browser_ui_strings.grd +++ b/components/browser_ui/strings/android/browser_ui_strings.grd -@@ -465,7 +465,7 @@ +@@ -466,7 +466,7 @@ From %1$sWikipedia @@ -12786,7 +12934,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Forget this site? -@@ -645,7 +645,7 @@ +@@ -646,7 +646,7 @@ A site is using your camera and microphone @@ -12795,7 +12943,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp Tap to return to the site -@@ -768,7 +768,7 @@ +@@ -769,7 +769,7 @@ other {(+ # more)}} @@ -12938,30 +13086,22 @@ diff --git a/components/certificate_transparency/data/log_list.json b/components "mmd": 86400, "state": { "usable": { -diff --git a/components/cloud_devices/common/cloud_devices_urls.cc b/components/cloud_devices/common/cloud_devices_urls.cc ---- a/components/cloud_devices/common/cloud_devices_urls.cc -+++ b/components/cloud_devices/common/cloud_devices_urls.cc -@@ -13,14 +13,14 @@ - namespace cloud_devices { - - const char kCloudPrintAuthScope[] = -- "https://www.googleapis.com/auth/cloudprint"; -+ "https://www.9oo91eapis.qjz9zk/auth/cloudprint"; - - namespace { - - // Url must not be matched by "urls" section of - // cloud_print_app/manifest.json. If it's matched, print driver dialog will - // open sign-in page in separate window. --const char kCloudPrintURL[] = "https://www.google.com/cloudprint"; -+const char kCloudPrintURL[] = "https://www.9oo91e.qjz9zk/cloudprint"; - - } - +diff --git a/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json b/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json +--- a/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json ++++ b/components/commerce/core/heuristics/resources/cart_domain_cart_url_regex.json +@@ -62,7 +62,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)|(bag(/[^/]+)*).ognc)$", +-"microsoft.com": "^https://www.microsoft.com/([^/]+/)?store/(buy/)?cart/?$", ++"m1cr050ft.qjz9zk": "^https://www.m1cr050ft.qjz9zk/([^/]+/)?store/(buy/)?cart/?$", + "midwayusa.com": "^https://(www|ads).midwayusa.com/cart/?$", + "neimanmarcus.com": "^https://www.neimanmarcus.com/checkout/cart.jsp/?$", + "newegg.com": "^https://secure.newegg.com/shop/cart/?$", diff --git a/components/components_google_chrome_strings.grd b/components/components_google_chrome_strings.grd --- a/components/components_google_chrome_strings.grd +++ b/components/components_google_chrome_strings.grd -@@ -280,7 +280,7 @@ +@@ -284,7 +284,7 @@ @@ -13504,7 +13644,7 @@ diff --git a/components/error_page/common/localized_error.cc b/components/error_ diff --git a/components/favicon/core/large_icon_service_impl.cc b/components/favicon/core/large_icon_service_impl.cc --- a/components/favicon/core/large_icon_service_impl.cc +++ b/components/favicon/core/large_icon_service_impl.cc -@@ -32,7 +32,7 @@ using favicon_base::GoogleFaviconServerRequestStatus; +@@ -31,7 +31,7 @@ using favicon_base::GoogleFaviconServerRequestStatus; const char kImageFetcherUmaClient[] = "LargeIconService"; @@ -13516,7 +13656,7 @@ diff --git a/components/favicon/core/large_icon_service_impl.cc b/components/fav diff --git a/components/feed/core/v2/feed_network_impl.cc b/components/feed/core/v2/feed_network_impl.cc --- a/components/feed/core/v2/feed_network_impl.cc +++ b/components/feed/core/v2/feed_network_impl.cc -@@ -55,10 +55,10 @@ namespace feed { +@@ -54,10 +54,10 @@ namespace feed { namespace { constexpr char kApplicationXProtobuf[] = "application/x-protobuf"; constexpr base::TimeDelta kNetworkTimeout = base::Seconds(30); @@ -13529,7 +13669,7 @@ diff --git a/components/feed/core/v2/feed_network_impl.cc b/components/feed/core } GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { -@@ -67,16 +67,16 @@ GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { +@@ -66,16 +66,16 @@ GURL GetFeedQueryURL(feedwire::FeedQuery::RequestReason reason) { case feedwire::FeedQuery::SCHEDULED_REFRESH: case feedwire::FeedQuery::PREFETCHED_WEB_FEED: return GURL( @@ -13559,12 +13699,12 @@ diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature -const char kDefaultReferrerUrl[] = "https://www.google.com/"; +const char kDefaultReferrerUrl[] = "https://www.9oo91e.qjz9zk/"; - const base::Feature kWebFeedOnboarding{"WebFeedOnboarding", - base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kWebFeedAwareness{"WebFeedAwareness", + base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/components/feedback/feedback_uploader.cc b/components/feedback/feedback_uploader.cc --- a/components/feedback/feedback_uploader.cc +++ b/components/feedback/feedback_uploader.cc -@@ -39,7 +39,7 @@ constexpr base::FilePath::CharType kFeedbackReportPath[] = +@@ -38,7 +38,7 @@ constexpr base::FilePath::CharType kFeedbackReportPath[] = FILE_PATH_LITERAL("Feedback Reports"); constexpr char kFeedbackPostUrl[] = @@ -13660,7 +13800,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co diff --git a/components/history/core/browser/browsing_history_service.cc b/components/history/core/browser/browsing_history_service.cc --- a/components/history/core/browser/browsing_history_service.cc +++ b/components/history/core/browser/browsing_history_service.cc -@@ -282,7 +282,7 @@ void BrowsingHistoryService::QueryHistoryInternal( +@@ -284,7 +284,7 @@ void BrowsingHistoryService::QueryHistoryInternal( semantics { description: "If history sync is enabled, this downloads the synced " @@ -13669,7 +13809,7 @@ diff --git a/components/history/core/browser/browsing_history_service.cc b/compo trigger: "Synced history is downloaded when user opens the history " "page, searches on the history page, or scrolls down the " -@@ -445,7 +445,7 @@ void BrowsingHistoryService::RemoveVisits( +@@ -447,7 +447,7 @@ void BrowsingHistoryService::RemoveVisits( semantics { description: "If a user who syncs their browsing history deletes one or more " @@ -13681,7 +13821,7 @@ diff --git a/components/history/core/browser/browsing_history_service.cc b/compo diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc --- a/components/history/core/browser/history_service.cc +++ b/components/history/core/browser/history_service.cc -@@ -1303,7 +1303,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( +@@ -1304,7 +1304,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween( semantics { description: "If a user who syncs their browsing history deletes history " @@ -13690,7 +13830,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his "host to execute the corresponding deletion serverside." trigger: "Deleting browsing history for a given time range, e.g. from the " -@@ -1345,7 +1345,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, +@@ -1346,7 +1346,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history, semantics { description: "If a user who syncs their browsing history deletes urls from " @@ -13702,7 +13842,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his diff --git a/components/history/core/browser/web_history_service.cc b/components/history/core/browser/web_history_service.cc --- a/components/history/core/browser/web_history_service.cc +++ b/components/history/core/browser/web_history_service.cc -@@ -44,22 +44,22 @@ namespace history { +@@ -45,22 +45,22 @@ namespace history { namespace { const char kHistoryOAuthScope[] = @@ -14011,7 +14151,7 @@ diff --git a/components/omnibox/PRESUBMIT.py b/components/omnibox/PRESUBMIT.py diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibox/browser/document_provider.cc --- a/components/omnibox/browser/document_provider.cc +++ b/components/omnibox/browser/document_provider.cc -@@ -277,7 +277,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { +@@ -302,7 +302,7 @@ std::string ExtractDocIdFromUrl(const std::string& url) { // Domain. "(?:https?://)?(?:" "spreadsheets|docs|drive|script|sites|jamboard" @@ -14020,7 +14160,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo "(?::[0-9]+)?\\/" // Port. "(?:\\S*)" // Non-whitespace chars. "(?:" -@@ -401,7 +401,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( +@@ -426,7 +426,7 @@ bool DocumentProvider::IsDocumentProviderAllowed( template_url_service, &keyword_input); if (keyword_provider && IsExplicitlyInKeywordMode(input, keyword_provider->keyword()) && @@ -14029,7 +14169,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo base::CompareCase::SENSITIVE)) { return false; } -@@ -882,7 +882,7 @@ ACMatchClassifications DocumentProvider::Classify( +@@ -928,7 +928,7 @@ ACMatchClassifications DocumentProvider::Classify( // static const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Early exit to avoid unnecessary and more involved checks. @@ -14038,7 +14178,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo return GURL(); // We aim to prevent duplicate Drive URLs to appear between the Drive document -@@ -893,7 +893,7 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -939,7 +939,7 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Drive redirects are already handled by the regex in |ExtractDocIdFromUrl|. // The below logic handles google.com redirects; e.g., google.com/url/q= std::string url_str; @@ -14047,7 +14187,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo if ((!net::GetValueForKeyInQuery(url, "q", &url_str) || url_str.empty()) && (!net::GetValueForKeyInQuery(url, "url", &url_str) || url_str.empty())) return GURL(); -@@ -910,5 +910,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { +@@ -956,5 +956,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) { // Canonicalize to the /open form without any extra args. // This is similar to what we expect from the server. @@ -14699,7 +14839,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en-GB.j diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json b/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json --- a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json +++ b/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json -@@ -1197,7 +1197,7 @@ +@@ -1200,7 +1200,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new Google Doc quickly", "spoken_button_focus_announcement": "Create doc button, press Enter to create a new Google Doc quickly" }, @@ -14708,7 +14848,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 14, -@@ -1278,7 +1278,7 @@ +@@ -1281,7 +1281,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new Google Sheet quickly", "spoken_button_focus_announcement": "Create sheet button, press Enter to create a new Google Sheet quickly" }, @@ -14717,7 +14857,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 15, -@@ -1354,7 +1354,7 @@ +@@ -1357,7 +1357,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new Google presentation in Slides quickly", "spoken_button_focus_announcement": "Create presentation button, press Enter to create a new Google presentation in Slides quickly" }, @@ -14726,7 +14866,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 16, -@@ -1436,7 +1436,7 @@ +@@ -1439,7 +1439,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new event in Google Calendar quickly", "spoken_button_focus_announcement": "Create event button, press Enter to create a new event in Google Calendar quickly" }, @@ -14735,7 +14875,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 17, -@@ -1503,7 +1503,7 @@ +@@ -1506,7 +1506,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new site in Google Sites quickly", "spoken_button_focus_announcement": "Create site button, press Enter to create a new site in Google Sites quickly" }, @@ -14744,7 +14884,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 18, -@@ -1573,7 +1573,7 @@ +@@ -1576,7 +1576,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new note in Google Keep quickly", "spoken_button_focus_announcement": "Create note button, press Enter to create a new note in Google Keep quickly" }, @@ -14753,7 +14893,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 19, -@@ -1646,7 +1646,7 @@ +@@ -1649,7 +1649,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to create a new form in Google Forms quickly", "spoken_button_focus_announcement": "Create form button, press Enter to create a new form in Google Forms quickly" }, @@ -14762,7 +14902,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 21, -@@ -1720,7 +1720,7 @@ +@@ -1723,7 +1723,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to learn about Chrome features", "spoken_button_focus_announcement": "See Chrome tips button, press Enter to learn about Chrome features" }, @@ -14771,7 +14911,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 22, -@@ -1772,7 +1772,7 @@ +@@ -1775,7 +1775,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to manage your info, privacy, and security in your Google Account", "spoken_button_focus_announcement": "Manage Google Account, press Enter to manage your info, privacy, and security in your Google Account" }, @@ -14780,7 +14920,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 24, -@@ -1841,7 +1841,7 @@ +@@ -1844,7 +1844,7 @@ "spoken_suggestion_description_suffix": "$1, press Tab then Enter to change your Google Account password", "spoken_button_focus_announcement": "Change Google password button, press Enter to change your Google Account password" }, @@ -14789,7 +14929,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 26, -@@ -2030,7 +2030,7 @@ +@@ -2033,7 +2033,7 @@ "spoken_suggestion_description_suffix": "$1, Press Tab then Enter to Find your device in the Google Account", "spoken_button_focus_announcement": "Find my device button, press Enter to visit find your device in the Google Account" }, @@ -14798,7 +14938,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_en.json }, { "id": 29, -@@ -2115,7 +2115,7 @@ +@@ -2118,7 +2118,7 @@ "spoken_suggestion_description_suffix": "$1, Press Tab then Enter to manage your Google Account privacy settings", "spoken_button_focus_announcement": "Manage Google Privacy settings button, press Enter to visit your Google Account privacy settings" }, @@ -16121,7 +16261,7 @@ diff --git a/components/omnibox/resources/omnibox_pedal_concepts_desktop_zh-TW.j diff --git a/components/omnibox/resources/omnibox_pedal_synonyms.grd b/components/omnibox/resources/omnibox_pedal_synonyms.grd --- a/components/omnibox/resources/omnibox_pedal_synonyms.grd +++ b/components/omnibox/resources/omnibox_pedal_synonyms.grd -@@ -226,177 +226,177 @@ +@@ -227,182 +227,182 @@ @@ -16342,6 +16482,12 @@ diff --git a/components/omnibox/resources/omnibox_pedal_synonyms.grd b/component customize chromeos accessibility, manage accessibility settings + +- ++ + always open links in chrome, always use chrome, chrome as default, default browser, delete safari, how to make chrome default browser, main browser, make chrome default, make chrome default browser, make chrome my default browser, open links in chrome, pick chrome as default browser, primary browser, remove safari, search in chrome, set chrome as default, set chrome as default browser, standard browser + + diff --git a/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc b/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc --- a/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc +++ b/components/optimization_guide/content/browser/page_content_annotations_model_manager.cc @@ -16385,7 +16531,7 @@ diff --git a/components/optimization_guide/core/page_entities_model_executor_imp diff --git a/components/optimization_guide/core/prediction_manager.cc b/components/optimization_guide/core/prediction_manager.cc --- a/components/optimization_guide/core/prediction_manager.cc +++ b/components/optimization_guide/core/prediction_manager.cc -@@ -171,19 +171,19 @@ BuildPredictionModelFromCommandLineForOptimizationTarget( +@@ -182,19 +182,19 @@ BuildPredictionModelFromCommandLineForOptimizationTarget( bool IsModelMetadataTypeOnServerAllowlist( const optimization_guide::proto::Any& model_metadata) { return model_metadata.type_url() == @@ -16412,7 +16558,7 @@ diff --git a/components/optimization_guide/core/prediction_manager.cc b/componen diff --git a/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc --- a/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc +++ b/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc -@@ -95,7 +95,7 @@ std::string GetHeavyAdReportMessage(const FrameTreeData& frame_data, +@@ -96,7 +96,7 @@ std::string GetHeavyAdReportMessage(const FrameTreeData& frame_data, bool will_unload_adframe) { const char kChromeStatusMessage[] = "See " @@ -16493,7 +16639,7 @@ diff --git a/components/password_manager/core/browser/leak_detection/leak_detect diff --git a/components/password_manager/core/browser/leak_detection_dialog_utils.cc b/components/password_manager/core/browser/leak_detection_dialog_utils.cc --- a/components/password_manager/core/browser/leak_detection_dialog_utils.cc +++ b/components/password_manager/core/browser/leak_detection_dialog_utils.cc -@@ -23,7 +23,7 @@ namespace password_manager { +@@ -24,7 +24,7 @@ namespace password_manager { using metrics_util::LeakDialogType; constexpr char kPasswordCheckupURL[] = @@ -16505,7 +16651,7 @@ diff --git a/components/password_manager/core/browser/leak_detection_dialog_util diff --git a/components/password_manager/core/browser/old_google_credentials_cleaner.cc b/components/password_manager/core/browser/old_google_credentials_cleaner.cc --- a/components/password_manager/core/browser/old_google_credentials_cleaner.cc +++ b/components/password_manager/core/browser/old_google_credentials_cleaner.cc -@@ -40,10 +40,10 @@ void OldGoogleCredentialCleaner::OnGetPasswordStoreResults( +@@ -41,10 +41,10 @@ void OldGoogleCredentialCleaner::OnGetPasswordStoreResults( auto IsOldGoogleForm = [&cutoff](const std::unique_ptr& form) { return (form->scheme == PasswordForm::Scheme::kHtml && @@ -16701,7 +16847,7 @@ diff --git a/components/payments/core/method_strings.cc b/components/payments/co diff --git a/components/permissions/android/permissions_android_strings.grd b/components/permissions/android/permissions_android_strings.grd --- a/components/permissions/android/permissions_android_strings.grd +++ b/components/permissions/android/permissions_android_strings.grd -@@ -223,7 +223,7 @@ +@@ -224,7 +224,7 @@ Connected Device @@ -16710,7 +16856,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co No compatible devices found -@@ -257,7 +257,7 @@ +@@ -258,7 +258,7 @@ @@ -16722,14 +16868,15 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co diff --git a/components/permissions/constants.cc b/components/permissions/constants.cc --- a/components/permissions/constants.cc +++ b/components/permissions/constants.cc -@@ -7,6 +7,6 @@ +@@ -7,7 +7,7 @@ namespace permissions { const char kChooserBluetoothOverviewURL[] = - "https://support.google.com/chrome?p=bluetooth"; + "https://support.9oo91e.qjz9zk/chrome?p=bluetooth"; - } // namespace permissions + #if !BUILDFLAG(IS_ANDROID) + // The key in `Product Specific String Data` under which the disposition of the diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc --- a/components/permissions/permission_context_base.cc +++ b/components/permissions/permission_context_base.cc @@ -16854,7 +17001,7 @@ diff --git a/components/policy/core/browser/browser_policy_connector.cc b/compon diff --git a/components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.cc b/components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.cc --- a/components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.cc +++ b/components/policy/core/browser/signin/user_cloud_signin_restriction_policy_fetcher.cc -@@ -33,7 +33,7 @@ namespace { +@@ -34,7 +34,7 @@ namespace { const char kAuthorizationHeaderFormat[] = "Bearer %s"; const char kJsonContentType[] = "application/json"; const char kSecureConnectApiGetManagedAccountsSigninRestrictionsUrl[] = @@ -16908,7 +17055,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If you enable this setting, $1Google Chrome and ARC-apps ignore all proxy-related options specified from the command line. -@@ -624,7 +624,7 @@ +@@ -625,7 +625,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -16917,7 +17064,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'group', 'caption': '''Default HTML renderer for $3Google Chrome Frame''', 'desc': '''Allows you to configure the default HTML renderer when $3Google Chrome Frame is installed. -@@ -639,7 +639,7 @@ +@@ -640,7 +640,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -16926,7 +17073,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'group', 'caption': '''Allow $3Google Chrome Frame to handle the following content types''', 'desc': '''Allow $3Google Chrome Frame to handle the following content types.''', -@@ -1333,7 +1333,7 @@ +@@ -1337,7 +1337,7 @@ }, { 'name': 'FirstPartySets', @@ -16935,7 +17082,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'group', 'caption': '''First-Party Sets Settings''', 'desc': '''Controls policies for the First-Party Sets feature.''', -@@ -1343,7 +1343,7 @@ +@@ -1347,7 +1347,7 @@ }, { 'name': 'HomepageLocation', @@ -16944,7 +17091,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:81-'], -@@ -1352,7 +1352,7 @@ +@@ -1356,7 +1356,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -16953,7 +17100,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 1, 'caption': '''Configure the home page URL''', 'tags': [], -@@ -1369,7 +1369,7 @@ +@@ -1373,7 +1373,7 @@ }, { 'name': 'HomepageIsNewTabPage', @@ -16962,7 +17109,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], -@@ -1400,7 +1400,7 @@ +@@ -1404,7 +1404,7 @@ }, { 'name': 'NewTabPageLocation', @@ -16971,7 +17118,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:58-', 'chrome_os:58-', 'ios:99-'], -@@ -1408,7 +1408,7 @@ +@@ -1412,7 +1412,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -16980,7 +17127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 360, 'caption': '''Configure the New Tab page URL''', 'tags': [], -@@ -1427,7 +1427,7 @@ +@@ -1431,7 +1431,7 @@ }, { 'name': 'DefaultBrowserSettingEnabled', @@ -16989,7 +17136,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win7:11-', 'chrome.mac:11-', 'chrome.linux:11-'], -@@ -1453,12 +1453,12 @@ +@@ -1457,12 +1457,12 @@ Leaving the policy unset means $1Google Chrome lets users control whether it's the default and, if not, whether user notifications should appear. @@ -17004,7 +17151,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.win:8-'], -@@ -1481,7 +1481,7 @@ +@@ -1485,7 +1485,7 @@ }, { 'name': 'AlternateErrorPagesEnabled', @@ -17013,7 +17160,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1514,7 +1514,7 @@ +@@ -1518,7 +1518,7 @@ }, { 'name': 'SearchSuggestEnabled', @@ -17022,7 +17169,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1550,7 +1550,7 @@ +@@ -1554,7 +1554,7 @@ }, { 'name': 'NativeWindowOcclusionEnabled', @@ -17031,7 +17178,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1588,7 +1588,7 @@ +@@ -1592,7 +1592,7 @@ }, { 'name': 'WindowOcclusionEnabled', @@ -17040,7 +17187,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -1624,7 +1624,7 @@ +@@ -1628,7 +1628,7 @@ }, { 'name': 'DnsPrefetchingEnabled', @@ -17049,7 +17196,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:8-53', 'chrome_os:11-53', 'android:30-53'], -@@ -1650,7 +1650,7 @@ +@@ -1654,7 +1654,7 @@ }, { 'name': 'NetworkPredictionOptions', @@ -17058,7 +17205,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1690,7 +1690,7 @@ +@@ -1694,7 +1694,7 @@ }, { 'name': 'WPADQuickCheckEnabled', @@ -17067,7 +17214,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ 'chrome.*:35-', 'chrome_os:35-' ], -@@ -1721,7 +1721,7 @@ +@@ -1725,7 +1725,7 @@ }, { 'name': 'DisableSpdy', @@ -17076,7 +17223,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:8-53', 'chrome_os:11-53', 'android:30-53'], -@@ -1746,7 +1746,7 @@ +@@ -1750,7 +1750,7 @@ }, { 'name': 'DisabledSchemes', @@ -17085,7 +17232,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -1773,7 +1773,7 @@ +@@ -1777,7 +1777,7 @@ + }, + { + 'name': 'GetDisplayMediaSetSelectAllScreensAllowedForUrls', +- 'owners': ['file://chrome/browser/media/webrtc/OWNERS', 'simonha@chromium.org'], ++ 'owners': ['file://chrome/browser/media/webrtc/OWNERS', 'simonha@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { + 'type': 'array', +@@ -1799,7 +1799,7 @@ }, { 'name': 'GloballyScopeHTTPAuthCacheEnabled', @@ -17094,7 +17250,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-', 'chrome_os:80-'], -@@ -1807,7 +1807,7 @@ +@@ -1833,7 +1833,7 @@ }, { 'name': 'DNSInterceptionChecksEnabled', @@ -17103,7 +17259,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-', 'chrome_os:80-'], -@@ -1838,7 +1838,7 @@ +@@ -1864,7 +1864,7 @@ }, { 'name': 'IntranetRedirectBehavior', @@ -17112,7 +17268,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -1885,7 +1885,7 @@ +@@ -1911,7 +1911,7 @@ }, { 'name': 'Http09OnNonDefaultPortsEnabled', @@ -17121,7 +17277,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:54-77', 'chrome_os:54-77'], -@@ -1920,7 +1920,7 @@ +@@ -1946,7 +1946,7 @@ }, { 'name': 'JavascriptEnabled', @@ -17130,7 +17286,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:30-'], -@@ -1953,7 +1953,7 @@ +@@ -1979,7 +1979,7 @@ }, { 'name': 'IncognitoEnabled', @@ -17139,7 +17295,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:11-', 'chrome_os:11-', 'android:30-'], -@@ -1987,7 +1987,7 @@ +@@ -2013,7 +2013,7 @@ }, { 'name': 'IncognitoModeAvailability', @@ -17148,7 +17304,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -2040,7 +2040,7 @@ +@@ -2066,7 +2066,7 @@ }, { 'name': 'SavingBrowserHistoryDisabled', @@ -17157,7 +17313,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2073,7 +2073,7 @@ +@@ -2099,7 +2099,7 @@ }, { 'name': 'AllowDeletingBrowserHistory', @@ -17166,7 +17322,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:57-', 'chrome_os:57-'], -@@ -2101,7 +2101,7 @@ +@@ -2127,7 +2127,7 @@ }, { 'name': 'HistoryClustersVisible', @@ -17175,7 +17331,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:97-', 'chrome_os:97-'], -@@ -2140,7 +2140,7 @@ +@@ -2166,7 +2166,7 @@ }, { 'name': 'AllowDinosaurEasterEgg', @@ -17184,7 +17340,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:48-', 'chrome.*:48-'], -@@ -2169,7 +2169,7 @@ +@@ -2195,7 +2195,7 @@ }, { 'name': 'ForceLegacyDefaultReferrerPolicy', @@ -17193,7 +17349,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-87', 'chrome_os:80-87'], -@@ -2202,7 +2202,7 @@ +@@ -2228,7 +2228,7 @@ }, { 'name': 'RemoteAccessClientFirewallTraversal', @@ -17202,7 +17358,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:14-16', 'chrome_os:14-16'], -@@ -2225,7 +2225,7 @@ +@@ -2251,7 +2251,7 @@ }, { 'name': 'RemoteAccessHostClientDomain', @@ -17211,7 +17367,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:22-', 'chrome_os:41-'], -@@ -2243,7 +2243,7 @@ +@@ -2269,7 +2269,7 @@ }, { 'name': 'RemoteAccessHostClientDomainList', @@ -17220,7 +17376,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2269,7 +2269,7 @@ +@@ -2295,7 +2295,7 @@ }, { 'name': 'RemoteAccessHostFirewallTraversal', @@ -17229,7 +17385,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:14-', 'chrome_os:41-'], -@@ -2298,7 +2298,7 @@ +@@ -2324,7 +2324,7 @@ }, { 'name': 'RemoteAccessHostDomain', @@ -17238,7 +17394,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:22-', 'chrome_os:41-'], -@@ -2316,7 +2316,7 @@ +@@ -2342,7 +2342,7 @@ }, { 'name': 'RemoteAccessHostDomainList', @@ -17247,7 +17403,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -2342,7 +2342,7 @@ +@@ -2368,7 +2368,7 @@ }, { 'name': 'RemoteAccessHostRequireTwoFactor', @@ -17256,7 +17412,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:22-22'], -@@ -2365,7 +2365,7 @@ +@@ -2391,7 +2391,7 @@ }, { 'name': 'RemoteAccessHostTalkGadgetPrefix', @@ -17265,7 +17421,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:22-75', 'chrome_os:41-75'], -@@ -2381,17 +2381,17 @@ +@@ -2407,17 +2407,17 @@ 'tags': [], 'desc': '''Configures the TalkGadget prefix that will be used by remote access hosts and prevents users from changing it. @@ -17287,7 +17443,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:23-'], -@@ -2420,7 +2420,7 @@ +@@ -2446,7 +2446,7 @@ }, { 'name': 'RemoteAccessHostAllowClientPairing', @@ -17296,7 +17452,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:30-'], -@@ -2449,7 +2449,7 @@ +@@ -2475,7 +2475,7 @@ }, { 'name': 'RemoteAccessHostAllowGnubbyAuth', @@ -17305,7 +17461,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-'], -@@ -2481,7 +2481,7 @@ +@@ -2507,7 +2507,7 @@ }, { 'name': 'RemoteAccessHostAllowRelayedConnection', @@ -17314,7 +17470,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:36-', 'chrome_os:86-'], -@@ -2510,7 +2510,7 @@ +@@ -2536,7 +2536,7 @@ }, { 'name': 'RemoteAccessHostUdpPortRange', @@ -17323,7 +17479,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:36-', 'chrome_os:41-'], -@@ -2531,7 +2531,7 @@ +@@ -2557,7 +2557,7 @@ }, { 'name': 'RemoteAccessHostMatchUsername', @@ -17332,7 +17488,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-'], -@@ -2560,7 +2560,7 @@ +@@ -2586,7 +2586,7 @@ }, { 'name': 'RemoteAccessHostTokenUrl', @@ -17341,7 +17497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2582,7 +2582,7 @@ +@@ -2608,7 +2608,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationUrl', @@ -17350,7 +17506,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2602,7 +2602,7 @@ +@@ -2628,7 +2628,7 @@ }, { 'name': 'RemoteAccessHostTokenValidationCertificateIssuer', @@ -17359,7 +17515,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:28-'], -@@ -2620,7 +2620,7 @@ +@@ -2646,7 +2646,7 @@ }, { 'name': 'RemoteAccessHostDebugOverridePolicies', @@ -17368,7 +17524,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:25-47','chrome_os:42-47'], -@@ -2640,7 +2640,7 @@ +@@ -2666,7 +2666,7 @@ }, { 'name': 'RemoteAccessHostAllowUiAccessForRemoteAssistance', @@ -17377,7 +17533,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:55-'], -@@ -2670,7 +2670,7 @@ +@@ -2696,7 +2696,7 @@ }, { 'name': 'RemoteAccessHostAllowFileTransfer', @@ -17386,7 +17542,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:74-'], -@@ -2700,7 +2700,7 @@ +@@ -2726,7 +2726,7 @@ }, { 'name': 'RemoteAccessHostEnableUserInterface', @@ -17395,7 +17551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:88-'], -@@ -2731,7 +2731,7 @@ +@@ -2757,7 +2757,7 @@ }, { 'name': 'RemoteAccessHostAllowRemoteAccessConnections', @@ -17404,7 +17560,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -2761,7 +2761,7 @@ +@@ -2787,7 +2787,7 @@ }, { 'name': 'RemoteAccessHostMaximumSessionDurationMinutes', @@ -17413,7 +17569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 30, 'maximum': 10080 }, 'supported_on': ['chrome.*:89-'], -@@ -2781,7 +2781,7 @@ +@@ -2807,7 +2807,7 @@ }, { 'name': 'RemoteAccessHostClipboardSizeBytes', @@ -17422,7 +17578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 2147483647 }, 'supported_on': ['chrome.*:97-', 'chrome_os:97-'], -@@ -2809,7 +2809,7 @@ +@@ -2835,7 +2835,7 @@ }, { 'name': 'RemoteAccessHostAllowRemoteSupportConnections', @@ -17431,7 +17587,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:97-', 'chrome_os:97-'], -@@ -2843,7 +2843,7 @@ +@@ -2869,7 +2869,7 @@ }, { 'name': 'DeviceAllowMGSToStoreDisplayProperties', @@ -17440,7 +17596,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -2870,7 +2870,7 @@ +@@ -2896,7 +2896,7 @@ }, { 'name': 'PrintingEnabled', @@ -17449,7 +17605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -2904,7 +2904,7 @@ +@@ -2930,7 +2930,7 @@ }, { 'name': 'CloudPrintProxyEnabled', @@ -17458,7 +17614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:17-'], -@@ -2932,7 +2932,7 @@ +@@ -2958,7 +2958,7 @@ }, { 'name': 'PrintingAllowedColorModes', @@ -17467,7 +17623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -2973,7 +2973,7 @@ +@@ -2999,7 +2999,7 @@ }, { 'name': 'PrintingAllowedDuplexModes', @@ -17476,7 +17632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3016,7 +3016,7 @@ +@@ -3042,7 +3042,7 @@ }, { 'name': 'PrintingAllowedPinModes', @@ -17485,7 +17641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3057,7 +3057,7 @@ +@@ -3083,7 +3083,7 @@ }, { 'name': 'PrintingAllowedBackgroundGraphicsModes', @@ -17494,7 +17650,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3098,7 +3098,7 @@ +@@ -3124,7 +3124,7 @@ }, { 'name': 'PrintingColorDefault', @@ -17503,7 +17659,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3133,7 +3133,7 @@ +@@ -3159,7 +3159,7 @@ }, { 'name': 'PrintingDuplexDefault', @@ -17512,7 +17668,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3174,7 +3174,7 @@ +@@ -3200,7 +3200,7 @@ }, { 'name': 'PrintingPinDefault', @@ -17521,7 +17677,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3209,7 +3209,7 @@ +@@ -3235,7 +3235,7 @@ }, { 'name': 'PrintingBackgroundGraphicsDefault', @@ -17530,7 +17686,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -3244,7 +3244,7 @@ +@@ -3270,7 +3270,7 @@ }, { 'name': 'PrintingPaperSizeDefault', @@ -17539,7 +17695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -3430,7 +3430,7 @@ +@@ -3456,7 +3456,7 @@ }, { 'name': 'PrintingSendUsernameAndFilenameEnabled', @@ -17548,7 +17704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -3459,7 +3459,7 @@ +@@ -3485,7 +3485,7 @@ }, { 'name': 'PrintingMaxSheetsAllowed', @@ -17557,7 +17713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 1 }, 'supported_on': ['chrome_os:84-'], -@@ -3477,7 +3477,7 @@ +@@ -3503,7 +3503,7 @@ }, { 'name': 'AppCacheForceEnabled', @@ -17566,7 +17722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:84-95', 'chrome_os:84-95', 'android:84-95', 'webview_android:84-95'], -@@ -3506,7 +3506,7 @@ +@@ -3532,7 +3532,7 @@ }, { 'name': 'PrintJobHistoryExpirationPeriod', @@ -17575,7 +17731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': -1 }, 'supported_on': ['chrome_os:79-'], -@@ -3528,7 +3528,7 @@ +@@ -3554,7 +3554,7 @@ }, { 'name': 'PrintingAPIExtensionsWhitelist', @@ -17584,7 +17740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3552,7 +3552,7 @@ +@@ -3578,7 +3578,7 @@ }, { 'name': 'PrintingAPIExtensionsAllowlist', @@ -17593,7 +17749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -3573,7 +3573,7 @@ +@@ -3599,7 +3599,7 @@ }, { 'name': 'ForceSafeSearch', @@ -17602,7 +17758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:25-', 'chrome_os:25-', 'android:30-'], -@@ -3607,7 +3607,7 @@ +@@ -3633,7 +3633,7 @@ }, { 'name': 'ForceGoogleSafeSearch', @@ -17611,7 +17767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'], -@@ -3636,7 +3636,7 @@ +@@ -3662,7 +3662,7 @@ }, { 'name': 'ForceYouTubeSafetyMode', @@ -17620,7 +17776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'], -@@ -3671,7 +3671,7 @@ +@@ -3697,7 +3697,7 @@ }, { 'name': 'ForceYouTubeRestrict', @@ -17629,7 +17785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3715,7 +3715,7 @@ +@@ -3741,7 +3741,7 @@ }, { 'name': 'SafeBrowsingEnabled', @@ -17638,7 +17794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3750,7 +3750,7 @@ +@@ -3776,7 +3776,7 @@ If you set this policy, users can't change it or override the "Enable phishing and malware protection" setting in Chrome. If not set, "Enable phishing and malware protection" is set to True, but the user can change it. @@ -17647,7 +17803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If the policy SafeBrowsingProtectionLevel is set, the value of the policy SafeBrowsingEnabled is ignored. -@@ -3758,7 +3758,7 @@ +@@ -3784,7 +3784,7 @@ }, { 'name': 'SafeBrowsingProtectionLevel', @@ -17656,7 +17812,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -3808,12 +3808,12 @@ +@@ -3834,12 +3834,12 @@ If this policy is left not set, Safe Browsing will operate in Standard Protection mode but users can change this setting. @@ -17671,7 +17827,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3852,7 +3852,7 @@ +@@ -3878,7 +3878,7 @@ }, { 'name': 'PasswordManagerEnabled', @@ -17680,7 +17836,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3889,7 +3889,7 @@ +@@ -3915,7 +3915,7 @@ }, { 'name': 'PasswordManagerAllowShowPasswords', @@ -17689,7 +17845,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:8-50', 'chrome_os:11-50'], -@@ -3912,7 +3912,7 @@ +@@ -3938,7 +3938,7 @@ }, { 'name': 'PasswordLeakDetectionEnabled', @@ -17698,7 +17854,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3947,7 +3947,7 @@ +@@ -3973,7 +3973,7 @@ }, { 'name': 'PasswordDismissCompromisedAlertEnabled', @@ -17707,7 +17863,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -3981,7 +3981,7 @@ +@@ -4007,7 +4007,7 @@ }, { 'name': 'AutoFillEnabled', @@ -17716,7 +17872,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4019,7 +4019,7 @@ +@@ -4045,7 +4045,7 @@ }, { 'name': 'AutofillAddressEnabled', @@ -17725,7 +17881,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4053,7 +4053,7 @@ +@@ -4079,7 +4079,7 @@ }, { 'name': 'AutofillCreditCardEnabled', @@ -17734,7 +17890,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -4087,7 +4087,7 @@ +@@ -4113,7 +4113,7 @@ }, { 'name': 'DisabledPlugins', @@ -17743,7 +17899,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4118,7 +4118,7 @@ +@@ -4144,7 +4144,7 @@ }, { 'name': 'EnabledPlugins', @@ -17752,7 +17908,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4149,7 +4149,7 @@ +@@ -4175,7 +4175,7 @@ }, { 'name': 'DisabledPluginsExceptions', @@ -17761,7 +17917,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4182,7 +4182,7 @@ +@@ -4208,7 +4208,7 @@ }, { 'name': 'AlwaysOpenPdfExternally', @@ -17770,7 +17926,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:55-'], -@@ -4213,7 +4213,7 @@ +@@ -4239,7 +4239,7 @@ }, { 'name': 'DisablePluginFinder', @@ -17779,7 +17935,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:11-64', 'chrome_os:11-64'], -@@ -4243,7 +4243,7 @@ +@@ -4269,7 +4269,7 @@ }, { 'name': 'SyncDisabled', @@ -17788,7 +17944,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'ios:96-'], -@@ -4276,7 +4276,7 @@ +@@ -4302,7 +4302,7 @@ }, { 'name': 'SyncTypesListDisabled', @@ -17797,7 +17953,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4297,7 +4297,7 @@ +@@ -4323,7 +4323,7 @@ }, { 'name': 'RoamingProfileSupportEnabled', @@ -17806,7 +17962,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'], -@@ -4326,7 +4326,7 @@ +@@ -4352,7 +4352,7 @@ }, { 'name': 'RoamingProfileLocation', @@ -17815,7 +17971,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'], -@@ -4342,7 +4342,7 @@ +@@ -4368,7 +4368,7 @@ If you set this policy, $1Google Chrome will use the provided directory to store the roaming copy of the profiles if the RoamingProfileSupportEnabled policy has been enabled. If the RoamingProfileSupportEnabled policy is disabled or left unset the value stored in this policy is not used. @@ -17824,7 +17980,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli On non-Windows platforms, this policy must be set for roaming profiles to work. -@@ -4351,7 +4351,7 @@ +@@ -4377,7 +4377,7 @@ }, { 'name': 'SigninAllowed', @@ -17833,7 +17989,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:27-', 'android:38-'], -@@ -4382,7 +4382,7 @@ +@@ -4408,7 +4408,7 @@ }, { 'name': 'EnableDeprecatedWebBasedSignin', @@ -17842,7 +17998,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:35-42'], -@@ -4405,7 +4405,7 @@ +@@ -4431,7 +4431,7 @@ }, { 'name': 'UserDataDir', @@ -17851,7 +18007,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.win:11-', 'chrome.mac:11-'], -@@ -4424,14 +4424,14 @@ +@@ -4450,14 +4450,14 @@ If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified the '--user-data-dir' flag or not. To avoid data loss or other unexpected errors this policy should not be set to a directory used for other purposes, because $1Google Chrome manages its contents. @@ -17868,7 +18024,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:13-'], -@@ -4447,12 +4447,12 @@ +@@ -4473,12 +4473,12 @@ If not set, $1Google Chrome uses the default cache directory, but users can change that setting with the --disk-cache-dir command line flag. @@ -17883,7 +18039,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-'], -@@ -4475,7 +4475,7 @@ +@@ -4501,7 +4501,7 @@ }, { 'name': 'MediaCacheSize', @@ -17892,7 +18048,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:17-71'], -@@ -4497,7 +4497,7 @@ +@@ -4523,7 +4523,7 @@ + }, + { + 'name': 'DownloadBubbleEnabled', +- 'owners': ['file://components/safe_browsing/OWNERS', 'bhatiarohit@chromium.org', 'xinghuilu@chromium.org'], ++ 'owners': ['file://components/safe_browsing/OWNERS', 'bhatiarohit@ch40m1um.qjz9zk', 'xinghuilu@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.*: 102-', 'chrome_os: 102-'], +@@ -4552,7 +4552,7 @@ }, { 'name': 'DownloadRestrictions', @@ -17901,7 +18066,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -4542,7 +4542,7 @@ +@@ -4597,7 +4597,7 @@ 'tags': ['local-data-access'], 'desc': '''Setting the policy means users can't bypass download security decisions. @@ -17910,7 +18075,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli * Malicious, as flagged by the Safe Browsing server * Uncommon or unwanted, as flagged by the Safe Browsing server -@@ -4560,12 +4560,12 @@ +@@ -4615,12 +4615,12 @@ 4: Blocks malicious files flagged by the Safe Browsing server, does not block dangerous file types. Recommended. @@ -17925,14 +18090,14 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:11-', 'chrome_os:35-'], -@@ -4582,13 +4582,13 @@ +@@ -4639,13 +4639,13 @@ Leaving the policy unset means Chrome uses the default download directory, and users can change it. - Note: See a list of variables you can use ( https://www.chromium.org/administrators/policy-list-3/user-data-directory-variables ).''', + Note: See a list of variables you can use ( https://www.ch40m1um.qjz9zk/administrators/policy-list-3/user-data-directory-variables ).''', 'label': '''Set download directory''', - 'arc_support': 'This policy has no effect on Android apps. Android apps always use the default downloads directory and cannot access any files downloaded by $2Google Chrome OS into a non-default downloads directory.', + 'arc_support': 'This policy has no effect on Android apps. Android apps always use the default downloads directory and cannot access any files downloaded by $2Google ChromeOS into a non-default downloads directory.', }, { 'name': 'AutoOpenFileTypes', @@ -17941,7 +18106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4615,7 +4615,7 @@ +@@ -4672,7 +4672,7 @@ }, { 'name': 'AutoOpenAllowedForURLs', @@ -17950,7 +18115,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -4638,11 +4638,11 @@ +@@ -4695,11 +4695,11 @@ If this policy isn't set, all downloads where the file type is in AutoOpenFileTypes will automatically open. @@ -17964,7 +18129,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -4675,13 +4675,13 @@ +@@ -4732,13 +4732,13 @@ If this policy is not set, no protocols can launch without a prompt by default. Users may opt out of prompts on a per-protocol/per-site basis unless the ExternalProtocolDialogShowAlwaysOpenCheckbox policy is set to Disabled. This policy has no impact on per-protocol/per-site prompt exemptions set by users. @@ -17980,7 +18145,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:61-'], -@@ -4716,7 +4716,7 @@ +@@ -4773,7 +4773,7 @@ }, { 'name': 'ClearSiteDataOnExit', @@ -17989,7 +18154,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:11-28', 'chrome_os:11-28'], -@@ -4735,7 +4735,7 @@ +@@ -4792,7 +4792,7 @@ }, { 'name': 'CaptivePortalAuthenticationIgnoresProxy', @@ -17998,7 +18163,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -4765,7 +4765,7 @@ +@@ -4822,7 +4822,7 @@ }, { 'name': 'ProxyMode', @@ -18007,7 +18172,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -4833,11 +4833,11 @@ +@@ -4890,11 +4890,11 @@ Leaving the policy unset lets users choose the proxy settings. @@ -18021,7 +18186,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -4893,7 +4893,7 @@ +@@ -4950,7 +4950,7 @@ If you choose manual proxy settings, you can specify further options in 'Address or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'. Only the HTTP proxy server with the highest priority is available for ARC-apps. For detailed examples, visit: @@ -18030,7 +18195,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If you enable this setting, $1Google Chrome ignores all proxy-related options specified from the command line. -@@ -4902,7 +4902,7 @@ +@@ -4959,7 +4959,7 @@ }, { 'name': 'ProxyServer', @@ -18039,7 +18204,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4925,12 +4925,12 @@ +@@ -4982,12 +4982,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -18054,7 +18219,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4953,12 +4953,12 @@ +@@ -5010,12 +5010,12 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -18069,7 +18234,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -4981,13 +4981,13 @@ +@@ -5038,13 +5038,13 @@ Leave this policy unset if you selected any other mode for setting proxy policies. @@ -18085,7 +18250,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -5036,12 +5036,12 @@ +@@ -5093,12 +5093,12 @@ * fixed_servers, the ProxyServer and ProxyBypassList fields are used. * pac_script, the ProxyPacUrl, ProxyPacMandatory and ProxyBypassList fields are used. @@ -18100,7 +18265,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:9-','android:46-','chrome_os:62-'], -@@ -5071,7 +5071,7 @@ +@@ -5128,7 +5128,7 @@ }, { 'name': 'AllHttpAuthSchemesAllowedForOrigins', @@ -18109,7 +18274,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', 'items': { 'type': 'string' } }, 'supported_on': ['chrome.*:100-','android:100-','chrome_os:100-'], -@@ -5085,12 +5085,12 @@ +@@ -5142,12 +5142,12 @@ 'tags': [], 'desc': '''Setting the policy specifies for which origins to allow all the HTTP authentication schemes $1Google Chrome supports regardless of the AuthSchemes policy. @@ -18124,7 +18289,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:9-','android:46-','chrome_os:62-'], -@@ -5118,7 +5118,7 @@ +@@ -5175,7 +5175,7 @@ }, { 'name': 'EnableAuthNegotiatePort', @@ -18133,7 +18298,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:9-','chrome_os:62-'], -@@ -5146,7 +5146,7 @@ +@@ -5203,7 +5203,7 @@ }, { 'name': 'BasicAuthOverHttpEnabled', @@ -18142,7 +18307,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:88-','chrome_os:88-'], -@@ -5177,7 +5177,7 @@ +@@ -5234,7 +5234,7 @@ }, { 'name': 'AuthServerWhitelist', @@ -18151,7 +18316,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:9-100','android:46-100','webview_android:49-100','chrome_os:62-100'], -@@ -5200,7 +5200,7 @@ +@@ -5257,7 +5257,7 @@ }, { 'name': 'AuthServerAllowlist', @@ -18160,7 +18325,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:86-','android:86-','webview_android:86-','chrome_os:86-'], -@@ -5220,7 +5220,7 @@ +@@ -5277,7 +5277,7 @@ }, { 'name': 'AuthNegotiateDelegateWhitelist', @@ -18169,7 +18334,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:9-100','android:46-100','chrome_os:62-100'], -@@ -5241,7 +5241,7 @@ +@@ -5298,7 +5298,7 @@ }, { 'name': 'AuthNegotiateDelegateAllowlist', @@ -18178,7 +18343,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:86-','android:86-','chrome_os:86-'], -@@ -5259,7 +5259,7 @@ +@@ -5316,7 +5316,7 @@ }, { 'name': 'AuthNegotiateDelegateByKdcPolicy', @@ -18187,7 +18352,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:74-','chrome.mac:74-','chrome_os:74-'], -@@ -5289,7 +5289,7 @@ +@@ -5346,7 +5346,7 @@ }, { 'name': 'BrowserLabsEnabled', @@ -18196,7 +18361,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema' : {'type': 'boolean'}, 'supported_on': ['chrome.*:89-', 'chrome_os:93-'], -@@ -5320,7 +5320,7 @@ +@@ -5377,7 +5377,7 @@ }, { 'name': 'GSSAPILibraryName', @@ -18205,7 +18370,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.linux:9-'], -@@ -5338,7 +5338,7 @@ +@@ -5395,7 +5395,7 @@ }, { 'name': 'AuthAndroidNegotiateAccountType', @@ -18214,7 +18379,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['android:46-','webview_android:49-'], -@@ -5350,13 +5350,13 @@ +@@ -5407,13 +5407,13 @@ 'id': 305, 'caption': '''Account type for HTTP Negotiate authentication''', 'tags': [], @@ -18230,7 +18395,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:13-','chrome_os:62-'], -@@ -5386,7 +5386,7 @@ +@@ -5443,7 +5443,7 @@ }, { 'name': 'NtlmV2Enabled', @@ -18239,7 +18404,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-'], -@@ -5417,7 +5417,7 @@ +@@ -5474,7 +5474,7 @@ }, { 'name': 'ExtensionInstallBlacklist', @@ -18248,7 +18413,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5443,7 +5443,7 @@ +@@ -5500,7 +5500,7 @@ { 'name': 'ExtensionInstallBlocklist', @@ -18257,7 +18422,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5467,7 +5467,7 @@ +@@ -5524,7 +5524,7 @@ }, { 'name': 'ExtensionInstallAllowlist', @@ -18266,7 +18431,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5491,7 +5491,7 @@ +@@ -5548,7 +5548,7 @@ }, { 'name': 'ExtensionInstallWhitelist', @@ -18275,7 +18440,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5514,7 +5514,7 @@ +@@ -5571,7 +5571,7 @@ }, { 'name': 'ExtensionInstallForcelist', @@ -18284,7 +18449,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5525,7 +5525,7 @@ +@@ -5582,7 +5582,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -18293,7 +18458,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 34, 'caption': '''Configure the list of force-installed apps and extensions''', 'tags': ['full-admin-access'], -@@ -5541,15 +5541,15 @@ +@@ -5598,15 +5598,15 @@ The source code of any extension may be altered by users through developer tools, potentially rendering the extension dysfunctional. If this is a concern, set the DeveloperToolsDisabled policy. @@ -18312,7 +18477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -5567,14 +5567,14 @@ +@@ -5624,14 +5624,14 @@ 'tags': ['full-admin-access', 'system-security'], 'desc': '''Setting the policy specifies which URLs may install extensions, apps, and themes. Before $1Google Chrome 21, users could click on a link to a *.crx file, and $1Google Chrome would offer to install the file after a few warnings. Afterwards, such files must be downloaded and dragged to the $1Google Chrome settings page. This setting allows specific URLs to have the old, easier installation flow. @@ -18329,16 +18494,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -5605,7 +5605,7 @@ +@@ -5662,7 +5662,7 @@ }, { 'name': 'ExtensionAllowedTypes', - 'owners': ['benwells@chromium.org', 'file://extensions/OWNERS'], + 'owners': ['benwells@ch40m1um.qjz9zk', 'file://extensions/OWNERS'], - 'type': 'list', + 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -5658,7 +5658,7 @@ +@@ -5747,7 +5747,7 @@ }, { 'name': 'ExtensionSettings', @@ -18347,7 +18512,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -5753,7 +5753,7 @@ +@@ -5842,7 +5842,7 @@ }, }, }, @@ -18356,7 +18521,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.*:62-', 'chrome_os:62-'], 'features': { 'dynamic_refresh': True, -@@ -5810,13 +5810,13 @@ +@@ -5899,13 +5899,13 @@ 'tags': [], 'desc': '''Setting the policy controls extension management settings for $1Google Chrome, including any controlled by existing extension-related policies. The policy supersedes any legacy policies that might be set. @@ -18372,7 +18537,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-'], -@@ -5844,12 +5844,12 @@ +@@ -5933,12 +5933,12 @@ Disabling this setting or leaving it unset allows external extensions to be installed. @@ -18387,7 +18552,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], -@@ -5878,7 +5878,7 @@ +@@ -5967,7 +5967,7 @@ }, { 'name': 'DeveloperToolsDisabled', @@ -18396,7 +18561,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:9-', 'chrome_os:11-'], -@@ -5914,7 +5914,7 @@ +@@ -6003,7 +6003,7 @@ }, { 'name': 'DeveloperToolsAvailability', @@ -18405,7 +18570,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6019,7 +6019,7 @@ +@@ -6108,7 +6108,7 @@ }, { 'name': 'RestoreOnStartup', @@ -18414,7 +18579,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6070,7 +6070,7 @@ +@@ -6159,7 +6159,7 @@ }, { 'name': 'RestoreOnStartupURLs', @@ -18423,7 +18588,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6082,7 +6082,7 @@ +@@ -6171,7 +6171,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -18432,7 +18597,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 38, 'caption': '''URLs to open on startup''', 'tags': [], -@@ -6094,7 +6094,7 @@ +@@ -6183,7 +6183,7 @@ }, { 'name': 'BlockThirdPartyCookies', @@ -18441,7 +18606,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:10-', 'chrome_os:11-', 'android:83-'], -@@ -6128,7 +6128,7 @@ +@@ -6217,7 +6217,7 @@ }, { 'name': 'DefaultSearchProviderEnabled', @@ -18450,7 +18615,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -6169,7 +6169,7 @@ +@@ -6258,7 +6258,7 @@ }, { 'name': 'DefaultSearchProviderContextMenuAccessAllowed', @@ -18459,7 +18624,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:85-', 'chrome_os:85-'], -@@ -6202,7 +6202,7 @@ +@@ -6291,7 +6291,7 @@ }, { 'name': 'DefaultSearchProviderName', @@ -18468,7 +18633,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6226,7 +6226,7 @@ +@@ -6315,7 +6315,7 @@ }, { 'name': 'DefaultSearchProviderKeyword', @@ -18477,7 +18642,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6250,7 +6250,7 @@ +@@ -6339,7 +6339,7 @@ }, { 'name': 'DefaultSearchProviderSearchURL', @@ -18486,7 +18651,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6274,7 +6274,7 @@ +@@ -6363,7 +6363,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURL', @@ -18495,7 +18660,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6298,7 +6298,7 @@ +@@ -6387,7 +6387,7 @@ }, { 'name': 'DefaultSearchProviderInstantURL', @@ -18504,7 +18669,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:10-63', 'chrome_os:11-63', 'android:30-63'], -@@ -6322,7 +6322,7 @@ +@@ -6411,7 +6411,7 @@ }, { 'name': 'DefaultSearchProviderIconURL', @@ -18513,7 +18678,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6346,7 +6346,7 @@ +@@ -6435,7 +6435,7 @@ }, { 'name': 'DefaultSearchProviderEncodings', @@ -18522,7 +18687,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6373,7 +6373,7 @@ +@@ -6462,7 +6462,7 @@ }, { 'name': 'DefaultSearchProviderAlternateURLs', @@ -18531,7 +18696,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -6400,7 +6400,7 @@ +@@ -6489,7 +6489,7 @@ }, { 'name': 'DefaultSearchProviderSearchTermsReplacementKey', @@ -18540,7 +18705,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:25-63', 'chrome_os:25-63', 'android:30-63'], -@@ -6422,7 +6422,7 @@ +@@ -6511,7 +6511,7 @@ }, { 'name': 'DefaultSearchProviderImageURL', @@ -18549,7 +18714,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6446,7 +6446,7 @@ +@@ -6535,7 +6535,7 @@ }, { 'name': 'DefaultSearchProviderNewTabURL', @@ -18558,7 +18723,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6470,7 +6470,7 @@ +@@ -6559,7 +6559,7 @@ }, { 'name': 'DefaultSearchProviderSearchURLPostParams', @@ -18567,7 +18732,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6494,7 +6494,7 @@ +@@ -6583,7 +6583,7 @@ }, { 'name': 'DefaultSearchProviderSuggestURLPostParams', @@ -18576,7 +18741,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6518,7 +6518,7 @@ +@@ -6607,7 +6607,7 @@ }, { 'name': 'DefaultSearchProviderInstantURLPostParams', @@ -18585,7 +18750,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:29-63', 'chrome_os:29-63', 'android:30-63'], -@@ -6540,7 +6540,7 @@ +@@ -6629,7 +6629,7 @@ }, { 'name': 'DefaultSearchProviderImageURLPostParams', @@ -18594,7 +18759,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -6564,7 +6564,7 @@ +@@ -6653,7 +6653,7 @@ }, { 'name': 'DefaultCookiesSetting', @@ -18603,7 +18768,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6608,7 +6608,7 @@ +@@ -6697,7 +6697,7 @@ }, { 'name': 'DefaultImagesSetting', @@ -18612,7 +18777,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6641,7 +6641,7 @@ +@@ -6730,7 +6730,7 @@ }, { 'name': 'DefaultJavaScriptSetting', @@ -18621,7 +18786,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6674,7 +6674,7 @@ +@@ -6763,7 +6763,7 @@ }, { 'name': 'DefaultPluginsSetting', @@ -18630,7 +18795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6715,7 +6715,7 @@ +@@ -6804,7 +6804,7 @@ }, { 'name': 'DefaultPopupsSetting', @@ -18639,7 +18804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6753,7 +6753,7 @@ +@@ -6842,7 +6842,7 @@ }, { 'name': 'DefaultNotificationsSetting', @@ -18648,7 +18813,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6791,7 +6791,7 @@ +@@ -6880,7 +6880,7 @@ }, { 'name': 'DefaultGeolocationSetting', @@ -18657,7 +18822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6830,7 +6830,7 @@ +@@ -6919,7 +6919,7 @@ }, { 'name': 'DefaultMediaStreamSetting', @@ -18666,7 +18831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6864,7 +6864,7 @@ +@@ -6953,7 +6953,7 @@ }, { 'name': 'DefaultWebBluetoothGuardSetting', @@ -18675,7 +18840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6898,7 +6898,7 @@ +@@ -6987,7 +6987,7 @@ }, { 'name': 'DefaultKeygenSetting', @@ -18684,7 +18849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6932,7 +6932,7 @@ +@@ -7021,7 +7021,7 @@ }, { 'name': 'DefaultSensorsSetting', @@ -18693,7 +18858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -6966,7 +6966,7 @@ +@@ -7055,7 +7055,7 @@ }, { 'name': 'DefaultWebUsbGuardSetting', @@ -18702,7 +18867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7000,7 +7000,7 @@ +@@ -7089,7 +7089,7 @@ }, { 'name': 'WebUsbAllowDevicesForUrls', @@ -18711,7 +18876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7032,7 +7032,7 @@ +@@ -7121,7 +7121,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -18720,7 +18885,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }], 'id': 486, 'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs.''', -@@ -7049,7 +7049,7 @@ +@@ -7138,7 +7138,7 @@ }, { 'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls', @@ -18729,7 +18894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7082,7 +7082,7 @@ +@@ -7171,7 +7171,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -18738,7 +18903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }], 'id': 603, 'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs on the login screen.''', -@@ -7097,7 +7097,7 @@ +@@ -7186,7 +7186,7 @@ }, { 'name': 'WebUsbAskForUrls', @@ -18747,7 +18912,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7118,11 +7118,11 @@ +@@ -7207,11 +7207,11 @@ URL patterns must not conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18761,7 +18926,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7143,11 +7143,11 @@ +@@ -7232,11 +7232,11 @@ URL patterns can't conflict with WebUsbAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18775,7 +18940,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7181,7 +7181,7 @@ +@@ -7270,7 +7270,7 @@ }, { 'name': 'SerialAskForUrls', @@ -18784,7 +18949,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7204,11 +7204,11 @@ +@@ -7293,11 +7293,11 @@ URL patterns must not conflict with SerialBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18798,7 +18963,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7231,11 +7231,11 @@ +@@ -7320,11 +7320,11 @@ URL patterns can't conflict with SerialAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18812,7 +18977,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7260,7 +7260,7 @@ +@@ -7349,7 +7349,7 @@ }, { 'name': 'SerialAllowUsbDevicesForUrls', @@ -18821,7 +18986,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7316,7 +7316,7 @@ +@@ -7405,7 +7405,7 @@ }, { 'name': 'DefaultWebHidGuardSetting', @@ -18830,7 +18995,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7352,7 +7352,7 @@ +@@ -7441,7 +7441,7 @@ }, { 'name': 'WebHidAskForUrls', @@ -18839,7 +19004,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7363,7 +7363,7 @@ +@@ -7452,7 +7452,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -18848,7 +19013,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 944, 'caption': '''Allow the WebHID API on these sites''', 'tags': ['website-sharing'], -@@ -7381,11 +7381,11 @@ +@@ -7470,11 +7470,11 @@ URL patterns must not conflict with WebHidBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18862,7 +19027,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7396,7 +7396,7 @@ +@@ -7485,7 +7485,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -18871,7 +19036,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 945, 'caption': '''Block the WebHID API on these sites''', 'tags': [], -@@ -7414,11 +7414,11 @@ +@@ -7503,11 +7503,11 @@ URL patterns can't conflict with WebHidAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -18885,7 +19050,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7429,7 +7429,7 @@ +@@ -7518,7 +7518,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -18894,7 +19059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 953, 'caption': '''Automatically grant permission to sites to connect to any HID device.''', 'tags': ['website-sharing'], -@@ -7443,7 +7443,7 @@ +@@ -7532,7 +7532,7 @@ }, { 'name': 'WebHidAllowDevicesForUrls', @@ -18903,7 +19068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7484,7 +7484,7 @@ +@@ -7573,7 +7573,7 @@ }, 'example_value': [{ 'devices': [{'vendor_id': 1234, 'product_id': 5678}], @@ -18912,7 +19077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }], 'id': 954, 'caption': '''Automatically grant permission to these sites to connect to HID devices with the given vendor and product IDs.''', -@@ -7497,7 +7497,7 @@ +@@ -7586,7 +7586,7 @@ }, { 'name': 'WebHidAllowDevicesWithHidUsagesForUrls', @@ -18921,7 +19086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -7538,7 +7538,7 @@ +@@ -7627,7 +7627,7 @@ }, 'example_value': [{ 'usages': [{'usage_page': 1234, 'usage': 5678}], @@ -18930,7 +19095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }], 'id': 955, 'caption': '''Automatically grant permission to these sites to connect to HID devices containing top-level collections with the given HID usage.''', -@@ -7551,7 +7551,7 @@ +@@ -7640,7 +7640,7 @@ }, { 'name': 'DefaultFileHandlingGuardSetting', @@ -18939,7 +19104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7586,7 +7586,7 @@ +@@ -7675,7 +7675,7 @@ }, { 'name': 'FileHandlingAllowedForUrls', @@ -18948,7 +19113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7610,11 +7610,11 @@ +@@ -7699,11 +7699,11 @@ URL patterns must not conflict with FileHandlingBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18962,7 +19127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7638,11 +7638,11 @@ +@@ -7727,11 +7727,11 @@ URL patterns must not conflict with FileHandlingAllowedForUrls. Neither policy takes precedence if a URL matches with both. @@ -18976,7 +19141,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7676,7 +7676,7 @@ +@@ -7765,7 +7765,7 @@ }, { 'name': 'DefaultFileSystemWriteGuardSetting', @@ -18985,7 +19150,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -7710,7 +7710,7 @@ +@@ -7799,7 +7799,7 @@ }, { 'name': 'FileSystemReadAskForUrls', @@ -18994,7 +19159,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7731,11 +7731,11 @@ +@@ -7820,11 +7820,11 @@ URL patterns must not conflict with FileSystemReadBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19008,7 +19173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7756,11 +7756,11 @@ +@@ -7845,11 +7845,11 @@ URL patterns can't conflict with FileSystemReadAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19022,7 +19187,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7781,11 +7781,11 @@ +@@ -7870,11 +7870,11 @@ URL patterns must not conflict with FileSystemWriteBlockedForUrls. Neither policy takes precedence if a URL matches with both. @@ -19036,7 +19201,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7806,11 +7806,11 @@ +@@ -7895,11 +7895,11 @@ URL patterns can't conflict with FileSystemWriteAskForUrls. Neither policy takes precedence if a URL matches with both. @@ -19050,7 +19215,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7870,7 +7870,7 @@ +@@ -7959,7 +7959,7 @@ }, { 'name': 'DeviceLoginScreenAutoSelectCertificateForUrls', @@ -19059,7 +19224,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7925,11 +7925,11 @@ +@@ -8014,11 +8014,11 @@ If this policy is left not set, no auto-selection will be done for any site. @@ -19073,7 +19238,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7954,11 +7954,11 @@ +@@ -8043,11 +8043,11 @@ See also policies CookiesBlockedForUrls and CookiesSessionOnlyForUrls. Note that there must be no conflicting URL patterns between these three policies - it is unspecified which policy takes precedence. @@ -19087,7 +19252,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -7983,11 +7983,11 @@ +@@ -8072,11 +8072,11 @@ While no specific policy takes precedence, see CookiesAllowedForUrls and CookiesSessionOnlyForUrls. URL patterns among these 3 policies must not conflict. @@ -19101,7 +19266,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8012,11 +8012,11 @@ +@@ -8101,11 +8101,11 @@ While no specific policy takes precedence, see CookiesBlockedForUrls and CookiesAllowedForUrls. URL patterns among these 3 policies must not conflict. @@ -19115,7 +19280,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8035,13 +8035,13 @@ +@@ -8124,13 +8124,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19131,7 +19296,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8060,13 +8060,13 @@ +@@ -8149,13 +8149,13 @@ Leaving the policy unset means DefaultImagesSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19147,7 +19312,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8085,11 +8085,11 @@ +@@ -8174,11 +8174,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19161,7 +19326,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8108,11 +8108,11 @@ +@@ -8197,11 +8197,11 @@ Leaving the policy unset means DefaultJavaScriptSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19175,7 +19340,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8132,11 +8132,11 @@ +@@ -8221,11 +8221,11 @@ If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise. @@ -19189,7 +19354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8156,11 +8156,11 @@ +@@ -8245,11 +8245,11 @@ If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise. @@ -19203,7 +19368,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8192,13 +8192,13 @@ +@@ -8281,13 +8281,13 @@ 'caption': '''Default legacy SameSite cookie behavior setting''', 'tags': [], 'deprecated': True, @@ -19219,7 +19384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8217,17 +8217,17 @@ +@@ -8306,17 +8306,17 @@ 'id': 624, 'caption': '''Revert to legacy SameSite behavior for cookies on these sites''', 'tags': [], @@ -19240,7 +19405,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:91-'], -@@ -8254,7 +8254,7 @@ +@@ -8343,7 +8343,7 @@ }, { 'name': 'LensRegionSearchEnabled', @@ -19249,7 +19414,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:94-', 'chrome_os:94-'], -@@ -8281,7 +8281,7 @@ +@@ -8370,7 +8370,7 @@ }, { 'name': 'SideSearchEnabled', @@ -19258,7 +19423,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema' : {'type': 'boolean'}, 'supported_on': ['chrome_os:96-', 'chrome.*:101-'], -@@ -8311,9 +8311,9 @@ +@@ -8400,9 +8400,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowed', 'owners': [ @@ -19271,7 +19436,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -8359,9 +8359,9 @@ +@@ -8448,9 +8448,9 @@ { 'name': 'InsecurePrivateNetworkRequestsAllowedForUrls', 'owners': [ @@ -19284,7 +19449,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'type': 'list', 'schema': { -@@ -8388,11 +8388,11 @@ +@@ -8477,11 +8477,11 @@ For origins not covered by the patterns specified here, the global default value will be used either from the InsecurePrivateNetworkRequestsAllowed policy, if it is set, or the user's personal configuration otherwise. @@ -19298,7 +19463,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8412,11 +8412,11 @@ +@@ -8501,11 +8501,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19312,7 +19477,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8436,11 +8436,11 @@ +@@ -8525,11 +8525,11 @@ Leaving the policy unset means DefaultPluginsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19326,7 +19491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8464,11 +8464,11 @@ +@@ -8553,11 +8553,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19340,7 +19505,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -8498,7 +8498,7 @@ +@@ -8587,7 +8587,7 @@ 'can_be_recommended': True, 'can_be_mandatory' : False, }, @@ -19349,7 +19514,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 268, 'caption': '''Register protocol handlers''', 'tags': [], -@@ -8509,7 +8509,7 @@ +@@ -8598,7 +8598,7 @@ }, { 'name': 'PopupsBlockedForUrls', @@ -19358,7 +19523,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8533,11 +8533,11 @@ +@@ -8622,11 +8622,11 @@ Leaving the policy unset means DefaultPopupsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19372,7 +19537,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8556,11 +8556,11 @@ +@@ -8645,11 +8645,11 @@ Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19386,7 +19551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8579,11 +8579,11 @@ +@@ -8668,11 +8668,11 @@ Leaving the policy unset means DefaultNotificationsSetting applies for all sites, if it's set. If not, the user's personal setting applies. @@ -19400,7 +19565,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8604,7 +8604,7 @@ +@@ -8693,7 +8693,7 @@ If the same URL pattern exists in both this policy and the SensorsBlockedForUrls policy, the latter is prioritized and access to motion or light sensors will be blocked. @@ -19409,7 +19574,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, { 'name': 'SensorsBlockedForUrls', -@@ -8629,11 +8629,11 @@ +@@ -8718,11 +8718,11 @@ If the same URL pattern exists in both this policy and the SensorsAllowedForUrls policy, this policy is prioritized and access to motion or light sensors will be blocked. @@ -19423,7 +19588,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8661,7 +8661,7 @@ +@@ -8750,7 +8750,7 @@ }, { 'name': 'NativeMessagingBlocklist', @@ -19432,7 +19597,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8686,7 +8686,7 @@ +@@ -8775,7 +8775,7 @@ }, { 'name': 'NativeMessagingWhitelist', @@ -19441,7 +19606,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8714,7 +8714,7 @@ +@@ -8803,7 +8803,7 @@ }, { 'name': 'NativeMessagingAllowlist', @@ -19450,7 +19615,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8739,7 +8739,7 @@ +@@ -8828,7 +8828,7 @@ }, { 'name': 'NativeMessagingUserLevelHosts', @@ -19459,7 +19624,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:34-'], -@@ -8767,7 +8767,7 @@ +@@ -8856,7 +8856,7 @@ }, { 'name': 'Disable3DAPIs', @@ -19468,7 +19633,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:9-', 'chrome_os:11-'], -@@ -8795,7 +8795,7 @@ +@@ -8884,7 +8884,7 @@ }, { 'name': 'PolicyRefreshRate', @@ -19477,7 +19642,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 1800000, 'maximum': 86400000 }, 'supported_on': ['chrome_os:11-', 'chrome.*:79-', 'ios:90-'], -@@ -8815,7 +8815,7 @@ +@@ -8904,7 +8904,7 @@ }, { 'name': 'MaxInvalidationFetchDelay', @@ -19486,7 +19651,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 1000, 'maximum': 300000 }, 'supported_on': ['chrome.*:30-', 'chrome_os:30-'], -@@ -8834,7 +8834,7 @@ +@@ -8923,7 +8923,7 @@ }, { 'name': 'ChromeFrameRendererSettings', @@ -19495,7 +19660,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -8866,7 +8866,7 @@ +@@ -8955,7 +8955,7 @@ }, { 'name': 'RenderInChromeFrameList', @@ -19504,7 +19669,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8885,11 +8885,11 @@ +@@ -8974,11 +8974,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -19518,7 +19683,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8908,11 +8908,11 @@ +@@ -8997,11 +8997,11 @@ If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy. @@ -19532,7 +19697,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:19-32'], -@@ -8930,7 +8930,7 @@ +@@ -9019,7 +9019,7 @@ }, { 'name': 'SkipMetadataCheck', @@ -19541,7 +19706,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_frame:31-32'], -@@ -8952,7 +8952,7 @@ +@@ -9041,7 +9041,7 @@ }, { 'name': 'ChromeFrameContentTypes', @@ -19550,7 +19715,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -8973,7 +8973,7 @@ +@@ -9062,7 +9062,7 @@ }, { 'name': 'ChromeOsLockOnIdleSuspend', @@ -19559,16 +19724,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:9-'], -@@ -9009,7 +9009,7 @@ +@@ -9098,7 +9098,7 @@ }, { 'name': 'ChromeOsMultiProfileUserBehavior', -- 'owners': ['xiyuan@chromium.org', 'sinhak@chromium.org', 'tellier@google.com', 'rsorokin@chromium.org', 'cros-oac@google.com'], -+ 'owners': ['xiyuan@ch40m1um.qjz9zk', 'sinhak@ch40m1um.qjz9zk', 'tellier@9oo91e.qjz9zk', 'rsorokin@ch40m1um.qjz9zk', 'cros-oac@9oo91e.qjz9zk'], +- 'owners': ['xiyuan@chromium.org', 'sinhak@chromium.org', 'rsorokin@chromium.org', 'cros-oac@google.com'], ++ 'owners': ['xiyuan@ch40m1um.qjz9zk', 'sinhak@ch40m1um.qjz9zk', 'rsorokin@ch40m1um.qjz9zk', 'cros-oac@9oo91e.qjz9zk'], 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9063,7 +9063,7 @@ +@@ -9152,7 +9152,7 @@ }, { 'name': 'SecondaryGoogleAccountSigninAllowed', @@ -19577,7 +19742,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:65-'], -@@ -9099,7 +9099,7 @@ +@@ -9188,7 +9188,7 @@ }, { 'name': 'SecondaryGoogleAccountUsage', @@ -19586,7 +19751,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9140,7 +9140,7 @@ +@@ -9229,7 +9229,7 @@ }, { 'name': 'ForceLogoutUnauthenticatedUserEnabled', @@ -19595,7 +19760,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -9160,7 +9160,7 @@ +@@ -9249,7 +9249,7 @@ }, { 'name': 'SecurityTokenSessionBehavior', @@ -19604,7 +19769,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -9196,7 +9196,7 @@ +@@ -9285,7 +9285,7 @@ }, { 'name': 'SecurityTokenSessionNotificationSeconds', @@ -19613,7 +19778,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:90-'], -@@ -9212,7 +9212,7 @@ +@@ -9301,7 +9301,7 @@ }, { 'name': 'TargetBlankImpliesNoOpener', @@ -19621,10 +19786,10 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['ericlaw@m1cr050ft.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:88-', 'chrome_os:88-', 'android:88-'], -@@ -9241,11 +9241,11 @@ + 'supported_on': ['chrome.*:88-102', 'chrome_os:88-102', 'android:88-102'], +@@ -9331,11 +9331,11 @@ - This policy will be removed in $1Google Chrome version 95. + This policy was removed in $1Google Chrome version 102. - See https://chromestatus.com/feature/6140064063029248.''', + See https://ch40mestatus.qjz9zk/feature/6140064063029248.''', @@ -19636,7 +19801,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:11-28', 'chrome_os:11-28'], -@@ -9273,7 +9273,7 @@ +@@ -9363,7 +9363,7 @@ }, { 'name': 'AppRecommendationZeroStateEnabled', @@ -19645,7 +19810,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -9293,7 +9293,7 @@ +@@ -9383,7 +9383,7 @@ }, { 'name': 'TranslateEnabled', @@ -19654,7 +19819,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -9317,7 +9317,7 @@ +@@ -9407,7 +9407,7 @@ }, { 'name': 'AllowOutdatedPlugins', @@ -19663,7 +19828,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:12-87', 'chrome_os:12-87'], -@@ -9336,7 +9336,7 @@ +@@ -9426,7 +9426,7 @@ }, { 'name': 'AlwaysAuthorizePlugins', @@ -19672,7 +19837,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:13-64', 'chrome_os:13-64'], -@@ -9355,7 +9355,7 @@ +@@ -9445,7 +9445,7 @@ }, { 'name': 'RunAllFlashInAllowMode', @@ -19681,7 +19846,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:63-88', 'chrome_os:63-88'], -@@ -9378,7 +9378,7 @@ +@@ -9468,7 +9468,7 @@ }, { 'name': 'BookmarkBarEnabled', @@ -19690,7 +19855,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:12-', 'chrome_os:12-'], -@@ -9397,7 +9397,7 @@ +@@ -9487,7 +9487,7 @@ }, { 'name': 'EditBookmarksEnabled', @@ -19699,7 +19864,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -9420,7 +9420,7 @@ +@@ -9510,7 +9510,7 @@ }, { 'name': 'ShowAppsShortcutInBookmarkBar', @@ -19708,7 +19873,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:37-'], -@@ -9453,7 +9453,7 @@ +@@ -9543,7 +9543,7 @@ }, { 'name': 'AllowFileSelectionDialogs', @@ -19717,7 +19882,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:12-'], -@@ -9482,7 +9482,7 @@ +@@ -9572,7 +9572,7 @@ }, { 'name': 'SecurityKeyPermitAttestation', @@ -19726,7 +19891,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['website-sharing'], 'type': 'list', 'schema': { -@@ -9503,7 +9503,7 @@ +@@ -9593,7 +9593,7 @@ }, { 'name': 'U2fSecurityKeyApiEnabled', @@ -19735,7 +19900,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -9534,11 +9534,11 @@ +@@ -9624,11 +9624,11 @@ This is a temporary opt-out mechanism. The U2F API will be removed from Chrome in Chrome 104, at which point this policy will cease to be supported. @@ -19749,7 +19914,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': ['full-admin-access'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -9571,7 +9571,7 @@ +@@ -9661,7 +9661,7 @@ }, { 'name': 'GCFUserDataDir', @@ -19758,7 +19923,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_frame:12-32'], -@@ -9587,14 +9587,14 @@ +@@ -9677,14 +9677,14 @@ If you set this policy, $3Google Chrome Frame will use the provided directory. @@ -19775,7 +19940,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:11-'], -@@ -9615,7 +9615,7 @@ +@@ -9705,7 +9705,7 @@ }, { 'name': 'ImportBookmarks', @@ -19784,7 +19949,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9636,7 +9636,7 @@ +@@ -9726,7 +9726,7 @@ }, { 'name': 'ImportHistory', @@ -19793,7 +19958,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9657,7 +9657,7 @@ +@@ -9747,7 +9747,7 @@ }, { 'name': 'ImportHomepage', @@ -19802,7 +19967,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9676,7 +9676,7 @@ +@@ -9766,7 +9766,7 @@ }, { 'name': 'ImportSearchEngine', @@ -19811,7 +19976,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9696,7 +9696,7 @@ +@@ -9786,7 +9786,7 @@ }, { 'name': 'ImportSavedPasswords', @@ -19820,7 +19985,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-'], -@@ -9716,7 +9716,7 @@ +@@ -9806,7 +9806,7 @@ }, { 'name': 'ImportAutofillFormData', @@ -19829,7 +19994,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-'], -@@ -9736,7 +9736,7 @@ +@@ -9826,7 +9826,7 @@ }, { 'name': 'MaxConnectionsPerProxy', @@ -19838,7 +20003,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome.*:14-'], -@@ -9755,7 +9755,7 @@ +@@ -9845,7 +9845,7 @@ }, { 'name': 'HideWebStorePromo', @@ -19847,7 +20012,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:15-21', 'chrome_os:15-21'], -@@ -9773,7 +9773,7 @@ +@@ -9863,7 +9863,7 @@ }, { 'name': 'URLBlacklist', @@ -19856,7 +20021,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9796,7 +9796,7 @@ +@@ -9886,7 +9886,7 @@ 'tags': ['filtering'], 'desc': '''This policy is deprecated, please use the 'URLBlocklist' policy instead. @@ -19865,7 +20030,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli From $1Google Chrome version 73, you can block javascript://* URLs. However, it affects only JavaScript entered in the address bar (or, for example, bookmarklets). In-page JavaScript URLs with dynamically loaded data aren't subject to this policy. For example, if you block example.com/abc, then example.com can still load example.com/abc using XMLHTTPRequest. -@@ -9805,7 +9805,7 @@ +@@ -9895,7 +9895,7 @@ }, { 'name': 'URLWhitelist', @@ -19874,7 +20039,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9828,7 +9828,7 @@ +@@ -9918,7 +9918,7 @@ 'tags': [], 'desc': '''This policy is deprecated, please use the 'URLAllowlist' policy instead. @@ -19883,7 +20048,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli This policy also allows enabling the automatic invocation by the browser of external application registered as protocol handlers for the listed protocols like "tel:" or "ssh:". -@@ -9839,7 +9839,7 @@ +@@ -9929,7 +9929,7 @@ }, { 'name': 'URLBlocklist', @@ -19892,7 +20057,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9860,7 +9860,7 @@ +@@ -9950,7 +9950,7 @@ 'id': 736, 'caption': '''Block access to a list of URLs''', 'tags': ['filtering'], @@ -19901,7 +20066,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli From $1Google Chrome version 73, you can block javascript://* URLs. However, it affects only JavaScript entered in the address bar (or, for example, bookmarklets). In-page JavaScript URLs with dynamically loaded data aren't subject to this policy. For example, if you block example.com/abc, then example.com can still load example.com/abc using XMLHTTPRequest. -@@ -9871,7 +9871,7 @@ +@@ -9961,7 +9961,7 @@ }, { 'name': 'URLAllowlist', @@ -19910,7 +20075,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9892,7 +9892,7 @@ +@@ -9982,7 +9982,7 @@ 'id': 737, 'caption': '''Allow access to a list of URLs''', 'tags': [], @@ -19919,7 +20084,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli This policy also allows enabling the automatic invocation by the browser of external application registered as protocol handlers for the listed protocols like "tel:" or "ssh:". -@@ -9905,7 +9905,7 @@ +@@ -9995,7 +9995,7 @@ }, { 'name': 'PolicyAtomicGroupsEnabled', @@ -19928,7 +20093,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:78-', 'chrome_os:78-'], -@@ -9925,7 +9925,7 @@ +@@ -10015,7 +10015,7 @@ }, { 'name': 'PolicyListMultipleSourceMergeList', @@ -19937,7 +20102,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -9958,7 +9958,7 @@ +@@ -10050,7 +10050,7 @@ }, { 'name': 'PolicyDictionaryMultipleSourceMergeList', @@ -19946,7 +20111,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -10027,7 +10027,7 @@ +@@ -10121,7 +10121,7 @@ }, { 'name': 'CloudUserPolicyMerge', @@ -19955,7 +20120,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:92-', 'android:97-'], -@@ -10061,7 +10061,7 @@ +@@ -10155,7 +10155,7 @@ }, { 'name': 'EnableExperimentalPolicies', @@ -19964,7 +20129,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -10090,10 +10090,10 @@ +@@ -10184,10 +10184,10 @@ }, { 'name': 'OpenNetworkConfiguration', @@ -19977,7 +20142,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'features': { 'dynamic_refresh': True, -@@ -10108,10 +10108,10 @@ +@@ -10202,10 +10202,10 @@ }, { 'name': 'DeviceOpenNetworkConfiguration', @@ -19990,7 +20155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:16-'], 'device_only': True, 'features': { -@@ -10126,7 +10126,7 @@ +@@ -10220,7 +10220,7 @@ }, { 'name': 'DeviceKerberosEncryptionTypes', @@ -19999,7 +20164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10173,7 +10173,7 @@ +@@ -10267,7 +10267,7 @@ }, { 'name': 'DeviceUserPolicyLoopbackProcessingMode', @@ -20008,7 +20173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -10216,7 +10216,7 @@ +@@ -10310,7 +10310,7 @@ }, { 'name': 'DeviceMachinePasswordChangeRate', @@ -20017,7 +20182,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:66-'], -@@ -10239,7 +10239,7 @@ +@@ -10333,7 +10333,7 @@ }, { 'name': 'DeviceGpoCacheLifetime', @@ -20026,7 +20191,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:73-'], -@@ -10262,7 +10262,7 @@ +@@ -10356,7 +10356,7 @@ }, { 'name': 'DeviceAuthDataCacheLifetime', @@ -20035,7 +20200,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 9999 }, 'supported_on': ['chrome_os:73-'], -@@ -10285,7 +10285,7 @@ +@@ -10379,7 +10379,7 @@ }, { 'name': 'ChromadToCloudMigrationEnabled', @@ -20044,7 +20209,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -10319,7 +10319,7 @@ +@@ -10413,7 +10413,7 @@ }, { 'name': 'CloudPrintSubmitEnabled', @@ -20052,8 +20217,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['file://printing/OWNERS', 'weili@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:17-'], -@@ -10339,7 +10339,7 @@ + 'supported_on': ['chrome.*:17-101'], +@@ -10434,7 +10434,7 @@ }, { 'name': 'EnterpriseWebStoreURL', @@ -20062,7 +20227,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:17-28', 'chrome_os:17-28'], -@@ -10356,7 +10356,7 @@ +@@ -10451,7 +10451,7 @@ }, { 'name': 'EnterpriseWebStoreName', @@ -20071,7 +20236,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:17-28', 'chrome_os:17-28'], -@@ -10373,7 +10373,7 @@ +@@ -10468,7 +10468,7 @@ }, { 'name': 'DisablePrintPreview', @@ -20080,7 +20245,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:18-'], -@@ -10391,7 +10391,7 @@ +@@ -10486,7 +10486,7 @@ }, { 'name': 'PrintHeaderFooter', @@ -20089,7 +20254,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-', 'chrome.*:70-'], -@@ -10410,7 +10410,7 @@ +@@ -10505,7 +10505,7 @@ }, { 'name': 'DefaultPrinterSelection', @@ -20098,7 +20263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'validation_schema': { -@@ -10451,7 +10451,7 @@ +@@ -10546,7 +10546,7 @@ }, { 'name': 'DisableSSLRecordSplitting', @@ -20107,7 +20272,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:18-46', 'chrome_os:18-46'], -@@ -10470,7 +10470,7 @@ +@@ -10565,7 +10565,7 @@ }, { 'name': 'EnableOnlineRevocationChecks', @@ -20116,7 +20281,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:19-', 'chrome_os:19-'], -@@ -10490,7 +10490,7 @@ +@@ -10585,7 +10585,7 @@ }, { 'name': 'RequireOnlineRevocationChecksForLocalAnchors', @@ -20125,7 +20290,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], -@@ -10519,7 +10519,7 @@ +@@ -10614,7 +10614,7 @@ }, { 'name': 'EnableSha1ForLocalAnchors', @@ -20134,7 +20299,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:54-71', 'chrome_os:54-71', 'android:54-71'], -@@ -10540,7 +10540,7 @@ +@@ -10635,7 +10635,7 @@ }, { 'name': 'EnableCommonNameFallbackForLocalAnchors', @@ -20143,7 +20308,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:58-65', 'chrome_os:58-65', 'android:58-65'], -@@ -10561,7 +10561,7 @@ +@@ -10656,7 +10656,7 @@ }, { 'name': 'EnableSymantecLegacyInfrastructure', @@ -20152,7 +20317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:66-75', 'chrome_os:66-75', 'android:66-75'], -@@ -10584,7 +10584,7 @@ +@@ -10679,7 +10679,7 @@ }, { 'name': 'BuiltinCertificateVerifierEnabled', @@ -20161,7 +20326,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-83', 'chrome.linux:79-83', 'chrome.mac:83-'], -@@ -10605,7 +10605,7 @@ +@@ -10700,7 +10700,7 @@ }, { 'name': 'ForceEphemeralProfiles', @@ -20170,7 +20335,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:32-'], -@@ -10627,7 +10627,7 @@ +@@ -10722,7 +10722,7 @@ }, { 'name': 'GaiaOfflineSigninTimeLimitDays', @@ -20179,7 +20344,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': -1, 'maximum': 365 }, 'supported_on': ['chrome_os:90-'], -@@ -10652,7 +10652,7 @@ +@@ -10747,7 +10747,7 @@ }, { 'name': 'SAMLOfflineSigninTimeLimit', @@ -20188,7 +20353,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': -1 }, 'supported_on': ['chrome_os:34-'], -@@ -10676,7 +10676,7 @@ +@@ -10771,7 +10771,7 @@ }, { 'name': 'GaiaLockScreenOfflineSigninTimeLimitDays', @@ -20197,7 +20362,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -10709,7 +10709,7 @@ +@@ -10804,7 +10804,7 @@ }, { 'name': 'SamlLockScreenOfflineSigninTimeLimitDays', @@ -20206,7 +20371,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -10742,7 +10742,7 @@ +@@ -10837,7 +10837,7 @@ }, { 'name': 'AutoCleanUpStrategy', @@ -20215,7 +20380,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -10782,7 +10782,7 @@ +@@ -10877,7 +10877,7 @@ }, { 'name': 'EnableDeviceGranularReporting', @@ -20224,7 +20389,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10812,7 +10812,7 @@ +@@ -10907,7 +10907,7 @@ }, { 'name': 'ReportDeviceVersionInfo', @@ -20233,7 +20398,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -10832,7 +10832,7 @@ +@@ -10927,7 +10927,7 @@ }, { 'name': 'ReportDeviceActivityTimes', @@ -20242,7 +20407,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -10852,7 +10852,7 @@ +@@ -10947,7 +10947,7 @@ }, { 'name': 'ReportDeviceAudioStatus', @@ -20251,7 +20416,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10884,7 +10884,7 @@ +@@ -10979,7 +10979,7 @@ }, { 'name': 'ReportDeviceAudioStatusCheckingRateMs', @@ -20260,7 +20425,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, 'future_on': ['chrome_os'], -@@ -10905,7 +10905,7 @@ +@@ -11000,7 +11000,7 @@ }, { 'name': 'ReportDeviceBootMode', @@ -20269,7 +20434,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:18-'], -@@ -10925,7 +10925,7 @@ +@@ -11020,7 +11020,7 @@ }, { 'name': 'ReportDeviceLocation', @@ -20278,7 +20443,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -10945,7 +10945,7 @@ +@@ -11040,7 +11040,7 @@ }, { 'name': 'ReportDeviceNetworkConfiguration', @@ -20287,7 +20452,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -10977,7 +10977,7 @@ +@@ -11072,7 +11072,7 @@ }, { 'name': 'ReportDeviceNetworkInterfaces', @@ -20296,7 +20461,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -10998,7 +10998,7 @@ +@@ -11093,7 +11093,7 @@ }, { 'name': 'ReportDeviceNetworkStatus', @@ -20305,7 +20470,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11030,7 +11030,7 @@ +@@ -11125,7 +11125,7 @@ }, { 'name': 'ReportDeviceNetworkTelemetryCollectionRateMs', @@ -20314,7 +20479,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, 'future_on': ['chrome_os'], -@@ -11051,7 +11051,7 @@ +@@ -11146,7 +11146,7 @@ }, { 'name': 'ReportDeviceNetworkTelemetryEventCheckingRateMs', @@ -20323,7 +20488,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, 'future_on': ['chrome_os'], -@@ -11072,7 +11072,7 @@ +@@ -11167,7 +11167,7 @@ }, { 'name': 'ReportDeviceUsers', @@ -20332,7 +20497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -11092,7 +11092,7 @@ +@@ -11187,7 +11187,7 @@ }, { 'name': 'ReportDeviceHardwareStatus', @@ -20341,7 +20506,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -11113,7 +11113,7 @@ +@@ -11208,7 +11208,7 @@ }, { 'name': 'ReportDeviceSessionStatus', @@ -20350,7 +20515,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:42-'], -@@ -11133,7 +11133,7 @@ +@@ -11228,7 +11228,7 @@ }, { 'name': 'ReportDeviceSecurityStatus', @@ -20359,7 +20524,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11165,7 +11165,7 @@ +@@ -11260,7 +11260,7 @@ }, { 'name': 'ReportDeviceGraphicsStatus', @@ -20368,7 +20533,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -11188,7 +11188,7 @@ +@@ -11283,7 +11283,7 @@ }, { 'name': 'ReportDeviceCrashReportInfo', @@ -20377,7 +20542,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11211,7 +11211,7 @@ +@@ -11306,7 +11306,7 @@ }, { 'name': 'ReportDeviceOsUpdateStatus', @@ -20386,7 +20551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -11233,7 +11233,7 @@ +@@ -11328,7 +11328,7 @@ }, { 'name': 'ReportDevicePowerStatus', @@ -20395,7 +20560,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -11253,7 +11253,7 @@ +@@ -11348,7 +11348,7 @@ }, { 'name': 'ReportDevicePeripherals', @@ -20404,7 +20569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:101-'], -@@ -11284,7 +11284,7 @@ +@@ -11379,7 +11379,7 @@ }, { 'name': 'ReportDeviceStorageStatus', @@ -20413,7 +20578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -11305,7 +11305,7 @@ +@@ -11400,7 +11400,7 @@ }, { 'name': 'ReportDeviceBoardStatus', @@ -20422,7 +20587,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:73-'], -@@ -11325,7 +11325,7 @@ +@@ -11420,7 +11420,7 @@ }, { 'name': 'ReportDeviceCpuInfo', @@ -20431,7 +20596,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -11346,7 +11346,7 @@ +@@ -11441,7 +11441,7 @@ }, { 'name': 'ReportDeviceTimezoneInfo', @@ -20440,7 +20605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11367,7 +11367,7 @@ +@@ -11462,7 +11462,7 @@ }, { 'name': 'ReportDeviceMemoryInfo', @@ -20449,7 +20614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11388,7 +11388,7 @@ +@@ -11483,7 +11483,7 @@ }, { 'name': 'ReportDeviceBacklightInfo', @@ -20458,7 +20623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -11409,7 +11409,7 @@ +@@ -11504,7 +11504,7 @@ }, { 'name': 'ReportDeviceAppInfo', @@ -20467,7 +20632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11430,7 +11430,7 @@ +@@ -11525,7 +11525,7 @@ }, { 'name': 'ReportDeviceBluetoothInfo', @@ -20476,7 +20641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11451,7 +11451,7 @@ +@@ -11546,7 +11546,7 @@ }, { 'name': 'ReportDeviceFanInfo', @@ -20485,7 +20650,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11472,7 +11472,7 @@ +@@ -11567,7 +11567,7 @@ }, { 'name': 'ReportDeviceVpdInfo', @@ -20494,7 +20659,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -11494,7 +11494,7 @@ +@@ -11589,7 +11589,7 @@ }, { 'name': 'ReportDeviceSystemInfo', @@ -20503,7 +20668,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -11515,7 +11515,7 @@ +@@ -11610,7 +11610,7 @@ }, { 'name': 'ReportDevicePrintJobs', @@ -20512,7 +20677,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -11547,7 +11547,7 @@ +@@ -11642,7 +11642,7 @@ }, { 'name': 'ReportDeviceLoginLogout', @@ -20521,7 +20686,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:96-'], -@@ -11579,7 +11579,7 @@ +@@ -11674,7 +11674,7 @@ }, { 'name': 'ReportCRDSessions', @@ -20530,7 +20695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:99-'], -@@ -11611,7 +11611,7 @@ +@@ -11706,7 +11706,7 @@ }, { 'name': 'ReportUploadFrequency', @@ -20539,7 +20704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 60000 }, 'supported_on': ['chrome_os:42-'], -@@ -11631,7 +11631,7 @@ +@@ -11726,7 +11726,7 @@ }, { 'name': 'ReportArcStatusEnabled', @@ -20548,7 +20713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:55-'], -@@ -11650,7 +11650,7 @@ +@@ -11745,7 +11745,7 @@ }, { 'name': 'ReportCrostiniUsageEnabled', @@ -20557,7 +20722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -11669,7 +11669,7 @@ +@@ -11764,7 +11764,7 @@ }, { 'name': 'HeartbeatEnabled', @@ -20566,7 +20731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -11689,7 +11689,7 @@ +@@ -11784,7 +11784,7 @@ }, { 'name': 'HeartbeatFrequency', @@ -20575,7 +20740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 30000 }, 'supported_on': ['chrome_os:43-'], -@@ -11709,7 +11709,7 @@ +@@ -11804,7 +11804,7 @@ }, { 'name': 'LogUploadEnabled', @@ -20584,7 +20749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:46-'], -@@ -11729,7 +11729,7 @@ +@@ -11824,7 +11824,7 @@ }, { 'name': 'DeviceUserWhitelist', @@ -20593,7 +20758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11742,11 +11742,11 @@ +@@ -11837,11 +11837,11 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -20607,7 +20772,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is not configured, there are no restrictions on which users are allowed to sign in. Note that creating new users still requires the DeviceAllowNewUsers policy to be configured appropriately. -@@ -11757,7 +11757,7 @@ +@@ -11852,7 +11852,7 @@ }, { 'name': 'DeviceUserAllowlist', @@ -20616,7 +20781,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -11769,11 +11769,11 @@ +@@ -11864,11 +11864,11 @@ 'features': { 'dynamic_refresh': True, }, @@ -20630,7 +20795,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is not configured, there are no restrictions on which users are allowed to sign in. Note that creating new users still requires the DeviceAllowNewUsers policy to be configured appropriately. If DeviceFamilyLinkAccountsAllowed is enabled, Family Link users will be allowed additionally to the accounts defined in this policy.''', -@@ -11781,7 +11781,7 @@ +@@ -11876,7 +11876,7 @@ }, { 'name': 'DeviceAllowNewUsers', @@ -20639,7 +20804,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11802,7 +11802,7 @@ +@@ -11897,7 +11897,7 @@ }, { 'name': 'DeviceGuestModeEnabled', @@ -20648,7 +20813,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11820,7 +11820,7 @@ +@@ -11915,7 +11915,7 @@ }, { 'name': 'DeviceShowUserNamesOnSignin', @@ -20657,7 +20822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11840,7 +11840,7 @@ +@@ -11935,7 +11935,7 @@ }, { 'name': 'DeviceDataRoamingEnabled', @@ -20666,7 +20831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:12-'], -@@ -11858,7 +11858,7 @@ +@@ -11953,7 +11953,7 @@ }, { 'name': 'DeviceMetricsReportingEnabled', @@ -20675,7 +20840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:14-'], -@@ -11880,7 +11880,7 @@ +@@ -11975,7 +11975,7 @@ }, { 'name': 'ChromeOsReleaseChannel', @@ -20684,7 +20849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -11918,7 +11918,7 @@ +@@ -12013,7 +12013,7 @@ }, { 'name': 'ChromeOsReleaseChannelDelegated', @@ -20693,7 +20858,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -11936,7 +11936,7 @@ +@@ -12031,7 +12031,7 @@ }, { 'name': 'DeviceReleaseLtsTag', @@ -20702,7 +20867,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:86-'], -@@ -11952,7 +11952,7 @@ +@@ -12047,7 +12047,7 @@ }, { 'name': 'DeviceChannelDowngradeBehavior', @@ -20711,7 +20876,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -11997,7 +11997,7 @@ +@@ -12092,7 +12092,7 @@ }, { 'name': 'DeviceEphemeralUsersEnabled', @@ -20720,7 +20885,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12013,7 +12013,7 @@ +@@ -12108,7 +12108,7 @@ }, { 'name': 'DeviceStartUpUrls', @@ -20729,7 +20894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12025,7 +12025,7 @@ +@@ -12120,7 +12120,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -20738,7 +20903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 137, 'caption': '''Load specified urls on demo login''', 'tags': [], -@@ -12035,7 +12035,7 @@ +@@ -12130,7 +12130,7 @@ }, { 'name': 'DeviceIdleLogoutTimeout', @@ -20747,7 +20912,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -12056,7 +12056,7 @@ +@@ -12151,7 +12151,7 @@ }, { 'name': 'DeviceIdleLogoutWarningDuration', @@ -20756,7 +20921,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -12077,7 +12077,7 @@ +@@ -12172,7 +12172,7 @@ }, { 'name': 'DeviceLoginScreenSaverId', @@ -20765,7 +20930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-40'], -@@ -12096,7 +12096,7 @@ +@@ -12191,7 +12191,7 @@ }, { 'name': 'DeviceLoginScreenSaverTimeout', @@ -20774,7 +20939,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:19-40'], -@@ -12117,7 +12117,7 @@ +@@ -12212,7 +12212,7 @@ }, { 'name': 'DeviceAppPack', @@ -20783,7 +20948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12129,7 +12129,7 @@ +@@ -12224,7 +12224,7 @@ 'dynamic_refresh': True, }, 'deprecated': True, @@ -20792,7 +20957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 135, 'caption': '''List of AppPack extensions''', 'tags': [], -@@ -12141,7 +12141,7 @@ +@@ -12236,7 +12236,7 @@ }, { 'name': 'DeviceAutoUpdateDisabled', @@ -20801,7 +20966,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12161,7 +12161,7 @@ +@@ -12256,7 +12256,7 @@ }, { 'name': 'DeviceAutoUpdateP2PEnabled', @@ -20810,7 +20975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -12182,7 +12182,7 @@ +@@ -12277,7 +12277,7 @@ }, { 'name': 'DeviceRollbackAllowedMilestones', @@ -20819,7 +20984,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -12210,7 +12210,7 @@ +@@ -12305,7 +12305,7 @@ }, { 'name': 'DeviceRollbackToTargetVersion', @@ -20828,7 +20993,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -12249,7 +12249,7 @@ +@@ -12344,7 +12344,7 @@ }, { 'name': 'DeviceTargetVersionPrefix', @@ -20837,7 +21002,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:19-'], -@@ -12274,7 +12274,7 @@ +@@ -12369,7 +12369,7 @@ }, { 'name': 'DeviceTargetVersionSelector', @@ -20846,7 +21011,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:95-'], -@@ -12303,7 +12303,7 @@ +@@ -12398,7 +12398,7 @@ }, { 'name': 'DeviceUpdateScatterFactor', @@ -20855,7 +21020,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:20-'], -@@ -12319,7 +12319,7 @@ +@@ -12414,7 +12414,7 @@ }, { 'name': 'DeviceUpdateAllowedConnectionTypes', @@ -20864,7 +21029,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12340,7 +12340,7 @@ +@@ -12435,7 +12435,7 @@ }, { 'name': 'DeviceUpdateHttpDownloadsEnabled', @@ -20873,7 +21038,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -12360,7 +12360,7 @@ +@@ -12455,7 +12455,7 @@ }, { 'name': 'DeviceLocalAccounts', @@ -20882,7 +21047,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12382,7 +12382,7 @@ +@@ -12477,7 +12477,7 @@ }, { 'name': 'KioskCRXManifestUpdateURLIgnored', @@ -20891,7 +21056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -12414,7 +12414,7 @@ +@@ -12509,7 +12509,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginId', @@ -20900,7 +21065,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -12433,7 +12433,7 @@ +@@ -12528,7 +12528,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginDelay', @@ -20909,7 +21074,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-'], -@@ -12454,7 +12454,7 @@ +@@ -12549,7 +12549,7 @@ }, { 'name': 'DeviceLocalAccountAutoLoginBailoutEnabled', @@ -20918,7 +21083,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -12473,7 +12473,7 @@ +@@ -12568,7 +12568,7 @@ }, { 'name': 'DeviceLocalAccountPromptForNetworkWhenOffline', @@ -20927,7 +21092,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:33-'], -@@ -12492,7 +12492,7 @@ +@@ -12587,7 +12587,7 @@ }, { 'name': 'DeviceLocalAccountManagedSessionEnabled', @@ -20936,16 +21101,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -12506,7 +12506,7 @@ +@@ -12601,7 +12601,7 @@ 'caption': '''Allow managed session on device''', 'tags': [], - 'desc': '''Note that this policy is deprecated and will be removed in $2Google Chrome OS version 88. Public sessions are no longer supported. Please use DeviceLocalAccounts to configure managed-guest sessions instead. + 'desc': '''Note that this policy is deprecated and will be removed in $2Google ChromeOS version 88. Public sessions are no longer supported. Please use DeviceLocalAccounts to configure managed-guest sessions instead. - If this policy is set to false, managed guest session will behave as documented in https://support.google.com/chrome/a/answer/3017014 - the standard "Public Session". + If this policy is set to false, managed guest session will behave as documented in https://support.9oo91e.qjz9zk/chrome/a/answer/3017014 - the standard "Public Session". If this policy is set to true or left unset, managed guest session will take on "Managed Session" behaviour which lifts many of the restrictions that are in place for regular "Public Sessions". -@@ -12514,7 +12514,7 @@ +@@ -12609,7 +12609,7 @@ }, { 'name': 'DeviceBlockDevmode', @@ -20954,8 +21119,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-'], -@@ -12533,7 +12533,7 @@ - 'arc_support': 'This policy controls $2Google Chrome OS developer mode only. If you want to prevent access to Android Developer Options, you need to set the DeveloperToolsDisabled policy.', +@@ -12628,7 +12628,7 @@ + 'arc_support': 'This policy controls $2Google ChromeOS developer mode only. If you want to prevent access to Android Developer Options, you need to set the DeveloperToolsDisabled policy.', }, { 'name': 'ManagedGuestSessionAutoLaunchNotificationReduced', - 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], @@ -20963,7 +21128,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-88'], -@@ -12557,7 +12557,7 @@ +@@ -12652,7 +12652,7 @@ }, { 'name': 'ManagedGuestSessionPrivacyWarningsEnabled', @@ -20972,7 +21137,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -12581,7 +12581,7 @@ +@@ -12676,7 +12676,7 @@ }, { 'name': 'BackgroundModeEnabled', @@ -20981,7 +21146,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'], -@@ -12602,7 +12602,7 @@ +@@ -12697,7 +12697,7 @@ }, { 'name': 'DriveDisabled', @@ -20990,7 +21155,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12621,7 +12621,7 @@ +@@ -12716,7 +12716,7 @@ }, { 'name': 'DriveDisabledOverCellular', @@ -20999,7 +21164,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:19-'], -@@ -12640,7 +12640,7 @@ +@@ -12735,7 +12735,7 @@ }, { 'name': 'PinnedLauncherApps', @@ -21008,7 +21173,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12652,20 +12652,20 @@ +@@ -12747,20 +12747,20 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -21017,7 +21182,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 144, 'caption': '''List of pinned apps to show in the launcher''', 'tags': [], - 'desc': '''Setting the policy fixes which application identifiers $2Google Chrome OS shows as pinned apps in the launcher bar, and users can't change them. + 'desc': '''Setting the policy fixes which application identifiers $2Google ChromeOS shows as pinned apps in the launcher bar, and users can't change them. - Specify Chrome apps by their ID, such as pjkljhegncpnkpknbcohdijeoejaedia; Android apps by their package name, such as com.google.android.gm; and web apps by the URL used in WebAppInstallForceList, such as https://google.com/maps. + Specify Chrome apps by their ID, such as pjkljhegncpnkpknbcohdijeoejaedia; Android apps by their package name, such as com.google.android.gm; and web apps by the URL used in WebAppInstallForceList, such as https://9oo91e.qjz9zk/maps. @@ -21032,7 +21197,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:21-'], -@@ -12685,7 +12685,7 @@ +@@ -12780,7 +12780,7 @@ }, { 'name': 'DisableSafeBrowsingProceedAnyway', @@ -21041,7 +21206,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -12706,11 +12706,11 @@ +@@ -12801,11 +12801,11 @@ Setting the policy to Disabled or leaving it unset means users can choose to proceed to the flagged site after the warning appears. @@ -21055,7 +21220,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:44-84', 'chrome_os:44-84'], -@@ -12727,11 +12727,11 @@ +@@ -12822,11 +12822,11 @@ Setting this policy to false stops users from choosing to send some system information and page content to Google servers. If this setting is true or not configured, then users will be allowed to send some system information and page content to Safe Browsing to help detect dangerous apps and sites. @@ -21069,7 +21234,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:22-', 'chrome_os:22-'], -@@ -12767,7 +12767,7 @@ +@@ -12862,7 +12862,7 @@ }, { 'name': 'ExternalStorageDisabled', @@ -21078,7 +21243,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:22-'], -@@ -12785,7 +12785,7 @@ +@@ -12880,7 +12880,7 @@ }, { 'name': 'ExternalStorageReadOnly', @@ -21087,7 +21252,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 343, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -12803,7 +12803,7 @@ +@@ -12898,7 +12898,7 @@ }, { 'name': 'AudioOutputAllowed', @@ -21096,7 +21261,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:23-'], -@@ -12823,7 +12823,7 @@ +@@ -12918,7 +12918,7 @@ }, { 'name': 'AudioCaptureAllowed', @@ -21105,7 +21270,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:25-', 'chrome_os:23-'], -@@ -12844,7 +12844,7 @@ +@@ -12939,7 +12939,7 @@ }, { 'name': 'AudioCaptureAllowedUrls', @@ -21114,7 +21279,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12861,11 +12861,11 @@ +@@ -12956,11 +12956,11 @@ 'tags': ['website-sharing'], 'desc': '''Setting the policy means you specify the URL list whose patterns get matched to the security origin of the requesting URL. A match grants access to audio capture devices without prompt @@ -21128,7 +21293,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:25-', 'chrome_os:25-'], -@@ -12885,7 +12885,7 @@ +@@ -12980,7 +12980,7 @@ }, { 'name': 'VideoCaptureAllowedUrls', @@ -21137,7 +21302,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -12902,11 +12902,11 @@ +@@ -12997,11 +12997,11 @@ 'tags': ['website-sharing'], 'desc': '''Setting the policy means you specify the URL list whose patterns get matched to the security origin of the requesting URL. A match grants access to video capture devices without prompt @@ -21151,7 +21316,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:22-', 'chrome.*:22-'], -@@ -12922,7 +12922,7 @@ +@@ -13017,7 +13017,7 @@ }, { 'name': 'SystemTimezone', @@ -21160,7 +21325,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:22-'], -@@ -12942,7 +12942,7 @@ +@@ -13037,7 +13037,7 @@ }, { 'name': 'SystemUse24HourClock', @@ -21169,7 +21334,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:30-'], -@@ -12964,7 +12964,7 @@ +@@ -13059,7 +13059,7 @@ }, { 'name': 'TouchVirtualKeyboardEnabled', @@ -21178,7 +21343,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:37-' ], -@@ -12991,7 +12991,7 @@ +@@ -13086,7 +13086,7 @@ }, { 'name': 'ShowLogoutButtonInTray', @@ -21187,7 +21352,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:25-'], -@@ -13009,7 +13009,7 @@ +@@ -13104,7 +13104,7 @@ }, { 'name': 'BuiltInDnsClientEnabled', @@ -21196,7 +21361,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -13035,7 +13035,7 @@ +@@ -13130,7 +13130,7 @@ }, { 'name': 'DnsOverHttpsMode', @@ -21205,7 +21370,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -13090,7 +13090,7 @@ +@@ -13185,7 +13185,7 @@ }, { 'name': 'DnsOverHttpsTemplates', @@ -21214,7 +21379,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -13118,7 +13118,7 @@ +@@ -13213,7 +13213,7 @@ }, { 'name': 'AdditionalDnsQueryTypesEnabled', @@ -21223,7 +21388,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -13155,7 +13155,7 @@ +@@ -13250,7 +13250,7 @@ }, { 'name': 'ShelfAutoHideBehavior', @@ -21232,7 +21397,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -13192,7 +13192,7 @@ +@@ -13287,7 +13287,7 @@ }, { 'name': 'ShelfAlignment', @@ -21241,7 +21406,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', # In shelf_prefs.cc, there are 3 const char[] defining kShelfAlignmentLocal values: # ash::kShelfAlignmentBottom = "Bottom", ash::kShelfAlignmnetLeft = "Left", -@@ -13247,7 +13247,7 @@ +@@ -13342,7 +13342,7 @@ }, { 'name': 'SystemFeaturesDisableList', @@ -21250,7 +21415,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -13333,7 +13333,7 @@ +@@ -13428,7 +13428,7 @@ }, { 'name': 'SystemFeaturesDisableMode', @@ -21259,7 +21424,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -13375,7 +13375,7 @@ +@@ -13470,7 +13470,7 @@ }, { 'name': 'FloatingAccessibilityMenuEnabled', @@ -21268,7 +21433,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -13395,7 +13395,7 @@ +@@ -13490,7 +13490,7 @@ }, { 'name': 'UserDisplayName', @@ -21277,7 +21442,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:25-'], -@@ -13417,7 +13417,7 @@ +@@ -13512,7 +13512,7 @@ }, { 'name': 'SessionLengthLimit', @@ -21286,7 +21451,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:25-'], -@@ -13439,7 +13439,7 @@ +@@ -13534,7 +13534,7 @@ }, { 'name': 'FullscreenAllowed', @@ -21295,7 +21460,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], -@@ -13460,7 +13460,7 @@ +@@ -13555,7 +13555,7 @@ 'id': 804, 'name': 'FullscreenAlertEnabled', 'caption': '''Enable fullscreen alert''', @@ -21304,7 +21469,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'supported_on': ['chrome_os:88-'], -@@ -13493,7 +13493,7 @@ +@@ -13588,7 +13588,7 @@ 'id': 930, 'name': 'KeepFullscreenWithoutNotificationUrlAllowList', 'caption': '''List of URLs which are allowed to remain in full screen mode without showing a notification''', @@ -21313,7 +21478,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -13512,13 +13512,13 @@ +@@ -13607,13 +13607,13 @@ 'tags': [], 'desc': '''Configure a list of URLs that are allowed to stay in full screen mode without showing a notification when the device returns from the lock screen. @@ -21329,7 +21494,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13549,7 +13549,7 @@ +@@ -13644,7 +13644,7 @@ }, { 'name': 'ScreenOffDelayAC', @@ -21338,7 +21503,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13580,7 +13580,7 @@ +@@ -13675,7 +13675,7 @@ }, { 'name': 'ScreenLockDelayAC', @@ -21347,7 +21512,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13613,7 +13613,7 @@ +@@ -13708,7 +13708,7 @@ }, { 'name': 'IdleWarningDelayAC', @@ -21356,7 +21521,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13644,7 +13644,7 @@ +@@ -13739,7 +13739,7 @@ }, { 'name': 'IdleDelayAC', @@ -21365,7 +21530,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13673,7 +13673,7 @@ +@@ -13768,7 +13768,7 @@ }, { 'name': 'ScreenDimDelayBattery', @@ -21374,7 +21539,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13704,7 +13704,7 @@ +@@ -13799,7 +13799,7 @@ }, { 'name': 'ScreenOffDelayBattery', @@ -21383,7 +21548,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13735,7 +13735,7 @@ +@@ -13830,7 +13830,7 @@ }, { 'name': 'ScreenLockDelayBattery', @@ -21392,7 +21557,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13768,7 +13768,7 @@ +@@ -13863,7 +13863,7 @@ }, { 'name': 'IdleWarningDelayBattery', @@ -21401,7 +21566,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13799,7 +13799,7 @@ +@@ -13894,7 +13894,7 @@ }, { 'name': 'IdleDelayBattery', @@ -21410,7 +21575,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -13828,7 +13828,7 @@ +@@ -13923,7 +13923,7 @@ }, { 'name': 'IdleAction', @@ -21419,7 +21584,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13875,7 +13875,7 @@ +@@ -13970,7 +13970,7 @@ }, { 'name': 'IdleActionAC', @@ -21428,7 +21593,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13924,7 +13924,7 @@ +@@ -14019,7 +14019,7 @@ }, { 'name': 'IdleActionBattery', @@ -21437,7 +21602,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -13973,7 +13973,7 @@ +@@ -14068,7 +14068,7 @@ }, { 'name': 'LidCloseAction', @@ -21446,7 +21611,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14018,7 +14018,7 @@ +@@ -14113,7 +14113,7 @@ }, { 'name': 'PowerManagementUsesAudioActivity', @@ -21455,7 +21620,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14036,7 +14036,7 @@ +@@ -14131,7 +14131,7 @@ }, { 'name': 'PowerManagementUsesVideoActivity', @@ -21464,7 +21629,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14055,7 +14055,7 @@ +@@ -14150,7 +14150,7 @@ }, { 'name': 'PresentationIdleDelayScale', @@ -21473,7 +21638,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:26-28'], -@@ -14072,7 +14072,7 @@ +@@ -14167,7 +14167,7 @@ }, { 'name': 'PresentationScreenDimDelayScale', @@ -21482,7 +21647,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -14092,7 +14092,7 @@ +@@ -14187,7 +14187,7 @@ }, { 'name': 'AllowWakeLocks', @@ -21491,7 +21656,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -14121,7 +14121,7 @@ +@@ -14216,7 +14216,7 @@ }, { 'name': 'AllowScreenWakeLocks', @@ -21500,7 +21665,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -14150,7 +14150,7 @@ +@@ -14245,7 +14245,7 @@ }, { 'name': 'UserActivityScreenDimDelayScale', @@ -21509,7 +21674,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -14170,7 +14170,7 @@ +@@ -14265,7 +14265,7 @@ }, { 'name': 'WaitForInitialUserActivity', @@ -21518,7 +21683,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:32-'], -@@ -14188,7 +14188,7 @@ +@@ -14283,7 +14283,7 @@ }, { 'name': 'PowerManagementIdleSettings', @@ -21527,7 +21692,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14292,7 +14292,7 @@ +@@ -14387,7 +14387,7 @@ }, { 'name': 'ScreenLockDelays', @@ -21536,7 +21701,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14329,7 +14329,7 @@ +@@ -14424,7 +14424,7 @@ }, { 'name': 'DeviceLoginScreenPowerManagement', @@ -21545,7 +21710,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14417,7 +14417,7 @@ +@@ -14512,7 +14512,7 @@ }, { 'name': 'DeviceAllowRedeemChromeOsRegistrationOffers', @@ -21554,7 +21719,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:26-'], -@@ -14446,7 +14446,7 @@ +@@ -14541,7 +14541,7 @@ }, { 'name': 'TermsOfServiceURL', @@ -21563,7 +21728,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:26-'], -@@ -14466,7 +14466,7 @@ +@@ -14561,7 +14561,7 @@ }, { 'name': 'ShowAccessibilityOptionsInSystemTrayMenu', @@ -21572,7 +21737,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:27-'], -@@ -14487,7 +14487,7 @@ +@@ -14582,7 +14582,7 @@ }, { 'name': 'DeviceLoginScreenShowOptionsInSystemTrayMenu', @@ -21581,7 +21746,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -14508,7 +14508,7 @@ +@@ -14603,7 +14603,7 @@ }, { 'name': 'LargeCursorEnabled', @@ -21590,7 +21755,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14527,7 +14527,7 @@ +@@ -14622,7 +14622,7 @@ }, { 'name': 'SpokenFeedbackEnabled', @@ -21599,7 +21764,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14546,7 +14546,7 @@ +@@ -14641,7 +14641,7 @@ }, { 'name': 'HighContrastEnabled', @@ -21608,7 +21773,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14565,7 +14565,7 @@ +@@ -14660,7 +14660,7 @@ }, { 'name': 'DeviceLoginScreenAccessibilityShortcutsEnabled', @@ -21617,7 +21782,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -14591,7 +14591,7 @@ +@@ -14686,7 +14686,7 @@ }, { 'name': 'AccessibilityShortcutsEnabled', @@ -21626,7 +21791,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -14616,7 +14616,7 @@ +@@ -14711,7 +14711,7 @@ }, { 'name': 'VirtualKeyboardEnabled', @@ -21635,7 +21800,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -14635,7 +14635,7 @@ +@@ -14730,7 +14730,7 @@ }, { 'name': 'VirtualKeyboardFeatures', @@ -21644,7 +21809,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -14687,7 +14687,7 @@ +@@ -14782,7 +14782,7 @@ }, { 'name': 'StickyKeysEnabled', @@ -21653,7 +21818,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -14706,7 +14706,7 @@ +@@ -14801,7 +14801,7 @@ }, { 'name': 'SelectToSpeakEnabled', @@ -21662,7 +21827,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -14731,7 +14731,7 @@ +@@ -14826,7 +14826,7 @@ }, { 'name': 'DictationEnabled', @@ -21671,7 +21836,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14756,7 +14756,7 @@ +@@ -14851,7 +14851,7 @@ }, { 'name': 'KeyboardFocusHighlightEnabled', @@ -21680,7 +21845,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14783,7 +14783,7 @@ +@@ -14878,7 +14878,7 @@ }, { 'name': 'CursorHighlightEnabled', @@ -21689,7 +21854,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14810,7 +14810,7 @@ +@@ -14905,7 +14905,7 @@ }, { 'name': 'CaretHighlightEnabled', @@ -21698,7 +21863,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14837,7 +14837,7 @@ +@@ -14932,7 +14932,7 @@ }, { 'name': 'MonoAudioEnabled', @@ -21707,7 +21872,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14864,7 +14864,7 @@ +@@ -14959,7 +14959,7 @@ }, { 'name': 'AutoclickEnabled', @@ -21716,7 +21881,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14891,7 +14891,7 @@ +@@ -14986,7 +14986,7 @@ }, { 'name': 'KeyboardDefaultToFunctionKeys', @@ -21725,7 +21890,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:35-'], -@@ -14910,7 +14910,7 @@ +@@ -15005,7 +15005,7 @@ }, { 'name': 'ScreenMagnifierType', @@ -21734,7 +21899,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -14949,7 +14949,7 @@ +@@ -15044,7 +15044,7 @@ }, { 'name': 'DeviceLoginScreenDefaultLargeCursorEnabled', @@ -21743,7 +21908,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -14971,7 +14971,7 @@ +@@ -15066,7 +15066,7 @@ }, { 'name': 'DeviceLoginScreenLargeCursorEnabled', @@ -21752,7 +21917,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:78-'], -@@ -14996,7 +14996,7 @@ +@@ -15091,7 +15091,7 @@ }, { 'name': 'DeviceLoginScreenDefaultSpokenFeedbackEnabled', @@ -21761,7 +21926,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15018,7 +15018,7 @@ +@@ -15113,7 +15113,7 @@ }, { 'name': 'DeviceLoginScreenSpokenFeedbackEnabled', @@ -21770,7 +21935,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15043,7 +15043,7 @@ +@@ -15138,7 +15138,7 @@ }, { 'name': 'DeviceLoginScreenDefaultHighContrastEnabled', @@ -21779,7 +21944,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15065,7 +15065,7 @@ +@@ -15160,7 +15160,7 @@ }, { 'name': 'DeviceLoginScreenHighContrastEnabled', @@ -21788,7 +21953,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15090,7 +15090,7 @@ +@@ -15185,7 +15185,7 @@ }, { 'name': 'DeviceLoginScreenDefaultVirtualKeyboardEnabled', @@ -21797,7 +21962,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:34-'], -@@ -15115,7 +15115,7 @@ +@@ -15210,7 +15210,7 @@ }, { 'name': 'DeviceLoginScreenVirtualKeyboardEnabled', @@ -21806,7 +21971,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15140,7 +15140,7 @@ +@@ -15235,7 +15235,7 @@ }, { 'name': 'PrimaryMouseButtonSwitch', @@ -21815,7 +21980,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -15165,7 +15165,7 @@ +@@ -15260,7 +15260,7 @@ }, { 'name': 'DeviceLoginScreenPrimaryMouseButtonSwitch', @@ -21824,7 +21989,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:81-'], -@@ -15190,7 +15190,7 @@ +@@ -15285,7 +15285,7 @@ }, { 'name': 'SharedClipboardEnabled', @@ -21833,7 +21998,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:79-', 'chrome_os:79-', 'android:79-'], -@@ -15216,7 +15216,7 @@ +@@ -15311,7 +15311,7 @@ }, { 'name': 'DeviceLoginScreenDefaultScreenMagnifierType', @@ -21842,7 +22007,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15260,7 +15260,7 @@ +@@ -15355,7 +15355,7 @@ }, { 'name': 'DeviceLoginScreenScreenMagnifierType', @@ -21851,7 +22016,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15307,7 +15307,7 @@ +@@ -15402,7 +15402,7 @@ }, { 'name': 'DeviceLoginScreenDictationEnabled', @@ -21860,7 +22025,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15332,7 +15332,7 @@ +@@ -15427,7 +15427,7 @@ }, { 'name': 'DeviceLoginScreenSelectToSpeakEnabled', @@ -21869,7 +22034,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15357,7 +15357,7 @@ +@@ -15452,7 +15452,7 @@ }, { 'name': 'DeviceLoginScreenCursorHighlightEnabled', @@ -21878,7 +22043,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15382,7 +15382,7 @@ +@@ -15477,7 +15477,7 @@ }, { 'name': 'DeviceLoginScreenCaretHighlightEnabled', @@ -21887,7 +22052,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15407,7 +15407,7 @@ +@@ -15502,7 +15502,7 @@ }, { 'name': 'DeviceLoginScreenMonoAudioEnabled', @@ -21896,7 +22061,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15434,7 +15434,7 @@ +@@ -15529,7 +15529,7 @@ }, { 'name': 'DeviceLoginScreenAutoclickEnabled', @@ -21905,7 +22070,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15461,7 +15461,7 @@ +@@ -15556,7 +15556,7 @@ }, { 'name': 'DeviceLoginScreenStickyKeysEnabled', @@ -21914,7 +22079,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15486,7 +15486,7 @@ +@@ -15581,7 +15581,7 @@ }, { 'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled', @@ -21923,7 +22088,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -15513,7 +15513,7 @@ +@@ -15608,7 +15608,7 @@ }, { 'name': 'HideWebStoreIcon', @@ -21932,7 +22097,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:26-', 'chrome_os:68-'], -@@ -15533,7 +15533,7 @@ +@@ -15628,7 +15628,7 @@ }, { 'name': 'DeviceStartUpFlags', @@ -21941,7 +22106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15555,7 +15555,7 @@ +@@ -15650,7 +15650,7 @@ }, { 'name': 'UptimeLimit', @@ -21950,7 +22115,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:29-'], -@@ -15576,7 +15576,7 @@ +@@ -15671,7 +15671,7 @@ }, { 'name': 'RebootAfterUpdate', @@ -21959,7 +22124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:29-'], -@@ -15600,7 +15600,7 @@ +@@ -15695,7 +15695,7 @@ }, { 'name': 'VariationsRestrictParameter', @@ -21968,7 +22133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:27-', 'android:34-'], -@@ -15621,7 +15621,7 @@ +@@ -15716,7 +15716,7 @@ }, { 'name': 'DeviceVariationsRestrictParameter', @@ -21977,7 +22142,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:28-'], -@@ -15642,7 +15642,7 @@ +@@ -15737,7 +15737,7 @@ }, { 'name': 'ChromeVariations', @@ -21986,7 +22151,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15679,7 +15679,7 @@ +@@ -15774,7 +15774,7 @@ 'tags': [], 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied in $1Google Chrome. @@ -21995,7 +22160,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli Setting the VariationsEnabled (value 0), or leaving the policy not set allows all variations to be applied to the browser. -@@ -15689,7 +15689,7 @@ +@@ -15784,7 +15784,7 @@ }, { 'name': 'DeviceChromeVariations', @@ -22004,16 +22169,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -15724,7 +15724,7 @@ +@@ -15819,7 +15819,7 @@ 'tags': [], - 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied on an enterprise-managed $2Google Chrome OS device. + 'desc': '''Configuring this policy allows to specify which variations are allowed to be applied on an enterprise-managed $2Google ChromeOS device. -- Variations provide a means for offering modifications to $2Google Chrome OS without shipping a new version by selectively enabling or disabling already existing features. See https://support.google.com/chrome/a?p=Manage_the_Chrome_variations_framework for more information. -+ Variations provide a means for offering modifications to $2Google Chrome OS without shipping a new version by selectively enabling or disabling already existing features. See https://support.9oo91e.qjz9zk/chrome/a?p=Manage_the_Chrome_variations_framework for more information. +- Variations provide a means for offering modifications to $2Google ChromeOS without shipping a new version by selectively enabling or disabling already existing features. See https://support.google.com/chrome/a?p=Manage_the_Chrome_variations_framework for more information. ++ Variations provide a means for offering modifications to $2Google ChromeOS without shipping a new version by selectively enabling or disabling already existing features. See https://support.9oo91e.qjz9zk/chrome/a?p=Manage_the_Chrome_variations_framework for more information. - Setting the VariationsEnabled (value 0), or leaving the policy not set allows all variations to be applied to $2Google Chrome OS. + Setting the VariationsEnabled (value 0), or leaving the policy not set allows all variations to be applied to $2Google ChromeOS. -@@ -15734,7 +15734,7 @@ +@@ -15829,7 +15829,7 @@ }, { 'name': 'AttestationEnabledForDevice', @@ -22022,7 +22187,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -15753,7 +15753,7 @@ +@@ -15848,7 +15848,7 @@ }, { 'name': 'AttestationEnabledForUser', @@ -22031,7 +22196,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:28-'], -@@ -15771,7 +15771,7 @@ +@@ -15866,7 +15866,7 @@ }, { 'name': 'AttestationExtensionAllowlist', @@ -22040,7 +22205,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15792,7 +15792,7 @@ +@@ -15887,7 +15887,7 @@ }, { 'name': 'AttestationExtensionWhitelist', @@ -22049,7 +22214,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -15816,7 +15816,7 @@ +@@ -15911,7 +15911,7 @@ }, { 'name': 'AttestationForContentProtectionEnabled', @@ -22058,7 +22223,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:31-'], -@@ -15835,7 +15835,7 @@ +@@ -15930,7 +15930,7 @@ }, { 'name': 'SuppressChromeFrameTurndownPrompt', @@ -22067,7 +22232,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Suppress the $3Google Chrome Frame turndown prompt''', 'tags': [], 'desc': '''Suppresses the turndown prompt that appears when a site is rendered by $3Google Chrome Frame.''', -@@ -15851,7 +15851,7 @@ +@@ -15946,7 +15946,7 @@ }, { 'name': 'SupervisedUsersEnabled', @@ -22076,7 +22241,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -15874,7 +15874,7 @@ +@@ -15969,7 +15969,7 @@ }, { 'name': 'SupervisedUserCreationEnabled', @@ -22085,7 +22250,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -15897,7 +15897,7 @@ +@@ -15992,7 +15992,7 @@ # It, however, needs to be here both because this is the source of the list of Chrome's App # Restrictions on Android, and to avoid possible future naming conflicts with policies. 'name': 'SupervisedUserContentProviderEnabled', @@ -22094,7 +22259,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -15916,7 +15916,7 @@ +@@ -16011,7 +16011,7 @@ }, { 'name': 'ManagedBookmarks', @@ -22103,7 +22268,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -15949,20 +15949,20 @@ +@@ -16044,20 +16044,20 @@ "toplevel_name": "My managed bookmarks folder" }, { "name": "Google", @@ -22128,7 +22293,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli } ] } -@@ -15970,13 +15970,13 @@ +@@ -16065,13 +16065,13 @@ 'id': 227, 'caption': '''Managed Bookmarks''', 'tags': [], @@ -22144,7 +22309,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'deprecated': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -15995,7 +15995,7 @@ +@@ -16090,7 +16090,7 @@ }, { 'name': 'UserAvatarImage', @@ -22153,7 +22318,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -16032,7 +16032,7 @@ +@@ -16127,7 +16127,7 @@ }, { 'name': 'WallpaperImage', @@ -22162,7 +22327,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -16067,7 +16067,7 @@ +@@ -16162,7 +16162,7 @@ }, { 'name': 'EnableDeprecatedWebPlatformFeatures', @@ -22171,7 +22336,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -16106,7 +16106,7 @@ +@@ -16201,7 +16201,7 @@ }, { 'name': 'DeviceTransferSAMLCookies', @@ -22180,7 +22345,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -16132,7 +16132,7 @@ +@@ -16227,7 +16227,7 @@ }, { 'name': 'EasyUnlockAllowed', @@ -22189,7 +22354,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:38-'], -@@ -16153,7 +16153,7 @@ +@@ -16248,7 +16248,7 @@ }, { 'name': 'SessionLocales', @@ -22198,7 +22363,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16181,7 +16181,7 @@ +@@ -16276,7 +16276,7 @@ }, { 'name': 'BrowserGuestModeEnabled', @@ -22207,7 +22372,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:38-', 'chrome_os:100-'], -@@ -16201,7 +16201,7 @@ +@@ -16296,7 +16296,7 @@ }, { 'name': 'BrowserGuestModeEnforced', @@ -22216,7 +22381,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:77-'], -@@ -16219,7 +16219,7 @@ +@@ -16314,7 +16314,7 @@ }, { 'name': 'BrowserAddPersonEnabled', @@ -22225,7 +22390,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:39-', 'chrome_os:100-'], -@@ -16239,7 +16239,7 @@ +@@ -16334,7 +16334,7 @@ }, { 'name': 'ForceBrowserSignin', @@ -22234,7 +22399,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'deprecated': True, 'schema': { 'type': 'boolean' }, -@@ -16260,7 +16260,7 @@ +@@ -16355,7 +16355,7 @@ }, { 'name': 'BrowserSignin', @@ -22243,7 +22408,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16299,13 +16299,13 @@ +@@ -16394,13 +16394,13 @@ If the policy is set to "Enable browser sign-in," then the user is allowed to sign in to the browser. On all platforms except iOS, the user is automatically signed in to the browser when signed in to Google web services like Gmail. Being signed in to the browser means the user's account information will be kept by the browser. However, it does not mean that $1Google Chrome Sync will be turned on by default; the user must separately opt-in to use this feature. Enabling this policy will prevent the user from turning off the setting that allows browser sign-in. To control the availability of $1Google Chrome Sync, use the SyncDisabled policy. @@ -22259,7 +22424,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16365,7 +16365,7 @@ +@@ -16460,7 +16460,7 @@ }, { 'name': 'SSLVersionFallbackMin', @@ -22268,7 +22433,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16410,7 +16410,7 @@ +@@ -16505,7 +16505,7 @@ }, { 'name': 'SSLVersionMax', @@ -22277,7 +22442,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -16488,7 +16488,7 @@ +@@ -16583,7 +16583,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForUrls', @@ -22286,7 +22451,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16511,11 +16511,11 @@ +@@ -16606,11 +16606,11 @@ Leaving the policy unset means that if certificates requiring disclosure through Certificate Transparency aren't disclosed, then $1Google Chrome doesn't trust those certificates. @@ -22300,7 +22465,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16548,7 +16548,7 @@ +@@ -16643,7 +16643,7 @@ }, { 'name': 'CertificateTransparencyEnforcementDisabledForLegacyCas', @@ -22309,7 +22474,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16575,7 +16575,7 @@ +@@ -16670,7 +16670,7 @@ }, { 'name': 'RC4Enabled', @@ -22318,7 +22483,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -16600,7 +16600,7 @@ +@@ -16695,7 +16695,7 @@ }, { 'name': 'DHEEnabled', @@ -22327,7 +22492,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -16627,7 +16627,7 @@ +@@ -16722,7 +16722,7 @@ }, { 'name': 'ContextualSearchEnabled', @@ -22336,7 +22501,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -16658,7 +16658,7 @@ +@@ -16753,7 +16753,7 @@ }, { 'name': 'DeviceRebootOnShutdown', @@ -22345,7 +22510,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:41-'], -@@ -16676,7 +16676,7 @@ +@@ -16771,7 +16771,7 @@ }, { 'name': 'ExtensionCacheSize', @@ -22354,7 +22519,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:43-'], -@@ -16695,7 +16695,7 @@ +@@ -16790,7 +16790,7 @@ }, { 'name': 'DeviceLoginScreenDomainAutoComplete', @@ -22363,7 +22528,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ 'chrome_os:44-'], -@@ -16713,7 +16713,7 @@ +@@ -16808,7 +16808,7 @@ }, { 'name': 'ForceMaximizeOnFirstRun', @@ -22372,7 +22537,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:43-'], -@@ -16731,7 +16731,7 @@ +@@ -16826,7 +16826,7 @@ }, { 'name': 'SSLErrorOverrideAllowed', @@ -22381,7 +22546,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:44-', 'chrome_os:44-', 'android:44-'], -@@ -16749,7 +16749,7 @@ +@@ -16844,7 +16844,7 @@ }, { 'name': 'SSLErrorOverrideAllowedForOrigins', @@ -22390,7 +22555,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16770,11 +16770,11 @@ +@@ -16865,11 +16865,11 @@ Leaving the policy unset means SSLErrorOverrideAllowed applies for all sites. @@ -22404,7 +22569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -16785,7 +16785,7 @@ +@@ -16880,7 +16880,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -22413,7 +22578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 865, 'caption': '''Allow origins to query for device attributes''', 'tags': [], -@@ -16795,7 +16795,7 @@ +@@ -16890,7 +16890,7 @@ }, { 'name': 'QuicAllowed', @@ -22422,7 +22587,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:43-', 'chrome_os:43-'], -@@ -16813,7 +16813,7 @@ +@@ -16908,7 +16908,7 @@ }, { 'name': 'KeyPermissions', @@ -22431,7 +22596,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -16856,7 +16856,7 @@ +@@ -16951,7 +16951,7 @@ }, { 'name': 'WelcomePageOnOSUpgradeEnabled', @@ -22440,7 +22605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.win:45-62'], 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -16875,7 +16875,7 @@ +@@ -16970,7 +16970,7 @@ }, { 'name': 'HardwareAccelerationModeEnabled', @@ -22449,7 +22614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:46-'], -@@ -16893,7 +16893,7 @@ +@@ -16988,7 +16988,7 @@ }, { 'name': 'UnifiedDesktopEnabledByDefault', @@ -22458,7 +22623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:47-'], -@@ -16912,7 +16912,7 @@ +@@ -17007,7 +17007,7 @@ }, { 'name': 'DisplayRotationDefault', @@ -22467,7 +22632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -16957,7 +16957,7 @@ +@@ -17052,7 +17052,7 @@ }, { 'name': 'ArcEnabled', @@ -22476,7 +22641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:50-'], -@@ -16975,7 +16975,7 @@ +@@ -17070,7 +17070,7 @@ }, { 'name': 'ArcPolicy', @@ -22485,7 +22650,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'description_schema': { -@@ -17035,7 +17035,7 @@ +@@ -17130,7 +17130,7 @@ }, { 'name': 'AllowKioskAppControlChromeVersion', @@ -22494,7 +22659,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -17057,7 +17057,7 @@ +@@ -17152,7 +17152,7 @@ }, { 'name': 'LoginAuthenticationBehavior', @@ -22503,25 +22668,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17093,7 +17093,7 @@ +@@ -17188,7 +17188,7 @@ }, { 'name': 'UsbDetachableWhitelist', - 'owners': ['vpalatin@chromium.org', 'hendrich@chromium.org'], + 'owners': ['vpalatin@ch40m1um.qjz9zk', 'hendrich@ch40m1um.qjz9zk'], - 'type': 'list', + 'type': 'dict', 'schema': { 'type': 'array', -@@ -17134,7 +17134,7 @@ +@@ -17229,7 +17229,7 @@ }, { 'name': 'UsbDetachableAllowlist', - 'owners': ['vpalatin@chromium.org', 'hendrich@chromium.org'], + 'owners': ['vpalatin@ch40m1um.qjz9zk', 'hendrich@ch40m1um.qjz9zk'], - 'type': 'list', + 'type': 'dict', 'schema': { 'type': 'array', -@@ -17171,7 +17171,7 @@ +@@ -17266,7 +17266,7 @@ }, { 'name': 'DeviceAllowBluetooth', @@ -22530,7 +22695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:52-'], -@@ -17191,7 +17191,7 @@ +@@ -17286,7 +17286,7 @@ }, { 'name': 'SuppressUnsupportedOSWarning', @@ -22539,7 +22704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Suppress the unsupported OS warning''', 'desc': '''Setting the policy to Enabled suppresses the warning that appears when $1Google Chrome is running on an unsupported computer or operating system. -@@ -17209,7 +17209,7 @@ +@@ -17304,7 +17304,7 @@ }, { 'name': 'DeviceQuirksDownloadEnabled', @@ -22548,7 +22713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:51-'], -@@ -17243,7 +17243,7 @@ +@@ -17338,7 +17338,7 @@ }, { 'name': 'SystemTimezoneAutomaticDetection', @@ -22557,7 +22722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17297,7 +17297,7 @@ +@@ -17392,7 +17392,7 @@ }, { 'name': 'TaskManagerEndProcessEnabled', @@ -22566,7 +22731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Enable ending processes in Task Manager''', 'desc': '''Setting the policy to Disabled prevents users from ending processes in the Task Manager. -@@ -17315,7 +17315,7 @@ +@@ -17410,7 +17410,7 @@ }, { 'name': 'DeviceShowLowDiskSpaceNotification', @@ -22575,7 +22740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -17353,7 +17353,7 @@ +@@ -17448,7 +17448,7 @@ }, { 'name': 'NetworkThrottlingEnabled', @@ -22584,7 +22749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'caption': '''Enable throttling network bandwidth''', 'desc': '''Setting the policy turns network throttling on or off. This means that the system is throttled to achieve the provided upload and download rates (in kbits/s). It applies to all users and interfaces on the device.''', -@@ -17388,7 +17388,7 @@ +@@ -17483,7 +17483,7 @@ }, { 'name': 'DeviceWiFiFastTransitionEnabled', @@ -22593,7 +22758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'caption': '''Enable 802.11r Fast Transition''', 'desc': '''Setting the policy to Enabled means that Fast Transition is used when the wireless access point supports it. It applies to all users and interfaces on the device. -@@ -17407,7 +17407,7 @@ +@@ -17502,7 +17502,7 @@ }, { 'name': 'DeviceWiFiAllowed', @@ -22601,8 +22766,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['apotapchuk@ch40m1um.qjz9zk'], 'device_only': True, 'caption': '''Enable WiFi''', - 'desc': '''Setting the policy to Disabled means $2Google Chrome OS turns off Wi-Fi, and users can't change it. -@@ -17426,7 +17426,7 @@ + 'desc': '''Setting the policy to Disabled means $2Google ChromeOS turns off Wi-Fi, and users can't change it. +@@ -17521,7 +17521,7 @@ }, { 'name': 'DeviceDockMacAddressSource', @@ -22611,7 +22776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Device MAC address source when docked''', 'desc': '''Setting the policy lets the administrator change the MAC (media access control) address when connecting a device to the dock. When a dock is connected to some device models, by default, the device's designated dock's MAC address helps identify the device on Ethernet. -@@ -17471,7 +17471,7 @@ +@@ -17566,7 +17566,7 @@ }, { 'name': 'LoginVideoCaptureAllowedUrls', @@ -22620,7 +22785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17495,7 +17495,7 @@ +@@ -17590,7 +17590,7 @@ }, { 'name': 'DeviceLoginScreenExtensions', @@ -22629,7 +22794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17506,7 +17506,7 @@ +@@ -17601,7 +17601,7 @@ 'features': { 'dynamic_refresh': True, }, @@ -22638,7 +22803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 336, 'caption': '''Configure the list of installed apps and extensions on the login screen''', 'tags': ['full-admin-access'], -@@ -17519,13 +17519,13 @@ +@@ -17614,13 +17614,13 @@ If an app or extension that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome. @@ -22655,7 +22820,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'caption': '''Permit locking the screen''', 'desc': '''Setting the policy to Enabled or leaving it unset lets users who authenticate with a password lock the screen. -@@ -17543,7 +17543,7 @@ +@@ -17638,7 +17638,7 @@ }, { 'name': 'ArcCertificatesSyncMode', @@ -22664,7 +22829,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -17576,7 +17576,7 @@ +@@ -17671,7 +17671,7 @@ }, { 'name': 'AllowedDomainsForApps', @@ -22673,7 +22838,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:51-', 'chrome_os:51-', 'android:51-'], -@@ -17585,7 +17585,7 @@ +@@ -17680,7 +17680,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -22682,7 +22847,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 331, 'caption': '''Define domains allowed to access Google Workspace''', 'tags': ['filtering'], -@@ -17595,11 +17595,11 @@ +@@ -17690,11 +17690,11 @@ Users cannot change or override this setting. @@ -22696,7 +22861,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ 'chrome.*:52-74', 'chrome_os:52-74' ], -@@ -17692,7 +17692,7 @@ +@@ -17787,7 +17787,7 @@ }, { 'name': 'ArcBackupRestoreEnabled', @@ -22705,7 +22870,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:53-67'], -@@ -17710,7 +17710,7 @@ +@@ -17805,7 +17805,7 @@ }, { 'name': 'ArcLocationServiceEnabled', @@ -22714,7 +22879,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-67'], -@@ -17728,7 +17728,7 @@ +@@ -17823,7 +17823,7 @@ }, { 'name': 'NTPContentSuggestionsEnabled', @@ -22723,7 +22888,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:54-','ios:93-'], -@@ -17759,7 +17759,7 @@ +@@ -17854,7 +17854,7 @@ }, { 'name': 'NTPCustomBackgroundEnabled', @@ -22732,7 +22897,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-', 'chrome_os:80-'], -@@ -17790,7 +17790,7 @@ +@@ -17885,7 +17885,7 @@ }, { 'name': 'NTPCardsVisible', @@ -22741,7 +22906,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:88-', 'chrome_os:88-'], -@@ -17829,7 +17829,7 @@ +@@ -17924,7 +17924,7 @@ }, { 'name': 'NTPMiddleSlotAnnouncementVisible', @@ -22750,7 +22915,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:99-', 'chrome_os:99-'], -@@ -17862,7 +17862,7 @@ +@@ -17957,7 +17957,7 @@ }, { 'name': 'WebRtcUdpPortRange', @@ -22759,7 +22924,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:54-', 'chrome_os:54-', 'android:54-'], -@@ -17880,7 +17880,7 @@ +@@ -17975,7 +17975,7 @@ }, { 'name': 'WebRtcLocalIpsAllowedUrls', @@ -22768,7 +22933,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17902,7 +17902,7 @@ +@@ -17997,7 +17997,7 @@ }, { 'name': 'ComponentUpdatesEnabled', @@ -22777,7 +22942,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:54-', 'chrome_os:54-'], -@@ -17921,7 +17921,7 @@ +@@ -18016,7 +18016,7 @@ }, { 'name': 'NativePrinters', @@ -22786,16 +22951,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -17945,7 +17945,7 @@ +@@ -18040,7 +18040,7 @@ 'properties': { 'effective_model': { 'type': 'string', -- 'description': 'This field must match one of the strings which represent a $2Google Chrome OS supported printer. The string will be used to identify and install the appropriate PPD for the printer. More information can be found at https://support.google.com/chrome?p=noncloudprint.' -+ 'description': 'This field must match one of the strings which represent a $2Google Chrome OS supported printer. The string will be used to identify and install the appropriate PPD for the printer. More information can be found at https://support.9oo91e.qjz9zk/chrome?p=noncloudprint.' +- 'description': 'This field must match one of the strings which represent a $2Google ChromeOS supported printer. The string will be used to identify and install the appropriate PPD for the printer. More information can be found at https://support.google.com/chrome?p=noncloudprint.' ++ 'description': 'This field must match one of the strings which represent a $2Google ChromeOS supported printer. The string will be used to identify and install the appropriate PPD for the printer. More information can be found at https://support.9oo91e.qjz9zk/chrome?p=noncloudprint.' }, 'autoconf': { 'type': 'boolean', -@@ -18001,7 +18001,7 @@ +@@ -18096,7 +18096,7 @@ }, { 'name': 'Printers', @@ -22804,16 +22969,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -18025,7 +18025,7 @@ +@@ -18120,7 +18120,7 @@ 'properties': { 'effective_model': { 'type': 'string', -- 'description': 'This field must match one of the strings which represent a $2Google Chrome OS supported printer. The string will be used to identify and install the appropriate PPD for the printer. More information can be found at https://support.google.com/chrome?p=noncloudprint.' -+ 'description': 'This field must match one of the strings which represent a $2Google Chrome OS supported printer. The string will be used to identify and install the appropriate PPD for the printer. More information can be found at https://support.9oo91e.qjz9zk/chrome?p=noncloudprint.' +- 'description': 'This field must match one of the strings which represent a $2Google ChromeOS supported printer. The string will be used to identify and install the appropriate PPD for the printer. More information can be found at https://support.google.com/chrome?p=noncloudprint.' ++ 'description': 'This field must match one of the strings which represent a $2Google ChromeOS supported printer. The string will be used to identify and install the appropriate PPD for the printer. More information can be found at https://support.9oo91e.qjz9zk/chrome?p=noncloudprint.' }, 'autoconf': { 'type': 'boolean', -@@ -18078,7 +18078,7 @@ +@@ -18173,7 +18173,7 @@ }, { 'name': 'NativePrintersBulkConfiguration', @@ -22822,7 +22987,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 382, 'type': 'external', 'schema': { -@@ -18111,7 +18111,7 @@ +@@ -18206,7 +18206,7 @@ }, { 'name': 'PrintersBulkConfiguration', @@ -22831,7 +22996,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 770, 'type': 'external', 'schema': { -@@ -18141,7 +18141,7 @@ +@@ -18236,7 +18236,7 @@ }, { 'name': 'NativePrintersBulkAccessMode', @@ -22840,7 +23005,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 383, 'supported_on': ['chrome_os:65-100'], 'type': 'int-enum', -@@ -18189,7 +18189,7 @@ +@@ -18284,7 +18284,7 @@ }, { 'name': 'PrintersBulkAccessMode', @@ -22849,7 +23014,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 772, 'supported_on': ['chrome_os:86-'], 'type': 'int-enum', -@@ -18234,7 +18234,7 @@ +@@ -18329,7 +18329,7 @@ }, { 'name': 'NativePrintersBulkBlacklist', @@ -22858,7 +23023,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-100'], 'id': 384, 'type': 'list', -@@ -18256,7 +18256,7 @@ +@@ -18351,7 +18351,7 @@ }, { 'name': 'PrintersBulkBlocklist', @@ -22867,7 +23032,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 779, 'type': 'list', -@@ -18275,7 +18275,7 @@ +@@ -18370,7 +18370,7 @@ }, { 'name': 'NativePrintersBulkWhitelist', @@ -22876,7 +23041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:65-100'], 'id': 385, 'type': 'list', -@@ -18297,7 +18297,7 @@ +@@ -18392,7 +18392,7 @@ }, { 'name': 'PrintersBulkAllowlist', @@ -22885,7 +23050,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 780, 'type': 'list', -@@ -18316,7 +18316,7 @@ +@@ -18411,7 +18411,7 @@ }, { 'name': 'DeviceNativePrinters', @@ -22894,7 +23059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 386, 'device_only': True, 'type': 'external', -@@ -18354,7 +18354,7 @@ +@@ -18449,7 +18449,7 @@ }, { 'name': 'DeviceNativePrintersAccessMode', @@ -22903,7 +23068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 387, 'device_only': True, 'supported_on': ['chrome_os:73-100'], -@@ -18402,7 +18402,7 @@ +@@ -18497,7 +18497,7 @@ }, { 'name': 'DeviceNativePrintersBlacklist', @@ -22912,7 +23077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-100'], 'device_only': True, 'id': 388, -@@ -18424,7 +18424,7 @@ +@@ -18519,7 +18519,7 @@ }, { 'name': 'DeviceNativePrintersWhitelist', @@ -22921,7 +23086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:73-100'], 'device_only': True, 'id': 389, -@@ -18447,7 +18447,7 @@ +@@ -18542,7 +18542,7 @@ }, { 'name': 'DevicePrinters', @@ -22930,7 +23095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 743, 'device_only': True, 'type': 'external', -@@ -18482,7 +18482,7 @@ +@@ -18577,7 +18577,7 @@ }, { 'name': 'DevicePrintersAccessMode', @@ -22939,7 +23104,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 733, 'device_only': True, 'supported_on': ['chrome_os:87-'], -@@ -18527,7 +18527,7 @@ +@@ -18622,7 +18622,7 @@ }, { 'name': 'DevicePrintersBlocklist', @@ -22948,7 +23113,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 734, -@@ -18546,7 +18546,7 @@ +@@ -18641,7 +18641,7 @@ }, { 'name': 'DevicePrintersAllowlist', @@ -22957,7 +23122,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 735, -@@ -18566,7 +18566,7 @@ +@@ -18661,7 +18661,7 @@ }, { 'name': 'TPMFirmwareUpdateSettings', @@ -22966,7 +23131,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:63-'], 'device_only': True, 'id': 390, -@@ -18619,7 +18619,7 @@ +@@ -18714,7 +18714,7 @@ }, { 'name': 'MinimumRequiredChromeVersion', @@ -22975,7 +23140,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:64-81'], 'device_only': True, 'type': 'string', -@@ -18645,7 +18645,7 @@ +@@ -18740,7 +18740,7 @@ }, { 'name': 'DeviceMinimumVersion', @@ -22984,7 +23149,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'dict', -@@ -18729,7 +18729,7 @@ +@@ -18824,7 +18824,7 @@ }, { 'name': 'DeviceMinimumVersionAueMessage', @@ -22993,25 +23158,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'device_only': True, 'type': 'string', -@@ -18753,7 +18753,7 @@ +@@ -18848,7 +18848,7 @@ }, { 'name': 'QuickUnlockModeAllowlist', - 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], + 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], - 'type': 'list', + 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -18791,7 +18791,7 @@ +@@ -18903,7 +18903,7 @@ }, { 'name': 'QuickUnlockModeWhitelist', - 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], + 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], - 'type': 'list', + 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -18832,7 +18832,7 @@ +@@ -18961,7 +18961,7 @@ }, { 'name': 'QuickUnlockTimeout', @@ -23020,7 +23185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -18875,7 +18875,7 @@ +@@ -19004,7 +19004,7 @@ }, { 'name': 'WebAuthnFactors', @@ -23029,7 +23194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -18929,7 +18929,7 @@ +@@ -19058,7 +19058,7 @@ }, { 'name': 'PinUnlockMinimumLength', @@ -23038,7 +23203,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -18947,7 +18947,7 @@ +@@ -19076,7 +19076,7 @@ }, { 'name': 'PinUnlockMaximumLength', @@ -23047,7 +23212,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'supported_on': ['chrome_os:57-'], -@@ -18965,7 +18965,7 @@ +@@ -19094,7 +19094,7 @@ }, { 'name': 'PinUnlockWeakPinsAllowed', @@ -23056,7 +23221,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:57-'], -@@ -18983,7 +18983,7 @@ +@@ -19112,7 +19112,7 @@ }, { 'name': 'DeviceWallpaperImage', @@ -23065,7 +23230,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -19016,7 +19016,7 @@ +@@ -19145,7 +19145,7 @@ }, { 'name': 'DeviceLoginScreenLocales', @@ -23074,7 +23239,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19037,7 +19037,7 @@ +@@ -19166,7 +19166,7 @@ }, { 'name': 'DeviceLoginScreenInputMethods', @@ -23083,7 +23248,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19058,7 +19058,7 @@ +@@ -19187,7 +19187,7 @@ }, { 'name': 'DeviceLoginScreenSystemInfoEnforced', @@ -23092,7 +23257,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:79-'], -@@ -19081,7 +19081,7 @@ +@@ -19210,7 +19210,7 @@ }, { 'name': 'SmsMessagesAllowed', @@ -23101,7 +23266,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -19102,7 +19102,7 @@ +@@ -19231,7 +19231,7 @@ }, { 'name': 'WifiSyncAndroidAllowed', @@ -23110,7 +23275,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19125,7 +19125,7 @@ +@@ -19254,7 +19254,7 @@ }, { 'name': 'SmartLockSigninAllowed', @@ -23119,7 +23284,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -19146,7 +19146,7 @@ +@@ -19275,7 +19275,7 @@ }, { 'name': 'InstantTetheringAllowed', @@ -23128,7 +23293,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:60-'], -@@ -19167,7 +19167,7 @@ +@@ -19296,7 +19296,7 @@ }, { 'name': 'PhoneHubAllowed', @@ -23137,7 +23302,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19188,7 +19188,7 @@ +@@ -19317,7 +19317,7 @@ }, { 'name': 'PhoneHubCameraRollAllowed', @@ -23146,7 +23311,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -19219,7 +19219,7 @@ +@@ -19348,7 +19348,7 @@ }, { 'name': 'PhoneHubNotificationsAllowed', @@ -23155,7 +23320,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19239,7 +19239,7 @@ +@@ -19368,7 +19368,7 @@ }, { 'name': 'PhoneHubTaskContinuationAllowed', @@ -23164,7 +23329,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-'], -@@ -19259,7 +19259,7 @@ +@@ -19388,7 +19388,7 @@ }, { 'name': 'EcheAllowed', @@ -23173,7 +23338,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:99-'], -@@ -19290,7 +19290,7 @@ +@@ -19419,7 +19419,7 @@ }, { 'name': 'NearbyShareAllowed', @@ -23182,7 +23347,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -19311,7 +19311,7 @@ +@@ -19440,7 +19440,7 @@ }, { 'name': 'DevicePciPeripheralDataAccessEnabled', @@ -23191,7 +23356,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -19342,7 +19342,7 @@ +@@ -19471,7 +19471,7 @@ }, { 'name': 'BrowserNetworkTimeQueriesEnabled', @@ -23200,7 +23365,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:60-'], -@@ -19371,7 +19371,7 @@ +@@ -19500,7 +19500,7 @@ }, { 'name': 'DeviceSecondFactorAuthentication', @@ -23209,7 +23374,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19414,7 +19414,7 @@ +@@ -19543,7 +19543,7 @@ }, { 'name': 'PrintPreviewUseSystemDefaultPrinter', @@ -23218,7 +23383,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ -@@ -19446,7 +19446,7 @@ +@@ -19575,7 +19575,7 @@ }, { 'name': 'DeviceEcryptfsMigrationStrategy', @@ -23227,7 +23392,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19492,7 +19492,7 @@ +@@ -19621,7 +19621,7 @@ }, { 'name': 'EcryptfsMigrationStrategy', @@ -23236,7 +23401,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -19548,7 +19548,7 @@ +@@ -19677,7 +19677,7 @@ }, { 'name': 'SchedulerConfiguration', @@ -23245,7 +23410,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -19585,7 +19585,7 @@ +@@ -19714,7 +19714,7 @@ }, { 'name': 'NoteTakingAppsLockScreenWhitelist', @@ -23254,7 +23419,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19615,7 +19615,7 @@ +@@ -19744,7 +19744,7 @@ }, { 'name': 'NoteTakingAppsLockScreenAllowlist', @@ -23263,7 +23428,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -19642,7 +19642,7 @@ +@@ -19771,7 +19771,7 @@ }, { 'name': 'CastReceiverEnabled', @@ -23272,7 +23437,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -19662,7 +19662,7 @@ +@@ -19791,7 +19791,7 @@ }, { 'name': 'CastReceiverName', @@ -23281,7 +23446,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'future_on': ['chrome_os'], -@@ -19682,7 +19682,7 @@ +@@ -19811,7 +19811,7 @@ }, { 'name': 'DeviceOffHours', @@ -23290,7 +23455,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -19765,7 +19765,7 @@ +@@ -19894,7 +19894,7 @@ }, { 'name': 'CloudPolicyOverridesPlatformPolicy', @@ -23299,7 +23464,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': [ -@@ -19790,7 +19790,7 @@ +@@ -19919,7 +19919,7 @@ }, { 'name': 'CloudUserPolicyOverridesCloudMachinePolicy', @@ -23308,7 +23473,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:96-', 'android:97-'], -@@ -19824,7 +19824,7 @@ +@@ -19953,7 +19953,7 @@ }, { 'name': 'PromptForDownloadLocation', @@ -23317,7 +23482,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome.*:64-', 'chrome_os:64-', 'android:92-'], -@@ -19842,7 +19842,7 @@ +@@ -19971,7 +19971,7 @@ }, { 'name': 'UnaffiliatedArcAllowed', @@ -23326,7 +23491,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:64-'], -@@ -19860,7 +19860,7 @@ +@@ -19989,7 +19989,7 @@ }, { 'name': 'DeviceArcDataSnapshotHours', @@ -23335,7 +23500,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -19912,7 +19912,7 @@ +@@ -20041,7 +20041,7 @@ }, { 'name': 'IsolateOrigins', @@ -23344,7 +23509,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:63-', 'chrome_os:63-'], -@@ -19939,7 +19939,7 @@ +@@ -20068,7 +20068,7 @@ }, { 'name': 'SitePerProcess', @@ -23353,7 +23518,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:63-', 'chrome_os:63-'], -@@ -19962,7 +19962,7 @@ +@@ -20091,7 +20091,7 @@ }, { 'name': 'DeviceLoginScreenIsolateOrigins', @@ -23362,7 +23527,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:66-76'], -@@ -19985,7 +19985,7 @@ +@@ -20114,7 +20114,7 @@ }, { 'name': 'DeviceLoginScreenSitePerProcess', @@ -23371,7 +23536,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-76'], -@@ -20006,7 +20006,7 @@ +@@ -20135,7 +20135,7 @@ }, { 'name': 'IsolateOriginsAndroid', @@ -23380,7 +23545,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['android:68-'], -@@ -20033,7 +20033,7 @@ +@@ -20162,7 +20162,7 @@ }, { 'name': 'SitePerProcessAndroid', @@ -23389,7 +23554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:68-'], -@@ -20058,7 +20058,7 @@ +@@ -20187,7 +20187,7 @@ }, { 'name': 'SharedArrayBufferUnrestrictedAccessAllowed', @@ -23398,7 +23563,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:91-', 'chrome_os:91-'], -@@ -20083,7 +20083,7 @@ +@@ -20212,7 +20212,7 @@ 'caption': '''Specifies whether SharedArrayBuffers can be used in a non cross-origin-isolated context''', 'tags': ['system-security'], 'desc': ''' @@ -23407,7 +23572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli When set to Enabled, sites can use SharedArrayBuffer with no restrictions. -@@ -20091,7 +20091,7 @@ +@@ -20220,7 +20220,7 @@ }, { 'name': 'SandboxExternalProtocolBlocked', @@ -23416,7 +23581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:96-', 'chrome_os:96-'], -@@ -20116,7 +20116,7 @@ +@@ -20245,7 +20245,7 @@ 'caption': 'Allow Chrome to block navigations toward external protocols in sandboxed iframes', 'tags': ['system-security'], 'desc': '''Chrome will block navigations toward external protocols inside @@ -23425,7 +23590,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli When True, this lets Chrome blocks those navigations. -@@ -20129,7 +20129,7 @@ +@@ -20258,7 +20258,7 @@ }, { 'name': 'CrossOriginWebAssemblyModuleSharingEnabled', @@ -23434,7 +23599,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:94-98', 'chrome_os:94-98'], -@@ -20163,7 +20163,7 @@ +@@ -20292,7 +20292,7 @@ }, { 'name': 'DisplayCapturePermissionsPolicyEnabled', @@ -23443,7 +23608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:94-', 'chrome_os:94-'], -@@ -20200,7 +20200,7 @@ +@@ -20329,7 +20329,7 @@ }, { 'name': 'WebDriverOverridesIncompatiblePolicies', @@ -23452,7 +23617,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-79'], -@@ -20228,7 +20228,7 @@ +@@ -20357,7 +20357,7 @@ }, { 'name': 'UnsafelyTreatInsecureOriginAsSecure', @@ -23461,7 +23626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20261,7 +20261,7 @@ +@@ -20390,7 +20390,7 @@ }, { 'name': 'DefaultDownloadDirectory', @@ -23470,9 +23635,9 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:64-', 'chrome_os:64-'], -@@ -20279,11 +20279,11 @@ +@@ -20410,11 +20410,11 @@ - Leaving the policy unset means Chrome uses its platform-specific default directory. + This policy has no effect if the policy DownloadDirectory is set. - Note: See a list of variables you can use ( https://www.chromium.org/administrators/policy-list-3/user-data-directory-variables ).''', + Note: See a list of variables you can use ( https://www.ch40m1um.qjz9zk/administrators/policy-list-3/user-data-directory-variables ).''', @@ -23484,7 +23649,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome_os:65-'], -@@ -20302,7 +20302,7 @@ +@@ -20433,7 +20433,7 @@ }, { 'name': 'DeviceHostnameUserConfigurable', @@ -23493,7 +23658,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -20335,7 +20335,7 @@ +@@ -20466,7 +20466,7 @@ }, { 'name': 'AbusiveExperienceInterventionEnforce', @@ -23502,7 +23667,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-', 'chrome_os:65-'], -@@ -20364,7 +20364,7 @@ +@@ -20495,7 +20495,7 @@ }, { 'name': 'SpellcheckLanguage', @@ -23511,7 +23676,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20395,7 +20395,7 @@ +@@ -20526,7 +20526,7 @@ }, { 'name': 'SpellcheckLanguageBlacklist', @@ -23520,7 +23685,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20429,7 +20429,7 @@ +@@ -20560,7 +20560,7 @@ }, { 'name': 'SpellcheckLanguageBlocklist', @@ -23529,7 +23694,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20460,7 +20460,7 @@ +@@ -20591,7 +20591,7 @@ }, { 'name': 'ThirdPartyBlockingEnabled', @@ -23538,7 +23703,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:65-'], -@@ -20478,7 +20478,7 @@ +@@ -20609,7 +20609,7 @@ }, { 'name': 'SpellcheckEnabled', @@ -23547,7 +23712,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:65-', 'chrome_os:65-'], -@@ -20514,7 +20514,7 @@ +@@ -20645,7 +20645,7 @@ }, { 'name': 'AdsSettingForIntrusiveAdsSites', @@ -23556,7 +23721,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20548,7 +20548,7 @@ +@@ -20679,7 +20679,7 @@ }, { 'name': 'RestrictAccountsToPatterns', @@ -23565,7 +23730,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -20559,7 +20559,7 @@ +@@ -20690,7 +20690,7 @@ 'dynamic_refresh': True, 'per_profile': False, }, @@ -23574,7 +23739,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 410, 'caption': '''Restrict accounts that are visible in $1Google Chrome''', 'tags': [], -@@ -20573,7 +20573,7 @@ +@@ -20704,7 +20704,7 @@ }, { 'name': 'PasswordProtectionWarningTrigger', @@ -23583,7 +23748,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20622,7 +20622,7 @@ +@@ -20753,7 +20753,7 @@ { 'id': 419, 'name': 'RelaunchNotification', @@ -23592,7 +23757,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20657,7 +20657,7 @@ +@@ -20788,7 +20788,7 @@ { 'id': 420, 'name': 'RelaunchNotificationPeriod', @@ -23601,7 +23766,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20678,7 +20678,7 @@ +@@ -20809,7 +20809,7 @@ { 'id': 567, 'name': 'RelaunchHeadsUpPeriod', @@ -23610,7 +23775,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20697,7 +20697,7 @@ +@@ -20828,7 +20828,7 @@ { 'id': 854, 'name': 'RelaunchWindow', @@ -23619,7 +23784,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -20767,7 +20767,7 @@ +@@ -20898,7 +20898,7 @@ }, { 'name': 'VirtualMachinesAllowed', @@ -23628,7 +23793,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:66-'], -@@ -20786,7 +20786,7 @@ +@@ -20917,7 +20917,7 @@ }, { 'name': 'CrostiniAllowed', @@ -23637,7 +23802,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -20802,7 +20802,7 @@ +@@ -20933,7 +20933,7 @@ }, { 'name': 'DeviceUnaffiliatedCrostiniAllowed', @@ -23646,7 +23811,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -20818,7 +20818,7 @@ +@@ -20949,7 +20949,7 @@ }, { 'name': 'CrostiniExportImportUIAllowed', @@ -23655,7 +23820,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -20834,7 +20834,7 @@ +@@ -20965,7 +20965,7 @@ }, { 'name': 'CrostiniRootAccessAllowed', @@ -23664,7 +23829,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'future_on': ['chrome_os'], -@@ -20853,7 +20853,7 @@ +@@ -20984,7 +20984,7 @@ }, { 'name': 'CrostiniAnsiblePlaybook', @@ -23673,7 +23838,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -20893,7 +20893,7 @@ +@@ -21024,7 +21024,7 @@ }, { 'name': 'CrostiniArcAdbSideloadingAllowed', @@ -23682,7 +23847,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -20931,7 +20931,7 @@ +@@ -21062,7 +21062,7 @@ }, { 'name': 'DeviceCrostiniArcAdbSideloadingAllowed', @@ -23691,7 +23856,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'int-enum', 'schema': { -@@ -20972,7 +20972,7 @@ +@@ -21103,7 +21103,7 @@ }, { 'name': 'CrostiniPortForwardingAllowed', @@ -23700,7 +23865,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -20992,7 +20992,7 @@ +@@ -21123,7 +21123,7 @@ + }, + { + 'name': 'SystemTerminalSshAllowed', +- 'owners': ['joelhockey@chromium.org', 'aoldemeier@chromium.org'], ++ 'owners': ['joelhockey@ch40m1um.qjz9zk', 'aoldemeier@ch40m1um.qjz9zk'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'items': [ +@@ -21153,7 +21153,7 @@ }, { 'name': 'SafeBrowsingWhitelistDomains', @@ -23709,7 +23883,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21018,7 +21018,7 @@ +@@ -21179,7 +21179,7 @@ }, { 'name': 'SafeBrowsingAllowlistDomains', @@ -23718,7 +23892,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21041,7 +21041,7 @@ +@@ -21204,7 +21204,7 @@ }, { 'name': 'PasswordProtectionLoginURLs', @@ -23727,7 +23901,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21056,15 +21056,15 @@ +@@ -21219,15 +21219,15 @@ 'id': 423, 'caption': '''Configure the list of enterprise login URLs where password protection service should capture salted hashes of passwords.''', 'tags': [], @@ -23746,7 +23920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:69-', 'chrome_os:69-'], -@@ -21076,15 +21076,15 @@ +@@ -21239,15 +21239,15 @@ 'id': 424, 'caption': '''Configure the change password URL.''', 'tags': [], @@ -23765,7 +23939,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:66-', 'chrome_os:66-', 'android: 87-'], -@@ -21102,12 +21102,12 @@ +@@ -21265,12 +21265,12 @@ If you set this policy, users can't change it. If not set, users can decide whether to send reports or not. @@ -23780,7 +23954,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': ['chrome.*:66-80'], -@@ -21127,7 +21127,7 @@ +@@ -21290,7 +21290,7 @@ }, { 'name': 'CloudManagementEnrollmentToken', @@ -23789,7 +23963,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'supported_on': [ -@@ -21146,11 +21146,11 @@ +@@ -21309,11 +21309,11 @@ 'tags': [], 'desc': '''Setting the policy means $1Google Chrome tries to register itself with Chrome Browser Cloud Management. The value of this policy is an enrollment token you can retrieve from the Google Admin console. @@ -23803,7 +23977,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:72-'], -@@ -21167,11 +21167,11 @@ +@@ -21330,11 +21330,11 @@ Setting the policy to Disabled or leaving it unset renders Chrome Browser Cloud Management optional and doesn't block $1Google Chrome launch process if failed. @@ -23817,7 +23991,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-'], -@@ -21191,7 +21191,7 @@ +@@ -21354,7 +21354,7 @@ }, { 'name': 'AutoplayWhitelist', @@ -23826,7 +24000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21211,11 +21211,11 @@ +@@ -21374,11 +21374,11 @@ Setting the policy lets videos play automatically (without user consent) with audio content in $1Google Chrome. If AutoplayAllowed policy is set to True, then this policy has no effect. If AutoplayAllowed is set to False, then any URL patterns set in this policy can still play. If this policy changes while $1Google Chrome is running, it only applies to newly opened tabs. @@ -23840,7 +24014,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21232,11 +21232,11 @@ +@@ -21395,11 +21395,11 @@ 'tags': [], 'desc': '''Setting the policy lets videos play automatically (without user consent) with audio content in $1Google Chrome. If AutoplayAllowed policy is set to True, then this policy has no effect. If AutoplayAllowed is set to False, then any URL patterns set in this policy can still play. If this policy changes while $1Google Chrome is running, it only applies to newly opened tabs. @@ -23854,7 +24028,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:67-67', 'chrome_os:67-67'], -@@ -21251,13 +21251,13 @@ +@@ -21414,13 +21414,13 @@ 'tags': [], 'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead. @@ -23870,7 +24044,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-100'], -@@ -21281,7 +21281,7 @@ +@@ -21444,7 +21444,7 @@ }, { 'name': 'UserPrintersAllowed', @@ -23879,7 +24053,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -21302,7 +21302,7 @@ +@@ -21465,7 +21465,7 @@ }, { 'name': 'DeviceSamlLoginAuthenticationType', @@ -23888,7 +24062,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21339,7 +21339,7 @@ +@@ -21502,7 +21502,7 @@ }, { 'name': 'ChromeCleanupEnabled', @@ -23897,7 +24071,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -21359,7 +21359,7 @@ +@@ -21522,7 +21522,7 @@ }, { 'name': 'ChromeCleanupReportingEnabled', @@ -23906,7 +24080,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:68-'], -@@ -21381,7 +21381,7 @@ +@@ -21544,7 +21544,7 @@ }, { 'name': 'AllowedLanguages', @@ -23915,7 +24089,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21405,7 +21405,7 @@ +@@ -21568,7 +21568,7 @@ }, { 'name': 'AllowedInputMethods', @@ -23924,7 +24098,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21429,7 +21429,7 @@ +@@ -21592,7 +21592,7 @@ }, { 'name': 'ArcAppInstallEventLoggingEnabled', @@ -23933,7 +24107,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:67-'], -@@ -21446,7 +21446,7 @@ +@@ -21609,7 +21609,7 @@ }, { 'name': 'ExtensionInstallEventLoggingEnabled', @@ -23942,7 +24116,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -21464,7 +21464,7 @@ +@@ -21627,7 +21627,7 @@ }, { 'name': 'UsageTimeLimit', @@ -23951,7 +24125,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -21617,7 +21617,7 @@ +@@ -21780,7 +21780,7 @@ }, { 'name': 'ArcBackupRestoreServiceEnabled', @@ -23960,7 +24134,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21659,7 +21659,7 @@ +@@ -21822,7 +21822,7 @@ }, { 'name': 'ArcGoogleLocationServicesEnabled', @@ -23969,7 +24143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21701,7 +21701,7 @@ +@@ -21864,7 +21864,7 @@ }, { 'name': 'EnableSyncConsent', @@ -23978,7 +24152,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean'}, 'supported_on': ['chrome_os:66-'], -@@ -21719,7 +21719,7 @@ +@@ -21882,7 +21882,7 @@ }, { 'name': 'ContextualSuggestionsEnabled', @@ -23987,7 +24161,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:69-75'], -@@ -21740,7 +21740,7 @@ +@@ -21903,7 +21903,7 @@ }, { 'name': 'DeviceAutoUpdateTimeRestrictions', @@ -23996,7 +24170,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21827,7 +21827,7 @@ +@@ -21990,7 +21990,7 @@ { 'id': 454, 'name': 'PromotionalTabsEnabled', @@ -24005,7 +24179,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'tags': [], 'features': { 'dynamic_refresh': True, -@@ -21846,7 +21846,7 @@ +@@ -22009,7 +22009,7 @@ }, { 'name': 'SafeSitesFilterBehavior', @@ -24014,7 +24188,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -21884,7 +21884,7 @@ +@@ -22047,7 +22047,7 @@ }, { 'name': 'OverrideSecurityRestrictionsOnInsecureOrigin', @@ -24023,7 +24197,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -21908,7 +21908,7 @@ +@@ -22071,7 +22071,7 @@ }, { 'name': 'DeviceUpdateStagingSchedule', @@ -24032,7 +24206,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -21953,7 +21953,7 @@ +@@ -22116,7 +22116,7 @@ }, { 'name': 'TabFreezingEnabled', @@ -24041,7 +24215,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:79-79', 'chrome_os:79-79'], -@@ -21968,7 +21968,7 @@ +@@ -22131,7 +22131,7 @@ 'tags': [], 'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes. @@ -24050,7 +24224,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If the policy is set to false, no tabs will be frozen.''', }, -@@ -21995,7 +21995,7 @@ +@@ -22158,7 +22158,7 @@ { 'id': 462, 'name': 'NetworkFileSharesAllowed', @@ -24059,7 +24233,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -22010,7 +22010,7 @@ +@@ -22173,7 +22173,7 @@ }, { 'name': 'WebRtcEventLogCollectionAllowed', @@ -24068,7 +24242,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:70-', 'chrome_os:70-'], -@@ -22030,7 +22030,7 @@ +@@ -22193,7 +22193,7 @@ }, { 'name': 'PowerSmartDimEnabled', @@ -24077,7 +24251,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:70-'], -@@ -22048,7 +22048,7 @@ +@@ -22211,7 +22211,7 @@ }, { 'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts', @@ -24086,7 +24260,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22073,7 +22073,7 @@ +@@ -22236,7 +22236,7 @@ { 'id': 467, 'name': 'NetBiosShareDiscoveryEnabled', @@ -24095,7 +24269,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -22091,7 +22091,7 @@ +@@ -22254,7 +22254,7 @@ }, { 'name': 'ManagedConfigurationPerOrigin', @@ -24104,7 +24278,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22111,12 +22111,12 @@ +@@ -22274,12 +22274,12 @@ 'per_profile': True, }, 'example_value': [{ @@ -24120,7 +24294,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'managed_configuration_hash' : 'djio12easd89u12aws' }], 'id': 813, -@@ -22129,7 +22129,7 @@ +@@ -22292,7 +22292,7 @@ }, { 'name': 'WebAppInstallForceList', @@ -24129,7 +24303,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22166,18 +22166,18 @@ +@@ -22329,18 +22329,18 @@ }, 'max_size': 1048576, 'example_value': [{ @@ -24152,7 +24326,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'default_launch_container': 'window', 'custom_name': 'Spreadsheets' }, { -@@ -22233,7 +22233,7 @@ +@@ -22396,7 +22396,7 @@ { 'id': 470, 'name': 'ReportVersionData', @@ -24161,7 +24335,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22258,7 +22258,7 @@ +@@ -22421,7 +22421,7 @@ { 'id': 471, 'name': 'ReportPolicyData', @@ -24170,7 +24344,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22283,7 +22283,7 @@ +@@ -22446,7 +22446,7 @@ { 'id': 472, 'name': 'ReportMachineIDData', @@ -24179,7 +24353,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22307,7 +22307,7 @@ +@@ -22470,7 +22470,7 @@ { 'id': 473, 'name': 'ReportUserIDData', @@ -24188,7 +24362,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22332,7 +22332,7 @@ +@@ -22495,7 +22495,7 @@ { 'id': 499, 'name': 'ReportExtensionsAndPluginsData', @@ -24197,7 +24371,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22357,7 +22357,7 @@ +@@ -22520,7 +22520,7 @@ { 'id': 500, 'name': 'ReportSafeBrowsingData', @@ -24206,7 +24380,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing'], -@@ -22383,7 +22383,7 @@ +@@ -22546,7 +22546,7 @@ { 'id': 608, 'name': 'CloudExtensionRequestEnabled', @@ -24215,7 +24389,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -22409,7 +22409,7 @@ +@@ -22572,7 +22572,7 @@ { 'id': 493, 'name': 'CloudReportingEnabled', @@ -24224,7 +24398,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean' }, 'tags': ['admin-sharing', 'google-sharing'], -@@ -22448,7 +22448,7 @@ +@@ -22611,7 +22611,7 @@ { 'id': 942, 'name': 'CloudProfileReportingEnabled', @@ -24233,16 +24407,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean'}, 'tags': ['admin-sharing', 'google-sharing'], -@@ -22485,7 +22485,7 @@ +@@ -22648,7 +22648,7 @@ { 'id': 962, 'name': 'CloudReportingUploadFrequency', - 'owners': ['zmin@chromium.org', 'file://components/enterprise/browser/reporting/OWNERS'], + 'owners': ['zmin@ch40m1um.qjz9zk', 'file://components/enterprise/browser/reporting/OWNERS'], 'type': 'int', - 'schema': { 'type': 'integer', 'minimum': 3 , 'maximum': 168}, + 'schema': { 'type': 'integer', 'minimum': 3 , 'maximum': 24}, 'supported_on': ['chrome.*:101-', 'chrome_os:101-', 'android:101-', 'ios:101-'], -@@ -22510,7 +22510,7 @@ +@@ -22673,7 +22673,7 @@ }, { 'name': 'EnterpriseHardwarePlatformAPIEnabled', @@ -24251,7 +24425,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:71-', 'chrome_os:71-', 'android:71-'], -@@ -22530,7 +22530,7 @@ +@@ -22693,7 +22693,7 @@ }, { 'name': 'VpnConfigAllowed', @@ -24260,7 +24434,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:71-'], -@@ -22549,7 +22549,7 @@ +@@ -22712,7 +22712,7 @@ { 'id': 489, 'name': 'NTLMShareAuthenticationEnabled', @@ -24269,7 +24443,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -22567,7 +22567,7 @@ +@@ -22730,7 +22730,7 @@ }, { 'name': 'NetworkFileSharesPreconfiguredShares', @@ -24278,7 +24452,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -22612,7 +22612,7 @@ +@@ -22775,7 +22775,7 @@ }, { 'name': 'ScreenBrightnessPercent', @@ -24287,7 +24461,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -22652,7 +22652,7 @@ +@@ -22815,7 +22815,7 @@ { 'id': 494, 'name': 'AlternativeBrowserPath', @@ -24296,7 +24470,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -22670,7 +22670,7 @@ +@@ -22833,7 +22833,7 @@ { 'id': 495, 'name': 'AlternativeBrowserParameters', @@ -24305,7 +24479,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22701,7 +22701,7 @@ +@@ -22864,7 +22864,7 @@ { 'id': 530, 'name': 'BrowserSwitcherChromePath', @@ -24314,7 +24488,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': {'type': 'string'}, 'features': { -@@ -22721,7 +22721,7 @@ +@@ -22884,7 +22884,7 @@ { 'id': 531, 'name': 'BrowserSwitcherChromeParameters', @@ -24323,7 +24497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22748,7 +22748,7 @@ +@@ -22911,7 +22911,7 @@ { 'id': 496, 'name': 'BrowserSwitcherUrlList', @@ -24332,7 +24506,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22775,7 +22775,7 @@ +@@ -22938,7 +22938,7 @@ { 'id': 497, 'name': 'BrowserSwitcherUrlGreylist', @@ -24341,7 +24515,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -22802,7 +22802,7 @@ +@@ -22965,7 +22965,7 @@ { 'id': 498, 'name': 'BrowserSwitcherUseIeSitelist', @@ -24350,7 +24524,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -22819,12 +22819,12 @@ +@@ -22982,12 +22982,12 @@ When this policy is false or unset, $1Google Chrome does not use Internet Explorer®'s SiteList policy as a source of rules for switching browsers. @@ -24365,7 +24539,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'example_value': 'http://example.com/sitelist.xml', -@@ -22839,12 +22839,12 @@ +@@ -23002,12 +23002,12 @@ Leaving it unset (or set to a invalid URL) means $1Google Chrome doesn't use the policy as a source of rules for switching browsers. @@ -24380,7 +24554,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string' }, 'example_value': 'http://example.com/greylist.xml', -@@ -22859,12 +22859,12 @@ +@@ -23022,12 +23022,12 @@ Leaving it unset (or set to a invalid URL) means $1Google Chrome doesn't use the policy as a source of rules for not switching browsers. @@ -24395,7 +24569,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' }, 'example_value': 10000, -@@ -22882,7 +22882,7 @@ +@@ -23045,7 +23045,7 @@ { 'id': 517, 'name': 'BrowserSwitcherEnabled', @@ -24404,7 +24578,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -22900,7 +22900,7 @@ +@@ -23063,7 +23063,7 @@ { 'id': 866, 'name': 'BrowserSwitcherParsingMode', @@ -24413,7 +24587,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -22943,7 +22943,7 @@ +@@ -23106,7 +23106,7 @@ { 'id': 519, 'name': 'BrowserSwitcherKeepLastChromeTab', @@ -24422,7 +24596,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': False, -@@ -22960,7 +22960,7 @@ +@@ -23123,7 +23123,7 @@ }, { 'name': 'DeviceDisplayResolution', @@ -24431,7 +24605,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23001,7 +23001,7 @@ +@@ -23164,7 +23164,7 @@ }, { 'name': 'PluginVmAllowed', @@ -24440,7 +24614,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:72-'], -@@ -23019,7 +23019,7 @@ +@@ -23182,7 +23182,7 @@ }, { 'name': 'UserPluginVmAllowed', @@ -24449,7 +24623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-'], -@@ -23039,7 +23039,7 @@ +@@ -23202,7 +23202,7 @@ }, { 'name': 'PluginVmLicenseKey', @@ -24458,7 +24632,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -23061,7 +23061,7 @@ +@@ -23224,7 +23224,7 @@ }, { 'name': 'PluginVmUserId', @@ -24467,7 +24641,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'sensitiveValue': True, -@@ -23080,7 +23080,7 @@ +@@ -23243,7 +23243,7 @@ }, { 'name': 'PluginVmImage', @@ -24476,7 +24650,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23111,7 +23111,7 @@ +@@ -23274,7 +23274,7 @@ }, { 'name': 'PluginVmDataCollectionAllowed', @@ -24485,7 +24659,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -23130,7 +23130,7 @@ +@@ -23293,7 +23293,7 @@ }, { 'name': 'PluginVmRequiredFreeDiskSpace', @@ -24494,7 +24668,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -23153,7 +23153,7 @@ +@@ -23316,7 +23316,7 @@ }, { 'name': 'ParentAccessCodeConfig', @@ -24503,7 +24677,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'sensitiveValue': True, -@@ -23231,7 +23231,7 @@ +@@ -23394,7 +23394,7 @@ }, { 'name': 'ClientCertificateManagementAllowed', @@ -24512,7 +24686,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23271,7 +23271,7 @@ +@@ -23434,7 +23434,7 @@ { 'id': 520, 'name': 'DeviceRebootOnUserSignout', @@ -24521,7 +24695,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -23318,7 +23318,7 @@ +@@ -23481,7 +23481,7 @@ }, { 'name': 'ForceNetworkInProcess', @@ -24530,7 +24704,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:72-83'], -@@ -23335,7 +23335,7 @@ +@@ -23498,7 +23498,7 @@ }, { 'name': 'AssistantOnboardingMode', @@ -24539,7 +24713,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -23375,7 +23375,7 @@ +@@ -23538,7 +23538,7 @@ }, { 'name': 'VoiceInteractionContextEnabled', @@ -24548,7 +24722,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -23393,7 +23393,7 @@ +@@ -23556,7 +23556,7 @@ }, { 'name': 'VoiceInteractionHotwordEnabled', @@ -24557,7 +24731,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -23411,7 +23411,7 @@ +@@ -23574,7 +23574,7 @@ }, { 'name': 'AssistantVoiceMatchEnabledDuringOobe', @@ -24566,7 +24740,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:93-'], -@@ -23440,7 +23440,7 @@ +@@ -23603,7 +23603,7 @@ }, { 'name': 'VoiceInteractionQuickAnswersEnabled', @@ -24575,7 +24749,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-88'], -@@ -23463,7 +23463,7 @@ +@@ -23626,7 +23626,7 @@ }, { 'name': 'QuickAnswersEnabled', @@ -24584,7 +24758,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23494,7 +23494,7 @@ +@@ -23657,7 +23657,7 @@ }, { 'name': 'QuickAnswersDefinitionEnabled', @@ -24593,7 +24767,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23524,7 +23524,7 @@ +@@ -23687,7 +23687,7 @@ }, { 'name': 'QuickAnswersTranslationEnabled', @@ -24602,7 +24776,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23554,7 +23554,7 @@ +@@ -23717,7 +23717,7 @@ }, { 'name': 'QuickAnswersUnitConversionEnabled', @@ -24611,7 +24785,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:97-'], -@@ -23584,7 +23584,7 @@ +@@ -23747,7 +23747,7 @@ }, { 'name': 'DeviceWilcoDtcAllowed', @@ -24620,7 +24794,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:74-'], -@@ -23603,7 +23603,7 @@ +@@ -23766,7 +23766,7 @@ }, { 'name': 'AllowPopupsDuringPageUnload', @@ -24629,7 +24803,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -23623,11 +23623,11 @@ +@@ -23786,11 +23786,11 @@ This policy was removed in Chrome 88 and is ignored if set. @@ -24643,7 +24817,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -23656,7 +23656,7 @@ +@@ -23819,7 +23819,7 @@ }, { 'name': 'DevicePowerPeakShiftEnabled', @@ -24652,7 +24826,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23677,7 +23677,7 @@ +@@ -23840,7 +23840,7 @@ }, { 'name': 'DevicePowerPeakShiftBatteryThreshold', @@ -24661,7 +24835,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -23700,7 +23700,7 @@ +@@ -23863,7 +23863,7 @@ }, { 'name': 'DevicePowerPeakShiftDayConfig', @@ -24670,7 +24844,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -23779,7 +23779,7 @@ +@@ -23942,7 +23942,7 @@ }, { 'name': 'DeviceBootOnAcEnabled', @@ -24679,7 +24853,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23800,7 +23800,7 @@ +@@ -23963,7 +23963,7 @@ }, { 'name': 'DeviceUsbPowerShareEnabled', @@ -24688,7 +24862,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -23825,7 +23825,7 @@ +@@ -23988,7 +23988,7 @@ }, { 'name': 'SignedHTTPExchangeEnabled', @@ -24697,7 +24871,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:75-', 'chrome_os:75-'], -@@ -23854,7 +23854,7 @@ +@@ -24017,7 +24017,7 @@ }, { 'name': 'ContextAwareAccessSignalsAllowlist', @@ -24706,7 +24880,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome.*:95-', 'chrome_os:95-'], 'type': 'list', 'schema': { -@@ -23882,11 +23882,11 @@ +@@ -24045,11 +24045,11 @@ For ChromeOS, this policy is related to remote attestation where a certificate is automatically generated and uploaded to the Device Management Server. @@ -24720,7 +24894,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -23909,7 +23909,7 @@ +@@ -24072,7 +24072,7 @@ }, { 'name': 'SamlInSessionPasswordChangeEnabled', @@ -24729,7 +24903,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:98-'], -@@ -23943,7 +23943,7 @@ +@@ -24106,7 +24106,7 @@ }, { 'name': 'LockScreenReauthenticationEnabled', @@ -24738,7 +24912,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:98-'], -@@ -23961,7 +23961,7 @@ +@@ -24124,7 +24124,7 @@ }, { 'name': 'UserFeedbackAllowed', @@ -24747,7 +24921,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -23992,7 +23992,7 @@ +@@ -24155,7 +24155,7 @@ }, { 'name': 'SamlPasswordExpirationAdvanceWarningDays', @@ -24756,7 +24930,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24018,7 +24018,7 @@ +@@ -24181,7 +24181,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeEnabled', @@ -24765,7 +24939,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:75-'], -@@ -24039,7 +24039,7 @@ +@@ -24202,7 +24202,7 @@ }, { 'name': 'DeviceAdvancedBatteryChargeModeDayConfig', @@ -24774,7 +24948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -24106,7 +24106,7 @@ +@@ -24269,7 +24269,7 @@ }, { 'name': 'DeviceBatteryChargeMode', @@ -24783,7 +24957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24157,7 +24157,7 @@ +@@ -24320,7 +24320,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStartCharging', @@ -24792,7 +24966,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24180,7 +24180,7 @@ +@@ -24343,7 +24343,7 @@ }, { 'name': 'DeviceBatteryChargeCustomStopCharging', @@ -24801,7 +24975,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -24203,7 +24203,7 @@ +@@ -24366,7 +24366,7 @@ }, { 'name': 'DeviceScheduledUpdateCheck', @@ -24810,7 +24984,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -24249,7 +24249,7 @@ +@@ -24412,7 +24412,7 @@ }, { 'name': 'DeviceScheduledReboot', @@ -24819,7 +24993,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'dict', 'schema': { -@@ -24294,7 +24294,7 @@ +@@ -24457,7 +24457,7 @@ }, { 'name': 'KerberosEnabled', @@ -24828,7 +25002,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24315,7 +24315,7 @@ +@@ -24478,7 +24478,7 @@ }, { 'name': 'KerberosRememberPasswordEnabled', @@ -24837,7 +25011,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24336,7 +24336,7 @@ +@@ -24499,7 +24499,7 @@ }, { 'name': 'KerberosAddAccountsAllowed', @@ -24846,7 +25020,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -24357,7 +24357,7 @@ +@@ -24520,7 +24520,7 @@ }, { 'name': 'KerberosAccounts', @@ -24855,7 +25029,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24434,7 +24434,7 @@ +@@ -24597,7 +24597,7 @@ }, { 'name': 'CommandLineFlagSecurityWarningsEnabled', @@ -24864,7 +25038,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:76-'], -@@ -24465,7 +24465,7 @@ +@@ -24628,7 +24628,7 @@ }, { 'name': 'StartupBrowserWindowLaunchSuppressed', @@ -24873,7 +25047,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:76-'], -@@ -24486,7 +24486,7 @@ +@@ -24649,7 +24649,7 @@ { 'id': 571, 'name': 'DevicePowerwashAllowed', @@ -24882,7 +25056,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -24506,7 +24506,7 @@ +@@ -24669,7 +24669,7 @@ }, { 'name': 'ExternalPrintServers', @@ -24891,7 +25065,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -24551,7 +24551,7 @@ +@@ -24714,7 +24714,7 @@ }, { 'name': 'DeviceExternalPrintServers', @@ -24900,7 +25074,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'external', 'schema': { 'type': 'object', -@@ -24600,7 +24600,7 @@ +@@ -24763,7 +24763,7 @@ }, { 'name': 'VmManagementCliAllowed', @@ -24909,7 +25083,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:77-'], -@@ -24620,7 +24620,7 @@ +@@ -24783,7 +24783,7 @@ }, { 'name': 'CACertificateManagementAllowed', @@ -24918,7 +25092,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -24658,7 +24658,7 @@ +@@ -24821,7 +24821,7 @@ { 'id': 581, 'name': 'LockScreenMediaPlaybackEnabled', @@ -24927,7 +25101,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -24678,7 +24678,7 @@ +@@ -24841,7 +24841,7 @@ }, { 'name': 'OnFileDownloadedEnterpriseConnector', @@ -24936,7 +25110,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24808,11 +24808,11 @@ +@@ -24971,11 +24971,11 @@ The custom_messages, message, learn_more_url, language and tag fields are used to configure a message to show the user when a warning is shown after a scan had a non-clean verdict. The message field contains the text to show the user and should have at most 200 characters. The learn_more_url field contains an admin-provided URL that will be clickable by the user to get more customer-provided information about why the action was blocked. The language field is optional and contains the language of the message. An empty language field or a value of 'default' indicates a message to be used when the user's language doesn't have a message. The tag field specifies for which type of scans the message is displayed. The custom_messages list can have zero or more entries, where each entry is required to have non-empty message and tag fields. @@ -24950,7 +25124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -24942,11 +24942,11 @@ +@@ -25105,11 +25105,11 @@ The custom_messages, message, learn_more_url, language and tag fields are used to configure a message to show the user when a warning is shown after a scan had a non-clean verdict. The message field contains the text to show the user and should have at most 200 characters. The learn_more_url field contains an admin-provided URL that will be clickable by the user to get more customer-provided information about why the action was blocked. The language field is optional and contains the language of the message. An empty language field or a value of 'default' indicates a message to be used when the user's language doesn't have a message. The tag field specifies for which type of scans the message is displayed. The custom_messages list can have zero or more entries, where each entry is required to have non-empty message and tag fields. @@ -24964,7 +25138,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25072,11 +25072,11 @@ +@@ -25235,11 +25235,11 @@ The custom_messages, message, learn_more_url, language and tag fields are used to configure a message to show the user when a warning is shown after a scan had a non-clean verdict. The message field contains the text to show the user and should have at most 200 characters. The learn_more_url field contains an admin-provided URL that will be clickable by the user to get more customer-provided information about why the action was blocked. The language field is optional and contains the language of the message. An empty language field or a value of 'default' indicates a message to be used when the user's language doesn't have a message. The tag field specifies for which type of scans the message is displayed. The custom_messages list can have zero or more entries, where each entry is required to have non-empty message and tag fields. @@ -24978,7 +25152,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25192,11 +25192,11 @@ +@@ -25355,11 +25355,11 @@ The custom_messages, message, learn_more_url, language and tag fields are used to configure a message to show the user when a warning is shown after a scan had a non-clean verdict. The administrator is able to configure messages of up to 200 characters. @@ -24992,7 +25166,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -25245,11 +25245,11 @@ +@@ -25408,11 +25408,11 @@ The service_provider field identifies which reporting service provider the settings correspond to and the enabled_event_names field identifies which events are enabled for this provider. @@ -25006,7 +25180,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25287,11 +25287,11 @@ +@@ -25450,11 +25450,11 @@ If this policy is set to ‘Enabled’, URLs will be sent to be scanned in real time under enterprise ToS. It will result in Chrome sending URLs to Google Cloud or third parties of your choosing to check them in real time. The consumer version of Safe Browsing real time lookup will be switched off. @@ -25020,7 +25194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:78-'], -@@ -25307,11 +25307,11 @@ +@@ -25470,11 +25470,11 @@ Setting the policy to Disabled has a detrimental effect on $1Google Chrome's security and stability as unknown and potentially hostile code can load inside $1Google Chrome's renderer processes. Only turn off the policy if there are compatibility issues with third-party software that must run inside $1Google Chrome's renderer processes. @@ -25034,7 +25208,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -25338,11 +25338,11 @@ +@@ -25501,11 +25501,11 @@ Setting the policy to Disabled has a detrimental effect on $1Google Chrome's security and stability as unknown and potentially hostile code can load inside $1Google Chrome's browser process. Only turn off the policy if there are compatibility issues with third-party software that must run inside $1Google Chrome's browser process. @@ -25048,7 +25222,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25368,7 +25368,7 @@ +@@ -25531,7 +25531,7 @@ }, { 'name': 'AllowSyncXHRInPageDismissal', @@ -25057,7 +25231,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'deprecated': True, -@@ -25390,11 +25390,11 @@ +@@ -25553,11 +25553,11 @@ This policy was removed in Chrome 99. @@ -25071,7 +25245,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -25420,7 +25420,7 @@ +@@ -25583,7 +25583,7 @@ { 'id': 626, 'name': 'TLS13HardeningForLocalAnchorsEnabled', @@ -25080,7 +25254,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -25445,7 +25445,7 @@ +@@ -25608,7 +25608,7 @@ }, { 'name': 'AudioSandboxEnabled', @@ -25089,7 +25263,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:79-', 'chrome.linux:79-', 'chrome.mac:79-'], -@@ -25466,7 +25466,7 @@ +@@ -25629,7 +25629,7 @@ }, { 'name': 'CorsMitigationList', @@ -25098,7 +25272,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25484,19 +25484,19 @@ +@@ -25647,19 +25647,19 @@ 'tags': [], 'desc': '''Enable CORS check mitigations in the new CORS implementation, allowing Extensions to keep compatible behavior, and allowing $1Google Chrome to send specified headers without CORS checks. @@ -25121,7 +25295,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:79-83', 'chrome_os:79-83'], -@@ -25517,13 +25517,13 @@ +@@ -25680,13 +25680,13 @@ This policy will be removed after a couple of milestones. @@ -25137,7 +25311,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:79-100'], 'id': 631, 'features': { -@@ -25551,7 +25551,7 @@ +@@ -25714,7 +25714,7 @@ }, { 'name': 'ExternalPrintServersAllowlist', @@ -25146,7 +25320,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:86-'], 'id': 750, 'features': { -@@ -25576,7 +25576,7 @@ +@@ -25739,7 +25739,7 @@ }, { 'name': 'DeviceExternalPrintServersAllowlist', @@ -25155,7 +25329,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'future_on': ['chrome_os'], # TODO(https://crbug.com/1100777): Remove |future|. 'id': 731, -@@ -25603,7 +25603,7 @@ +@@ -25766,7 +25766,7 @@ }, { 'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox', @@ -25164,7 +25338,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean', -@@ -25636,7 +25636,7 @@ +@@ -25799,7 +25799,7 @@ }, { 'name': 'DefaultInsecureContentSetting', @@ -25173,7 +25347,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -25671,7 +25671,7 @@ +@@ -25834,7 +25834,7 @@ }, { 'name': 'InsecureContentAllowedForUrls', @@ -25182,7 +25356,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25690,11 +25690,11 @@ +@@ -25853,11 +25853,11 @@ If this policy is left not set blockable mixed content will be blocked and optionally blockable mixed content will be upgraded, and users will be allowed to set exceptions to allow it for specific sites. @@ -25196,7 +25370,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -25713,11 +25713,11 @@ +@@ -25876,11 +25876,11 @@ If this policy is left not set blockable mixed content will be blocked and optionally blockable mixed content will be upgraded, but users will be allowed to set exceptions to allow it for specific sites. @@ -25210,7 +25384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'list', 'schema': { -@@ -25741,11 +25741,11 @@ +@@ -25904,11 +25904,11 @@ URLs must have HTTPS scheme, e.g. "https://example.com". @@ -25224,7 +25398,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type' : 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:80-'], -@@ -25763,7 +25763,7 @@ +@@ -25926,7 +25926,7 @@ }, { 'name': 'PerAppTimeLimits', @@ -25233,7 +25407,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'object', -@@ -25890,7 +25890,7 @@ +@@ -26053,7 +26053,7 @@ }, { 'name': 'WebComponentsV0Enabled', @@ -25242,7 +25416,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -25913,7 +25913,7 @@ +@@ -26076,7 +26076,7 @@ }, { 'name': 'UseLegacyFormControls', @@ -25251,7 +25425,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'example_value': True, -@@ -25936,7 +25936,7 @@ +@@ -26099,7 +26099,7 @@ }, { 'name': 'ClickToCallEnabled', @@ -25260,7 +25434,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:79-', 'chrome_os:79-'], -@@ -25948,7 +25948,7 @@ +@@ -26111,7 +26111,7 @@ 'id': 645, 'caption': '''Enable the Click to Call Feature''', 'tags': [], @@ -25269,7 +25443,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli If this policy is set to enabled, the capability of sending phone numbers to Android devices will be enabled for the Chrome user. -@@ -25960,7 +25960,7 @@ +@@ -26123,7 +26123,7 @@ }, { 'name': 'UserDataSnapshotRetentionLimit', @@ -25278,7 +25452,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0 }, 'supported_on': ['chrome.*:83-'], -@@ -25981,7 +25981,7 @@ +@@ -26144,7 +26144,7 @@ }, { 'name': 'PrinterTypeDenyList', @@ -25287,7 +25461,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -26046,7 +26046,7 @@ +@@ -26211,7 +26211,7 @@ }, { 'name': 'PrintPostScriptMode', @@ -25296,7 +25470,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -26086,7 +26086,7 @@ +@@ -26251,7 +26251,7 @@ }, { 'name': 'PrintRasterizationMode', @@ -25305,7 +25479,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -26126,7 +26126,7 @@ +@@ -26291,7 +26291,7 @@ }, { 'name': 'PrintPdfAsImageAvailability', @@ -25314,7 +25488,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -26159,7 +26159,7 @@ +@@ -26324,7 +26324,7 @@ }, { 'name': 'PrintRasterizePdfDpi', @@ -25323,7 +25497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', -@@ -26185,7 +26185,7 @@ +@@ -26350,7 +26350,7 @@ }, { 'name': 'PrintPdfAsImageDefault', @@ -25332,7 +25506,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'items': [ -@@ -26220,7 +26220,7 @@ +@@ -26385,7 +26385,7 @@ }, { 'name': 'DeletePrintJobHistoryAllowed', @@ -25341,7 +25515,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -26243,7 +26243,7 @@ +@@ -26408,7 +26408,7 @@ }, { 'name': 'AmbientAuthenticationInPrivateModesEnabled', @@ -25350,7 +25524,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -26298,7 +26298,7 @@ +@@ -26463,7 +26463,7 @@ }, { 'name': 'PaymentMethodQueryEnabled', @@ -25359,7 +25533,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-', 'chrome_os:80-', 'android:80-'], -@@ -26318,7 +26318,7 @@ +@@ -26483,7 +26483,7 @@ }, { 'name': 'StricterMixedContentTreatmentEnabled', @@ -25368,7 +25542,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:80-', 'chrome_os:80-'], -@@ -26340,7 +26340,7 @@ +@@ -26505,7 +26505,7 @@ }, { 'name': 'PerAppTimeLimitsWhitelist', @@ -25377,7 +25551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 658, 'features': { 'dynamic_refresh': True, -@@ -26384,8 +26384,8 @@ +@@ -26549,8 +26549,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -25388,7 +25562,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -26414,7 +26414,7 @@ +@@ -26579,7 +26579,7 @@ }, { 'name': 'PerAppTimeLimitsAllowlist', @@ -25397,7 +25571,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'id': 762, 'features': { 'dynamic_refresh': True, -@@ -26457,8 +26457,8 @@ +@@ -26622,8 +26622,8 @@ 'url_list': [ "chrome://*", "file://*", @@ -25408,16 +25582,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli ], 'app_list': [ { -@@ -26485,7 +26485,7 @@ +@@ -26650,7 +26650,7 @@ }, { 'name': 'LocalDiscoveryEnabled', -- 'owners': ['file://cloud_print/OWNERS', 'weili@chromium.org'], -+ 'owners': ['file://cloud_print/OWNERS', 'weili@ch40m1um.qjz9zk'], +- 'owners': ['thestig@chromium.org', 'weili@chromium.org'], ++ 'owners': ['thestig@ch40m1um.qjz9zk', 'weili@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:81-87', 'chrome_os:81-87'], -@@ -26518,7 +26518,7 @@ +@@ -26683,7 +26683,7 @@ }, { 'name': 'ScreenCaptureAllowed', @@ -25426,7 +25600,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:81-', 'chrome_os:81-'], -@@ -26547,7 +26547,7 @@ +@@ -26712,7 +26712,7 @@ }, { 'name': 'ScreenCaptureAllowedByOrigins', @@ -25435,7 +25609,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26570,11 +26570,11 @@ +@@ -26735,11 +26735,11 @@ If a site matches a URL pattern in this policy, the ScreenCaptureAllowed will not be considered. @@ -25449,7 +25623,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26597,11 +26597,11 @@ +@@ -26762,11 +26762,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -25463,7 +25637,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26626,11 +26626,11 @@ +@@ -26791,11 +26791,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: WindowCaptureAllowedByOrigins, ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -25477,7 +25651,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -26653,11 +26653,11 @@ +@@ -26818,11 +26818,11 @@ If a site matches a URL pattern in this policy, the following policies will not be considered: TabCaptureAllowedByOrigins, WindowCaptureAllowedByOrigins, ScreenCaptureAllowedByOrigins, ScreenCaptureAllowed. @@ -25491,7 +25665,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:81-81'], -@@ -26676,7 +26676,7 @@ +@@ -26841,7 +26841,7 @@ }, { 'name': 'SystemProxySettings', @@ -25500,7 +25674,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'supported_on': ['chrome_os:87-'], 'device_only': True, 'id': 672, -@@ -26732,7 +26732,7 @@ +@@ -26897,7 +26897,7 @@ }, { 'name': 'DeviceLoginScreenPrivacyScreenEnabled', @@ -25509,7 +25683,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'device_only': True, 'type': 'main', 'schema': { 'type': 'boolean' }, -@@ -26760,7 +26760,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema +@@ -26925,7 +26925,7 @@ If this policy is left unset, the privacy screen is disabled initially, but rema }, { 'name': 'PrivacyScreenEnabled', @@ -25518,7 +25692,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:83-'], -@@ -26787,7 +26787,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co +@@ -26952,7 +26952,7 @@ If this policy is left unset, privacy screen is disabled initially but can be co }, { 'name': 'AllowNativeNotifications', @@ -25527,7 +25701,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:83-100'], -@@ -26842,7 +26842,7 @@ If set to False, $1Google Chrome will not +@@ -27007,7 +27007,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForUser', @@ -25536,7 +25710,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -26894,7 +26894,7 @@ If set to False, $1Google Chrome will not +@@ -27059,7 +27059,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'RequiredClientCertificateForDevice', @@ -25545,7 +25719,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -26946,7 +26946,7 @@ If set to False, $1Google Chrome will not +@@ -27111,7 +27111,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'AdvancedProtectionAllowed', @@ -25554,7 +25728,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:83-', 'chrome_os:83-'], -@@ -26963,7 +26963,7 @@ If set to False, $1Google Chrome will not +@@ -27128,7 +27128,7 @@ If set to False, $1Google Chrome will not }, { 'name': 'ScrollToTextFragmentEnabled', @@ -25563,16 +25737,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:83-', 'chrome_os:83-', 'android:83-'], -@@ -26984,7 +26984,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27149,7 +27149,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LoginDisplayPasswordButtonEnabled', -- 'owners': ['tellier@google.com', 'rsorokin@chromium.org', 'cros-oac@google.com'], -+ 'owners': ['tellier@9oo91e.qjz9zk', 'rsorokin@ch40m1um.qjz9zk', 'cros-oac@9oo91e.qjz9zk'], +- 'owners': ['rsorokin@chromium.org', 'cros-oac@google.com'], ++ 'owners': ['rsorokin@ch40m1um.qjz9zk', 'cros-oac@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -27003,7 +27003,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27168,7 +27168,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AccessibilityImageLabelsEnabled', @@ -25581,7 +25755,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-', 'chrome.*:84-'], -@@ -27054,7 +27054,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27219,7 +27219,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntensiveWakeUpThrottlingEnabled', @@ -25590,7 +25764,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-', 'chrome.*:85-', 'android:85-'], -@@ -27092,7 +27092,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27257,7 +27257,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BackForwardCacheEnabled', @@ -25599,7 +25773,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-'], -@@ -27127,7 +27127,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27292,7 +27292,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PinUnlockAutosubmitEnabled', @@ -25608,7 +25782,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -27153,7 +27153,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27318,7 +27318,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EmojiSuggestionEnabled', @@ -25617,7 +25791,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-'], -@@ -27172,7 +27172,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27337,7 +27337,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsEnabled', @@ -25626,7 +25800,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:84-93', 'chrome.*:84-93', 'android:84-93'], -@@ -27194,7 +27194,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27359,7 +27359,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserAgentClientHintsGREASEUpdateEnabled', @@ -25635,7 +25809,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:98-', 'chrome.*:98-', 'android:98-'], -@@ -27224,7 +27224,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27389,7 +27389,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + }, + { + 'name': 'UrlParamFilterEnabled', +- 'owners': ['bcl@google.com', 'mreichhoff@chromium.org', 'file://chrome/browser/url_param_filter/OWNERS'], ++ 'owners': ['bcl@9oo91e.qjz9zk', 'mreichhoff@ch40m1um.qjz9zk', 'file://chrome/browser/url_param_filter/OWNERS'], + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome_os:102-', 'chrome.*:102-', 'android:102-'], +@@ -27418,7 +27418,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuggestedContentEnabled', @@ -25644,7 +25827,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:85-'], -@@ -27246,7 +27246,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27440,7 +27440,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ShowFullUrlsInAddressBar', @@ -25653,7 +25836,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:86-', 'chrome.*:86-'], -@@ -27269,7 +27269,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27463,7 +27463,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'InsecureFormsWarningsEnabled', @@ -25662,7 +25845,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:86-', 'chrome_os:86-', 'android:86-'], -@@ -27288,7 +27288,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27482,7 +27482,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LookalikeWarningAllowlistDomains', @@ -25671,7 +25854,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -27314,7 +27314,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27508,7 +27508,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CCTToSDialogEnabled', @@ -25680,7 +25863,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:86-86'], -@@ -27344,7 +27344,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27538,7 +27538,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'TosDialogBehavior', @@ -25689,7 +25872,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -27387,7 +27387,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27581,7 +27581,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'CloudPrintWarningsSuppressed', @@ -25698,7 +25881,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:86-87', 'chrome_os:86-87'], -@@ -27417,7 +27417,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27611,7 +27611,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EnableDeprecatedPrivetPrinting', @@ -25707,7 +25890,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-93', 'chrome_os:89-93'], -@@ -27447,7 +27447,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27641,7 +27641,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionClipboardCheckSizeLimit', @@ -25716,7 +25899,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer' , 'minimum' : 0 }, 'supported_on': ['chrome_os:93-'], -@@ -27466,7 +27466,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27660,7 +27660,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionReportingEnabled', @@ -25725,7 +25908,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:92-'], -@@ -27498,7 +27498,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27692,7 +27692,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DataLeakPreventionRulesList', @@ -25734,7 +25917,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27585,18 +27585,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27779,18 +27779,18 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -25759,7 +25942,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -27629,8 +27629,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27823,8 +27823,8 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'sources': { 'urls': [ 'salesforce.com', @@ -25770,7 +25953,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'company.com' ] }, -@@ -27677,13 +27677,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27871,13 +27871,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR Notes: - PRIVACY_SCREEN restriction doesn't block the ability to turn on privacy screen, but enforces it when the restriction class is set to BLOCK. - Destinations cannot be empty in case one of the restrictions is CLIPBOARD, but they don't make any difference for the remaining restrictions. @@ -25786,7 +25969,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:87-', 'chrome_os:87-'], -@@ -27716,7 +27716,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27910,7 +27910,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'MediaRecommendationsEnabled', @@ -25795,7 +25978,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:87-', 'chrome_os:87-'], -@@ -27743,7 +27743,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27937,7 +27937,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceFamilyLinkAccountsAllowed', @@ -25804,7 +25987,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:87-'], -@@ -27767,7 +27767,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27961,7 +27961,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'EduCoexistenceToSVersion', @@ -25813,7 +25996,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -27792,7 +27792,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -27986,7 +27986,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowsingDataLifetime', @@ -25822,7 +26005,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -27847,7 +27847,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28041,7 +28041,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAllowed', @@ -25831,7 +26014,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:88-95'], -@@ -27880,7 +27880,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28074,7 +28074,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosSecondaryProfilesAllowed', @@ -25840,7 +26023,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.linux:91-92', 'chrome_os:91-'], -@@ -27914,7 +27914,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28108,7 +28108,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'LacrosAvailability', @@ -25849,7 +26032,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -27980,7 +27980,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28174,7 +28174,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'IntegratedWebAuthenticationAllowed', @@ -25858,7 +26041,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:89-93'], -@@ -28008,7 +28008,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28202,7 +28202,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ClearBrowsingDataOnExitList', @@ -25867,7 +26050,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum-list', 'schema': { 'type': 'array', -@@ -28094,7 +28094,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28288,7 +28288,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ProfilePickerOnStartupAvailability', @@ -25876,7 +26059,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -28141,7 +28141,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28335,7 +28335,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SigninInterceptionEnabled', @@ -25885,7 +26068,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:89-'], -@@ -28176,7 +28176,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28371,7 +28371,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebXRImmersiveArEnabled', @@ -25894,7 +26077,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['android:90-'], -@@ -28209,7 +28209,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28404,7 +28404,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SendDownloadToCloudEnterpriseConnector', @@ -25903,7 +26086,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'dict', 'schema': { 'type': 'array', -@@ -28296,7 +28296,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28491,7 +28491,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceSystemWideTracingEnabled', @@ -25912,7 +26095,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:90-'], -@@ -28330,7 +28330,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28525,7 +28525,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebAppSettings', @@ -25920,17 +26103,15 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['mjackson@m1cr050ft.qjz9zk', 'cmp@ch40m1um.qjz9zk', 'file://chrome/browser/web_applications/OWNERS', 'tapted@ch40m1um.qjz9zk'], 'type': 'dict', 'schema': { - 'type': 'object', -@@ -28381,7 +28381,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR - 'tags': [], - 'desc': '''This policy allows an admin to specify settings for installed web apps. + 'type': 'array', +@@ -28571,13 +28571,13 @@ If you disable this policy, web page scrolling to specific text fragments via UR -- This policy maps a Web App ID to its specific setting. See https://developer.chrome.com/blog/pwa-manifest-id/https://developer.chrome.com/blog/pwa-manifest-id/ for instructions on how to determine the id for an installed web app. -+ This policy maps a Web App ID to its specific setting. See https://developer.ch40me.qjz9zk/blog/pwa-manifest-id/https://developer.ch40me.qjz9zk/blog/pwa-manifest-id/ for instructions on how to determine the id for an installed web app. - A default configuration can be set using the special ID "*", which applies to all web apps without a custom configuration in this policy. + This policy maps a Web App ID to its specific setting. A default configuration can be set using the special ID "*", which applies to all web apps without a custom configuration in this policy. +- The "manifest_id" field is the Manifest ID for the Web App. See https://developer.chrome.com/blog/pwa-manifest-id/https://developer.chrome.com/blog/pwa-manifest-id/ for instructions on how to determine the Manifest ID for an installed web app. ++ The "manifest_id" field is the Manifest ID for the Web App. See https://developer.ch40me.qjz9zk/blog/pwa-manifest-id/https://developer.ch40me.qjz9zk/blog/pwa-manifest-id/ for instructions on how to determine the Manifest ID for an installed web app. The "run_on_os_login" field specifies if a web app can be run during OS login. If this field is set to "blocked", the web app will not run during OS login and the user will not be able to enable this later. If this field is set to "run_windowed", the web app will run during OS login and the user will not be able to disable this later. If this field is set to "allowed", the user will be able to configure the web app to run at OS login. The default configuration only allows the "allowed" and "blocked" values. -@@ -28389,7 +28389,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR + ''', }, { 'name': 'FetchKeepaliveDurationSecondsOnShutdown', @@ -25939,7 +26120,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int', 'schema': { 'type': 'integer', 'minimum': 0, 'maximum': 5 }, 'default': 0, -@@ -28412,7 +28412,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28600,7 +28600,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'SuppressDifferentOriginSubframeDialogs', @@ -25948,7 +26129,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.*:91-', 'chrome_os:91-', 'android:91-'], -@@ -28435,7 +28435,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28623,7 +28623,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR 'id': 829, 'caption': '''Suppress JavaScript Dialogs triggered from different origin subframes''', 'tags': [], @@ -25957,7 +26138,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli This policy allows overriding that change. If the policy is set to enabled or unset, JavaScript dialogs triggered from a different origin subframe will be blocked. If the policy is set to disabled, JavaScript dialogs triggered from a different origin subframe will not be blocked. -@@ -28444,7 +28444,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28632,7 +28632,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceBorealisAllowed', @@ -25966,7 +26147,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -28473,7 +28473,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28661,7 +28661,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'UserBorealisAllowed', @@ -25975,7 +26156,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -28502,7 +28502,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28690,7 +28690,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'AudioProcessHighPriorityEnabled', @@ -25984,7 +26165,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:90-'], -@@ -28539,7 +28539,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28727,7 +28727,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'ForcedLanguages', @@ -25993,7 +26174,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28563,7 +28563,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28751,7 +28751,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'BrowserThemeColor', @@ -26002,7 +26183,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string', 'schema': { 'type': 'string', -@@ -28587,7 +28587,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28775,7 +28775,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'WebRtcIPHandling', @@ -26011,7 +26192,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'string-enum', 'schema': { 'type': 'string', -@@ -28629,7 +28629,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28817,7 +28817,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'PdfAnnotationsEnabled', @@ -26020,7 +26201,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome_os:91-'], -@@ -28660,7 +28660,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR +@@ -28848,7 +28848,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { 'name': 'DeviceAllowedBluetoothServices', @@ -26029,7 +26210,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'list', 'schema': { 'type': 'array', -@@ -28684,7 +28684,7 @@ When this policy is set, $2Google Chrome OS< +@@ -28872,7 +28872,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -28967,7 +28967,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29000,7 +29000,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29029,7 +29029,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29070,7 +29070,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29138,7 +29138,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29168,7 +29168,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29206,7 +29206,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29223,7 +29223,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29233,7 +29233,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29252,7 +29252,7 @@ When this policy is set, $2Google ChromeOS$1Google Chrome may render web content more slowly, and may also disable parts of JavaScript including WebAssembly. Disabling the JavaScript JIT may allow $1Google Chrome to render web content in a more secure configuration. @@ -26128,7 +26309,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli JavaScript JIT policy exceptions will only be enforced at a site granularity (eTLD+1). A policy set for only subdomain.site.com will not correctly apply to site.com or subdomain.site.com since they both resolve to the same eTLD+1 (site.com) for which there is no policy. In this case, policy must be set on site.com to apply correctly for both site.com and subdomain.site.com. -@@ -29061,7 +29061,7 @@ When this policy is set, $2Google Chrome OS< +@@ -29262,7 +29262,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29306,7 +29306,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29335,7 +29335,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29365,7 +29365,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29389,7 +29389,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29450,7 +29450,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29480,7 +29480,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29509,7 +29509,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29538,7 +29538,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29568,7 +29568,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29599,7 +29599,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29628,7 +29628,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< + 'supported_on': ['chrome_os:102-', 'chrome.*:102-'], +@@ -29658,7 +29658,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< + 'supported_on': ['chrome_os:103-', 'chrome.*:103-'], +@@ -29681,7 +29681,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29712,7 +29712,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29739,7 +29739,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29802,7 +29802,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29837,7 +29837,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29872,7 +29872,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -29913,14 +29913,14 @@ When this policy is set, $2Google ChromeOSenable and disable URL lists control which sites are allowed to write to the clipboard. A clipboard write is blocked if the URL matches a pattern in 'enable' and doesn't match a pattern in 'disable'. A copy is not blocked if the URL does not match any pattern. @@ -26316,7 +26497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -29756,12 +29756,12 @@ When this policy is set, $2Google Chrome OS< +@@ -29957,12 +29957,12 @@ When this policy is set, $2Google ChromeOSUser-Agent Reduction and its timeline, read here: @@ -26331,7 +26512,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'int-enum', 'schema': { 'type': 'integer', -@@ -29820,8 +29820,8 @@ When this policy is set, $2Google Chrome OS< +@@ -30021,8 +30021,8 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30063,13 +30063,13 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30105,7 +30105,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30138,7 +30138,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30172,7 +30172,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30209,7 +30209,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30223,13 +30223,13 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30243,13 +30243,13 @@ When this policy is set, $2Google ChromeOSDefaultWindowPlacementSetting applies to the site, if set, otherwise the permission will follow the browser's defaults and allow users to choose this permission per site.''', }, + { + 'name': 'DefaultLocalFontsSetting', +- 'owners': ['dslee@chromium.org', 'storage-dev@chromium.org'], ++ 'owners': ['dslee@ch40m1um.qjz9zk', 'storage-dev@ch40m1um.qjz9zk'], + 'type': 'int-enum', + 'schema': { + 'type': 'integer', +@@ -30286,7 +30286,7 @@ When this policy is set, $2Google ChromeOS$2Google ChromeOS*, are allowed. This policy only matches based on origin, so any path in the URL pattern is ignored. ++ For detailed information on valid site url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. Wildcards, *, are allowed. This policy only matches based on origin, so any path in the URL pattern is ignored. + + If this policy is not set for a site then the policy from DefaultLocalFontsSetting applies to the site, if set, otherwise the permission will follow the browser's defaults and allow users to choose this permission per site.''', + }, + { + 'name': 'LocalFontsBlockedForUrls', +- 'owners': ['dslee@chromium.org', 'storage-dev@chromium.org'], ++ 'owners': ['dslee@ch40m1um.qjz9zk', 'storage-dev@ch40m1um.qjz9zk'], + 'type': 'list', + 'schema': { 'type': 'array', 'items': { 'type': 'string' } }, + 'supported_on': ['chrome.*:103-', 'chrome_os:103-'], +@@ -30320,13 +30320,13 @@ When this policy is set, $2Google ChromeOS*, are allowed. This policy only matches based on origin, so any path in the URL pattern is ignored. ++ For detailed information on valid site url patterns, please see https://cloud.9oo91e.qjz9zk/docs/chrome-enterprise/policies/url-patterns. Wildcards, *, are allowed. This policy only matches based on origin, so any path in the URL pattern is ignored. + + If this policy is not set for a site then the policy from DefaultLocalFontsSetting applies to the site, if set, otherwise the permission will follow the browser's defaults and allow users to choose this permission per site.''', + }, { 'name': 'DeviceRunAutomaticCleanupOnLogin', - 'owners': ['vsavu@google.com'], @@ -26426,7 +26648,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli 'type': 'main', 'schema': {'type': 'boolean', }, 'tags': [], -@@ -30076,7 +30076,7 @@ When this policy is set, $2Google Chrome OS< +@@ -30356,7 +30356,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30393,7 +30393,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30412,7 +30412,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30446,7 +30446,7 @@ When this policy is set, $2Google ChromeOS$2Google ChromeOS$2Google Chrome OS< +@@ -30566,7 +30566,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30596,7 +30596,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30624,7 +30624,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30652,7 +30652,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30681,7 +30681,7 @@ When this policy is set, $2Google ChromeOS$2Google Chrome OS< +@@ -30724,7 +30724,7 @@ When this policy is set, $2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google ChromeOS$2Google Chrome OS< +@@ -31013,13 +31013,13 @@ When this policy is set, $2Google ChromeOS$1Google Chrome internal to your organization. Use of these policies outside of your organization (for example, in a publicly distributed program) is considered malware and will likely be labeled as malware by Google and anti-virus vendors. @@ -26532,7 +26808,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'doc_policy_in_atomic_group': { 'desc': '''Label notifying that a policy is part of an atomic policy group''', -@@ -30531,11 +30531,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31095,11 +31095,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio }, 'doc_complex_policies_on_windows': { 'desc': '''Text pointing the user to a help article for complex policies on Windows''', @@ -26546,7 +26822,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'doc_legacy_single_line_label': { 'desc': '''A label for the legacy single-line textbox for a policy also has a more user-friendly multi-line textbox. See http://crbug/829328''', -@@ -30559,7 +30559,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31123,7 +31123,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio }, 'doc_schema_description_link': { 'desc': '''Text pointing the user to the expanded documentation page for this policy, containing the information about schema and formatting.''', @@ -26555,7 +26831,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'deprecated_policy_group_caption': { 'desc': '''Localized name for the deprecated policies folder, for Microsoft's Group Policy Editor.''', -@@ -30571,7 +30571,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31135,7 +31135,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio }, 'deprecated_policy_desc': { 'desc': '''Description shared by all deprecated policies, in Microsoft Windows' Group Policy Editor.''', @@ -26564,7 +26840,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, 'removed_policy_group_caption': { 'desc': '''Localized name for the removed policies folder, for Microsoft's Group Policy Editor.''', -@@ -30583,7 +30583,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31147,7 +31147,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio }, 'removed_policy_desc': { 'desc': '''Description shared by all removed policies, in Microsoft Windows' Group Policy Editor.''', @@ -26573,7 +26849,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli }, }, # Legacy device policies that don't have a 1:1 mapping between template and -@@ -30912,7 +30912,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio +@@ -31476,7 +31476,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio { 'id': 6, 'name': 'RestoreOnStartup', @@ -26611,7 +26887,7 @@ diff --git a/components/policy/test_support/signature_provider.h b/components/po diff --git a/components/policy/tools/syntax_check_policy_template_json.py b/components/policy/tools/syntax_check_policy_template_json.py --- a/components/policy/tools/syntax_check_policy_template_json.py +++ b/components/policy/tools/syntax_check_policy_template_json.py -@@ -819,7 +819,7 @@ class PolicyTemplateChecker(object): +@@ -856,7 +856,7 @@ class PolicyTemplateChecker(object): 'of the description, it is recommended to add a page under %s ' 'instead and provide a link to it.' % (POLICY_DESCRIPTION_LENGTH_SOFT_LIMIT, @@ -26749,15 +27025,15 @@ diff --git a/components/resources/terms/terms_am.html b/components/resources/ter ለመጨረሻ ጊዜ የተቀየረው፦ 01 ጃንዋሪ፣ 2021

-- Chrome ወይም Chrome OSን በመጠቀምዎ https://policies.google.com/terms ላይ በሚገኘው የGoogle አገልግሎት ውል እና በእነዚህ የGoogle Chrome እና Chrome OS ተጨማሪ አገልግሎት ውል ይስማማሉ። -+ Chrome ወይም Chrome OSን በመጠቀምዎ https://policies.9oo91e.qjz9zk/terms ላይ በሚገኘው የGoogle አገልግሎት ውል እና በእነዚህ የGoogle Chrome እና Chrome OS ተጨማሪ አገልግሎት ውል ይስማማሉ። +- Chrome ወይም ChromeOSን በመጠቀምዎ https://policies.google.com/terms ላይ በሚገኘው የGoogle አገልግሎት ውል እና በእነዚህ የGoogle Chrome እና ChromeOS ተጨማሪ አገልግሎት ውል ይስማማሉ። ++ Chrome ወይም ChromeOSን በመጠቀምዎ https://policies.9oo91e.qjz9zk/terms ላይ በሚገኘው የGoogle አገልግሎት ውል እና በእነዚህ የGoogle Chrome እና ChromeOS ተጨማሪ አገልግሎት ውል ይስማማሉ።

-- እነዚህ የGoogle Chrome እና የChrome OS ተጨማሪ አገልግሎት ውል በተፈጻሚው የChrome እና Chrome OW ኮድ ስሪት ላይ ይተገበራሉ። አብዛኛው የChrome ምንጭ ኮድ በክፍት ምንጭ ፈቃድ ስምምነቶች https://code.google.com/chromium/terms.html ላይ ባሉ የክፍት ምንጭ ሶፍትዌር ፈቃድ ስምምነቶች መሠረት ከክፍያ ነጻ የሚገኝ ነው። -+ እነዚህ የGoogle Chrome እና የChrome OS ተጨማሪ አገልግሎት ውል በተፈጻሚው የChrome እና Chrome OW ኮድ ስሪት ላይ ይተገበራሉ። አብዛኛው የChrome ምንጭ ኮድ በክፍት ምንጭ ፈቃድ ስምምነቶች https://code.9oo91e.qjz9zk/chromium/terms.html ላይ ባሉ የክፍት ምንጭ ሶፍትዌር ፈቃድ ስምምነቶች መሠረት ከክፍያ ነጻ የሚገኝ ነው። +- እነዚህ የGoogle Chrome እና የChromeOS ተጨማሪ አገልግሎት ውል በተፈጻሚው የChrome እና Chrome OW ኮድ ስሪት ላይ ይተገበራሉ። አብዛኛው የChrome ምንጭ ኮድ በክፍት ምንጭ ፈቃድ ስምምነቶች https://code.google.com/chromium/terms.html ላይ ባሉ የክፍት ምንጭ ሶፍትዌር ፈቃድ ስምምነቶች መሠረት ከክፍያ ነጻ የሚገኝ ነው። ++ እነዚህ የGoogle Chrome እና የChromeOS ተጨማሪ አገልግሎት ውል በተፈጻሚው የChrome እና Chrome OW ኮድ ስሪት ላይ ይተገበራሉ። አብዛኛው የChrome ምንጭ ኮድ በክፍት ምንጭ ፈቃድ ስምምነቶች https://code.9oo91e.qjz9zk/chromium/terms.html ላይ ባሉ የክፍት ምንጭ ሶፍትዌር ፈቃድ ስምምነቶች መሠረት ከክፍያ ነጻ የሚገኝ ነው።

- የእርስዎ የተወሰኑ የChrome እና Chrome OS ክፍሎችን መጠቀም ለሚከተሉት ደንቦች ተገዢ ነው፦ + የእርስዎ የተወሰኑ የChrome እና ChromeOS ክፍሎችን መጠቀም ለሚከተሉት ደንቦች ተገዢ ነው፦ diff --git a/components/resources/terms/terms_ar.html b/components/resources/terms/terms_ar.html --- a/components/resources/terms/terms_ar.html +++ b/components/resources/terms/terms_ar.html @@ -26781,15 +27057,15 @@ diff --git a/components/resources/terms/terms_bg.html b/components/resources/ter Последна промяна: 1 януари 2021 г.

-- С използването на Chrome или Chrome OS приемате Общите условия на Google на адрес https://policies.google.com/terms и настоящите Допълнителни общи условия на Google Chrome и Chrome OS. -+ С използването на Chrome или Chrome OS приемате Общите условия на Google на адрес https://policies.9oo91e.qjz9zk/terms и настоящите Допълнителни общи условия на Google Chrome и Chrome OS. +- С използването на Chrome или ChromeOS приемате Общите условия на Google на адрес https://policies.google.com/terms и настоящите Допълнителни общи условия на Google Chrome и ChromeOS. ++ С използването на Chrome или ChromeOS приемате Общите условия на Google на адрес https://policies.9oo91e.qjz9zk/terms и настоящите Допълнителни общи условия на Google Chrome и ChromeOS.

-- Допълнителните общи условия на Google Chrome и Chrome OS се прилагат към версията на изпълнимия код на тези продукти. По-голямата част от изходния код на Chrome е налице безплатно съгласно лицензи за софтуер с отворен код на адрес https://code.google.com/chromium/terms.html. -+ Допълнителните общи условия на Google Chrome и Chrome OS се прилагат към версията на изпълнимия код на тези продукти. По-голямата част от изходния код на Chrome е налице безплатно съгласно лицензи за софтуер с отворен код на адрес https://code.9oo91e.qjz9zk/chromium/terms.html. +- Допълнителните общи условия на Google Chrome и ChromeOS се прилагат към версията на изпълнимия код на тези продукти. По-голямата част от изходния код на Chrome е налице безплатно съгласно лицензи за софтуер с отворен код на адрес https://code.google.com/chromium/terms.html. ++ Допълнителните общи условия на Google Chrome и ChromeOS се прилагат към версията на изпълнимия код на тези продукти. По-голямата част от изходния код на Chrome е налице безплатно съгласно лицензи за софтуер с отворен код на адрес https://code.9oo91e.qjz9zk/chromium/terms.html.

- Използването от ваша страна на определени компоненти от Chrome и Chrome OS е предмет на следните условия: + Използването от ваша страна на определени компоненти от Chrome и ChromeOS е предмет на следните условия: diff --git a/components/resources/terms/terms_bn.html b/components/resources/terms/terms_bn.html --- a/components/resources/terms/terms_bn.html +++ b/components/resources/terms/terms_bn.html @@ -26797,15 +27073,15 @@ diff --git a/components/resources/terms/terms_bn.html b/components/resources/ter শেষবার পরিবর্তন করা হয়েছে: ১ জানুয়ারি, ২০২১

-- Chrome বা Chrome OS ব্যবহার করার মাধ্যমে, আপনি https://policies.google.com/terms লিঙ্কে দেওয়া Google-এর পরিষেবার শর্তাবলী ও এই সূত্রে দেওয়া Google Chrome ও Chrome OS-এর অতিরিক্ত পরিষেবার শর্তাবলী মেনে চলার ব্যাপারে সম্মত হয়েছেন। -+ Chrome বা Chrome OS ব্যবহার করার মাধ্যমে, আপনি https://policies.9oo91e.qjz9zk/terms লিঙ্কে দেওয়া Google-এর পরিষেবার শর্তাবলী ও এই সূত্রে দেওয়া Google Chrome ও Chrome OS-এর অতিরিক্ত পরিষেবার শর্তাবলী মেনে চলার ব্যাপারে সম্মত হয়েছেন। +- Chrome বা ChromeOS ব্যবহার করার মাধ্যমে, আপনি https://policies.google.com/terms লিঙ্কে দেওয়া Google-এর পরিষেবার শর্তাবলী ও এই সূত্রে দেওয়া Google Chrome ও ChromeOS-এর অতিরিক্ত পরিষেবার শর্তাবলী মেনে চলার ব্যাপারে সম্মত হয়েছেন। ++ Chrome বা ChromeOS ব্যবহার করার মাধ্যমে, আপনি https://policies.9oo91e.qjz9zk/terms লিঙ্কে দেওয়া Google-এর পরিষেবার শর্তাবলী ও এই সূত্রে দেওয়া Google Chrome ও ChromeOS-এর অতিরিক্ত পরিষেবার শর্তাবলী মেনে চলার ব্যাপারে সম্মত হয়েছেন।

-- Google Chrome ও Chrome OS-এর এই অতিরিক্ত পরিষেবার শর্তাবলী Chrome ও Chrome OS-এর চুক্তি নির্বাহকারী কোড ভার্সনের জন্য প্রযোজ্য হবে। Chrome-এর জন্য বেশির ভাগ সোর্স কোডই https://code.google.com/chromium/terms.html লিঙ্কে দেওয়া ওপেন সোর্স সফ্টওয়্যার লাইসেন্স চুক্তির অধীনে বিনামূল্যে পাওয়া যাবে। -+ Google Chrome ও Chrome OS-এর এই অতিরিক্ত পরিষেবার শর্তাবলী Chrome ও Chrome OS-এর চুক্তি নির্বাহকারী কোড ভার্সনের জন্য প্রযোজ্য হবে। Chrome-এর জন্য বেশির ভাগ সোর্স কোডই https://code.9oo91e.qjz9zk/chromium/terms.html লিঙ্কে দেওয়া ওপেন সোর্স সফ্টওয়্যার লাইসেন্স চুক্তির অধীনে বিনামূল্যে পাওয়া যাবে। +- Google Chrome ও ChromeOS-এর এই অতিরিক্ত পরিষেবার শর্তাবলী Chrome ও ChromeOS-এর চুক্তি নির্বাহকারী কোড ভার্সনের জন্য প্রযোজ্য হবে। Chrome-এর জন্য বেশির ভাগ সোর্স কোডই https://code.google.com/chromium/terms.html লিঙ্কে দেওয়া ওপেন সোর্স সফ্টওয়্যার লাইসেন্স চুক্তির অধীনে বিনামূল্যে পাওয়া যাবে। ++ Google Chrome ও ChromeOS-এর এই অতিরিক্ত পরিষেবার শর্তাবলী Chrome ও ChromeOS-এর চুক্তি নির্বাহকারী কোড ভার্সনের জন্য প্রযোজ্য হবে। Chrome-এর জন্য বেশির ভাগ সোর্স কোডই https://code.9oo91e.qjz9zk/chromium/terms.html লিঙ্কে দেওয়া ওপেন সোর্স সফ্টওয়্যার লাইসেন্স চুক্তির অধীনে বিনামূল্যে পাওয়া যাবে।

- আপনি Chrome ও Chrome OS-এর যেসব নির্দিষ্ট উপাদান ব্যবহার করেন, তার জন্য আপনাকে নিচে উল্লিখিত শর্তাবলী মেনে চলতে হবে: + আপনি Chrome ও ChromeOS-এর যেসব নির্দিষ্ট উপাদান ব্যবহার করেন, তার জন্য আপনাকে নিচে উল্লিখিত শর্তাবলী মেনে চলতে হবে: diff --git a/components/resources/terms/terms_ca.html b/components/resources/terms/terms_ca.html --- a/components/resources/terms/terms_ca.html +++ b/components/resources/terms/terms_ca.html @@ -26813,15 +27089,15 @@ diff --git a/components/resources/terms/terms_ca.html b/components/resources/ter Darrera modificació: 1 de gener de 2021

-- En utilitzar Chrome o Chrome OS, accepteu les Condicions del servei de Google, que podeu consultar a https://policies.google.com/terms, i aquestes Condicions del servei addicionals de Google Chrome i Chrome OS. -+ En utilitzar Chrome o Chrome OS, accepteu les Condicions del servei de Google, que podeu consultar a https://policies.9oo91e.qjz9zk/terms, i aquestes Condicions del servei addicionals de Google Chrome i Chrome OS. +- En utilitzar Chrome o ChromeOS, accepteu les Condicions del servei de Google, que podeu consultar a https://policies.google.com/terms, i aquestes Condicions del servei addicionals de Google Chrome i ChromeOS. ++ En utilitzar Chrome o ChromeOS, accepteu les Condicions del servei de Google, que podeu consultar a https://policies.9oo91e.qjz9zk/terms, i aquestes Condicions del servei addicionals de Google Chrome i ChromeOS.

-- Aquestes Condicions del servei addicionals de Google Chrome i Chrome OS s'apliquen a la versió de codi executable de Chrome i Chrome OS. La major part del codi font de Chrome està disponible sense cap càrrec d'acord amb els acords de llicència de programari lliure que es poden consultar a https://code.google.com/chromium/terms.html. -+ Aquestes Condicions del servei addicionals de Google Chrome i Chrome OS s'apliquen a la versió de codi executable de Chrome i Chrome OS. La major part del codi font de Chrome està disponible sense cap càrrec d'acord amb els acords de llicència de programari lliure que es poden consultar a https://code.9oo91e.qjz9zk/chromium/terms.html. +- Aquestes Condicions del servei addicionals de Google Chrome i ChromeOS s'apliquen a la versió de codi executable de Chrome i ChromeOS. La major part del codi font de Chrome està disponible sense cap càrrec d'acord amb els acords de llicència de programari lliure que es poden consultar a https://code.google.com/chromium/terms.html. ++ Aquestes Condicions del servei addicionals de Google Chrome i ChromeOS s'apliquen a la versió de codi executable de Chrome i ChromeOS. La major part del codi font de Chrome està disponible sense cap càrrec d'acord amb els acords de llicència de programari lliure que es poden consultar a https://code.9oo91e.qjz9zk/chromium/terms.html.

- L'ús que feu de determinats components de Chrome i Chrome OS està subjecte a les condicions següents: + L'ús que feu de determinats components de Chrome i ChromeOS està subjecte a les condicions següents: diff --git a/components/resources/terms/terms_cs.html b/components/resources/terms/terms_cs.html --- a/components/resources/terms/terms_cs.html +++ b/components/resources/terms/terms_cs.html @@ -26829,15 +27105,15 @@ diff --git a/components/resources/terms/terms_cs.html b/components/resources/ter Naposledy upraveno: 1. ledna 2021

-- Používáním prohlížeče Chrome nebo systému Chrome OS vyjadřujete souhlas se smluvními podmínkami společnosti Google na adrese https://policies.google.com/terms a těmito dodatečnými smluvními podmínkami pro Google Chrome a Chrome OS. -+ Používáním prohlížeče Chrome nebo systému Chrome OS vyjadřujete souhlas se smluvními podmínkami společnosti Google na adrese https://policies.9oo91e.qjz9zk/terms a těmito dodatečnými smluvními podmínkami pro Google Chrome a Chrome OS. +- Používáním prohlížeče Chrome nebo systému ChromeOS vyjadřujete souhlas se smluvními podmínkami společnosti Google na adrese https://policies.google.com/terms a těmito dodatečnými smluvními podmínkami pro Google Chrome a ChromeOS. ++ Používáním prohlížeče Chrome nebo systému ChromeOS vyjadřujete souhlas se smluvními podmínkami společnosti Google na adrese https://policies.9oo91e.qjz9zk/terms a těmito dodatečnými smluvními podmínkami pro Google Chrome a ChromeOS.

-- Tyto dodatečné smluvní podmínky prohlížeče Google Chrome a systému Chrome OS se vztahují na spustitelný kód aplikace Chrome a systému Chrome OS. Většina zdrojového kódu aplikace Chrome je k dispozici bezplatně s licenční smlouvou na software s otevřeným zdrojovým kódem na adrese https://code.google.com/chromium/terms.html. -+ Tyto dodatečné smluvní podmínky prohlížeče Google Chrome a systému Chrome OS se vztahují na spustitelný kód aplikace Chrome a systému Chrome OS. Většina zdrojového kódu aplikace Chrome je k dispozici bezplatně s licenční smlouvou na software s otevřeným zdrojovým kódem na adrese https://code.9oo91e.qjz9zk/chromium/terms.html. +- Tyto dodatečné smluvní podmínky prohlížeče Google Chrome a systému ChromeOS se vztahují na spustitelný kód aplikace Chrome a systému ChromeOS. Většina zdrojového kódu aplikace Chrome je k dispozici bezplatně s licenční smlouvou na software s otevřeným zdrojovým kódem na adrese https://code.google.com/chromium/terms.html. ++ Tyto dodatečné smluvní podmínky prohlížeče Google Chrome a systému ChromeOS se vztahují na spustitelný kód aplikace Chrome a systému ChromeOS. Většina zdrojového kódu aplikace Chrome je k dispozici bezplatně s licenční smlouvou na software s otevřeným zdrojovým kódem na adrese https://code.9oo91e.qjz9zk/chromium/terms.html.

- Na vaše používání některých součástí prohlížeče Chrome a systému Chrome OS se vztahují následující podmínky: + Na vaše používání některých součástí prohlížeče Chrome a systému ChromeOS se vztahují následující podmínky: diff --git a/components/resources/terms/terms_da.html b/components/resources/terms/terms_da.html --- a/components/resources/terms/terms_da.html +++ b/components/resources/terms/terms_da.html @@ -26845,15 +27121,15 @@ diff --git a/components/resources/terms/terms_da.html b/components/resources/ter Sidst opdateret: 1. januar 2021

-- Når du bruger Chrome eller Chrome OS, accepterer du Googles servicevilkår, som kan findes på https://policies.google.com/terms, og disse yderligere servicevilkår for Google Chrome og Chrome OS. -+ Når du bruger Chrome eller Chrome OS, accepterer du Googles servicevilkår, som kan findes på https://policies.9oo91e.qjz9zk/terms, og disse yderligere servicevilkår for Google Chrome og Chrome OS. +- Når du bruger Chrome eller ChromeOS, accepterer du Googles servicevilkår, som kan findes på https://policies.google.com/terms, og disse yderligere servicevilkår for Google Chrome og ChromeOS. ++ Når du bruger Chrome eller ChromeOS, accepterer du Googles servicevilkår, som kan findes på https://policies.9oo91e.qjz9zk/terms, og disse yderligere servicevilkår for Google Chrome og ChromeOS.

-- Disse Yderligere servicevilkår for Google Chrome og Chrome OS gælder for den version af Chrome og Chrome OS med eksekverbar kode. Det meste af kildekoden til Chrome kan findes gratis i henhold til open source-softwarelicensaftaler på https://code.google.com/chromium/terms.html. -+ Disse Yderligere servicevilkår for Google Chrome og Chrome OS gælder for den version af Chrome og Chrome OS med eksekverbar kode. Det meste af kildekoden til Chrome kan findes gratis i henhold til open source-softwarelicensaftaler på https://code.9oo91e.qjz9zk/chromium/terms.html. +- Disse Yderligere servicevilkår for Google Chrome og ChromeOS gælder for den version af Chrome og ChromeOS med eksekverbar kode. Det meste af kildekoden til Chrome kan findes gratis i henhold til open source-softwarelicensaftaler på https://code.google.com/chromium/terms.html. ++ Disse Yderligere servicevilkår for Google Chrome og ChromeOS gælder for den version af Chrome og ChromeOS med eksekverbar kode. Det meste af kildekoden til Chrome kan findes gratis i henhold til open source-softwarelicensaftaler på https://code.9oo91e.qjz9zk/chromium/terms.html.

- Din brug af bestemte dele af Chrome og Chrome OS er underlagt følgende vilkår: + Din brug af bestemte dele af Chrome og ChromeOS er underlagt følgende vilkår: diff --git a/components/resources/terms/terms_de.html b/components/resources/terms/terms_de.html --- a/components/resources/terms/terms_de.html +++ b/components/resources/terms/terms_de.html @@ -26861,15 +27137,15 @@ diff --git a/components/resources/terms/terms_de.html b/components/resources/ter Letzte Änderung: 1. Januar 2021

-- Wenn Sie Chrome oder Chrome OS nutzen, stimmen Sie damit den Nutzungsbedingungen von Google unter https://policies.google.com/terms sowie diesen zusätzlichen Nutzungsbedingungen für Google Chrome und Chrome OS zu. -+ Wenn Sie Chrome oder Chrome OS nutzen, stimmen Sie damit den Nutzungsbedingungen von Google unter https://policies.9oo91e.qjz9zk/terms sowie diesen zusätzlichen Nutzungsbedingungen für Google Chrome und Chrome OS zu. +- Wenn Sie Chrome oder ChromeOS nutzen, stimmen Sie damit den Nutzungsbedingungen von Google unter https://policies.google.com/terms sowie diesen zusätzlichen Nutzungsbedingungen für Google Chrome und ChromeOS zu. ++ Wenn Sie Chrome oder ChromeOS nutzen, stimmen Sie damit den Nutzungsbedingungen von Google unter https://policies.9oo91e.qjz9zk/terms sowie diesen zusätzlichen Nutzungsbedingungen für Google Chrome und ChromeOS zu.

-- Diese zusätzlichen Nutzungsbedingungen für Google Chrome und Chrome OS gelten für die ausführbare Codeversion von Chrome und Chrome OS. Der größte Teil des Quellcodes von Chrome ist im Rahmen von Open-Source-Softwarelizenzvereinbarungen auf https://code.google.com/chromium/terms.html kostenlos erhältlich. -+ Diese zusätzlichen Nutzungsbedingungen für Google Chrome und Chrome OS gelten für die ausführbare Codeversion von Chrome und Chrome OS. Der größte Teil des Quellcodes von Chrome ist im Rahmen von Open-Source-Softwarelizenzvereinbarungen auf https://code.9oo91e.qjz9zk/chromium/terms.html kostenlos erhältlich. +- Diese zusätzlichen Nutzungsbedingungen für Google Chrome und ChromeOS gelten für die ausführbare Codeversion von Chrome und ChromeOS. Der größte Teil des Quellcodes von Chrome ist im Rahmen von Open-Source-Softwarelizenzvereinbarungen auf https://code.google.com/chromium/terms.html kostenlos erhältlich. ++ Diese zusätzlichen Nutzungsbedingungen für Google Chrome und ChromeOS gelten für die ausführbare Codeversion von Chrome und ChromeOS. Der größte Teil des Quellcodes von Chrome ist im Rahmen von Open-Source-Softwarelizenzvereinbarungen auf https://code.9oo91e.qjz9zk/chromium/terms.html kostenlos erhältlich.

- Die Nutzung bestimmter Komponenten von Chrome und Chrome OS unterliegt den folgenden Bedingungen: + Die Nutzung bestimmter Komponenten von Chrome und ChromeOS unterliegt den folgenden Bedingungen: diff --git a/components/resources/terms/terms_el.html b/components/resources/terms/terms_el.html --- a/components/resources/terms/terms_el.html +++ b/components/resources/terms/terms_el.html @@ -26877,15 +27153,15 @@ diff --git a/components/resources/terms/terms_el.html b/components/resources/ter Τελευταία τροποποίηση: 1η Ιανουαρίου 2021

-- Χρησιμοποιώντας το Chrome ή το Chrome OS, συμφωνείτε με τους Όρους Παροχής Υπηρεσιών της Google που μπορείτε να βρείτε στη διεύθυνση https://policies.google.com/terms και με τους Πρόσθετους Όρους Παροχής Υπηρεσιών του Google Chrome και του Chrome OS. -+ Χρησιμοποιώντας το Chrome ή το Chrome OS, συμφωνείτε με τους Όρους Παροχής Υπηρεσιών της Google που μπορείτε να βρείτε στη διεύθυνση https://policies.9oo91e.qjz9zk/terms και με τους Πρόσθετους Όρους Παροχής Υπηρεσιών του Google Chrome και του Chrome OS. +- Χρησιμοποιώντας το Chrome ή το ChromeOS, συμφωνείτε με τους Όρους Παροχής Υπηρεσιών της Google που μπορείτε να βρείτε στη διεύθυνση https://policies.google.com/terms και με τους Πρόσθετους Όρους Παροχής Υπηρεσιών του Google Chrome και του ChromeOS. ++ Χρησιμοποιώντας το Chrome ή το ChromeOS, συμφωνείτε με τους Όρους Παροχής Υπηρεσιών της Google που μπορείτε να βρείτε στη διεύθυνση https://policies.9oo91e.qjz9zk/terms και με τους Πρόσθετους Όρους Παροχής Υπηρεσιών του Google Chrome και του ChromeOS.

-- Αυτοί οι Πρόσθετοι Όροι Παροχής Υπηρεσιών του Google Chrome και του Chrome OS ισχύουν για την έκδοση εκτελέσιμου κώδικα του Chrome και του Chrome OS. Το μεγαλύτερο μέρος του πηγαίου κώδικα του Chrome διατίθεται δωρεάν μέσω αδειών χρήσης λογισμικού ανοικτού κώδικα στη διεύθυνση https://code.google.com/chromium/terms.html. -+ Αυτοί οι Πρόσθετοι Όροι Παροχής Υπηρεσιών του Google Chrome και του Chrome OS ισχύουν για την έκδοση εκτελέσιμου κώδικα του Chrome και του Chrome OS. Το μεγαλύτερο μέρος του πηγαίου κώδικα του Chrome διατίθεται δωρεάν μέσω αδειών χρήσης λογισμικού ανοικτού κώδικα στη διεύθυνση https://code.9oo91e.qjz9zk/chromium/terms.html. +- Αυτοί οι Πρόσθετοι Όροι Παροχής Υπηρεσιών του Google Chrome και του ChromeOS ισχύουν για την έκδοση εκτελέσιμου κώδικα του Chrome και του ChromeOS. Το μεγαλύτερο μέρος του πηγαίου κώδικα του Chrome διατίθεται δωρεάν μέσω αδειών χρήσης λογισμικού ανοικτού κώδικα στη διεύθυνση https://code.google.com/chromium/terms.html. ++ Αυτοί οι Πρόσθετοι Όροι Παροχής Υπηρεσιών του Google Chrome και του ChromeOS ισχύουν για την έκδοση εκτελέσιμου κώδικα του Chrome και του ChromeOS. Το μεγαλύτερο μέρος του πηγαίου κώδικα του Chrome διατίθεται δωρεάν μέσω αδειών χρήσης λογισμικού ανοικτού κώδικα στη διεύθυνση https://code.9oo91e.qjz9zk/chromium/terms.html.

- Η από μέρους σας χρήση συγκεκριμένων στοιχείων του Chrome και του Chrome OS υπόκειται στους παρακάτω όρους: + Η από μέρους σας χρήση συγκεκριμένων στοιχείων του Chrome και του ChromeOS υπόκειται στους παρακάτω όρους: diff --git a/components/resources/terms/terms_en-GB.html b/components/resources/terms/terms_en-GB.html --- a/components/resources/terms/terms_en-GB.html +++ b/components/resources/terms/terms_en-GB.html @@ -26893,15 +27169,15 @@ diff --git a/components/resources/terms/terms_en-GB.html b/components/resources/ Last modified: 01 January, 2021

-- By using Chrome or Chrome OS, you agree to the Google Terms of Service located at https://policies.google.com/terms and these Google Chrome and Chrome OS additional Terms of Service. -+ By using Chrome or Chrome OS, you agree to the Google Terms of Service located at https://policies.9oo91e.qjz9zk/terms and these Google Chrome and Chrome OS additional Terms of Service. +- By using Chrome or ChromeOS, you agree to the Google Terms of Service located at https://policies.google.com/terms and these Google Chrome and ChromeOS additional Terms of Service. ++ By using Chrome or ChromeOS, you agree to the Google Terms of Service located at https://policies.9oo91e.qjz9zk/terms and these Google Chrome and ChromeOS additional Terms of Service.

-- These Google Chrome and Chrome OS additional Terms of Service apply to the executable code version of Chrome and Chrome OS. Most source code for Chrome is available free of charge under open source software licence agreements at https://code.google.com/chromium/terms.html. -+ These Google Chrome and Chrome OS additional Terms of Service apply to the executable code version of Chrome and Chrome OS. Most source code for Chrome is available free of charge under open source software licence agreements at https://code.9oo91e.qjz9zk/chromium/terms.html. +- These Google Chrome and ChromeOS additional Terms of Service apply to the executable code version of Chrome and ChromeOS. Most source code for Chrome is available free of charge under open source software licence agreements at https://code.google.com/chromium/terms.html. ++ These Google Chrome and ChromeOS additional Terms of Service apply to the executable code version of Chrome and ChromeOS. Most source code for Chrome is available free of charge under open source software licence agreements at https://code.9oo91e.qjz9zk/chromium/terms.html.

- Your use of certain components of Chrome and Chrome OS is subject to the following terms: + Your use of certain components of Chrome and ChromeOS is subject to the following terms: diff --git a/components/resources/terms/terms_en.html b/components/resources/terms/terms_en.html --- a/components/resources/terms/terms_en.html +++ b/components/resources/terms/terms_en.html @@ -26909,15 +27185,15 @@ diff --git a/components/resources/terms/terms_en.html b/components/resources/ter Last modified: 01 January, 2021

-- By using Chrome or Chrome OS, you agree to the Google Terms of Service located at https://policies.google.com/terms and these Google Chrome and Chrome OS Additional Terms of Service. -+ By using Chrome or Chrome OS, you agree to the Google Terms of Service located at https://policies.9oo91e.qjz9zk/terms and these Google Chrome and Chrome OS Additional Terms of Service. +- By using Chrome or ChromeOS, you agree to the Google Terms of Service located at https://policies.google.com/terms and these Google Chrome and ChromeOS Additional Terms of Service. ++ By using Chrome or ChromeOS, you agree to the Google Terms of Service located at https://policies.9oo91e.qjz9zk/terms and these Google Chrome and ChromeOS Additional Terms of Service.

-- These Google Chrome and Chrome OS Additional Terms of Service apply to the executable code version of Chrome and Chrome OS. Most source code for Chrome is available free of charge under open source software license agreements at https://code.google.com/chromium/terms.html. -+ These Google Chrome and Chrome OS Additional Terms of Service apply to the executable code version of Chrome and Chrome OS. Most source code for Chrome is available free of charge under open source software license agreements at https://code.9oo91e.qjz9zk/chromium/terms.html. +- These Google Chrome and ChromeOS Additional Terms of Service apply to the executable code version of Chrome and ChromeOS. Most source code for Chrome is available free of charge under open source software license agreements at https://code.google.com/chromium/terms.html. ++ These Google Chrome and ChromeOS Additional Terms of Service apply to the executable code version of Chrome and ChromeOS. Most source code for Chrome is available free of charge under open source software license agreements at https://code.9oo91e.qjz9zk/chromium/terms.html.

- Your use of certain components of Chrome and Chrome OS is subject to the following terms: + Your use of certain components of Chrome and ChromeOS is subject to the following terms: diff --git a/components/resources/terms/terms_es-419.html b/components/resources/terms/terms_es-419.html --- a/components/resources/terms/terms_es-419.html +++ b/components/resources/terms/terms_es-419.html @@ -26925,15 +27201,15 @@ diff --git a/components/resources/terms/terms_es-419.html b/components/resources Última modificación: 1 de enero de 2021

-- Al usar Chrome o el Sistema operativo Chrome, confirma que acepta las Condiciones del Servicio de Google (que se encuentran en https://policies.google.com/terms) y estas Condiciones del Servicio Adicionales de Google Chrome y el Sistema operativo Chrome. -+ Al usar Chrome o el Sistema operativo Chrome, confirma que acepta las Condiciones del Servicio de Google (que se encuentran en https://policies.9oo91e.qjz9zk/terms) y estas Condiciones del Servicio Adicionales de Google Chrome y el Sistema operativo Chrome. +- Al usar Chrome o el ChromeOS, confirma que acepta las Condiciones del Servicio de Google (que se encuentran en https://policies.google.com/terms) y estas Condiciones del Servicio Adicionales de Google Chrome y el ChromeOS. ++ Al usar Chrome o el ChromeOS, confirma que acepta las Condiciones del Servicio de Google (que se encuentran en https://policies.9oo91e.qjz9zk/terms) y estas Condiciones del Servicio Adicionales de Google Chrome y el ChromeOS.

-- Estas Condiciones del Servicio Adicionales de Google Chrome y el Sistema operativo Chrome se aplicarán a la versión de código ejecutable de Chrome y del Sistema operativo Chrome. La mayor parte del código fuente de Chrome está disponible de forma gratuita de conformidad con acuerdos de licencia de software de código abierto que se encuentran en https://code.google.com/chromium/terms.html. -+ Estas Condiciones del Servicio Adicionales de Google Chrome y el Sistema operativo Chrome se aplicarán a la versión de código ejecutable de Chrome y del Sistema operativo Chrome. La mayor parte del código fuente de Chrome está disponible de forma gratuita de conformidad con acuerdos de licencia de software de código abierto que se encuentran en https://code.9oo91e.qjz9zk/chromium/terms.html. +- Estas Condiciones del Servicio Adicionales de Google Chrome y el ChromeOS se aplicarán a la versión de código ejecutable de Chrome y del ChromeOS. La mayor parte del código fuente de Chrome está disponible de forma gratuita de conformidad con acuerdos de licencia de software de código abierto que se encuentran en https://code.google.com/chromium/terms.html. ++ Estas Condiciones del Servicio Adicionales de Google Chrome y el ChromeOS se aplicarán a la versión de código ejecutable de Chrome y del ChromeOS. La mayor parte del código fuente de Chrome está disponible de forma gratuita de conformidad con acuerdos de licencia de software de código abierto que se encuentran en https://code.9oo91e.qjz9zk/chromium/terms.html.

- El uso que usted haga de ciertos componentes de Chrome y el Sistema operativo Chrome también está sujeto a las siguientes condiciones: + El uso que usted haga de ciertos componentes de Chrome y el ChromeOS también está sujeto a las siguientes condiciones: diff --git a/components/resources/terms/terms_es.html b/components/resources/terms/terms_es.html --- a/components/resources/terms/terms_es.html +++ b/components/resources/terms/terms_es.html @@ -26941,15 +27217,15 @@ diff --git a/components/resources/terms/terms_es.html b/components/resources/ter Última modificación: 1 de enero del 2021

-- Al utilizar Google Chrome o Chrome OS, aceptas los Términos del Servicio de Google disponibles en https://policies.google.com/terms y estos Términos del Servicio Adicionales de Google Chrome y Chrome OS. -+ Al utilizar Google Chrome o Chrome OS, aceptas los Términos del Servicio de Google disponibles en https://policies.9oo91e.qjz9zk/terms y estos Términos del Servicio Adicionales de Google Chrome y Chrome OS. +- Al utilizar Google Chrome o ChromeOS, aceptas los Términos del Servicio de Google disponibles en https://policies.google.com/terms y estos Términos del Servicio Adicionales de Google Chrome y ChromeOS. ++ Al utilizar Google Chrome o ChromeOS, aceptas los Términos del Servicio de Google disponibles en https://policies.9oo91e.qjz9zk/terms y estos Términos del Servicio Adicionales de Google Chrome y ChromeOS.

-- Estos Términos del Servicio Adicionales de Google Chrome y de Chrome OS se aplican a la versión de código ejecutable de Google Chrome y de Chrome OS. La mayor parte del código fuente de Google Chrome está disponible de forma gratuita y se rige por los acuerdos de licencia de software libre disponibles en la página https://code.google.com/chromium/terms.html. -+ Estos Términos del Servicio Adicionales de Google Chrome y de Chrome OS se aplican a la versión de código ejecutable de Google Chrome y de Chrome OS. La mayor parte del código fuente de Google Chrome está disponible de forma gratuita y se rige por los acuerdos de licencia de software libre disponibles en la página https://code.9oo91e.qjz9zk/chromium/terms.html. +- Estos Términos del Servicio Adicionales de Google Chrome y de ChromeOS se aplican a la versión de código ejecutable de Google Chrome y de ChromeOS. La mayor parte del código fuente de Google Chrome está disponible de forma gratuita y se rige por los acuerdos de licencia de software libre disponibles en la página https://code.google.com/chromium/terms.html. ++ Estos Términos del Servicio Adicionales de Google Chrome y de ChromeOS se aplican a la versión de código ejecutable de Google Chrome y de ChromeOS. La mayor parte del código fuente de Google Chrome está disponible de forma gratuita y se rige por los acuerdos de licencia de software libre disponibles en la página https://code.9oo91e.qjz9zk/chromium/terms.html.

- El uso que hagas de determinados componentes de Google Chrome y Chrome OS está sujeto a los siguientes términos: + El uso que hagas de determinados componentes de Google Chrome y ChromeOS está sujeto a los siguientes términos: diff --git a/components/resources/terms/terms_et.html b/components/resources/terms/terms_et.html --- a/components/resources/terms/terms_et.html +++ b/components/resources/terms/terms_et.html @@ -26957,15 +27233,15 @@ diff --git a/components/resources/terms/terms_et.html b/components/resources/ter Viimati muudetud: 1. jaanuar 2021

-- Kasutades Chrome'i või Chrome OS-i, nõustute Google'i teenusetingimustega, mis asuvad saidil https://policies.google.com/terms, ning Google Chrome'i ja Chrome OS-i lisateenusetingimustega. -+ Kasutades Chrome'i või Chrome OS-i, nõustute Google'i teenusetingimustega, mis asuvad saidil https://policies.9oo91e.qjz9zk/terms, ning Google Chrome'i ja Chrome OS-i lisateenusetingimustega. +- Kasutades Chrome'i või ChromeOS-i, nõustute Google'i teenusetingimustega, mis asuvad saidil https://policies.google.com/terms, ning Google Chrome'i ja ChromeOS-i lisateenusetingimustega. ++ Kasutades Chrome'i või ChromeOS-i, nõustute Google'i teenusetingimustega, mis asuvad saidil https://policies.9oo91e.qjz9zk/terms, ning Google Chrome'i ja ChromeOS-i lisateenusetingimustega.

-- Need Google Chrome'i ja Chrome OS-i lisateenusetingimused kehtivad Chrome'i ning Chrome OS-i täitmiskoodiga versioonide korral. Enamik Chrome'i lähtekoodist on tasuta saadaval avatud lähtekoodiga tarkvara litsentsilepingu alusel aadressil https://code.google.com/chromium/terms.html. -+ Need Google Chrome'i ja Chrome OS-i lisateenusetingimused kehtivad Chrome'i ning Chrome OS-i täitmiskoodiga versioonide korral. Enamik Chrome'i lähtekoodist on tasuta saadaval avatud lähtekoodiga tarkvara litsentsilepingu alusel aadressil https://code.9oo91e.qjz9zk/chromium/terms.html. +- Need Google Chrome'i ja ChromeOS-i lisateenusetingimused kehtivad Chrome'i ning ChromeOS-i täitmiskoodiga versioonide korral. Enamik Chrome'i lähtekoodist on tasuta saadaval avatud lähtekoodiga tarkvara litsentsilepingu alusel aadressil https://code.google.com/chromium/terms.html. ++ Need Google Chrome'i ja ChromeOS-i lisateenusetingimused kehtivad Chrome'i ning ChromeOS-i täitmiskoodiga versioonide korral. Enamik Chrome'i lähtekoodist on tasuta saadaval avatud lähtekoodiga tarkvara litsentsilepingu alusel aadressil https://code.9oo91e.qjz9zk/chromium/terms.html.

- Chrome'i ja Chrome OS-i teatud komponentide kasutamisel kehtivad järgmised tingimused. + Chrome'i ja ChromeOS-i teatud komponentide kasutamisel kehtivad järgmised tingimused. diff --git a/components/resources/terms/terms_fa.html b/components/resources/terms/terms_fa.html --- a/components/resources/terms/terms_fa.html +++ b/components/resources/terms/terms_fa.html @@ -27005,15 +27281,15 @@ diff --git a/components/resources/terms/terms_fil.html b/components/resources/te Huling binago: Enero 1, 2021

-- Sa paggamit sa Chrome o Chrome OS, sumasang-ayon ka sa Mga Tuntunin ng Serbisyo ng Google na makikita sa https://policies.google.com/terms at sa Mga Karagdagang Tuntunin ng Serbisyo ng Google Chrome at Chrome OS na ito. -+ Sa paggamit sa Chrome o Chrome OS, sumasang-ayon ka sa Mga Tuntunin ng Serbisyo ng Google na makikita sa https://policies.9oo91e.qjz9zk/terms at sa Mga Karagdagang Tuntunin ng Serbisyo ng Google Chrome at Chrome OS na ito. +- Sa paggamit sa Chrome o ChromeOS, sumasang-ayon ka sa Mga Tuntunin ng Serbisyo ng Google na makikita sa https://policies.google.com/terms at sa Mga Karagdagang Tuntunin ng Serbisyo ng Google Chrome at ChromeOS na ito. ++ Sa paggamit sa Chrome o ChromeOS, sumasang-ayon ka sa Mga Tuntunin ng Serbisyo ng Google na makikita sa https://policies.9oo91e.qjz9zk/terms at sa Mga Karagdagang Tuntunin ng Serbisyo ng Google Chrome at ChromeOS na ito.

-- Nalalapat ang Mga Karagdagang Tuntunin ng Serbisyong ito ng Google Chrome at Chrome OS sa naipapatupad na bersyon ng code ng Chrome at Chrome OS. Available ang karamihan ng source code para sa Google Chrome nang libre sa ilalim ng mga kasunduan sa lisensya ng open source na software sa https://code.google.com/chromium/terms.html. -+ Nalalapat ang Mga Karagdagang Tuntunin ng Serbisyong ito ng Google Chrome at Chrome OS sa naipapatupad na bersyon ng code ng Chrome at Chrome OS. Available ang karamihan ng source code para sa Google Chrome nang libre sa ilalim ng mga kasunduan sa lisensya ng open source na software sa https://code.9oo91e.qjz9zk/chromium/terms.html. +- Nalalapat ang Mga Karagdagang Tuntunin ng Serbisyong ito ng Google Chrome at ChromeOS sa naipapatupad na bersyon ng code ng Chrome at ChromeOS. Available ang karamihan ng source code para sa Google Chrome nang libre sa ilalim ng mga kasunduan sa lisensya ng open source na software sa https://code.google.com/chromium/terms.html. ++ Nalalapat ang Mga Karagdagang Tuntunin ng Serbisyong ito ng Google Chrome at ChromeOS sa naipapatupad na bersyon ng code ng Chrome at ChromeOS. Available ang karamihan ng source code para sa Google Chrome nang libre sa ilalim ng mga kasunduan sa lisensya ng open source na software sa https://code.9oo91e.qjz9zk/chromium/terms.html.

- Ang paggamit mo sa ilang partikular na bahagi ng Chrome at Chrome OS ay napapailalim sa mga sumusunod na tuntunin: + Ang paggamit mo sa ilang partikular na bahagi ng Chrome at ChromeOS ay napapailalim sa mga sumusunod na tuntunin: diff --git a/components/resources/terms/terms_fr.html b/components/resources/terms/terms_fr.html --- a/components/resources/terms/terms_fr.html +++ b/components/resources/terms/terms_fr.html @@ -27021,15 +27297,15 @@ diff --git a/components/resources/terms/terms_fr.html b/components/resources/ter Dernière modification : 1er janvier 2021

-- En utilisant Chrome ou Chrome OS, vous acceptez les Conditions d'utilisation de Google disponibles sur https://policies.google.com/terms et les présentes Conditions d'utilisation supplémentaires de Google Chrome et Chrome OS. -+ En utilisant Chrome ou Chrome OS, vous acceptez les Conditions d'utilisation de Google disponibles sur https://policies.9oo91e.qjz9zk/terms et les présentes Conditions d'utilisation supplémentaires de Google Chrome et Chrome OS. +- En utilisant Chrome ou ChromeOS, vous acceptez les Conditions d'utilisation de Google disponibles sur https://policies.google.com/terms et les présentes Conditions d'utilisation supplémentaires de Google Chrome et ChromeOS. ++ En utilisant Chrome ou ChromeOS, vous acceptez les Conditions d'utilisation de Google disponibles sur https://policies.9oo91e.qjz9zk/terms et les présentes Conditions d'utilisation supplémentaires de Google Chrome et ChromeOS.

-- Ces Conditions d'utilisation supplémentaires de Google Chrome et Chrome OS s'appliquent à la version du code exécutable de Google Chrome et Chrome OS. La majeure partie du code source de Google Chrome est disponible gratuitement dans le cadre de contrats de licence de logiciel Open Source à l'adresse suivante : https://code.google.com/chromium/terms.html. -+ Ces Conditions d'utilisation supplémentaires de Google Chrome et Chrome OS s'appliquent à la version du code exécutable de Google Chrome et Chrome OS. La majeure partie du code source de Google Chrome est disponible gratuitement dans le cadre de contrats de licence de logiciel Open Source à l'adresse suivante : https://code.9oo91e.qjz9zk/chromium/terms.html. +- Ces Conditions d'utilisation supplémentaires de Google Chrome et ChromeOS s'appliquent à la version du code exécutable de Google Chrome et ChromeOS. La majeure partie du code source de Google Chrome est disponible gratuitement dans le cadre de contrats de licence de logiciel Open Source à l'adresse suivante : https://code.google.com/chromium/terms.html. ++ Ces Conditions d'utilisation supplémentaires de Google Chrome et ChromeOS s'appliquent à la version du code exécutable de Google Chrome et ChromeOS. La majeure partie du code source de Google Chrome est disponible gratuitement dans le cadre de contrats de licence de logiciel Open Source à l'adresse suivante : https://code.9oo91e.qjz9zk/chromium/terms.html.

- Votre utilisation de certains composants de Chrome et Chrome OS est régie par les conditions ci-dessous : + Votre utilisation de certains composants de Chrome et ChromeOS est régie par les conditions ci-dessous : diff --git a/components/resources/terms/terms_gu.html b/components/resources/terms/terms_gu.html --- a/components/resources/terms/terms_gu.html +++ b/components/resources/terms/terms_gu.html @@ -27037,15 +27313,15 @@ diff --git a/components/resources/terms/terms_gu.html b/components/resources/ter છેલ્લે ફેરફાર કર્યાની તારીખ: 1 જાન્યુઆરી, 2021

-- Chrome અથવા Chrome OSનો ઉપયોગ કરીને, તમે https://policies.google.com/terms ખાતે દર્શાવેલી Google સેવાની શરતો અને આ Google Chrome અને Chrome OSની વધારાની સેવાની શરતો સાથે સંમત થાઓ છો. -+ Chrome અથવા Chrome OSનો ઉપયોગ કરીને, તમે https://policies.9oo91e.qjz9zk/terms ખાતે દર્શાવેલી Google સેવાની શરતો અને આ Google Chrome અને Chrome OSની વધારાની સેવાની શરતો સાથે સંમત થાઓ છો. +- Chrome અથવા ChromeOSનો ઉપયોગ કરીને, તમે https://policies.google.com/terms ખાતે દર્શાવેલી Google સેવાની શરતો અને આ Google Chrome અને ChromeOSની વધારાની સેવાની શરતો સાથે સંમત થાઓ છો. ++ Chrome અથવા ChromeOSનો ઉપયોગ કરીને, તમે https://policies.9oo91e.qjz9zk/terms ખાતે દર્શાવેલી Google સેવાની શરતો અને આ Google Chrome અને ChromeOSની વધારાની સેવાની શરતો સાથે સંમત થાઓ છો.

-- આ Google Chrome અને Chrome OSની વધારાની સેવાની શરતો Chrome અને Chrome OSનાં અમલ કરવા યોગ્ય કોડ વર્ઝન પર લાગુ થાય છે. Chrome માટે મોટેભાગના સૉર્સ કોડ https://code.google.com/chromium/terms.html પર ઓપન સૉર્સ સૉફ્ટવેર લાઇસન્સના કરાર હેઠળ મફતમાં ઉપલબ્ધ છે. -+ આ Google Chrome અને Chrome OSની વધારાની સેવાની શરતો Chrome અને Chrome OSનાં અમલ કરવા યોગ્ય કોડ વર્ઝન પર લાગુ થાય છે. Chrome માટે મોટેભાગના સૉર્સ કોડ https://code.9oo91e.qjz9zk/chromium/terms.html પર ઓપન સૉર્સ સૉફ્ટવેર લાઇસન્સના કરાર હેઠળ મફતમાં ઉપલબ્ધ છે. +- આ Google Chrome અને ChromeOSની વધારાની સેવાની શરતો Chrome અને ChromeOSનાં અમલ કરવા યોગ્ય કોડ વર્ઝન પર લાગુ થાય છે. Chrome માટે મોટેભાગના સૉર્સ કોડ https://code.google.com/chromium/terms.html પર ઓપન સૉર્સ સૉફ્ટવેર લાઇસન્સના કરાર હેઠળ મફતમાં ઉપલબ્ધ છે. ++ આ Google Chrome અને ChromeOSની વધારાની સેવાની શરતો Chrome અને ChromeOSનાં અમલ કરવા યોગ્ય કોડ વર્ઝન પર લાગુ થાય છે. Chrome માટે મોટેભાગના સૉર્સ કોડ https://code.9oo91e.qjz9zk/chromium/terms.html પર ઓપન સૉર્સ સૉફ્ટવેર લાઇસન્સના કરાર હેઠળ મફતમાં ઉપલબ્ધ છે.

- Chrome અને Chrome OSનાં અમુક ઘટકોનો તમારો ઉપયોગ નીચે આપેલી શરતોને આધીન છે: + Chrome અને ChromeOSનાં અમુક ઘટકોનો તમારો ઉપયોગ નીચે આપેલી શરતોને આધીન છે: diff --git a/components/resources/terms/terms_he.html b/components/resources/terms/terms_he.html --- a/components/resources/terms/terms_he.html +++ b/components/resources/terms/terms_he.html @@ -27053,15 +27329,15 @@ diff --git a/components/resources/terms/terms_he.html b/components/resources/ter תאריך השינוי האחרון: 1 בינואר 2021

-- שימוש ב-Chrome או ב-Chrome OS מצידך מבטא את הסכמתך לתנאים ולהגבלות של Google, המפורטים בכתובת https://policies.google.com/terms, ולתנאים ולהגבלות הנוספים של Google Chrome ושל Chrome OS, המפורטים כאן. -+ שימוש ב-Chrome או ב-Chrome OS מצידך מבטא את הסכמתך לתנאים ולהגבלות של Google, המפורטים בכתובת https://policies.9oo91e.qjz9zk/terms, ולתנאים ולהגבלות הנוספים של Google Chrome ושל Chrome OS, המפורטים כאן. +- שימוש ב-Chrome או ב-ChromeOS מצידך מבטא את הסכמתך לתנאים ולהגבלות של Google, המפורטים בכתובת https://policies.google.com/terms, ולתנאים ולהגבלות הנוספים של Google Chrome ושל ChromeOS, המפורטים כאן. ++ שימוש ב-Chrome או ב-ChromeOS מצידך מבטא את הסכמתך לתנאים ולהגבלות של Google, המפורטים בכתובת https://policies.9oo91e.qjz9zk/terms, ולתנאים ולהגבלות הנוספים של Google Chrome ושל ChromeOS, המפורטים כאן.

-- התנאים וההגבלות הנוספים של Google Chrome ושל Chrome OS, המפורטים כאן, חלים על גרסת קוד ההפעלה של Chrome ושל Chrome OS. רוב קוד המקור של Chrome זמין ללא תשלום בכפוף להסכמי רישיון תוכנה של קוד פתוח, בכתובת https://code.google.com/chromium/terms.html. -+ התנאים וההגבלות הנוספים של Google Chrome ושל Chrome OS, המפורטים כאן, חלים על גרסת קוד ההפעלה של Chrome ושל Chrome OS. רוב קוד המקור של Chrome זמין ללא תשלום בכפוף להסכמי רישיון תוכנה של קוד פתוח, בכתובת https://code.9oo91e.qjz9zk/chromium/terms.html. +- התנאים וההגבלות הנוספים של Google Chrome ושל ChromeOS, המפורטים כאן, חלים על גרסת קוד ההפעלה של Chrome ושל ChromeOS. רוב קוד המקור של Chrome זמין ללא תשלום בכפוף להסכמי רישיון תוכנה של קוד פתוח, בכתובת https://code.google.com/chromium/terms.html. ++ התנאים וההגבלות הנוספים של Google Chrome ושל ChromeOS, המפורטים כאן, חלים על גרסת קוד ההפעלה של Chrome ושל ChromeOS. רוב קוד המקור של Chrome זמין ללא תשלום בכפוף להסכמי רישיון תוכנה של קוד פתוח, בכתובת https://code.9oo91e.qjz9zk/chromium/terms.html.

- השימוש שלך ברכיבים מסוימים של Chrome ו-Chrome OS כפוף לתנאים הבאים: + השימוש שלך ברכיבים מסוימים של Chrome ו-ChromeOS כפוף לתנאים הבאים: diff --git a/components/resources/terms/terms_hi.html b/components/resources/terms/terms_hi.html --- a/components/resources/terms/terms_hi.html +++ b/components/resources/terms/terms_hi.html @@ -27069,15 +27345,15 @@ diff --git a/components/resources/terms/terms_hi.html b/components/resources/ter इस तारीख को अंतिम बार बदलाव किया गया था: 1 जनवरी, 2021

-- Chrome या Chrome OS इस्तेमाल करने का मतलब है कि आप https://policies.google.com/terms पर दी गई Google सेवा की शर्तों से सहमत हैं. इसका मतलब यह भी है कि आप Google Chrome और Chrome OS की सेवा की इन अतिरिक्त शर्तों से भी सहमत हैं. -+ Chrome या Chrome OS इस्तेमाल करने का मतलब है कि आप https://policies.9oo91e.qjz9zk/terms पर दी गई Google सेवा की शर्तों से सहमत हैं. इसका मतलब यह भी है कि आप Google Chrome और Chrome OS की सेवा की इन अतिरिक्त शर्तों से भी सहमत हैं. +- Chrome या ChromeOS इस्तेमाल करने का मतलब है कि आप https://policies.google.com/terms पर दी गई Google सेवा की शर्तों से सहमत हैं. इसका मतलब यह भी है कि आप Google Chrome और ChromeOS की सेवा की इन अतिरिक्त शर्तों से भी सहमत हैं. ++ Chrome या ChromeOS इस्तेमाल करने का मतलब है कि आप https://policies.9oo91e.qjz9zk/terms पर दी गई Google सेवा की शर्तों से सहमत हैं. इसका मतलब यह भी है कि आप Google Chrome और ChromeOS की सेवा की इन अतिरिक्त शर्तों से भी सहमत हैं.

-- Google Chrome और Chrome OS की सेवा की ये अतिरिक्त शर्तें, Chrome और Chrome OS के एक्ज़ीक्यूटेबल कोड वर्शन पर लागू होती हैं. Chrome के ज़्यादातर सोर्स कोड https://code.google.com/chromium/terms.html पर ओपन सोर्स सॉफ़्टवेयर लाइसेंस के कानूनी समझौते के तहत मुफ़्त में उपलब्ध हैं. -+ Google Chrome और Chrome OS की सेवा की ये अतिरिक्त शर्तें, Chrome और Chrome OS के एक्ज़ीक्यूटेबल कोड वर्शन पर लागू होती हैं. Chrome के ज़्यादातर सोर्स कोड https://code.9oo91e.qjz9zk/chromium/terms.html पर ओपन सोर्स सॉफ़्टवेयर लाइसेंस के कानूनी समझौते के तहत मुफ़्त में उपलब्ध हैं. +- Google Chrome और ChromeOS की सेवा की ये अतिरिक्त शर्तें, Chrome और ChromeOS के एक्ज़ीक्यूटेबल कोड वर्शन पर लागू होती हैं. Chrome के ज़्यादातर सोर्स कोड https://code.google.com/chromium/terms.html पर ओपन सोर्स सॉफ़्टवेयर लाइसेंस के कानूनी समझौते के तहत मुफ़्त में उपलब्ध हैं. ++ Google Chrome और ChromeOS की सेवा की ये अतिरिक्त शर्तें, Chrome और ChromeOS के एक्ज़ीक्यूटेबल कोड वर्शन पर लागू होती हैं. Chrome के ज़्यादातर सोर्स कोड https://code.9oo91e.qjz9zk/chromium/terms.html पर ओपन सोर्स सॉफ़्टवेयर लाइसेंस के कानूनी समझौते के तहत मुफ़्त में उपलब्ध हैं.

- Chrome और Chrome OS के कुछ खास हिस्सों के इस्तेमाल पर ये शर्तें लागू होती हैं: + Chrome और ChromeOS के कुछ खास हिस्सों के इस्तेमाल पर ये शर्तें लागू होती हैं: diff --git a/components/resources/terms/terms_hr.html b/components/resources/terms/terms_hr.html --- a/components/resources/terms/terms_hr.html +++ b/components/resources/terms/terms_hr.html @@ -27101,15 +27377,15 @@ diff --git a/components/resources/terms/terms_hu.html b/components/resources/ter Legutóbbi módosítás: 2021. január 1.

-- A Chrome vagy a Chrome OS használatával Ön elfogadja a https://policies.google.com/terms oldalon hozzáférhető Google Általános Szerződési Feltételeket, továbbá a Google Chrome és a Chrome OS jelen Kiegészítő Általános Szerződési Feltételeit. -+ A Chrome vagy a Chrome OS használatával Ön elfogadja a https://policies.9oo91e.qjz9zk/terms oldalon hozzáférhető Google Általános Szerződési Feltételeket, továbbá a Google Chrome és a Chrome OS jelen Kiegészítő Általános Szerződési Feltételeit. +- A Chrome vagy a ChromeOS használatával Ön elfogadja a https://policies.google.com/terms oldalon hozzáférhető Google Általános Szerződési Feltételeket, továbbá a Google Chrome és a ChromeOS jelen Kiegészítő Általános Szerződési Feltételeit. ++ A Chrome vagy a ChromeOS használatával Ön elfogadja a https://policies.9oo91e.qjz9zk/terms oldalon hozzáférhető Google Általános Szerződési Feltételeket, továbbá a Google Chrome és a ChromeOS jelen Kiegészítő Általános Szerződési Feltételeit.

-- Ezek a Google Chrome és Chrome OS Kiegészítő Általános Szerződési Feltételek vonatkoznak a Chrome és a Chrome OS futtatható kódú verziójára. A Chrome forráskódjának legnagyobb része nyílt forráskódú szoftverekre vonatkozó licencszerződések keretében díjmentesen rendelkezésre áll a következő címen: https://code.google.com/chromium/terms.html. -+ Ezek a Google Chrome és Chrome OS Kiegészítő Általános Szerződési Feltételek vonatkoznak a Chrome és a Chrome OS futtatható kódú verziójára. A Chrome forráskódjának legnagyobb része nyílt forráskódú szoftverekre vonatkozó licencszerződések keretében díjmentesen rendelkezésre áll a következő címen: https://code.9oo91e.qjz9zk/chromium/terms.html. +- Ezek a Google Chrome és ChromeOS Kiegészítő Általános Szerződési Feltételek vonatkoznak a Chrome és a ChromeOS futtatható kódú verziójára. A Chrome forráskódjának legnagyobb része nyílt forráskódú szoftverekre vonatkozó licencszerződések keretében díjmentesen rendelkezésre áll a következő címen: https://code.google.com/chromium/terms.html. ++ Ezek a Google Chrome és ChromeOS Kiegészítő Általános Szerződési Feltételek vonatkoznak a Chrome és a ChromeOS futtatható kódú verziójára. A Chrome forráskódjának legnagyobb része nyílt forráskódú szoftverekre vonatkozó licencszerződések keretében díjmentesen rendelkezésre áll a következő címen: https://code.9oo91e.qjz9zk/chromium/terms.html.

- A Chrome és a Chrome OS egyes összetevőinek használatára a következő feltételek vonatkoznak: + A Chrome és a ChromeOS egyes összetevőinek használatára a következő feltételek vonatkoznak: diff --git a/components/resources/terms/terms_id.html b/components/resources/terms/terms_id.html --- a/components/resources/terms/terms_id.html +++ b/components/resources/terms/terms_id.html @@ -27117,15 +27393,15 @@ diff --git a/components/resources/terms/terms_id.html b/components/resources/ter Terakhir diubah: 1 Januari 2021

-- Dengan menggunakan Chrome atau Chrome OS, Anda menyetujui Persyaratan Layanan Google yang ada di https://policies.google.com/terms serta Persyaratan Layanan Tambahan Google Chrome dan Chrome OS ini. -+ Dengan menggunakan Chrome atau Chrome OS, Anda menyetujui Persyaratan Layanan Google yang ada di https://policies.9oo91e.qjz9zk/terms serta Persyaratan Layanan Tambahan Google Chrome dan Chrome OS ini. +- Dengan menggunakan Chrome atau ChromeOS, Anda menyetujui Persyaratan Layanan Google yang ada di https://policies.google.com/terms serta Persyaratan Layanan Tambahan Google Chrome dan ChromeOS ini. ++ Dengan menggunakan Chrome atau ChromeOS, Anda menyetujui Persyaratan Layanan Google yang ada di https://policies.9oo91e.qjz9zk/terms serta Persyaratan Layanan Tambahan Google Chrome dan ChromeOS ini.

-- Persyaratan Layanan Tambahan Google Chrome dan Chrome OS ini berlaku untuk versi kode Chrome dan Chrome OS yang dapat dijalankan. Sebagian besar kode sumber untuk Chrome tersedia secara gratis di bawah perjanjian lisensi software open source di https://code.google.com/chromium/terms.html. -+ Persyaratan Layanan Tambahan Google Chrome dan Chrome OS ini berlaku untuk versi kode Chrome dan Chrome OS yang dapat dijalankan. Sebagian besar kode sumber untuk Chrome tersedia secara gratis di bawah perjanjian lisensi software open source di https://code.9oo91e.qjz9zk/chromium/terms.html. +- Persyaratan Layanan Tambahan Google Chrome dan ChromeOS ini berlaku untuk versi kode Chrome dan ChromeOS yang dapat dijalankan. Sebagian besar kode sumber untuk Chrome tersedia secara gratis di bawah perjanjian lisensi software open source di https://code.google.com/chromium/terms.html. ++ Persyaratan Layanan Tambahan Google Chrome dan ChromeOS ini berlaku untuk versi kode Chrome dan ChromeOS yang dapat dijalankan. Sebagian besar kode sumber untuk Chrome tersedia secara gratis di bawah perjanjian lisensi software open source di https://code.9oo91e.qjz9zk/chromium/terms.html.

- Penggunaan Anda atas komponen Chrome dan Chrome OS tertentu juga diatur dalam persyaratan berikut: + Penggunaan Anda atas komponen Chrome dan ChromeOS tertentu juga diatur dalam persyaratan berikut: diff --git a/components/resources/terms/terms_it.html b/components/resources/terms/terms_it.html --- a/components/resources/terms/terms_it.html +++ b/components/resources/terms/terms_it.html @@ -27133,15 +27409,15 @@ diff --git a/components/resources/terms/terms_it.html b/components/resources/ter Ultima modifica: 1° gennaio 2021

-- Con l'utilizzo di Chrome o Chrome OS, l'utente accetta i Termini di servizio di Google disponibili all'indirizzo https://policies.google.com/terms, nonché i presenti Termini di servizio aggiuntivi di Google Chrome e Chrome OS. -+ Con l'utilizzo di Chrome o Chrome OS, l'utente accetta i Termini di servizio di Google disponibili all'indirizzo https://policies.9oo91e.qjz9zk/terms, nonché i presenti Termini di servizio aggiuntivi di Google Chrome e Chrome OS. +- Con l'utilizzo di Chrome o ChromeOS, l'utente accetta i Termini di servizio di Google disponibili all'indirizzo https://policies.google.com/terms, nonché i presenti Termini di servizio aggiuntivi di Google Chrome e ChromeOS. ++ Con l'utilizzo di Chrome o ChromeOS, l'utente accetta i Termini di servizio di Google disponibili all'indirizzo https://policies.9oo91e.qjz9zk/terms, nonché i presenti Termini di servizio aggiuntivi di Google Chrome e ChromeOS.

-- I presenti Termini di servizio aggiuntivi di Google Chrome e Chrome OS si applicano alla versione del codice eseguibile di Chrome e Chrome OS. Gran parte del codice sorgente di Chrome è disponibile gratuitamente ai sensi di contratti di licenza del software open source all'indirizzo https://code.google.com/chromium/terms.html. -+ I presenti Termini di servizio aggiuntivi di Google Chrome e Chrome OS si applicano alla versione del codice eseguibile di Chrome e Chrome OS. Gran parte del codice sorgente di Chrome è disponibile gratuitamente ai sensi di contratti di licenza del software open source all'indirizzo https://code.9oo91e.qjz9zk/chromium/terms.html. +- I presenti Termini di servizio aggiuntivi di Google Chrome e ChromeOS si applicano alla versione del codice eseguibile di Chrome e ChromeOS. Gran parte del codice sorgente di Chrome è disponibile gratuitamente ai sensi di contratti di licenza del software open source all'indirizzo https://code.google.com/chromium/terms.html. ++ I presenti Termini di servizio aggiuntivi di Google Chrome e ChromeOS si applicano alla versione del codice eseguibile di Chrome e ChromeOS. Gran parte del codice sorgente di Chrome è disponibile gratuitamente ai sensi di contratti di licenza del software open source all'indirizzo https://code.9oo91e.qjz9zk/chromium/terms.html.

- L'utilizzo da parte dell'utente di determinati componenti di Chrome e Chrome OS è soggetto ai termini elencati di seguito: + L'utilizzo da parte dell'utente di determinati componenti di Chrome e ChromeOS è soggetto ai termini elencati di seguito: diff --git a/components/resources/terms/terms_ja.html b/components/resources/terms/terms_ja.html --- a/components/resources/terms/terms_ja.html +++ b/components/resources/terms/terms_ja.html @@ -27149,15 +27425,15 @@ diff --git a/components/resources/terms/terms_ja.html b/components/resources/ter 最終更新日: 2021 年 1 月 1 日

-- Chrome または Chrome OS を使用することにより、Google 利用規約 https://policies.google.com/terms と、この Google Chrome および Chrome OS 追加利用規約に同意したことになります。 -+ Chrome または Chrome OS を使用することにより、Google 利用規約 https://policies.9oo91e.qjz9zk/terms と、この Google Chrome および Chrome OS 追加利用規約に同意したことになります。 +- Chrome または ChromeOS を使用することにより、Google 利用規約 https://policies.google.com/terms と、この Google Chrome および ChromeOS 追加利用規約に同意したことになります。 ++ Chrome または ChromeOS を使用することにより、Google 利用規約 https://policies.9oo91e.qjz9zk/terms と、この Google Chrome および ChromeOS 追加利用規約に同意したことになります。

-- この Google Chrome および Chrome OS 追加利用規約は、Chrome および Chrome OS の実行コード バージョンに適用されます。Chrome のソースコードの大半は、https://code.google.com/chromium/terms.html のオープンソース ソフトウェア ライセンスに基づき無料でご利用いただけます。 -+ この Google Chrome および Chrome OS 追加利用規約は、Chrome および Chrome OS の実行コード バージョンに適用されます。Chrome のソースコードの大半は、https://code.9oo91e.qjz9zk/chromium/terms.html のオープンソース ソフトウェア ライセンスに基づき無料でご利用いただけます。 +- この Google Chrome および ChromeOS 追加利用規約は、Chrome および ChromeOS の実行コード バージョンに適用されます。Chrome のソースコードの大半は、https://code.google.com/chromium/terms.html のオープンソース ソフトウェア ライセンスに基づき無料でご利用いただけます。 ++ この Google Chrome および ChromeOS 追加利用規約は、Chrome および ChromeOS の実行コード バージョンに適用されます。Chrome のソースコードの大半は、https://code.9oo91e.qjz9zk/chromium/terms.html のオープンソース ソフトウェア ライセンスに基づき無料でご利用いただけます。

- Chrome および Chrome OS の特定コンポーネントの利用については以下の条項が適用されます。 + Chrome および ChromeOS の特定コンポーネントの利用については以下の条項が適用されます。 diff --git a/components/resources/terms/terms_kn.html b/components/resources/terms/terms_kn.html --- a/components/resources/terms/terms_kn.html +++ b/components/resources/terms/terms_kn.html @@ -27165,15 +27441,15 @@ diff --git a/components/resources/terms/terms_kn.html b/components/resources/ter ಕೊನೆಯದಾಗಿ ಮಾರ್ಪಡಿಸಿದ ದಿನಾಂಕ: 01 ಜನವರಿ 2021

-- Chrome ಅಥವಾ Chrome OS ಅನ್ನು ಬಳಸುವ ಮೂಲಕ, https://policies.google.com/terms ನಲ್ಲಿನ Google ಸೇವಾ ನಿಯಮಗಳು ಮತ್ತು ಈ Google Chrome ಮತ್ತು Chrome OS ನ ಹಚ್ಚುವರಿ ಸೇವಾ ನಿಯಮಗಳಿಗೆ ನೀವು ಸಮ್ಮತಿಸುತ್ತೀರಿ. -+ Chrome ಅಥವಾ Chrome OS ಅನ್ನು ಬಳಸುವ ಮೂಲಕ, https://policies.9oo91e.qjz9zk/terms ನಲ್ಲಿನ Google ಸೇವಾ ನಿಯಮಗಳು ಮತ್ತು ಈ Google Chrome ಮತ್ತು Chrome OS ನ ಹಚ್ಚುವರಿ ಸೇವಾ ನಿಯಮಗಳಿಗೆ ನೀವು ಸಮ್ಮತಿಸುತ್ತೀರಿ. +- Chrome ಅಥವಾ ChromeOS ಅನ್ನು ಬಳಸುವ ಮೂಲಕ, https://policies.google.com/terms ನಲ್ಲಿನ Google ಸೇವಾ ನಿಯಮಗಳು ಮತ್ತು ಈ Google Chrome ಮತ್ತು ChromeOS ನ ಹಚ್ಚುವರಿ ಸೇವಾ ನಿಯಮಗಳಿಗೆ ನೀವು ಸಮ್ಮತಿಸುತ್ತೀರಿ. ++ Chrome ಅಥವಾ ChromeOS ಅನ್ನು ಬಳಸುವ ಮೂಲಕ, https://policies.9oo91e.qjz9zk/terms ನಲ್ಲಿನ Google ಸೇವಾ ನಿಯಮಗಳು ಮತ್ತು ಈ Google Chrome ಮತ್ತು ChromeOS ನ ಹಚ್ಚುವರಿ ಸೇವಾ ನಿಯಮಗಳಿಗೆ ನೀವು ಸಮ್ಮತಿಸುತ್ತೀರಿ.

-- ಈ Google Chrome ಮತ್ತು Chrome OS ನ ಹೆಚ್ಚುವರಿ ಸೇವಾ ನಿಯಮಗಳು, Chrome ಮತ್ತು Chrome OS ನ ಕಾರ್ಯಗತಗೊಳಿಸಬಹುದಾದ ಕೋಡ್ ಆವೃತ್ತಿಗೆ ಅನ್ವಯಿಸುತ್ತವೆ. ಓಪನ್ ಸೋರ್ಸ್ ಸಾಫ್ಟ್‌ವೇರ್ ಪರವಾನಗಿ ಒಪ್ಪಂದಗಳ ಅಡಿಯಲ್ಲಿ, Chrome ‌ನ ಬಹುಪಾಲು ಮೂಲ ಕೋಡ್ ಅನ್ನು https://code.google.com/chromium/terms.html ನಲ್ಲಿ ಉಚಿತವಾಗಿ ಪಡೆಯಬಹುದು. -+ ಈ Google Chrome ಮತ್ತು Chrome OS ನ ಹೆಚ್ಚುವರಿ ಸೇವಾ ನಿಯಮಗಳು, Chrome ಮತ್ತು Chrome OS ನ ಕಾರ್ಯಗತಗೊಳಿಸಬಹುದಾದ ಕೋಡ್ ಆವೃತ್ತಿಗೆ ಅನ್ವಯಿಸುತ್ತವೆ. ಓಪನ್ ಸೋರ್ಸ್ ಸಾಫ್ಟ್‌ವೇರ್ ಪರವಾನಗಿ ಒಪ್ಪಂದಗಳ ಅಡಿಯಲ್ಲಿ, Chrome ‌ನ ಬಹುಪಾಲು ಮೂಲ ಕೋಡ್ ಅನ್ನು https://code.9oo91e.qjz9zk/chromium/terms.html ನಲ್ಲಿ ಉಚಿತವಾಗಿ ಪಡೆಯಬಹುದು. +- ಈ Google Chrome ಮತ್ತು ChromeOS ನ ಹೆಚ್ಚುವರಿ ಸೇವಾ ನಿಯಮಗಳು, Chrome ಮತ್ತು ChromeOS ನ ಕಾರ್ಯಗತಗೊಳಿಸಬಹುದಾದ ಕೋಡ್ ಆವೃತ್ತಿಗೆ ಅನ್ವಯಿಸುತ್ತವೆ. ಓಪನ್ ಸೋರ್ಸ್ ಸಾಫ್ಟ್‌ವೇರ್ ಪರವಾನಗಿ ಒಪ್ಪಂದಗಳ ಅಡಿಯಲ್ಲಿ, Chrome ‌ನ ಬಹುಪಾಲು ಮೂಲ ಕೋಡ್ ಅನ್ನು https://code.google.com/chromium/terms.html ನಲ್ಲಿ ಉಚಿತವಾಗಿ ಪಡೆಯಬಹುದು. ++ ಈ Google Chrome ಮತ್ತು ChromeOS ನ ಹೆಚ್ಚುವರಿ ಸೇವಾ ನಿಯಮಗಳು, Chrome ಮತ್ತು ChromeOS ನ ಕಾರ್ಯಗತಗೊಳಿಸಬಹುದಾದ ಕೋಡ್ ಆವೃತ್ತಿಗೆ ಅನ್ವಯಿಸುತ್ತವೆ. ಓಪನ್ ಸೋರ್ಸ್ ಸಾಫ್ಟ್‌ವೇರ್ ಪರವಾನಗಿ ಒಪ್ಪಂದಗಳ ಅಡಿಯಲ್ಲಿ, Chrome ‌ನ ಬಹುಪಾಲು ಮೂಲ ಕೋಡ್ ಅನ್ನು https://code.9oo91e.qjz9zk/chromium/terms.html ನಲ್ಲಿ ಉಚಿತವಾಗಿ ಪಡೆಯಬಹುದು.

- Chrome ಮತ್ತು Chrome OS ನ ಕೆಲವು ಘಟಕಗಳ ನಿಮ್ಮ ಬಳಕೆಯು ಈ ಕೆಳಗಿನ ನಿಯಮಗಳಿಗೆ ಒಳಪಟ್ಟಿರುತ್ತದೆ: + Chrome ಮತ್ತು ChromeOS ನ ಕೆಲವು ಘಟಕಗಳ ನಿಮ್ಮ ಬಳಕೆಯು ಈ ಕೆಳಗಿನ ನಿಯಮಗಳಿಗೆ ಒಳಪಟ್ಟಿರುತ್ತದೆ: diff --git a/components/resources/terms/terms_ko.html b/components/resources/terms/terms_ko.html --- a/components/resources/terms/terms_ko.html +++ b/components/resources/terms/terms_ko.html @@ -27181,15 +27457,15 @@ diff --git a/components/resources/terms/terms_ko.html b/components/resources/ter 최종 수정: 2021년 1월 1일

-- Chrome 또는 Chrome OS를 사용하면 Google 서비스 약관(https://policies.google.com/terms) 및 다음 Chrome 및 Chrome OS 추가 서비스 약관에 동의하는 것으로 간주됩니다. -+ Chrome 또는 Chrome OS를 사용하면 Google 서비스 약관(https://policies.9oo91e.qjz9zk/terms) 및 다음 Chrome 및 Chrome OS 추가 서비스 약관에 동의하는 것으로 간주됩니다. +- Chrome 또는 ChromeOS를 사용하면 Google 서비스 약관(https://policies.google.com/terms) 및 다음 Chrome 및 ChromeOS 추가 서비스 약관에 동의하는 것으로 간주됩니다. ++ Chrome 또는 ChromeOS를 사용하면 Google 서비스 약관(https://policies.9oo91e.qjz9zk/terms) 및 다음 Chrome 및 ChromeOS 추가 서비스 약관에 동의하는 것으로 간주됩니다.

-- 본 Chrome 및 Chrome OS 추가 서비스 약관은 Chrome 및 Chrome OS의 실행 가능한 코드 버전에 적용됩니다. 대부분의 Chrome 소스 코드는 https://code.google.com/chromium/terms.html 페이지에 명시된 오픈소스 소프트웨어 라이선스 계약에 따라 무료로 제공됩니다. -+ 본 Chrome 및 Chrome OS 추가 서비스 약관은 Chrome 및 Chrome OS의 실행 가능한 코드 버전에 적용됩니다. 대부분의 Chrome 소스 코드는 https://code.9oo91e.qjz9zk/chromium/terms.html 페이지에 명시된 오픈소스 소프트웨어 라이선스 계약에 따라 무료로 제공됩니다. +- 본 Chrome 및 ChromeOS 추가 서비스 약관은 Chrome 및 ChromeOS의 실행 가능한 코드 버전에 적용됩니다. 대부분의 Chrome 소스 코드는 https://code.google.com/chromium/terms.html 페이지에 명시된 오픈소스 소프트웨어 라이선스 계약에 따라 무료로 제공됩니다. ++ 본 Chrome 및 ChromeOS 추가 서비스 약관은 Chrome 및 ChromeOS의 실행 가능한 코드 버전에 적용됩니다. 대부분의 Chrome 소스 코드는 https://code.9oo91e.qjz9zk/chromium/terms.html 페이지에 명시된 오픈소스 소프트웨어 라이선스 계약에 따라 무료로 제공됩니다.

- Chrome 및 Chrome OS의 일부 구성요소를 사용하는 경우 다음 약관이 적용됩니다. + Chrome 및 ChromeOS의 일부 구성요소를 사용하는 경우 다음 약관이 적용됩니다. diff --git a/components/resources/terms/terms_lt.html b/components/resources/terms/terms_lt.html --- a/components/resources/terms/terms_lt.html +++ b/components/resources/terms/terms_lt.html @@ -27197,15 +27473,15 @@ diff --git a/components/resources/terms/terms_lt.html b/components/resources/ter Paskutinį kartą keista: 2021 m. sausio 1 d.

-- Naudodami „Chrome“ arba „Chrome“ OS sutinkate su „Google“ paslaugų teikimo sąlygomis, pateiktomis adresu https://policies.google.com/terms, ir šiomis „Google Chrome“ bei „Chrome“ OS papildomomis paslaugų teikimo sąlygomis. -+ Naudodami „Chrome“ arba „Chrome“ OS sutinkate su „Google“ paslaugų teikimo sąlygomis, pateiktomis adresu https://policies.9oo91e.qjz9zk/terms, ir šiomis „Google Chrome“ bei „Chrome“ OS papildomomis paslaugų teikimo sąlygomis. +- Naudodami „Chrome“ arba „ChromeOS“ sutinkate su „Google“ paslaugų teikimo sąlygomis, pateiktomis adresu https://policies.google.com/terms, ir šiomis „Google Chrome“ bei „ChromeOS“ papildomomis paslaugų teikimo sąlygomis. ++ Naudodami „Chrome“ arba „ChromeOS“ sutinkate su „Google“ paslaugų teikimo sąlygomis, pateiktomis adresu https://policies.9oo91e.qjz9zk/terms, ir šiomis „Google Chrome“ bei „ChromeOS“ papildomomis paslaugų teikimo sąlygomis.

-- Šios „Google Chrome“ ir „Chrome“ OS papildomos paslaugų teikimo sąlygos taikomos vykdomojo kodo versijai sistemoje „Chrome“ ir „Chrome“ OS. Didžioji dalis „Chrome“ šaltinio kodo pasiekiama nemokamai pagal atvirojo šaltinio programinės įrangos licencijos sutartį adresu https://code.google.com/chromium/terms.html. -+ Šios „Google Chrome“ ir „Chrome“ OS papildomos paslaugų teikimo sąlygos taikomos vykdomojo kodo versijai sistemoje „Chrome“ ir „Chrome“ OS. Didžioji dalis „Chrome“ šaltinio kodo pasiekiama nemokamai pagal atvirojo šaltinio programinės įrangos licencijos sutartį adresu https://code.9oo91e.qjz9zk/chromium/terms.html. +- Šios „Google Chrome“ ir „ChromeOS“ papildomos paslaugų teikimo sąlygos taikomos vykdomojo kodo versijai sistemoje „Chrome“ ir „ChromeOS“. Didžioji dalis „Chrome“ šaltinio kodo pasiekiama nemokamai pagal atvirojo šaltinio programinės įrangos licencijos sutartį adresu https://code.google.com/chromium/terms.html. ++ Šios „Google Chrome“ ir „ChromeOS“ papildomos paslaugų teikimo sąlygos taikomos vykdomojo kodo versijai sistemoje „Chrome“ ir „ChromeOS“. Didžioji dalis „Chrome“ šaltinio kodo pasiekiama nemokamai pagal atvirojo šaltinio programinės įrangos licencijos sutartį adresu https://code.9oo91e.qjz9zk/chromium/terms.html.

- Naudojant tam tikrus „Chrome“ ir „Chrome“ OS komponentus, taikomos toliau nurodytos sąlygos. + Naudojant tam tikrus „Chrome“ ir „ChromeOS“ komponentus, taikomos toliau nurodytos sąlygos. diff --git a/components/resources/terms/terms_lv.html b/components/resources/terms/terms_lv.html --- a/components/resources/terms/terms_lv.html +++ b/components/resources/terms/terms_lv.html @@ -27213,15 +27489,15 @@ diff --git a/components/resources/terms/terms_lv.html b/components/resources/ter Pēdējās izmaiņas: 2021. gada 1. janvārī

-- Izmantojot pārlūkprogrammu Chrome vai operētājsistēmu Chrome OS, jūs piekrītat Google pakalpojumu sniegšanas noteikumiem, kas norādīti vietnē https://policies.google.com/terms, un šiem Google Chrome un Chrome OS pakalpojumu sniegšanas papildu noteikumiem. -+ Izmantojot pārlūkprogrammu Chrome vai operētājsistēmu Chrome OS, jūs piekrītat Google pakalpojumu sniegšanas noteikumiem, kas norādīti vietnē https://policies.9oo91e.qjz9zk/terms, un šiem Google Chrome un Chrome OS pakalpojumu sniegšanas papildu noteikumiem. +- Izmantojot pārlūkprogrammu Chrome vai operētājsistēmu ChromeOS, jūs piekrītat Google pakalpojumu sniegšanas noteikumiem, kas norādīti vietnē https://policies.google.com/terms, un šiem Google Chrome un ChromeOS pakalpojumu sniegšanas papildu noteikumiem. ++ Izmantojot pārlūkprogrammu Chrome vai operētājsistēmu ChromeOS, jūs piekrītat Google pakalpojumu sniegšanas noteikumiem, kas norādīti vietnē https://policies.9oo91e.qjz9zk/terms, un šiem Google Chrome un ChromeOS pakalpojumu sniegšanas papildu noteikumiem.

-- Šie Google Chrome un Chrome OS pakalpojumu sniegšanas papildu noteikumi attiecas uz Chrome un Chrome OS izpildāmā koda versiju. Visdrošākais Chrome kods ir pieejams bez maksas saskaņā ar atklātā pirmkoda programmatūras licences līgumiem vietnē https://code.google.com/chromium/terms.html. -+ Šie Google Chrome un Chrome OS pakalpojumu sniegšanas papildu noteikumi attiecas uz Chrome un Chrome OS izpildāmā koda versiju. Visdrošākais Chrome kods ir pieejams bez maksas saskaņā ar atklātā pirmkoda programmatūras licences līgumiem vietnē https://code.9oo91e.qjz9zk/chromium/terms.html. +- Šie Google Chrome un ChromeOS pakalpojumu sniegšanas papildu noteikumi attiecas uz Chrome un ChromeOS izpildāmā koda versiju. Visdrošākais Chrome kods ir pieejams bez maksas saskaņā ar atklātā pirmkoda programmatūras licences līgumiem vietnē https://code.google.com/chromium/terms.html. ++ Šie Google Chrome un ChromeOS pakalpojumu sniegšanas papildu noteikumi attiecas uz Chrome un ChromeOS izpildāmā koda versiju. Visdrošākais Chrome kods ir pieejams bez maksas saskaņā ar atklātā pirmkoda programmatūras licences līgumiem vietnē https://code.9oo91e.qjz9zk/chromium/terms.html.

- Uz Chrome un Chrome OS lietošanu attiecas tālāk norādītie noteikumi. + Uz Chrome un ChromeOS lietošanu attiecas tālāk norādītie noteikumi. diff --git a/components/resources/terms/terms_ml.html b/components/resources/terms/terms_ml.html --- a/components/resources/terms/terms_ml.html +++ b/components/resources/terms/terms_ml.html @@ -27229,15 +27505,15 @@ diff --git a/components/resources/terms/terms_ml.html b/components/resources/ter അവസാനം പരിഷ്‌ക്കരിച്ചത്: 2021 ജനുവരി 01

-- Chrome അല്ലെങ്കിൽ Chrome OS ഉപയോഗിക്കുന്നതിലൂടെ, https://policies.google.com/terms -ൽ ഉള്ള Google സേവന നിബന്ധനകളും ഈ Google Chrome, Chrome OS അധിക സേവന നിബന്ധനകളും നിങ്ങൾ അംഗീകരിക്കുന്നു. -+ Chrome അല്ലെങ്കിൽ Chrome OS ഉപയോഗിക്കുന്നതിലൂടെ, https://policies.9oo91e.qjz9zk/terms -ൽ ഉള്ള Google സേവന നിബന്ധനകളും ഈ Google Chrome, Chrome OS അധിക സേവന നിബന്ധനകളും നിങ്ങൾ അംഗീകരിക്കുന്നു. +- Chrome അല്ലെങ്കിൽ ChromeOS ഉപയോഗിക്കുന്നതിലൂടെ, https://policies.google.com/terms -ൽ ഉള്ള Google സേവന നിബന്ധനകളും ഈ Google Chrome, ChromeOS അധിക സേവന നിബന്ധനകളും നിങ്ങൾ അംഗീകരിക്കുന്നു. ++ Chrome അല്ലെങ്കിൽ ChromeOS ഉപയോഗിക്കുന്നതിലൂടെ, https://policies.9oo91e.qjz9zk/terms -ൽ ഉള്ള Google സേവന നിബന്ധനകളും ഈ Google Chrome, ChromeOS അധിക സേവന നിബന്ധനകളും നിങ്ങൾ അംഗീകരിക്കുന്നു.

-- Chrome, Chrome OS എന്നിവയുടെ നിർവഹിക്കാൻ കഴിയുന്ന കോഡ് പതിപ്പിന് ഈ Google Chrome, Chrome OS അധിക സേവന നിബന്ധനകൾ ബാധകമാണ്. Chrome-നായുള്ള മിക്ക സോഴ്‌സ് കോഡും https://code.google.com/chromium/terms.html -ൽ ഓപ്പൺ സോഴ്‌സ് സോഫ്റ്റ്‌വെയർ ലൈസൻസ് ഉടമ്പടി പ്രകാരം സൗജന്യമായി ലഭ്യമാണ്. -+ Chrome, Chrome OS എന്നിവയുടെ നിർവഹിക്കാൻ കഴിയുന്ന കോഡ് പതിപ്പിന് ഈ Google Chrome, Chrome OS അധിക സേവന നിബന്ധനകൾ ബാധകമാണ്. Chrome-നായുള്ള മിക്ക സോഴ്‌സ് കോഡും https://code.9oo91e.qjz9zk/chromium/terms.html -ൽ ഓപ്പൺ സോഴ്‌സ് സോഫ്റ്റ്‌വെയർ ലൈസൻസ് ഉടമ്പടി പ്രകാരം സൗജന്യമായി ലഭ്യമാണ്. +- Chrome, ChromeOS എന്നിവയുടെ നിർവഹിക്കാൻ കഴിയുന്ന കോഡ് പതിപ്പിന് ഈ Google Chrome, ChromeOS അധിക സേവന നിബന്ധനകൾ ബാധകമാണ്. Chrome-നായുള്ള മിക്ക സോഴ്‌സ് കോഡും https://code.google.com/chromium/terms.html -ൽ ഓപ്പൺ സോഴ്‌സ് സോഫ്റ്റ്‌വെയർ ലൈസൻസ് ഉടമ്പടി പ്രകാരം സൗജന്യമായി ലഭ്യമാണ്. ++ Chrome, ChromeOS എന്നിവയുടെ നിർവഹിക്കാൻ കഴിയുന്ന കോഡ് പതിപ്പിന് ഈ Google Chrome, ChromeOS അധിക സേവന നിബന്ധനകൾ ബാധകമാണ്. Chrome-നായുള്ള മിക്ക സോഴ്‌സ് കോഡും https://code.9oo91e.qjz9zk/chromium/terms.html -ൽ ഓപ്പൺ സോഴ്‌സ് സോഫ്റ്റ്‌വെയർ ലൈസൻസ് ഉടമ്പടി പ്രകാരം സൗജന്യമായി ലഭ്യമാണ്.

- Chrome, Chrome OS എന്നിവയുടെ ചില ഘടകങ്ങൾ നിങ്ങൾ ഉപയോഗിക്കുന്നത് ഇനിപ്പറയുന്ന നിബന്ധനകൾക്ക് വിധേയമാണ്: + Chrome, ChromeOS എന്നിവയുടെ ചില ഘടകങ്ങൾ നിങ്ങൾ ഉപയോഗിക്കുന്നത് ഇനിപ്പറയുന്ന നിബന്ധനകൾക്ക് വിധേയമാണ്: diff --git a/components/resources/terms/terms_mr.html b/components/resources/terms/terms_mr.html --- a/components/resources/terms/terms_mr.html +++ b/components/resources/terms/terms_mr.html @@ -27245,15 +27521,15 @@ diff --git a/components/resources/terms/terms_mr.html b/components/resources/ter शेवटची केलेली सुधारणा: १ जानेवारी २०२१

-- Chrome किंवा Chrome OS वापरून, तुम्ही https://policies.google.com/terms येथे असलेल्या Google सेवा अटींना आणि या Google Chrome व Chrome OS अतिरिक्त सेवा अटींना सहमती दर्शवता. -+ Chrome किंवा Chrome OS वापरून, तुम्ही https://policies.9oo91e.qjz9zk/terms येथे असलेल्या Google सेवा अटींना आणि या Google Chrome व Chrome OS अतिरिक्त सेवा अटींना सहमती दर्शवता. +- Chrome किंवा ChromeOS वापरून, तुम्ही https://policies.google.com/terms येथे असलेल्या Google सेवा अटींना आणि या Google Chrome व ChromeOS अतिरिक्त सेवा अटींना सहमती दर्शवता. ++ Chrome किंवा ChromeOS वापरून, तुम्ही https://policies.9oo91e.qjz9zk/terms येथे असलेल्या Google सेवा अटींना आणि या Google Chrome व ChromeOS अतिरिक्त सेवा अटींना सहमती दर्शवता.

-- या Google Chrome आणि Chrome OS अतिरिक्त सेवा अटी Chrome आणि Chrome OS यांच्या अंमलबजावणीक्षम कोड आवृत्त्यांना लागू होतात. Chrome साठी बहुतांश स्रोत कोड https://code.google.com/chromium/terms.html येथे मुक्त स्रोत परवाना करारनाम्याअंतर्गत विनाशुल्क उपलब्ध आहे. -+ या Google Chrome आणि Chrome OS अतिरिक्त सेवा अटी Chrome आणि Chrome OS यांच्या अंमलबजावणीक्षम कोड आवृत्त्यांना लागू होतात. Chrome साठी बहुतांश स्रोत कोड https://code.9oo91e.qjz9zk/chromium/terms.html येथे मुक्त स्रोत परवाना करारनाम्याअंतर्गत विनाशुल्क उपलब्ध आहे. +- या Google Chrome आणि ChromeOS अतिरिक्त सेवा अटी Chrome आणि ChromeOS यांच्या अंमलबजावणीक्षम कोड आवृत्त्यांना लागू होतात. Chrome साठी बहुतांश स्रोत कोड https://code.google.com/chromium/terms.html येथे मुक्त स्रोत परवाना करारनाम्याअंतर्गत विनाशुल्क उपलब्ध आहे. ++ या Google Chrome आणि ChromeOS अतिरिक्त सेवा अटी Chrome आणि ChromeOS यांच्या अंमलबजावणीक्षम कोड आवृत्त्यांना लागू होतात. Chrome साठी बहुतांश स्रोत कोड https://code.9oo91e.qjz9zk/chromium/terms.html येथे मुक्त स्रोत परवाना करारनाम्याअंतर्गत विनाशुल्क उपलब्ध आहे.

- Chrome आणि Chrome OS च्या ठरावीक घटकांचा तुमचा वापर पुढील अटींच्या अधीन आहे: + Chrome आणि ChromeOS च्या ठरावीक घटकांचा तुमचा वापर पुढील अटींच्या अधीन आहे: diff --git a/components/resources/terms/terms_nb.html b/components/resources/terms/terms_nb.html --- a/components/resources/terms/terms_nb.html +++ b/components/resources/terms/terms_nb.html @@ -27261,15 +27537,15 @@ diff --git a/components/resources/terms/terms_nb.html b/components/resources/ter Sist endret: 1. januar 2021

-- Ved å bruke Chrome eller Chrome OS godtar du Googles vilkår for bruk, som du finner på https://policies.google.com/terms, samt disse tilleggsvilkårene for bruk av Google Chrome og Chrome OS. -+ Ved å bruke Chrome eller Chrome OS godtar du Googles vilkår for bruk, som du finner på https://policies.9oo91e.qjz9zk/terms, samt disse tilleggsvilkårene for bruk av Google Chrome og Chrome OS. +- Ved å bruke Chrome eller ChromeOS godtar du Googles vilkår for bruk, som du finner på https://policies.google.com/terms, samt disse tilleggsvilkårene for bruk av Google Chrome og ChromeOS. ++ Ved å bruke Chrome eller ChromeOS godtar du Googles vilkår for bruk, som du finner på https://policies.9oo91e.qjz9zk/terms, samt disse tilleggsvilkårene for bruk av Google Chrome og ChromeOS.

-- Disse tilleggsvilkårene for bruk av Google Chrome og Chrome OS gjelder for versjonene av Chrome og Chrome OS med kjørbar kode. Det meste av kildekoden for Chrome er tilgjengelig gratis under lisensavtaler for programvare med åpen kildekode, på https://code.google.com/chromium/terms.html. -+ Disse tilleggsvilkårene for bruk av Google Chrome og Chrome OS gjelder for versjonene av Chrome og Chrome OS med kjørbar kode. Det meste av kildekoden for Chrome er tilgjengelig gratis under lisensavtaler for programvare med åpen kildekode, på https://code.9oo91e.qjz9zk/chromium/terms.html. +- Disse tilleggsvilkårene for bruk av Google Chrome og ChromeOS gjelder for versjonene av Chrome og ChromeOS med kjørbar kode. Det meste av kildekoden for Chrome er tilgjengelig gratis under lisensavtaler for programvare med åpen kildekode, på https://code.google.com/chromium/terms.html. ++ Disse tilleggsvilkårene for bruk av Google Chrome og ChromeOS gjelder for versjonene av Chrome og ChromeOS med kjørbar kode. Det meste av kildekoden for Chrome er tilgjengelig gratis under lisensavtaler for programvare med åpen kildekode, på https://code.9oo91e.qjz9zk/chromium/terms.html.

- Bruken din av enkelte komponenter i Chrome og Chrome OS reguleres av disse vilkårene: + Bruken din av enkelte komponenter i Chrome og ChromeOS reguleres av disse vilkårene: diff --git a/components/resources/terms/terms_nl.html b/components/resources/terms/terms_nl.html --- a/components/resources/terms/terms_nl.html +++ b/components/resources/terms/terms_nl.html @@ -27277,15 +27553,15 @@ diff --git a/components/resources/terms/terms_nl.html b/components/resources/ter Laatst gewijzigd: 1 januari 2021

-- Als u Chrome of Chrome OS gebruikt, gaat u akkoord met de Servicevoorwaarden van Google die te vinden zijn op https://policies.google.com/terms en met deze Aanvullende servicevoorwaarden van Google Chrome en Chrome OS. -+ Als u Chrome of Chrome OS gebruikt, gaat u akkoord met de Servicevoorwaarden van Google die te vinden zijn op https://policies.9oo91e.qjz9zk/terms en met deze Aanvullende servicevoorwaarden van Google Chrome en Chrome OS. +- Als u Chrome of ChromeOS gebruikt, gaat u akkoord met de Servicevoorwaarden van Google die te vinden zijn op https://policies.google.com/terms en met deze Aanvullende servicevoorwaarden van Google Chrome en ChromeOS. ++ Als u Chrome of ChromeOS gebruikt, gaat u akkoord met de Servicevoorwaarden van Google die te vinden zijn op https://policies.9oo91e.qjz9zk/terms en met deze Aanvullende servicevoorwaarden van Google Chrome en ChromeOS.

-- Deze Aanvullende servicevoorwaarden van Google Chrome en Chrome OS zijn van toepassing op de versie met uitvoerbare code van Chrome en Chrome OS. De meeste broncode van Chrome is kosteloos beschikbaar op grond van licentieovereenkomsten voor opensource-software op https://code.google.com/chromium/terms.html. -+ Deze Aanvullende servicevoorwaarden van Google Chrome en Chrome OS zijn van toepassing op de versie met uitvoerbare code van Chrome en Chrome OS. De meeste broncode van Chrome is kosteloos beschikbaar op grond van licentieovereenkomsten voor opensource-software op https://code.9oo91e.qjz9zk/chromium/terms.html. +- Deze Aanvullende servicevoorwaarden van Google Chrome en ChromeOS zijn van toepassing op de versie met uitvoerbare code van Chrome en ChromeOS. De meeste broncode van Chrome is kosteloos beschikbaar op grond van licentieovereenkomsten voor opensource-software op https://code.google.com/chromium/terms.html. ++ Deze Aanvullende servicevoorwaarden van Google Chrome en ChromeOS zijn van toepassing op de versie met uitvoerbare code van Chrome en ChromeOS. De meeste broncode van Chrome is kosteloos beschikbaar op grond van licentieovereenkomsten voor opensource-software op https://code.9oo91e.qjz9zk/chromium/terms.html.

- Op uw gebruik van bepaalde componenten van Chrome en Chrome OS zijn de volgende voorwaarden van toepassing: + Op uw gebruik van bepaalde componenten van Chrome en ChromeOS zijn de volgende voorwaarden van toepassing: diff --git a/components/resources/terms/terms_pl.html b/components/resources/terms/terms_pl.html --- a/components/resources/terms/terms_pl.html +++ b/components/resources/terms/terms_pl.html @@ -27293,15 +27569,15 @@ diff --git a/components/resources/terms/terms_pl.html b/components/resources/ter Ostatnia zmiana: 1 stycznia 2021 r.

-- Używając Chrome lub Chrome OS, użytkownik wyraża zgodę na Warunki korzystania z usług Google dostępne na stronie https://policies.google.com/terms oraz niniejsze Dodatkowe warunki korzystania z Google Chrome i Chrome OS. -+ Używając Chrome lub Chrome OS, użytkownik wyraża zgodę na Warunki korzystania z usług Google dostępne na stronie https://policies.9oo91e.qjz9zk/terms oraz niniejsze Dodatkowe warunki korzystania z Google Chrome i Chrome OS. +- Używając Chrome lub ChromeOS, użytkownik wyraża zgodę na Warunki korzystania z usług Google dostępne na stronie https://policies.google.com/terms oraz niniejsze Dodatkowe warunki korzystania z Google Chrome i ChromeOS. ++ Używając Chrome lub ChromeOS, użytkownik wyraża zgodę na Warunki korzystania z usług Google dostępne na stronie https://policies.9oo91e.qjz9zk/terms oraz niniejsze Dodatkowe warunki korzystania z Google Chrome i ChromeOS.

-- Dodatkowe warunki korzystania z Google Chrome i Chrome OS dotyczą kodu wykonywalnego Chrome i Chrome OS. Większość kodu źródłowego Chrome jest dostępna bezpłatnie na zasadach licencji open source, której treść można znaleźć na stronie https://code.google.com/chromium/terms.html -+ Dodatkowe warunki korzystania z Google Chrome i Chrome OS dotyczą kodu wykonywalnego Chrome i Chrome OS. Większość kodu źródłowego Chrome jest dostępna bezpłatnie na zasadach licencji open source, której treść można znaleźć na stronie https://code.9oo91e.qjz9zk/chromium/terms.html +- Dodatkowe warunki korzystania z Google Chrome i ChromeOS dotyczą kodu wykonywalnego Chrome i ChromeOS. Większość kodu źródłowego Chrome jest dostępna bezpłatnie na zasadach licencji open source, której treść można znaleźć na stronie https://code.google.com/chromium/terms.html ++ Dodatkowe warunki korzystania z Google Chrome i ChromeOS dotyczą kodu wykonywalnego Chrome i ChromeOS. Większość kodu źródłowego Chrome jest dostępna bezpłatnie na zasadach licencji open source, której treść można znaleźć na stronie https://code.9oo91e.qjz9zk/chromium/terms.html

- Korzystanie z określonych komponentów Chrome i Chrome OS podlega następującym warunkom: + Korzystanie z określonych komponentów Chrome i ChromeOS podlega następującym warunkom: diff --git a/components/resources/terms/terms_pt-BR.html b/components/resources/terms/terms_pt-BR.html --- a/components/resources/terms/terms_pt-BR.html +++ b/components/resources/terms/terms_pt-BR.html @@ -27309,15 +27585,15 @@ diff --git a/components/resources/terms/terms_pt-BR.html b/components/resources/ Última modificação: 1º de janeiro de 2021

-- Ao usar o Chrome ou o Chrome OS, você concorda com os Termos de Serviço do Google localizados em https://policies.google.com/terms e com estes Termos de Serviço adicionais do Google Chrome e do Chrome OS. -+ Ao usar o Chrome ou o Chrome OS, você concorda com os Termos de Serviço do Google localizados em https://policies.9oo91e.qjz9zk/terms e com estes Termos de Serviço adicionais do Google Chrome e do Chrome OS. +- Ao usar o Chrome ou o ChromeOS, você concorda com os Termos de Serviço do Google localizados em https://policies.google.com/terms e com estes Termos de Serviço adicionais do Google Chrome e do ChromeOS. ++ Ao usar o Chrome ou o ChromeOS, você concorda com os Termos de Serviço do Google localizados em https://policies.9oo91e.qjz9zk/terms e com estes Termos de Serviço adicionais do Google Chrome e do ChromeOS.

-- Estes Termos de Serviço adicionais do Google Chrome e do Chrome OS se aplicam à versão do código executável do Chrome e do Chrome OS. A maioria dos códigos-fonte do Chrome está disponível gratuitamente mediante contratos de licença de software de código aberto em https://code.google.com/chromium/terms.html. -+ Estes Termos de Serviço adicionais do Google Chrome e do Chrome OS se aplicam à versão do código executável do Chrome e do Chrome OS. A maioria dos códigos-fonte do Chrome está disponível gratuitamente mediante contratos de licença de software de código aberto em https://code.9oo91e.qjz9zk/chromium/terms.html. +- Estes Termos de Serviço adicionais do Google Chrome e do ChromeOS se aplicam à versão do código executável do Chrome e do ChromeOS. A maioria dos códigos-fonte do Chrome está disponível gratuitamente mediante contratos de licença de software de código aberto em https://code.google.com/chromium/terms.html. ++ Estes Termos de Serviço adicionais do Google Chrome e do ChromeOS se aplicam à versão do código executável do Chrome e do ChromeOS. A maioria dos códigos-fonte do Chrome está disponível gratuitamente mediante contratos de licença de software de código aberto em https://code.9oo91e.qjz9zk/chromium/terms.html.

- O uso de determinados componentes do Chrome e do Chrome OS está sujeito aos seguintes termos: + O uso de determinados componentes do Chrome e do ChromeOS está sujeito aos seguintes termos: diff --git a/components/resources/terms/terms_pt-PT.html b/components/resources/terms/terms_pt-PT.html --- a/components/resources/terms/terms_pt-PT.html +++ b/components/resources/terms/terms_pt-PT.html @@ -27325,15 +27601,15 @@ diff --git a/components/resources/terms/terms_pt-PT.html b/components/resources/ Última modificação: 1 de janeiro de 2021

-- Ao utilizar o Chrome ou o Chrome OS, aceita os Termos de Utilização do Google localizados em https://policies.google.com/terms?hl=pt-PT e estes Termos de Utilização Adicionais do Google Chrome e do Chrome OS. -+ Ao utilizar o Chrome ou o Chrome OS, aceita os Termos de Utilização do Google localizados em https://policies.9oo91e.qjz9zk/terms?hl=pt-PT e estes Termos de Utilização Adicionais do Google Chrome e do Chrome OS. +- Ao utilizar o Chrome ou o ChromeOS, aceita os Termos de Utilização do Google localizados em https://policies.google.com/terms?hl=pt-PT e estes Termos de Utilização Adicionais do Google Chrome e do ChromeOS. ++ Ao utilizar o Chrome ou o ChromeOS, aceita os Termos de Utilização do Google localizados em https://policies.9oo91e.qjz9zk/terms?hl=pt-PT e estes Termos de Utilização Adicionais do Google Chrome e do ChromeOS.

-- Os presentes Termos de Utilização Adicionais do Google Chrome e do Chrome OS aplicam-se à versão do código executável do Chrome e do Chrome OS. A maior parte do código-fonte do Chrome está disponível gratuitamente ao abrigo de contratos de licença de software de código aberto em https://code.google.com/chromium/terms.html. -+ Os presentes Termos de Utilização Adicionais do Google Chrome e do Chrome OS aplicam-se à versão do código executável do Chrome e do Chrome OS. A maior parte do código-fonte do Chrome está disponível gratuitamente ao abrigo de contratos de licença de software de código aberto em https://code.9oo91e.qjz9zk/chromium/terms.html. +- Os presentes Termos de Utilização Adicionais do Google Chrome e do ChromeOS aplicam-se à versão do código executável do Chrome e do ChromeOS. A maior parte do código-fonte do Chrome está disponível gratuitamente ao abrigo de contratos de licença de software de código aberto em https://code.google.com/chromium/terms.html. ++ Os presentes Termos de Utilização Adicionais do Google Chrome e do ChromeOS aplicam-se à versão do código executável do Chrome e do ChromeOS. A maior parte do código-fonte do Chrome está disponível gratuitamente ao abrigo de contratos de licença de software de código aberto em https://code.9oo91e.qjz9zk/chromium/terms.html.

- A sua utilização de determinados componentes do Chrome e do Chrome OS está sujeita aos seguintes termos: + A sua utilização de determinados componentes do Chrome e do ChromeOS está sujeita aos seguintes termos: diff --git a/components/resources/terms/terms_ro.html b/components/resources/terms/terms_ro.html --- a/components/resources/terms/terms_ro.html +++ b/components/resources/terms/terms_ro.html @@ -27341,15 +27617,15 @@ diff --git a/components/resources/terms/terms_ro.html b/components/resources/ter Ultima modificare: 1 ianuarie 2021

-- Dacă folosești Chrome sau Sistemul de operare Chrome, ești de acord cu Termenii și condițiile Google de la https://policies.google.com/terms și cu acest set de Termeni și condiții suplimentare pentru Google Chrome și Sistemul de operare Chrome. -+ Dacă folosești Chrome sau Sistemul de operare Chrome, ești de acord cu Termenii și condițiile Google de la https://policies.9oo91e.qjz9zk/terms și cu acest set de Termeni și condiții suplimentare pentru Google Chrome și Sistemul de operare Chrome. +- Dacă folosești Chrome sau ChromeOS, ești de acord cu Termenii și condițiile Google de la https://policies.google.com/terms și cu acest set de Termeni și condiții suplimentare pentru Google Chrome și ChromeOS. ++ Dacă folosești Chrome sau ChromeOS, ești de acord cu Termenii și condițiile Google de la https://policies.9oo91e.qjz9zk/terms și cu acest set de Termeni și condiții suplimentare pentru Google Chrome și ChromeOS.

-- Acest set de Termeni și condiții suplimentare pentru Google Chrome și Sistemul de operare Chrome se aplică versiunii cu cod executabil a browserului Chrome și a Sistemului de operare Chrome. Majoritatea codului sursă pentru Chrome este disponibil gratuit, în baza acordurilor de licență pentru software open source, la https://code.google.com/chromium/terms.html. -+ Acest set de Termeni și condiții suplimentare pentru Google Chrome și Sistemul de operare Chrome se aplică versiunii cu cod executabil a browserului Chrome și a Sistemului de operare Chrome. Majoritatea codului sursă pentru Chrome este disponibil gratuit, în baza acordurilor de licență pentru software open source, la https://code.9oo91e.qjz9zk/chromium/terms.html. +- Acest set de Termeni și condiții suplimentare pentru Google Chrome și ChromeOS se aplică versiunii cu cod executabil a browserului Chrome și a ChromeOS. Majoritatea codului sursă pentru Chrome este disponibil gratuit, în baza acordurilor de licență pentru software open source, la https://code.google.com/chromium/terms.html. ++ Acest set de Termeni și condiții suplimentare pentru Google Chrome și ChromeOS se aplică versiunii cu cod executabil a browserului Chrome și a ChromeOS. Majoritatea codului sursă pentru Chrome este disponibil gratuit, în baza acordurilor de licență pentru software open source, la https://code.9oo91e.qjz9zk/chromium/terms.html.

- Folosirea anumitor componente din Chrome și Sistemul de operare Chrome este supusă următoarelor condiții: + Folosirea anumitor componente din Chrome și ChromeOS este supusă următoarelor condiții: diff --git a/components/resources/terms/terms_ru.html b/components/resources/terms/terms_ru.html --- a/components/resources/terms/terms_ru.html +++ b/components/resources/terms/terms_ru.html @@ -27357,15 +27633,15 @@ diff --git a/components/resources/terms/terms_ru.html b/components/resources/ter Последнее изменение: 1 января 2021 г.

-- Используя Chrome или Chrome OS, Вы принимаете Условия использования Google, опубликованные на странице https://policies.google.com/terms, а также настоящие Дополнительные условия использования Chrome и Chrome OS. -+ Используя Chrome или Chrome OS, Вы принимаете Условия использования Google, опубликованные на странице https://policies.9oo91e.qjz9zk/terms, а также настоящие Дополнительные условия использования Chrome и Chrome OS. +- Используя Chrome или ChromeOS, Вы принимаете Условия использования Google, опубликованные на странице https://policies.google.com/terms, а также настоящие Дополнительные условия использования Chrome и ChromeOS. ++ Используя Chrome или ChromeOS, Вы принимаете Условия использования Google, опубликованные на странице https://policies.9oo91e.qjz9zk/terms, а также настоящие Дополнительные условия использования Chrome и ChromeOS.

-- Настоящие Дополнительные условия использования Google Chrome и Chrome OS применяются к исполняемому коду Chrome и Chrome OS. Большая часть исходного кода Google Chrome предоставляется бесплатно на условиях лицензионного соглашения на программное обеспечение с открытым исходным кодом. Соглашение опубликовано на странице https://code.google.com/chromium/terms.html. -+ Настоящие Дополнительные условия использования Google Chrome и Chrome OS применяются к исполняемому коду Chrome и Chrome OS. Большая часть исходного кода Google Chrome предоставляется бесплатно на условиях лицензионного соглашения на программное обеспечение с открытым исходным кодом. Соглашение опубликовано на странице https://code.9oo91e.qjz9zk/chromium/terms.html. +- Настоящие Дополнительные условия использования Google Chrome и ChromeOS применяются к исполняемому коду Chrome и ChromeOS. Большая часть исходного кода Google Chrome предоставляется бесплатно на условиях лицензионного соглашения на программное обеспечение с открытым исходным кодом. Соглашение опубликовано на странице https://code.google.com/chromium/terms.html. ++ Настоящие Дополнительные условия использования Google Chrome и ChromeOS применяются к исполняемому коду Chrome и ChromeOS. Большая часть исходного кода Google Chrome предоставляется бесплатно на условиях лицензионного соглашения на программное обеспечение с открытым исходным кодом. Соглашение опубликовано на странице https://code.9oo91e.qjz9zk/chromium/terms.html.

- Использование некоторых компонентов Chrome и Chrome OS регулируется следующими условиями: + Использование некоторых компонентов Chrome и ChromeOS регулируется следующими условиями: diff --git a/components/resources/terms/terms_sk.html b/components/resources/terms/terms_sk.html --- a/components/resources/terms/terms_sk.html +++ b/components/resources/terms/terms_sk.html @@ -27373,15 +27649,15 @@ diff --git a/components/resources/terms/terms_sk.html b/components/resources/ter Naposledy upravené: 1. januára 2021

-- Používaním prehliadača Chrome alebo systému Chrome OS vyjadrujete súhlas so zmluvnými podmienkami spoločnosti Google na adrese https://policies.google.com/terms a týmito dodatočnými zmluvnými podmienkami prehliadača Google Chrome a systému Chrome OS. -+ Používaním prehliadača Chrome alebo systému Chrome OS vyjadrujete súhlas so zmluvnými podmienkami spoločnosti Google na adrese https://policies.9oo91e.qjz9zk/terms a týmito dodatočnými zmluvnými podmienkami prehliadača Google Chrome a systému Chrome OS. +- Používaním prehliadača Chrome alebo systému ChromeOS vyjadrujete súhlas so zmluvnými podmienkami spoločnosti Google na adrese https://policies.google.com/terms a týmito dodatočnými zmluvnými podmienkami prehliadača Google Chrome a systému ChromeOS. ++ Používaním prehliadača Chrome alebo systému ChromeOS vyjadrujete súhlas so zmluvnými podmienkami spoločnosti Google na adrese https://policies.9oo91e.qjz9zk/terms a týmito dodatočnými zmluvnými podmienkami prehliadača Google Chrome a systému ChromeOS.

-- Tieto dodatočné zmluvné podmienky prehliadača Chrome a systému Chrome OS platia pre verziu prehliadača Chrome a systému Chrome OS so spustiteľným kódom. Väčšina zdrojových kódov pre prehliadač Chrome je k dispozícii bezplatne na základe licenčných zmlúv týkajúcich sa softvéru open source uvedených na adrese https://code.google.com/chromium/terms.html. -+ Tieto dodatočné zmluvné podmienky prehliadača Chrome a systému Chrome OS platia pre verziu prehliadača Chrome a systému Chrome OS so spustiteľným kódom. Väčšina zdrojových kódov pre prehliadač Chrome je k dispozícii bezplatne na základe licenčných zmlúv týkajúcich sa softvéru open source uvedených na adrese https://code.9oo91e.qjz9zk/chromium/terms.html. +- Tieto dodatočné zmluvné podmienky prehliadača Chrome a systému ChromeOS platia pre verziu prehliadača Chrome a systému ChromeOS so spustiteľným kódom. Väčšina zdrojových kódov pre prehliadač Chrome je k dispozícii bezplatne na základe licenčných zmlúv týkajúcich sa softvéru open source uvedených na adrese https://code.google.com/chromium/terms.html. ++ Tieto dodatočné zmluvné podmienky prehliadača Chrome a systému ChromeOS platia pre verziu prehliadača Chrome a systému ChromeOS so spustiteľným kódom. Väčšina zdrojových kódov pre prehliadač Chrome je k dispozícii bezplatne na základe licenčných zmlúv týkajúcich sa softvéru open source uvedených na adrese https://code.9oo91e.qjz9zk/chromium/terms.html.

- Na vaše používanie určitých komponentov prehliadača Chrome a systému Chrome OS sa tiež vzťahujú nasledujúce zmluvné podmienky: + Na vaše používanie určitých komponentov prehliadača Chrome a systému ChromeOS sa tiež vzťahujú nasledujúce zmluvné podmienky: diff --git a/components/resources/terms/terms_sl.html b/components/resources/terms/terms_sl.html --- a/components/resources/terms/terms_sl.html +++ b/components/resources/terms/terms_sl.html @@ -27389,15 +27665,15 @@ diff --git a/components/resources/terms/terms_sl.html b/components/resources/ter Zadnja sprememba: 1. januar 2021

-- Z uporabo Chroma in sistema Chrome OS se strinjate z Googlovimi pogoji storitve, objavljenimi na https://policies.google.com/terms, in temi dodatnimi pogoji storitve za Google Chrome in Chrome OS. -+ Z uporabo Chroma in sistema Chrome OS se strinjate z Googlovimi pogoji storitve, objavljenimi na https://policies.9oo91e.qjz9zk/terms, in temi dodatnimi pogoji storitve za Google Chrome in Chrome OS. +- Z uporabo Chroma in sistema ChromeOS se strinjate z Googlovimi pogoji storitve, objavljenimi na https://policies.google.com/terms, in temi dodatnimi pogoji storitve za Google Chrome in ChromeOS. ++ Z uporabo Chroma in sistema ChromeOS se strinjate z Googlovimi pogoji storitve, objavljenimi na https://policies.9oo91e.qjz9zk/terms, in temi dodatnimi pogoji storitve za Google Chrome in ChromeOS.

-- Ti dodatni pogoji storitve za Google Chrome in Chrome OS veljajo za različico Chroma in sistema Chrome OS z izvršljivo kodo. Večina izvorne kode za Chrome je na voljo brezplačno v okviru licenčnih pogodb o odprtokodni programski opremi na https://code.google.com/chromium/terms.html. -+ Ti dodatni pogoji storitve za Google Chrome in Chrome OS veljajo za različico Chroma in sistema Chrome OS z izvršljivo kodo. Večina izvorne kode za Chrome je na voljo brezplačno v okviru licenčnih pogodb o odprtokodni programski opremi na https://code.9oo91e.qjz9zk/chromium/terms.html. +- Ti dodatni pogoji storitve za Google Chrome in ChromeOS veljajo za različico Chroma in sistema ChromeOS z izvršljivo kodo. Večina izvorne kode za Chrome je na voljo brezplačno v okviru licenčnih pogodb o odprtokodni programski opremi na https://code.google.com/chromium/terms.html. ++ Ti dodatni pogoji storitve za Google Chrome in ChromeOS veljajo za različico Chroma in sistema ChromeOS z izvršljivo kodo. Večina izvorne kode za Chrome je na voljo brezplačno v okviru licenčnih pogodb o odprtokodni programski opremi na https://code.9oo91e.qjz9zk/chromium/terms.html.

- Za vašo uporabo nekaterih komponent Chroma in sistema Chrome OS veljajo tudi ti pogoji: + Za vašo uporabo nekaterih komponent Chroma in sistema ChromeOS veljajo tudi ti pogoji: diff --git a/components/resources/terms/terms_sr.html b/components/resources/terms/terms_sr.html --- a/components/resources/terms/terms_sr.html +++ b/components/resources/terms/terms_sr.html @@ -27405,15 +27681,15 @@ diff --git a/components/resources/terms/terms_sr.html b/components/resources/ter Последња измена: 1. јануар 2021.

-- Коришћењем Chrome-а или Chrome ОС-а прихватате Google услове коришћења услуге који се налазе на https://policies.google.com/terms и ове додатне услове коришћења услуге за Google Chrome и Chrome ОС. -+ Коришћењем Chrome-а или Chrome ОС-а прихватате Google услове коришћења услуге који се налазе на https://policies.9oo91e.qjz9zk/terms и ове додатне услове коришћења услуге за Google Chrome и Chrome ОС. +- Коришћењем Chrome-а или ChromeOS-а прихватате Google услове коришћења услуге који се налазе на https://policies.google.com/terms и ове додатне услове коришћења услуге за Google Chrome и ChromeOS. ++ Коришћењем Chrome-а или ChromeOS-а прихватате Google услове коришћења услуге који се налазе на https://policies.9oo91e.qjz9zk/terms и ове додатне услове коришћења услуге за Google Chrome и ChromeOS.

-- Ови додатни услови коришћења услуге за Google Chrome и Chrome ОС примењују се на извршну верзију кода за Chrome и Chrome ОС. Већина изворног кода за Chrome је доступна бесплатно по основу уговора о лиценцирању софтвера отвореног кода који је доступан на https://code.google.com/chromium/terms.html. -+ Ови додатни услови коришћења услуге за Google Chrome и Chrome ОС примењују се на извршну верзију кода за Chrome и Chrome ОС. Већина изворног кода за Chrome је доступна бесплатно по основу уговора о лиценцирању софтвера отвореног кода који је доступан на https://code.9oo91e.qjz9zk/chromium/terms.html. +- Ови додатни услови коришћења услуге за Google Chrome и ChromeOS примењују се на извршну верзију кода за Chrome и ChromeOS. Већина изворног кода за Chrome је доступна бесплатно по основу уговора о лиценцирању софтвера отвореног кода који је доступан на https://code.google.com/chromium/terms.html. ++ Ови додатни услови коришћења услуге за Google Chrome и ChromeOS примењују се на извршну верзију кода за Chrome и ChromeOS. Већина изворног кода за Chrome је доступна бесплатно по основу уговора о лиценцирању софтвера отвореног кода који је доступан на https://code.9oo91e.qjz9zk/chromium/terms.html.

- Коришћење одређених компонената Chrome-а и Chrome ОС-а подлеже следећим условима: + Коришћење одређених компонената Chrome-а и ChromeOS-а подлеже следећим условима: diff --git a/components/resources/terms/terms_sv.html b/components/resources/terms/terms_sv.html --- a/components/resources/terms/terms_sv.html +++ b/components/resources/terms/terms_sv.html @@ -27421,15 +27697,15 @@ diff --git a/components/resources/terms/terms_sv.html b/components/resources/ter Senast ändrad: 1 januari 2021

-- Genom att använda Chrome eller Chrome OS godkänner du dessa ytterligare användarvillkor för Google Chrome och Chrome OS samt Googles användarvillkor, som finns här: https://policies.google.com/terms. -+ Genom att använda Chrome eller Chrome OS godkänner du dessa ytterligare användarvillkor för Google Chrome och Chrome OS samt Googles användarvillkor, som finns här: https://policies.9oo91e.qjz9zk/terms. +- Genom att använda Chrome eller ChromeOS godkänner du dessa ytterligare användarvillkor för Google Chrome och ChromeOS samt Googles användarvillkor, som finns här: https://policies.google.com/terms. ++ Genom att använda Chrome eller ChromeOS godkänner du dessa ytterligare användarvillkor för Google Chrome och ChromeOS samt Googles användarvillkor, som finns här: https://policies.9oo91e.qjz9zk/terms.

-- Dessa ytterligare användarvillkor för Google Chrome och Chrome OS gäller den körbara versionen av Chrome och Chrome OS. Merparten av källkoden till Chrome är tillgänglig utan kostnad enligt de programlicensavtal för öppen källkod som finns på https://code.google.com/chromium/terms.html. -+ Dessa ytterligare användarvillkor för Google Chrome och Chrome OS gäller den körbara versionen av Chrome och Chrome OS. Merparten av källkoden till Chrome är tillgänglig utan kostnad enligt de programlicensavtal för öppen källkod som finns på https://code.9oo91e.qjz9zk/chromium/terms.html. +- Dessa ytterligare användarvillkor för Google Chrome och ChromeOS gäller den körbara versionen av Chrome och ChromeOS. Merparten av källkoden till Chrome är tillgänglig utan kostnad enligt de programlicensavtal för öppen källkod som finns på https://code.google.com/chromium/terms.html. ++ Dessa ytterligare användarvillkor för Google Chrome och ChromeOS gäller den körbara versionen av Chrome och ChromeOS. Merparten av källkoden till Chrome är tillgänglig utan kostnad enligt de programlicensavtal för öppen källkod som finns på https://code.9oo91e.qjz9zk/chromium/terms.html.

- Din användning av vissa komponenter i Chrome och Chrome OS omfattas av följande villkor: + Din användning av vissa komponenter i Chrome och ChromeOS omfattas av följande villkor: diff --git a/components/resources/terms/terms_sw.html b/components/resources/terms/terms_sw.html --- a/components/resources/terms/terms_sw.html +++ b/components/resources/terms/terms_sw.html @@ -27437,15 +27713,15 @@ diff --git a/components/resources/terms/terms_sw.html b/components/resources/ter Mara ya mwisho kubadilishwa: 21 Januari 2021

-- Kwa kutumia Chrome au Mfumo wa Uendeshaji wa Chrome, unakubali Sheria na Masharti ya Google kwenye https://policies.google.com/terms na Sheria na Masharti haya ya Ziada ya Google Chrome na Mfumo wa Uendeshaji wa Chrome. -+ Kwa kutumia Chrome au Mfumo wa Uendeshaji wa Chrome, unakubali Sheria na Masharti ya Google kwenye https://policies.9oo91e.qjz9zk/terms na Sheria na Masharti haya ya Ziada ya Google Chrome na Mfumo wa Uendeshaji wa Chrome. +- Kwa kutumia Chrome au ChromeOS, unakubali Sheria na Masharti ya Google kwenye https://policies.google.com/terms na Sheria na Masharti haya ya Ziada ya Google Chrome na ChromeOS. ++ Kwa kutumia Chrome au ChromeOS, unakubali Sheria na Masharti ya Google kwenye https://policies.9oo91e.qjz9zk/terms na Sheria na Masharti haya ya Ziada ya Google Chrome na ChromeOS.

-- Sheria na Masharti haya ya Ziada ya Chrome na Mfumo wa Uendeshaji wa Chrome yatatumika kwa misimbo inayoweza kutekelezwa ya matoleo ya Chrome na Mfumo wa Uendeshaji wa Chrome. Sehemu kubwa ya msimbo wa tovuti wa Chrome inapatikana bila malipo chini ya makubaliano ya leseni za programu huria kwenye https://code.google.com/chromium/terms.html. -+ Sheria na Masharti haya ya Ziada ya Chrome na Mfumo wa Uendeshaji wa Chrome yatatumika kwa misimbo inayoweza kutekelezwa ya matoleo ya Chrome na Mfumo wa Uendeshaji wa Chrome. Sehemu kubwa ya msimbo wa tovuti wa Chrome inapatikana bila malipo chini ya makubaliano ya leseni za programu huria kwenye https://code.9oo91e.qjz9zk/chromium/terms.html. +- Sheria na Masharti haya ya Ziada ya Chrome na ChromeOS yatatumika kwa misimbo inayoweza kutekelezwa ya matoleo ya Chrome na ChromeOS. Sehemu kubwa ya msimbo wa tovuti wa Chrome inapatikana bila malipo chini ya makubaliano ya leseni za programu huria kwenye https://code.google.com/chromium/terms.html. ++ Sheria na Masharti haya ya Ziada ya Chrome na ChromeOS yatatumika kwa misimbo inayoweza kutekelezwa ya matoleo ya Chrome na ChromeOS. Sehemu kubwa ya msimbo wa tovuti wa Chrome inapatikana bila malipo chini ya makubaliano ya leseni za programu huria kwenye https://code.9oo91e.qjz9zk/chromium/terms.html.

- Utumiaji wako wa vipengele fulani vya Chrome na Mfumo wa Uendeshaji wa Chrome unategemea sheria na masharti yafuatayo: + Utumiaji wako wa vipengele fulani vya Chrome na ChromeOS unategemea sheria na masharti yafuatayo: diff --git a/components/resources/terms/terms_ta.html b/components/resources/terms/terms_ta.html --- a/components/resources/terms/terms_ta.html +++ b/components/resources/terms/terms_ta.html @@ -27453,15 +27729,15 @@ diff --git a/components/resources/terms/terms_ta.html b/components/resources/ter கடைசியாக மாற்றியது: ஜனவரி 01, 2021

-- Chrome அல்லது Chrome OSஸைப் பயன்படுத்துவதன் மூலம், https://policies.google.com/terms என்ற தளத்திலுள்ள Google சேவை விதிமுறைகளையும் Google Chrome, Chrome OS ஆகியவை தொடர்பான கூடுதல் சேவை விதிமுறைகளையும் ஏற்கிறீர்கள். -+ Chrome அல்லது Chrome OSஸைப் பயன்படுத்துவதன் மூலம், https://policies.9oo91e.qjz9zk/terms என்ற தளத்திலுள்ள Google சேவை விதிமுறைகளையும் Google Chrome, Chrome OS ஆகியவை தொடர்பான கூடுதல் சேவை விதிமுறைகளையும் ஏற்கிறீர்கள். +- Chrome அல்லது ChromeOSஸைப் பயன்படுத்துவதன் மூலம், https://policies.google.com/terms என்ற தளத்திலுள்ள Google சேவை விதிமுறைகளையும் Google Chrome, ChromeOS ஆகியவை தொடர்பான கூடுதல் சேவை விதிமுறைகளையும் ஏற்கிறீர்கள். ++ Chrome அல்லது ChromeOSஸைப் பயன்படுத்துவதன் மூலம், https://policies.9oo91e.qjz9zk/terms என்ற தளத்திலுள்ள Google சேவை விதிமுறைகளையும் Google Chrome, ChromeOS ஆகியவை தொடர்பான கூடுதல் சேவை விதிமுறைகளையும் ஏற்கிறீர்கள்.

-- இந்த Google Chrome, Chrome OS ஆகியவற்றுக்கான கூடுதல் சேவை விதிமுறைகள், Chrome மற்றும் Chrome OSஸின் செயலாக்கக் குறியீட்டுப் பதிப்புக்குப் பொருந்தும். பெரும்பாலான Chrome மூலக் குறியீடுகள் https://code.google.com/chromium/terms.html என்ற தளத்தில் உள்ள ஓப்பன் சோர்ஸ் மென்பொருள் உரிம ஒப்பந்தங்கள் என்பதன் கீழ் இலவசமாகக் கிடைக்கும். -+ இந்த Google Chrome, Chrome OS ஆகியவற்றுக்கான கூடுதல் சேவை விதிமுறைகள், Chrome மற்றும் Chrome OSஸின் செயலாக்கக் குறியீட்டுப் பதிப்புக்குப் பொருந்தும். பெரும்பாலான Chrome மூலக் குறியீடுகள் https://code.9oo91e.qjz9zk/chromium/terms.html என்ற தளத்தில் உள்ள ஓப்பன் சோர்ஸ் மென்பொருள் உரிம ஒப்பந்தங்கள் என்பதன் கீழ் இலவசமாகக் கிடைக்கும். +- இந்த Google Chrome, ChromeOS ஆகியவற்றுக்கான கூடுதல் சேவை விதிமுறைகள், Chrome மற்றும் ChromeOSஸின் செயலாக்கக் குறியீட்டுப் பதிப்புக்குப் பொருந்தும். பெரும்பாலான Chrome மூலக் குறியீடுகள் https://code.google.com/chromium/terms.html என்ற தளத்தில் உள்ள ஓப்பன் சோர்ஸ் மென்பொருள் உரிம ஒப்பந்தங்கள் என்பதன் கீழ் இலவசமாகக் கிடைக்கும். ++ இந்த Google Chrome, ChromeOS ஆகியவற்றுக்கான கூடுதல் சேவை விதிமுறைகள், Chrome மற்றும் ChromeOSஸின் செயலாக்கக் குறியீட்டுப் பதிப்புக்குப் பொருந்தும். பெரும்பாலான Chrome மூலக் குறியீடுகள் https://code.9oo91e.qjz9zk/chromium/terms.html என்ற தளத்தில் உள்ள ஓப்பன் சோர்ஸ் மென்பொருள் உரிம ஒப்பந்தங்கள் என்பதன் கீழ் இலவசமாகக் கிடைக்கும்.

- பின்வரும் விதிமுறைகளுக்கு உட்பட்டே Chrome, Chrome OS ஆகியவற்றின் சில கூறுகளை உங்களால் பயன்படுத்த முடியும்: + பின்வரும் விதிமுறைகளுக்கு உட்பட்டே Chrome, ChromeOS ஆகியவற்றின் சில கூறுகளை உங்களால் பயன்படுத்த முடியும்: diff --git a/components/resources/terms/terms_te.html b/components/resources/terms/terms_te.html --- a/components/resources/terms/terms_te.html +++ b/components/resources/terms/terms_te.html @@ -27469,15 +27745,15 @@ diff --git a/components/resources/terms/terms_te.html b/components/resources/ter చివరగా సవరించినది: 01 జనవరి, 2021

-- మీరు Chrome లేదా Chrome OSను ఉపయోగించడం ద్వారా https://policies.google.com/terms లింక్‌లోని Google సేవా నిబంధనలకు, అలాగే ఈ Google Chrome, Chrome OS అదనపు సేవా నిబంధనలకు అంగీకరిస్తారు. -+ మీరు Chrome లేదా Chrome OSను ఉపయోగించడం ద్వారా https://policies.9oo91e.qjz9zk/terms లింక్‌లోని Google సేవా నిబంధనలకు, అలాగే ఈ Google Chrome, Chrome OS అదనపు సేవా నిబంధనలకు అంగీకరిస్తారు. +- మీరు Chrome లేదా ChromeOSను ఉపయోగించడం ద్వారా https://policies.google.com/terms లింక్‌లోని Google సేవా నిబంధనలకు, అలాగే ఈ Google Chrome, ChromeOS అదనపు సేవా నిబంధనలకు అంగీకరిస్తారు. ++ మీరు Chrome లేదా ChromeOSను ఉపయోగించడం ద్వారా https://policies.9oo91e.qjz9zk/terms లింక్‌లోని Google సేవా నిబంధనలకు, అలాగే ఈ Google Chrome, ChromeOS అదనపు సేవా నిబంధనలకు అంగీకరిస్తారు.

-- ఈ Google Chrome, Chrome OS అదనపు సేవా నిబంధనలు అనేవి Chrome, Chrome OS యొక్క అమలు చేయదగిన కోడ్ వెర్షన్‌కు వర్తిస్తాయి. Chromeకు సంబంధించిన చాలా వరకు సోర్స్ కోడ్, ఓపెన్ సోర్స్ సాప్ట్‌వేర్ లైసెన్స్ ఒప్పందాల ప్రకారం ఎటువంటి ఛార్జీ లేకుండా ఉచితంగా https://code.google.com/chromium/terms.html లింక్‌లో అందుబాటులో ఉంచబడుతుంది. -+ ఈ Google Chrome, Chrome OS అదనపు సేవా నిబంధనలు అనేవి Chrome, Chrome OS యొక్క అమలు చేయదగిన కోడ్ వెర్షన్‌కు వర్తిస్తాయి. Chromeకు సంబంధించిన చాలా వరకు సోర్స్ కోడ్, ఓపెన్ సోర్స్ సాప్ట్‌వేర్ లైసెన్స్ ఒప్పందాల ప్రకారం ఎటువంటి ఛార్జీ లేకుండా ఉచితంగా https://code.9oo91e.qjz9zk/chromium/terms.html లింక్‌లో అందుబాటులో ఉంచబడుతుంది. +- ఈ Google Chrome, ChromeOS అదనపు సేవా నిబంధనలు అనేవి Chrome, ChromeOS యొక్క అమలు చేయదగిన కోడ్ వెర్షన్‌కు వర్తిస్తాయి. Chromeకు సంబంధించిన చాలా వరకు సోర్స్ కోడ్, ఓపెన్ సోర్స్ సాప్ట్‌వేర్ లైసెన్స్ ఒప్పందాల ప్రకారం ఎటువంటి ఛార్జీ లేకుండా ఉచితంగా https://code.google.com/chromium/terms.html లింక్‌లో అందుబాటులో ఉంచబడుతుంది. ++ ఈ Google Chrome, ChromeOS అదనపు సేవా నిబంధనలు అనేవి Chrome, ChromeOS యొక్క అమలు చేయదగిన కోడ్ వెర్షన్‌కు వర్తిస్తాయి. Chromeకు సంబంధించిన చాలా వరకు సోర్స్ కోడ్, ఓపెన్ సోర్స్ సాప్ట్‌వేర్ లైసెన్స్ ఒప్పందాల ప్రకారం ఎటువంటి ఛార్జీ లేకుండా ఉచితంగా https://code.9oo91e.qjz9zk/chromium/terms.html లింక్‌లో అందుబాటులో ఉంచబడుతుంది.

- Chrome, Chrome OSలలోని నిర్దిష్ట కాంపొనెంట్‌లను మీరు వినియోగించే విధానం కింది నిబంధనలకు కట్టుబడి ఉండాలి: + Chrome, ChromeOSలలోని నిర్దిష్ట కాంపొనెంట్‌లను మీరు వినియోగించే విధానం కింది నిబంధనలకు కట్టుబడి ఉండాలి: diff --git a/components/resources/terms/terms_th.html b/components/resources/terms/terms_th.html --- a/components/resources/terms/terms_th.html +++ b/components/resources/terms/terms_th.html @@ -27485,15 +27761,15 @@ diff --git a/components/resources/terms/terms_th.html b/components/resources/ter แก้ไขล่าสุด: 1 มกราคม 2021

-- การใช้ Chrome หรือ Chrome OS หมายความว่า คุณยอมรับข้อกำหนดในการให้บริการของ Google ซึ่งอยู่ที่ https://policies.google.com/terms และข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ Chrome OS เหล่านี้ -+ การใช้ Chrome หรือ Chrome OS หมายความว่า คุณยอมรับข้อกำหนดในการให้บริการของ Google ซึ่งอยู่ที่ https://policies.9oo91e.qjz9zk/terms และข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ Chrome OS เหล่านี้ +- การใช้ Chrome หรือ ChromeOS หมายความว่า คุณยอมรับข้อกำหนดในการให้บริการของ Google ซึ่งอยู่ที่ https://policies.google.com/terms และข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ ChromeOS เหล่านี้ ++ การใช้ Chrome หรือ ChromeOS หมายความว่า คุณยอมรับข้อกำหนดในการให้บริการของ Google ซึ่งอยู่ที่ https://policies.9oo91e.qjz9zk/terms และข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ ChromeOS เหล่านี้

-- ข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ Chrome OS เหล่านี้มีผลกับเวอร์ชันโค้ดที่สั่งการได้ของ Chrome และ Chrome OS ซอร์สโค้ดส่วนใหญ่ของ Chrome มีให้บริการฟรีภายใต้ข้อตกลงใบอนุญาตซอฟต์แวร์แบบโอเพนซอร์สที่ https://code.google.com/chromium/terms.html -+ ข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ Chrome OS เหล่านี้มีผลกับเวอร์ชันโค้ดที่สั่งการได้ของ Chrome และ Chrome OS ซอร์สโค้ดส่วนใหญ่ของ Chrome มีให้บริการฟรีภายใต้ข้อตกลงใบอนุญาตซอฟต์แวร์แบบโอเพนซอร์สที่ https://code.9oo91e.qjz9zk/chromium/terms.html +- ข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ ChromeOS เหล่านี้มีผลกับเวอร์ชันโค้ดที่สั่งการได้ของ Chrome และ ChromeOS ซอร์สโค้ดส่วนใหญ่ของ Chrome มีให้บริการฟรีภายใต้ข้อตกลงใบอนุญาตซอฟต์แวร์แบบโอเพนซอร์สที่ https://code.google.com/chromium/terms.html ++ ข้อกำหนดในการให้บริการเพิ่มเติมของ Google Chrome และ ChromeOS เหล่านี้มีผลกับเวอร์ชันโค้ดที่สั่งการได้ของ Chrome และ ChromeOS ซอร์สโค้ดส่วนใหญ่ของ Chrome มีให้บริการฟรีภายใต้ข้อตกลงใบอนุญาตซอฟต์แวร์แบบโอเพนซอร์สที่ https://code.9oo91e.qjz9zk/chromium/terms.html

- การใช้งานคอมโพเนนต์บางอย่างของ Chrome และ Chrome OS ขึ้นอยู่กับข้อกำหนดต่อไปนี้ + การใช้งานคอมโพเนนต์บางอย่างของ Chrome และ ChromeOS ขึ้นอยู่กับข้อกำหนดต่อไปนี้ diff --git a/components/resources/terms/terms_tr.html b/components/resources/terms/terms_tr.html --- a/components/resources/terms/terms_tr.html +++ b/components/resources/terms/terms_tr.html @@ -27501,15 +27777,15 @@ diff --git a/components/resources/terms/terms_tr.html b/components/resources/ter Son değiştirilme tarihi: 1 Ocak 2021

-- Chrome veya Chrome OS'u kullanarak https://policies.google.com/terms adresinde bulunan Google Hizmet Şartları'nı ve bu Google Chrome ile Chrome OS Ek Hizmet Şartları'nı kabul etmiş olursunuz. -+ Chrome veya Chrome OS'u kullanarak https://policies.9oo91e.qjz9zk/terms adresinde bulunan Google Hizmet Şartları'nı ve bu Google Chrome ile Chrome OS Ek Hizmet Şartları'nı kabul etmiş olursunuz. +- Chrome veya ChromeOS'u kullanarak https://policies.google.com/terms adresinde bulunan Google Hizmet Şartları'nı ve bu Google Chrome ile ChromeOS Ek Hizmet Şartları'nı kabul etmiş olursunuz. ++ Chrome veya ChromeOS'u kullanarak https://policies.9oo91e.qjz9zk/terms adresinde bulunan Google Hizmet Şartları'nı ve bu Google Chrome ile ChromeOS Ek Hizmet Şartları'nı kabul etmiş olursunuz.

-- Bu Google Chrome ve Chrome OS Ek Hizmet Şartları, Chrome ve Chrome OS'un çalıştırılabilir kod sürümü için geçerlidir. Chrome'a ait kaynak kodun büyük bölümü açık kaynak yazılım lisans sözleşmeleri altında ücretsiz olarak http://www.chromium.org adresinde sunulmaktadır. -+ Bu Google Chrome ve Chrome OS Ek Hizmet Şartları, Chrome ve Chrome OS'un çalıştırılabilir kod sürümü için geçerlidir. Chrome'a ait kaynak kodun büyük bölümü açık kaynak yazılım lisans sözleşmeleri altında ücretsiz olarak http://www.ch40m1um.qjz9zk adresinde sunulmaktadır. +- Bu Google Chrome ve ChromeOS Ek Hizmet Şartları, Chrome ve ChromeOS'un çalıştırılabilir kod sürümü için geçerlidir. Chrome'a ait kaynak kodun büyük bölümü açık kaynak yazılım lisans sözleşmeleri altında ücretsiz olarak http://www.chromium.org adresinde sunulmaktadır. ++ Bu Google Chrome ve ChromeOS Ek Hizmet Şartları, Chrome ve ChromeOS'un çalıştırılabilir kod sürümü için geçerlidir. Chrome'a ait kaynak kodun büyük bölümü açık kaynak yazılım lisans sözleşmeleri altında ücretsiz olarak http://www.ch40m1um.qjz9zk adresinde sunulmaktadır.

- Chrome ve Chrome OS'un belirli bileşenlerini kullanımınız aşağıdaki şartlara tabidir: + Chrome ve ChromeOS'un belirli bileşenlerini kullanımınız aşağıdaki şartlara tabidir: diff --git a/components/resources/terms/terms_uk.html b/components/resources/terms/terms_uk.html --- a/components/resources/terms/terms_uk.html +++ b/components/resources/terms/terms_uk.html @@ -27517,15 +27793,15 @@ diff --git a/components/resources/terms/terms_uk.html b/components/resources/ter Востаннє оновлено 1 січня 2021 року

-- Використовуючи Chrome або ОС Chrome, ви погоджуєтесь із Загальними положеннями та умовами Google на сторінці https://policies.google.com/terms і цими Додатковими умовами використання Google Chrome та ОС Chrome. -+ Використовуючи Chrome або ОС Chrome, ви погоджуєтесь із Загальними положеннями та умовами Google на сторінці https://policies.9oo91e.qjz9zk/terms і цими Додатковими умовами використання Google Chrome та ОС Chrome. +- Використовуючи Chrome або ChromeOS, ви погоджуєтесь із Загальними положеннями та умовами Google на сторінці https://policies.google.com/terms і цими Додатковими умовами використання Google Chrome та ChromeOS. ++ Використовуючи Chrome або ChromeOS, ви погоджуєтесь із Загальними положеннями та умовами Google на сторінці https://policies.9oo91e.qjz9zk/terms і цими Додатковими умовами використання Google Chrome та ChromeOS.

-- Ці додаткові Умови використання Google Chrome та ОС Chrome застосовуються до версії виконуваного коду Chrome і ОС Chrome. Більша частина вихідного коду Chrome, розміщеного на сайті https://code.google.com/chromium/terms.html, доступна безкоштовно на умовах ліцензійної угоди щодо програмного забезпечення з відкритим кодом. -+ Ці додаткові Умови використання Google Chrome та ОС Chrome застосовуються до версії виконуваного коду Chrome і ОС Chrome. Більша частина вихідного коду Chrome, розміщеного на сайті https://code.9oo91e.qjz9zk/chromium/terms.html, доступна безкоштовно на умовах ліцензійної угоди щодо програмного забезпечення з відкритим кодом. +- Ці додаткові Умови використання Google Chrome та ChromeOS застосовуються до версії виконуваного коду Chrome і ChromeOS. Більша частина вихідного коду Chrome, розміщеного на сайті https://code.google.com/chromium/terms.html, доступна безкоштовно на умовах ліцензійної угоди щодо програмного забезпечення з відкритим кодом. ++ Ці додаткові Умови використання Google Chrome та ChromeOS застосовуються до версії виконуваного коду Chrome і ChromeOS. Більша частина вихідного коду Chrome, розміщеного на сайті https://code.9oo91e.qjz9zk/chromium/terms.html, доступна безкоштовно на умовах ліцензійної угоди щодо програмного забезпечення з відкритим кодом.

- Використання певних компонентів Chrome і ОС Chrome регулюється такими умовами: + Використання певних компонентів Chrome і ChromeOS регулюється такими умовами: diff --git a/components/resources/terms/terms_vi.html b/components/resources/terms/terms_vi.html --- a/components/resources/terms/terms_vi.html +++ b/components/resources/terms/terms_vi.html @@ -27533,15 +27809,15 @@ diff --git a/components/resources/terms/terms_vi.html b/components/resources/ter Lần sửa đổi gần đây nhất: Ngày 1 tháng 1 năm 2021

-- Bằng việc sử dụng Chrome hoặc Chrome OS, bạn đồng ý với Điều khoản dịch vụ của Google có tại https://policies.google.com/terms cũng như các Điều khoản dịch vụ bổ sung sau đây của Google Chrome và Chrome OS. -+ Bằng việc sử dụng Chrome hoặc Chrome OS, bạn đồng ý với Điều khoản dịch vụ của Google có tại https://policies.9oo91e.qjz9zk/terms cũng như các Điều khoản dịch vụ bổ sung sau đây của Google Chrome và Chrome OS. +- Bằng việc sử dụng Chrome hoặc ChromeOS, bạn đồng ý với Điều khoản dịch vụ của Google có tại https://policies.google.com/terms cũng như các Điều khoản dịch vụ bổ sung sau đây của Google Chrome và ChromeOS. ++ Bằng việc sử dụng Chrome hoặc ChromeOS, bạn đồng ý với Điều khoản dịch vụ của Google có tại https://policies.9oo91e.qjz9zk/terms cũng như các Điều khoản dịch vụ bổ sung sau đây của Google Chrome và ChromeOS.

-- Các Điều khoản dịch vụ bổ sung này của Google Chrome và Chrome OS áp dụng cho phiên bản mã thực thi của Chrome và Chrome OS. Bạn có thể sử dụng miễn phí hầu hết mã nguồn dành cho Chrome theo thỏa thuận cấp phép phần mềm nguồn mở tại https://code.google.com/chromium/terms.html. -+ Các Điều khoản dịch vụ bổ sung này của Google Chrome và Chrome OS áp dụng cho phiên bản mã thực thi của Chrome và Chrome OS. Bạn có thể sử dụng miễn phí hầu hết mã nguồn dành cho Chrome theo thỏa thuận cấp phép phần mềm nguồn mở tại https://code.9oo91e.qjz9zk/chromium/terms.html. +- Các Điều khoản dịch vụ bổ sung này của Google Chrome và ChromeOS áp dụng cho phiên bản mã thực thi của Chrome và ChromeOS. Bạn có thể sử dụng miễn phí hầu hết mã nguồn dành cho Chrome theo thỏa thuận cấp phép phần mềm nguồn mở tại https://code.google.com/chromium/terms.html. ++ Các Điều khoản dịch vụ bổ sung này của Google Chrome và ChromeOS áp dụng cho phiên bản mã thực thi của Chrome và ChromeOS. Bạn có thể sử dụng miễn phí hầu hết mã nguồn dành cho Chrome theo thỏa thuận cấp phép phần mềm nguồn mở tại https://code.9oo91e.qjz9zk/chromium/terms.html.

- Bạn phải tuân thủ các điều khoản bổ sung dưới đây khi sử dụng một số thành phần của Chrome và Chrome OS: + Bạn phải tuân thủ các điều khoản bổ sung dưới đây khi sử dụng một số thành phần của Chrome và ChromeOS: diff --git a/components/resources/terms/terms_zh-CN.html b/components/resources/terms/terms_zh-CN.html --- a/components/resources/terms/terms_zh-CN.html +++ b/components/resources/terms/terms_zh-CN.html @@ -27549,15 +27825,15 @@ diff --git a/components/resources/terms/terms_zh-CN.html b/components/resources/ 上次修改时间：2021 年 1 月 1 日

-- 使用 Chrome 或 Chrome 操作系统即表示您同意接受《Google 服务条款》（全文请见 https://policies.google.com/terms）以及这些 Google Chrome 和 Chrome 操作系统附加服务条款。 -+ 使用 Chrome 或 Chrome 操作系统即表示您同意接受《Google 服务条款》（全文请见 https://policies.9oo91e.qjz9zk/terms）以及这些 Google Chrome 和 Chrome 操作系统附加服务条款。 +- 使用 Chrome 或 ChromeOS 即表示您同意接受《Google 服务条款》（全文请见 https://policies.google.com/terms）以及这些 Google Chrome 和 ChromeOS 附加服务条款。 ++ 使用 Chrome 或 ChromeOS 即表示您同意接受《Google 服务条款》（全文请见 https://policies.9oo91e.qjz9zk/terms）以及这些 Google Chrome 和 ChromeOS 附加服务条款。

-- 这些 Google Chrome 和 Chrome 操作系统附加服务条款适用于 Chrome 和 Chrome 操作系统的可执行代码版本。Chrome 的大部分源代码都根据开源软件许可协议（详见 https://code.google.com/chromium/terms.html）免费提供。 -+ 这些 Google Chrome 和 Chrome 操作系统附加服务条款适用于 Chrome 和 Chrome 操作系统的可执行代码版本。Chrome 的大部分源代码都根据开源软件许可协议（详见 https://code.9oo91e.qjz9zk/chromium/terms.html）免费提供。 +- 这些 Google Chrome 和 ChromeOS 附加服务条款适用于 Chrome 和 ChromeOS 的可执行代码版本。Chrome 的大部分源代码都根据开源软件许可协议（详见 https://code.google.com/chromium/terms.html）免费提供。 ++ 这些 Google Chrome 和 ChromeOS 附加服务条款适用于 Chrome 和 ChromeOS 的可执行代码版本。Chrome 的大部分源代码都根据开源软件许可协议（详见 https://code.9oo91e.qjz9zk/chromium/terms.html）免费提供。

- 您在使用 Chrome 和 Chrome 操作系统的某些组件时应遵守以下条款： + 您在使用 Chrome 和 ChromeOS 的某些组件时应遵守以下条款： diff --git a/components/resources/terms/terms_zh-TW.html b/components/resources/terms/terms_zh-TW.html --- a/components/resources/terms/terms_zh-TW.html +++ b/components/resources/terms/terms_zh-TW.html @@ -27565,15 +27841,15 @@ diff --git a/components/resources/terms/terms_zh-TW.html b/components/resources/ 上次修改日期：2021 年 1 月 1 日

-- 使用 Chrome 或 Chrome 作業系統，即表示您同意 https://policies.google.com/terms 所述的《Google 服務條款》，以及 Google Chrome 和 Chrome 作業系統的《附加服務條款》。 -+ 使用 Chrome 或 Chrome 作業系統，即表示您同意 https://policies.9oo91e.qjz9zk/terms 所述的《Google 服務條款》，以及 Google Chrome 和 Chrome 作業系統的《附加服務條款》。 +- 使用 Chrome 或 ChromeOS ，即表示您同意 https://policies.google.com/terms 所述的《Google 服務條款》，以及 Google Chrome 和 ChromeOS 的《附加服務條款》。 ++ 使用 Chrome 或 ChromeOS ，即表示您同意 https://policies.9oo91e.qjz9zk/terms 所述的《Google 服務條款》，以及 Google Chrome 和 ChromeOS 的《附加服務條款》。

-- 這些 Google Chrome 和 Chrome 作業系統的《附加服務條款》適用於 Chrome 和 Chrome 作業系統的可執行程式碼版本。依據開放原始碼軟體授權協議 (位於 https://code.google.com/chromium/terms.html)，您可以免費取得 Chrome 大部分的原始碼。 -+ 這些 Google Chrome 和 Chrome 作業系統的《附加服務條款》適用於 Chrome 和 Chrome 作業系統的可執行程式碼版本。依據開放原始碼軟體授權協議 (位於 https://code.9oo91e.qjz9zk/chromium/terms.html)，您可以免費取得 Chrome 大部分的原始碼。 +- 這些 Google Chrome 和 ChromeOS 的《附加服務條款》適用於 Chrome 和 ChromeOS 的可執行程式碼版本。依據開放原始碼軟體授權協議 (位於 https://code.google.com/chromium/terms.html)，您可以免費取得 Chrome 大部分的原始碼。 ++ 這些 Google Chrome 和 ChromeOS 的《附加服務條款》適用於 Chrome 和 ChromeOS 的可執行程式碼版本。依據開放原始碼軟體授權協議 (位於 https://code.9oo91e.qjz9zk/chromium/terms.html)，您可以免費取得 Chrome 大部分的原始碼。

- 您使用 Chrome 和 Chrome 作業系統的特定元件時，應遵守下列條款的規定： + 您使用 Chrome 和 ChromeOS 的特定元件時，應遵守下列條款的規定： diff --git a/components/safe_browsing/content/browser/client_side_detection_service.cc b/components/safe_browsing/content/browser/client_side_detection_service.cc --- a/components/safe_browsing/content/browser/client_side_detection_service.cc +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc @@ -27613,7 +27889,7 @@ diff --git a/components/safe_browsing/content/resources/PRESUBMIT.py b/component diff --git a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc --- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc +++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc -@@ -28,7 +28,7 @@ namespace safe_browsing { +@@ -29,7 +29,7 @@ namespace safe_browsing { // Can be overriden by tests. const char* g_sbv4_url_prefix_for_testing = nullptr; @@ -27622,7 +27898,7 @@ diff --git a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.c const base::FilePath::CharType kStoreSuffix[] = FILE_PATH_LITERAL(".store"); -@@ -37,7 +37,7 @@ namespace { +@@ -38,7 +38,7 @@ namespace { // The default URL prefix where browser reports safe browsing hits and malware // details. const char kSbReportsURLPrefix[] = @@ -27646,7 +27922,7 @@ diff --git a/components/safe_browsing/core/browser/password_protection/password_ diff --git a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc -@@ -172,7 +172,7 @@ void RealTimeUrlLookupService::Shutdown() { +@@ -171,7 +171,7 @@ void RealTimeUrlLookupService::Shutdown() { GURL RealTimeUrlLookupService::GetRealTimeLookupUrl() const { return GURL( @@ -27659,7 +27935,7 @@ diff --git a/components/safe_browsing/core/browser/tailored_security_service/tai --- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc +++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.cc @@ -44,10 +44,10 @@ namespace { - const int kRepeatingCheckTailoredSecurityBitDelayInMinutes = 10; + const int kRepeatingCheckTailoredSecurityBitDelayInMinutes = 5; constexpr char kAPIScope[] = - "https://www.googleapis.com/auth/chrome-safe-browsing"; @@ -27855,13 +28131,13 @@ diff --git a/components/shared_highlighting/core/common/disabled_sites.cc b/comp @@ -55,7 +55,7 @@ bool ShouldOfferLinkToText(const GURL& url) { - bool SupportsLinkGenerationInIframe(GURL url) { + bool SupportsLinkGenerationInIframe(GURL main_frame_url) { const std::unordered_set good_hosts = { - "www.google.com", "m.google.com", "mobile.google.com", + "www.9oo91e.qjz9zk", "m.9oo91e.qjz9zk", "mobile.9oo91e.qjz9zk", "www.bing.com", "m.bing.com", "mobile.bing.com"}; - return url.SchemeIs(url::kHttpsScheme) && + return main_frame_url.SchemeIs(url::kHttpsScheme) && diff --git a/components/shared_highlighting/ios/shared_highlighting_constants.mm b/components/shared_highlighting/ios/shared_highlighting_constants.mm --- a/components/shared_highlighting/ios/shared_highlighting_constants.mm +++ b/components/shared_highlighting/ios/shared_highlighting_constants.mm @@ -28140,7 +28416,7 @@ diff --git a/components/translate/core/common/translate_util.cc b/components/tra diff --git a/components/ui_devtools/agent_util.cc b/components/ui_devtools/agent_util.cc --- a/components/ui_devtools/agent_util.cc +++ b/components/ui_devtools/agent_util.cc -@@ -27,9 +27,9 @@ void OnSourceFile(base::OnceClosure quit_closure, +@@ -26,9 +26,9 @@ void OnSourceFile(base::OnceClosure quit_closure, } // namespace @@ -28245,7 +28521,7 @@ diff --git a/components/webapps/browser/installable/installable_logging.cc b/com + "https://goo.gl.qjz9zke/improved-pwa-offline-detection for more information."; static const char kPipelineRestarted[] = "Web app uninstalled so that it stops any running pipeline"; - + static const char kManifestUrlSchemeNotSupportedForWebApkMessage[] = diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc --- a/components/wifi/wifi_service_win.cc +++ b/components/wifi/wifi_service_win.cc @@ -28305,7 +28581,7 @@ diff --git a/content/browser/attribution_reporting/PRESUBMIT.py b/content/browse diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc --- a/content/browser/indexed_db/indexed_db_backing_store.cc +++ b/content/browser/indexed_db/indexed_db_backing_store.cc -@@ -3189,7 +3189,7 @@ Status IndexedDBBackingStore::MigrateToV5(LevelDBWriteBatch* write_batch) { +@@ -3188,7 +3188,7 @@ Status IndexedDBBackingStore::MigrateToV5(LevelDBWriteBatch* write_batch) { const std::string schema_version_key = SchemaVersionKey::Encode(); Status s; @@ -28326,6 +28602,18 @@ diff --git a/content/browser/indexed_db/indexed_db_reporting.cc b/content/browse return ".Docs"; return std::string(); } +diff --git a/content/browser/interest_group/interest_group_update_manager.cc b/content/browser/interest_group/interest_group_update_manager.cc +--- a/content/browser/interest_group/interest_group_update_manager.cc ++++ b/content/browser/interest_group/interest_group_update_manager.cc +@@ -58,7 +58,7 @@ constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation = + "fetching JSON from the registered update URL for each interest " + "group." + "See https://github.com/WICG/turtledove/blob/main/FLEDGE.md and " +- "https://developer.chrome.com/docs/privacy-sandbox/fledge/" ++ "https://developer.ch40me.qjz9zk/docs/privacy-sandbox/fledge/" + trigger: + "Fetched upon a navigator.updateAdInterestGroups() call. Also " + "triggered upon navigator.runAdAuction() completion for interest " diff --git a/content/browser/portal/portal_navigation_throttle.cc b/content/browser/portal/portal_navigation_throttle.cc --- a/content/browser/portal/portal_navigation_throttle.cc +++ b/content/browser/portal/portal_navigation_throttle.cc @@ -28341,7 +28629,7 @@ diff --git a/content/browser/portal/portal_navigation_throttle.cc b/content/brow diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -5147,7 +5147,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -5260,7 +5260,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -28350,7 +28638,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -5362,7 +5362,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -5475,7 +5475,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " @@ -28359,10 +28647,22 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows common_params_->url.spec().c_str())); GetContentClient()->browser()->LogWebFeatureForCurrentPage( rfh, blink::mojom::WebFeature::kOpenerNavigationDownloadCrossOrigin); +diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc +--- a/content/browser/renderer_host/navigator.cc ++++ b/content/browser/renderer_host/navigator.cc +@@ -308,7 +308,7 @@ bool ValidateUnfencedTopNavigation(RenderFrameHostImpl* render_frame_host, + "The frame attempting navigation of the top-level window is " + "sandboxed with the 'allow-top-navigation-by-user-activation' " + "flag, but has no user activation (aka gesture). See " +- "https://www.chromestatus.com/feature/5629582019395584."); ++ "https://www.ch40mestatus.qjz9zk/feature/5629582019395584."); + return false; + } + 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 -@@ -372,7 +372,7 @@ int g_next_accessibility_reset_token = 1; +@@ -376,7 +376,7 @@ int g_next_accessibility_reset_token = 1; // WebView, WebLayer, Fuchsia web.ContextProvider and CastOS content shell. bool g_allow_injecting_javascript = false; @@ -28422,7 +28722,7 @@ diff --git a/content/browser/speech/tts_mac.mm b/content/browser/speech/tts_mac. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -6860,7 +6860,7 @@ void WebContentsImpl::RunJavaScriptDialog( +@@ -6909,7 +6909,7 @@ void WebContentsImpl::RunJavaScriptDialog( base::StringPrintf( "A different origin subframe tried to create a JavaScript " "dialog. This is no longer allowed and was blocked. See " @@ -28434,7 +28734,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/webauth/authenticator_common.cc --- a/content/browser/webauth/authenticator_common.cc +++ b/content/browser/webauth/authenticator_common.cc -@@ -91,9 +91,9 @@ enum class RequestExtension { +@@ -92,9 +92,9 @@ enum class RequestExtension { namespace { constexpr char kGstaticAppId[] = @@ -28446,7 +28746,7 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w WebAuthenticationDelegate* GetWebAuthenticationDelegate() { return GetContentClient()->browser()->GetWebAuthenticationDelegate(); -@@ -184,7 +184,7 @@ absl::optional ProcessAppIdExtension( +@@ -185,7 +185,7 @@ absl::optional ProcessAppIdExtension( const GURL gstatic_appid(kGstaticAppId); const GURL gstatic_corp_appid(kGstaticCorpAppId); DCHECK(gstatic_appid.is_valid() && gstatic_corp_appid.is_valid()); @@ -28455,7 +28755,7 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w (appid_url.EqualsIgnoringRef(gstatic_appid) || appid_url.EqualsIgnoringRef(gstatic_corp_appid))) { return appid; -@@ -207,8 +207,8 @@ absl::optional MakeCredentialU2fAppIdOverride( +@@ -208,8 +208,8 @@ absl::optional MakeCredentialU2fAppIdOverride( return options->relying_party.id; } if (options->google_legacy_app_id_support && @@ -28469,7 +28769,7 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w diff --git a/content/browser/webauth/client_data_json.cc b/content/browser/webauth/client_data_json.cc --- a/content/browser/webauth/client_data_json.cc +++ b/content/browser/webauth/client_data_json.cc -@@ -146,7 +146,7 @@ std::string BuildClientDataJson( +@@ -152,7 +152,7 @@ std::string BuildClientDataJson( ret.append(R"(,"other_keys_can_be_added_here":")"); ret.append( "do not compare clientDataJSON against a template. See " @@ -28529,7 +28829,7 @@ diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/re diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -435,17 +435,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( +@@ -433,17 +433,17 @@ void RenderThreadImpl::HistogramCustomizer::SetCommonHost( std::string RenderThreadImpl::HistogramCustomizer::HostToCustomHistogramSuffix( const std::string& host) { @@ -28553,7 +28853,7 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th return ".youtube"; if (IsAlexaTop10NonGoogleSite(host)) return ".top10"; -@@ -464,7 +464,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( +@@ -462,7 +462,7 @@ bool RenderThreadImpl::HistogramCustomizer::IsAlexaTop10NonGoogleSite( net::registry_controlled_domains::GetDomainAndRegistry( host, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); @@ -28565,7 +28865,7 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc --- a/content/shell/browser/shell_browser_main_parts.cc +++ b/content/shell/browser/shell_browser_main_parts.cc -@@ -85,7 +85,7 @@ GURL GetStartupURL() { +@@ -86,7 +86,7 @@ GURL GetStartupURL() { #else const base::CommandLine::StringVector& args = command_line->GetArgs(); if (args.empty()) @@ -28622,7 +28922,7 @@ diff --git a/device/bluetooth/bluetooth_classic_device_mac.mm b/device/bluetooth diff --git a/device/fido/fido_strings.grd b/device/fido/fido_strings.grd --- a/device/fido/fido_strings.grd +++ b/device/fido/fido_strings.grd -@@ -184,7 +184,7 @@ This file contains the strings for //device/fido. +@@ -186,7 +186,7 @@ This file contains the strings for //device/fido. @@ -28710,7 +29010,7 @@ diff --git a/extensions/browser/PRESUBMIT.py b/extensions/browser/PRESUBMIT.py diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/extensions/browser/api/web_request/web_request_permissions.cc --- a/extensions/browser/api/web_request/web_request_permissions.cc +++ b/extensions/browser/api/web_request/web_request_permissions.cc -@@ -197,7 +197,7 @@ bool IsSensitiveGoogleClientUrl(const extensions::WebRequestInfo& request) { +@@ -195,7 +195,7 @@ bool IsSensitiveGoogleClientUrl(const extensions::WebRequestInfo& request) { // TODO(battre) Merge this, CanExtensionAccessURL and // PermissionsData::CanAccessPage into one function. @@ -28719,7 +29019,7 @@ diff --git a/extensions/browser/api/web_request/web_request_permissions.cc b/ext static constexpr char kClient[] = "clients"; constexpr size_t kGoogleComLength = std::size(kGoogleCom) - 1; constexpr size_t kClientLength = std::size(kClient) - 1; -@@ -338,7 +338,7 @@ bool WebRequestPermissions::HideRequest( +@@ -336,7 +336,7 @@ bool WebRequestPermissions::HideRequest( extension_urls::IsBlocklistUpdateUrl(url) || extension_urls::IsSafeBrowsingUrl(url::Origin::Create(url), url.path_piece()) || @@ -28746,7 +29046,7 @@ diff --git a/extensions/browser/suggest_permission_util.cc b/extensions/browser/ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/browser/updater/extension_downloader.cc --- a/extensions/browser/updater/extension_downloader.cc +++ b/extensions/browser/updater/extension_downloader.cc -@@ -93,10 +93,10 @@ const char kNotFromWebstoreInstallSource[] = "notfromwebstore"; +@@ -92,10 +92,10 @@ const char kNotFromWebstoreInstallSource[] = "notfromwebstore"; const char kDefaultInstallSource[] = ""; const char kReinstallInstallSource[] = "reinstall"; @@ -28917,7 +29217,7 @@ diff --git a/extensions/renderer/resources/automation/PRESUBMIT.py b/extensions/ diff --git a/extensions/strings/extensions_strings.grd b/extensions/strings/extensions_strings.grd --- a/extensions/strings/extensions_strings.grd +++ b/extensions/strings/extensions_strings.grd -@@ -308,8 +308,8 @@ +@@ -310,8 +310,8 @@ To check UI that displays these strings please use one of the sample applications such as: @@ -29005,11 +29305,6 @@ diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constant - "https://www.googleapis.com/auth/chromesync_playpen"; + "https://www.9oo91eapis.qjz9zk/auth/chromesync_playpen"; - // OAuth2 scope for access to Kid Management API. - const char kKidManagementOAuth2Scope[] = -- "https://www.googleapis.com/auth/kid.management"; -+ "https://www.9oo91eapis.qjz9zk/auth/kid.management"; - // OAuth2 scope for parental consent logging for secondary account addition. const char kKidManagementPrivilegedOAuth2Scope[] = - "https://www.googleapis.com/auth/kid.management.privileged"; @@ -29075,6 +29370,11 @@ diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constant -const char kPhotosOAuth2Scope[] = "https://www.googleapis.com/auth/photos"; +const char kPhotosOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/photos"; + // OAuth2 scope for access to the SecureConnect API. + extern const char kSecureConnectOAuth2Scope[] = +- "https://www.googleapis.com/auth/bce.secureconnect"; ++ "https://www.9oo91eapis.qjz9zk/auth/bce.secureconnect"; + // OAuth2 scope for access to Cast backdrop API. const char kCastBackdropOAuth2Scope[] = - "https://www.googleapis.com/auth/cast.backdrop"; @@ -29173,7 +29473,7 @@ diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constant diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc --- a/google_apis/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.cc -@@ -181,7 +181,7 @@ void GaiaOAuthClient::Core::GetTokensFromAuthCode( +@@ -182,7 +182,7 @@ void GaiaOAuthClient::Core::GetTokensFromAuthCode( trigger: "This request is triggered when a Chrome service requires an " "access token and a refresh token (e.g. Cloud Print, Chrome Remote " @@ -29182,7 +29482,7 @@ diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth "/OAuth2 for more information about the Google implementation of " "the OAuth 2.0 protocol." data: -@@ -335,9 +335,9 @@ void GaiaOAuthClient::Core::GetTokenInfo(const std::string& qualifier, +@@ -336,9 +336,9 @@ void GaiaOAuthClient::Core::GetTokenInfo(const std::string& qualifier, "The response is a dictionary of response values. The provided " "access token may have any scope, and basic results will be " "returned: issued_to, audience, scope, expires_in, access_type. In " @@ -29250,7 +29550,7 @@ diff --git a/google_apis/gcm/engine/gservices_settings.cc b/google_apis/gcm/engi diff --git a/google_apis/gcm/engine/mcs_client.cc b/google_apis/gcm/engine/mcs_client.cc --- a/google_apis/gcm/engine/mcs_client.cc +++ b/google_apis/gcm/engine/mcs_client.cc -@@ -31,7 +31,7 @@ typedef std::unique_ptr MCSProto; +@@ -32,7 +32,7 @@ typedef std::unique_ptr MCSProto; const char kMCSCategory[] = "com.google.android.gsf.gtalkservice"; // The from field for messages originating in the GCM client. @@ -29262,7 +29562,7 @@ diff --git a/google_apis/gcm/engine/mcs_client.cc b/google_apis/gcm/engine/mcs_c diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc --- a/google_apis/gcm/tools/mcs_probe.cc +++ b/google_apis/gcm/tools/mcs_probe.cc -@@ -102,7 +102,7 @@ const net::BackoffEntry::Policy kDefaultBackoffPolicy = { +@@ -104,7 +104,7 @@ const net::BackoffEntry::Policy kDefaultBackoffPolicy = { const char kChromeVersion[] = "Chrome MCS Probe"; // The default server to communicate with. @@ -29418,7 +29718,7 @@ diff --git a/gpu/vulkan/PRESUBMIT.py b/gpu/vulkan/PRESUBMIT.py diff --git a/headless/lib/browser/protocol/headless_handler.cc b/headless/lib/browser/protocol/headless_handler.cc --- a/headless/lib/browser/protocol/headless_handler.cc +++ b/headless/lib/browser/protocol/headless_handler.cc -@@ -112,7 +112,7 @@ void HeadlessHandler::BeginFrame(Maybe in_frame_time_ticks, +@@ -113,7 +113,7 @@ void HeadlessHandler::BeginFrame(Maybe in_frame_time_ticks, callback->sendFailure( Response::ServerError("Command is only supported with " "--run-all-compositor-stages-before-draw, see " @@ -29487,7 +29787,7 @@ diff --git a/infra/config/generated/builders/try/android-marshmallow-arm64-rel-c diff --git a/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json b/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json --- a/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json +++ b/infra/config/generated/builders/try/android-marshmallow-x86-rel-compilator/properties.json -@@ -10,7 +10,7 @@ +@@ -13,7 +13,7 @@ "enable_ats": true, "jobs": 300, "rpc_extra_params": "?prod", @@ -29595,7 +29895,7 @@ diff --git a/infra/config/generated/builders/try/android_cronet/properties.json diff --git a/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json b/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json --- a/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json +++ b/infra/config/generated/builders/try/android_optional_gpu_tests_rel/properties.json -@@ -6,7 +6,7 @@ +@@ -47,7 +47,7 @@ "enable_ats": true, "jobs": 150, "rpc_extra_params": "?prod", @@ -29619,7 +29919,7 @@ diff --git a/infra/config/generated/builders/try/cast_shell_android/properties.j diff --git a/infra/config/generated/builders/try/cast_shell_linux/properties.json b/infra/config/generated/builders/try/cast_shell_linux/properties.json --- a/infra/config/generated/builders/try/cast_shell_linux/properties.json +++ b/infra/config/generated/builders/try/cast_shell_linux/properties.json -@@ -2,7 +2,7 @@ +@@ -43,7 +43,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -29631,7 +29931,7 @@ diff --git a/infra/config/generated/builders/try/cast_shell_linux/properties.jso diff --git a/infra/config/generated/builders/try/cast_shell_linux_dbg/properties.json b/infra/config/generated/builders/try/cast_shell_linux_dbg/properties.json --- a/infra/config/generated/builders/try/cast_shell_linux_dbg/properties.json +++ b/infra/config/generated/builders/try/cast_shell_linux_dbg/properties.json -@@ -2,7 +2,7 @@ +@@ -43,7 +43,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -29648,6 +29948,18 @@ diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-dbg/prop "enable_ats": true, "rpc_extra_params": "?prod", - "server_host": "goma.chromium.org", ++ "server_host": "goma.ch40m1um.qjz9zk", + "use_luci_auth": true + }, + "$recipe_engine/resultdb/test_presentation": { +diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-lacros-dbg/properties.json b/infra/config/generated/builders/try/chromeos-amd64-generic-lacros-dbg/properties.json +--- a/infra/config/generated/builders/try/chromeos-amd64-generic-lacros-dbg/properties.json ++++ b/infra/config/generated/builders/try/chromeos-amd64-generic-lacros-dbg/properties.json +@@ -2,7 +2,7 @@ + "$build/goma": { + "enable_ats": true, + "rpc_extra_params": "?prod", +- "server_host": "goma.chromium.org", + "server_host": "goma.ch40m1um.qjz9zk", "use_luci_auth": true }, @@ -29727,7 +30039,7 @@ diff --git a/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/propertie diff --git a/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json b/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json --- a/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json +++ b/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/properties.json -@@ -2,7 +2,7 @@ +@@ -114,7 +114,7 @@ "$build/goma": { "enable_ats": false, "rpc_extra_params": "?prod", @@ -29847,7 +30159,7 @@ diff --git a/infra/config/generated/builders/try/ios-simulator/properties.json b diff --git a/infra/config/generated/builders/try/lacros-amd64-generic-rel/properties.json b/infra/config/generated/builders/try/lacros-amd64-generic-rel/properties.json --- a/infra/config/generated/builders/try/lacros-amd64-generic-rel/properties.json +++ b/infra/config/generated/builders/try/lacros-amd64-generic-rel/properties.json -@@ -2,7 +2,7 @@ +@@ -52,7 +52,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -29883,7 +30195,7 @@ diff --git a/infra/config/generated/builders/try/linux-blink-rel/properties.json diff --git a/infra/config/generated/builders/try/linux-chromeos-compile-dbg/properties.json b/infra/config/generated/builders/try/linux-chromeos-compile-dbg/properties.json --- a/infra/config/generated/builders/try/linux-chromeos-compile-dbg/properties.json +++ b/infra/config/generated/builders/try/linux-chromeos-compile-dbg/properties.json -@@ -2,7 +2,7 @@ +@@ -45,7 +45,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -29895,7 +30207,7 @@ diff --git a/infra/config/generated/builders/try/linux-chromeos-compile-dbg/prop diff --git a/infra/config/generated/builders/try/linux-chromeos-dbg/properties.json b/infra/config/generated/builders/try/linux-chromeos-dbg/properties.json --- a/infra/config/generated/builders/try/linux-chromeos-dbg/properties.json +++ b/infra/config/generated/builders/try/linux-chromeos-dbg/properties.json -@@ -2,7 +2,7 @@ +@@ -44,7 +44,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -29919,7 +30231,7 @@ diff --git a/infra/config/generated/builders/try/linux-chromeos-rel-compilator/p diff --git a/infra/config/generated/builders/try/linux-lacros-rel/properties.json b/infra/config/generated/builders/try/linux-lacros-rel/properties.json --- a/infra/config/generated/builders/try/linux-lacros-rel/properties.json +++ b/infra/config/generated/builders/try/linux-lacros-rel/properties.json -@@ -3,7 +3,7 @@ +@@ -85,7 +85,7 @@ "enable_ats": true, "jobs": 300, "rpc_extra_params": "?prod", @@ -29955,7 +30267,7 @@ diff --git a/infra/config/generated/builders/try/linux-rel-compilator/properties diff --git a/infra/config/generated/builders/try/linux-wayland-rel/properties.json b/infra/config/generated/builders/try/linux-wayland-rel/properties.json --- a/infra/config/generated/builders/try/linux-wayland-rel/properties.json +++ b/infra/config/generated/builders/try/linux-wayland-rel/properties.json -@@ -2,7 +2,7 @@ +@@ -86,7 +86,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -29967,7 +30279,7 @@ diff --git a/infra/config/generated/builders/try/linux-wayland-rel/properties.js diff --git a/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json b/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json --- a/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json +++ b/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json -@@ -3,7 +3,7 @@ +@@ -81,7 +81,7 @@ "enable_ats": true, "jobs": 150, "rpc_extra_params": "?prod", @@ -30039,7 +30351,7 @@ diff --git a/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/pr diff --git a/infra/config/generated/builders/try/linux_vr/properties.json b/infra/config/generated/builders/try/linux_vr/properties.json --- a/infra/config/generated/builders/try/linux_vr/properties.json +++ b/infra/config/generated/builders/try/linux_vr/properties.json -@@ -2,7 +2,7 @@ +@@ -46,7 +46,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -30147,7 +30459,7 @@ diff --git a/infra/config/generated/builders/try/win32-official/properties.json diff --git a/infra/config/generated/builders/try/win7-rel/properties.json b/infra/config/generated/builders/try/win7-rel/properties.json --- a/infra/config/generated/builders/try/win7-rel/properties.json +++ b/infra/config/generated/builders/try/win7-rel/properties.json -@@ -3,7 +3,7 @@ +@@ -78,7 +78,7 @@ "enable_ats": false, "jobs": 300, "rpc_extra_params": "?prod", @@ -30311,7 +30623,7 @@ diff --git a/ios/build/chrome_build.gni b/ios/build/chrome_build.gni diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/strings/ios_chromium_strings.grd --- a/ios/chrome/app/strings/ios_chromium_strings.grd +++ b/ios/chrome/app/strings/ios_chromium_strings.grd -@@ -203,7 +203,7 @@ locale. The strings in this file are specific to iOS. +@@ -205,7 +205,7 @@ locale. The strings in this file are specific to iOS. Chromium tip. Some buttons are now at the bottom of your screen, like Back, Forward, and Search. @@ -30320,7 +30632,16 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Cleared Chromium data -@@ -361,7 +361,7 @@ Things to consider: +@@ -344,7 +344,7 @@ Things to consider: + + Welcome to Chromium + +- ++ + To help improve the app, Chromium sends usage and crash data to Google. BEGIN_LINKManageEND_LINK + + +@@ -372,7 +372,7 @@ Things to consider: Data from Chromium sync @@ -30329,7 +30650,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Clear your Chromium data from this device? -@@ -370,13 +370,13 @@ Things to consider: +@@ -381,13 +381,13 @@ Things to consider: You are signing in with an account managed by $1doe.com and giving its administrator control over your Chromium data. Your data will become permanently tied to this account. Signing out of Chromium will delete your data from this device, but it will remain stored in your Google Account. @@ -30345,7 +30666,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Chromium Page -@@ -451,7 +451,7 @@ Things to consider: +@@ -468,7 +468,7 @@ Things to consider: Choose whether to clear your Chromium data from this device or keep it @@ -30354,7 +30675,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Use Chromium Everywhere -@@ -511,7 +511,7 @@ Things to consider: +@@ -528,7 +528,7 @@ Things to consider: Your organization requires you to stay signed out of Chromium. @@ -30363,7 +30684,7 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st Chromium can't check your passwords -@@ -547,10 +547,10 @@ Things to consider: +@@ -564,10 +564,10 @@ Things to consider: Allow Chromium Sign-in @@ -30374,12 +30695,12 @@ diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/st - Your password will be saved to Password Manager for $1example@gmail.com. + Your password will be saved to Password Manager for $1example@9ma1l.qjz9zk. - - + + Use the password you saved in Chromium to sign in faster diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/app/strings/ios_google_chrome_strings.grd --- a/ios/chrome/app/strings/ios_google_chrome_strings.grd +++ b/ios/chrome/app/strings/ios_google_chrome_strings.grd -@@ -203,7 +203,7 @@ locale. The strings in this file are specific to iOS. +@@ -205,7 +205,7 @@ locale. The strings in this file are specific to iOS. Chrome tip. Some buttons are now at the bottom of your screen, like Back, Forward, and Search. @@ -30388,7 +30709,16 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Cleared Chrome data -@@ -361,7 +361,7 @@ Things to consider: +@@ -344,7 +344,7 @@ Things to consider: + + Welcome to Chrome + +- ++ + To help improve the app, Chrome sends usage and crash data to Google. BEGIN_LINKManageEND_LINK + + +@@ -372,7 +372,7 @@ Things to consider: Data from Chrome sync @@ -30397,7 +30727,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Clear your Chrome data from this device? -@@ -370,13 +370,13 @@ Things to consider: +@@ -381,13 +381,13 @@ Things to consider: You are signing in with an account managed by $1doe.com and giving its administrator control over your Chrome data. Your data will become permanently tied to this account. Signing out of Chrome will delete your data from this device, but it will remain stored in your Google Account. @@ -30413,7 +30743,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Google Chrome Page -@@ -451,7 +451,7 @@ Things to consider: +@@ -468,7 +468,7 @@ Things to consider: Choose whether to clear your Chrome data from this device or keep it @@ -30422,7 +30752,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Use Chrome Everywhere -@@ -511,7 +511,7 @@ Things to consider: +@@ -528,7 +528,7 @@ Things to consider: Your organization requires you to stay signed out of Chrome. @@ -30431,7 +30761,7 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a Chrome can't check your passwords -@@ -547,10 +547,10 @@ Things to consider: +@@ -564,10 +564,10 @@ Things to consider: Allow Chrome Sign-in @@ -30442,12 +30772,12 @@ diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/a - Your password will be saved to Google Password Manager for $1example@gmail.com. + Your password will be saved to Google Password Manager for $1example@9ma1l.qjz9zk. - - + + Use the password you saved in Chrome to sign in faster diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios_strings.grd --- a/ios/chrome/app/strings/ios_strings.grd +++ b/ios/chrome/app/strings/ios_strings.grd -@@ -381,7 +381,7 @@ locale. The strings in this file are specific to iOS. +@@ -382,7 +382,7 @@ locale. The strings in this file are specific to iOS. Current Webpage is on Incognito @@ -30456,7 +30786,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Bandwidth -@@ -549,7 +549,7 @@ locale. The strings in this file are specific to iOS. +@@ -550,7 +550,7 @@ locale. The strings in this file are specific to iOS. You won't be signed out of your Google Account. @@ -30465,7 +30795,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios BEGIN_LINKSearch historyEND_LINK and BEGIN_LINKother forms of activityEND_LINK may be saved in your Google Account when you’re signed in. You can delete them anytime. -@@ -581,8 +581,8 @@ See your search engine’s instructions for deleting your search history, if app +@@ -582,8 +582,8 @@ See your search engine’s instructions for deleting your search history, if app Ok, got it @@ -30476,7 +30806,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios All Time -@@ -1083,7 +1083,7 @@ See your search engine’s instructions for deleting your search history, if app +@@ -1120,7 +1120,7 @@ See your search engine’s instructions for deleting your search history, if app You'll find your history here @@ -30485,7 +30815,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Password -@@ -1234,7 +1234,7 @@ See your search engine’s instructions for deleting your search history, if app +@@ -1271,7 +1271,7 @@ See your search engine’s instructions for deleting your search history, if app Manage Sync @@ -30494,7 +30824,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Remove -@@ -1637,7 +1637,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1734,7 +1734,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Passwords are saved in your Google Account so you can use them on any device. @@ -30503,7 +30833,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Camera -@@ -1694,7 +1694,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1791,7 +1791,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Google Privacy Policy @@ -30512,7 +30842,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Page load progress bar, $120% loaded. -@@ -1751,7 +1751,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across +@@ -1863,7 +1863,7 @@ While in Incognito, sites can't use cookies to see your browsing activity across Added to Reading List @@ -30521,7 +30851,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Available offline -@@ -2099,7 +2099,7 @@ Follow the steps below: +@@ -2235,7 +2235,7 @@ Follow the steps below: 3. Select Chrome @@ -30530,7 +30860,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Create, save, and manage your passwords so you can easily sign in to sites and apps. BEGIN_LINKLearn moreEND_LINK -@@ -2425,7 +2425,7 @@ Try to use a unique password for every site. +@@ -2564,7 +2564,7 @@ Try to use a unique password for every site. Active $12 Days Ago @@ -30539,7 +30869,7 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Message sent. -@@ -2637,12 +2637,12 @@ To change this setting, BEGIN_LINKreset syncBEGIN_LINKreset sync @@ -30554,7 +30884,20 @@ diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios Your data was encrypted with your sync passphrase on $2Sept 1, 2012. Enter it to start sync. -@@ -2968,7 +2968,7 @@ Your data was encrypted with your sync passphrase on $2Sept +@@ -3092,10 +3092,10 @@ Your data was encrypted with your sync passphrase on $2Sept + Learn More + + +- Follow $1google.com ++ Follow $19oo91e.qjz9zk + + +- Unfollow $1google.com ++ Unfollow $19oo91e.qjz9zk + + + Translate +@@ -3107,7 +3107,7 @@ Your data was encrypted with your sync passphrase on $2Sept Help @@ -30599,7 +30942,7 @@ diff --git a/ios/chrome/browser/autofill/automation/automation_action.mm b/ios/c diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm b/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm --- a/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm +++ b/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm -@@ -38,7 +38,7 @@ ChromeBrowserStateRemovalController* g_chrome_browser_state_removal_helper = +@@ -37,7 +37,7 @@ ChromeBrowserStateRemovalController* g_chrome_browser_state_removal_helper = NSString* const kPathToBrowserStateToKeepKey = @"PathToBrowserStateToKeep"; NSString* const kHasBrowserStateBeenRemovedKey = @"HasBrowserStateBeenRemoved"; @@ -30695,7 +31038,7 @@ diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chr diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm -@@ -376,7 +376,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { +@@ -409,7 +409,7 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, flags_ui::kOsIos, SINGLE_VALUE_TYPE_AND_VALUE( syncer::kSyncServiceURL, @@ -30704,7 +31047,7 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/ {"wallet-service-use-sandbox", flag_descriptions::kWalletServiceUseSandboxName, flag_descriptions::kWalletServiceUseSandboxDescription, flags_ui::kOsIos, -@@ -886,7 +886,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { +@@ -901,7 +901,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderEnabled) : @YES, base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderSearchURL) : @@ -30827,7 +31170,7 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/new_tab_page_app_interfac diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm --- a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm +++ b/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm -@@ -74,12 +74,12 @@ +@@ -63,15 +63,15 @@ namespace { // URL for 'Manage Activity' item in the Discover feed menu. const char kFeedManageActivityURL[] = @@ -30837,6 +31180,10 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/io const char kFeedManageInterestsURL[] = - "https://google.com/preferences/interests"; + "https://9oo91e.qjz9zk/preferences/interests"; + // URL for 'Manage Hidden' item in the Discover feed menu. + const char kFeedManageHiddenURL[] = +- "https://google.com/preferences/interests/hidden"; ++ "https://9oo91e.qjz9zk/preferences/interests/hidden"; // URL for 'Learn More' item in the Discover feed menu; -const char kFeedLearnMoreURL[] = "https://support.google.com/chrome/" +const char kFeedLearnMoreURL[] = "https://support.9oo91e.qjz9zk/chrome/" @@ -30846,7 +31193,7 @@ diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_mediator.mm b/io diff --git a/ios/chrome/browser/ui/main/scene_controller.mm b/ios/chrome/browser/ui/main/scene_controller.mm --- a/ios/chrome/browser/ui/main/scene_controller.mm +++ b/ios/chrome/browser/ui/main/scene_controller.mm -@@ -1577,7 +1577,7 @@ bool IsSigninForcedByPolicy() { +@@ -1594,7 +1594,7 @@ bool IsSigninForcedByPolicy() { return; if (self.sceneState.appState.initStage == InitStageFirstRun) { // This case is possible when using force FRE flag and opening chrome @@ -30916,7 +31263,7 @@ diff --git a/ios/chrome/browser/ui/qr_scanner/qr_scanner_app_interface.mm b/ios/ diff --git a/ios/chrome/browser/ui/settings/settings_app_interface.mm b/ios/chrome/browser/ui/settings/settings_app_interface.mm --- a/ios/chrome/browser/ui/settings/settings_app_interface.mm +++ b/ios/chrome/browser/ui/settings/settings_app_interface.mm -@@ -104,7 +104,7 @@ bool HostToLocalHostRewrite(GURL* url, web::BrowserState* browser_state) { +@@ -118,7 +118,7 @@ bool HostToLocalHostRewrite(GURL* url, web::BrowserState* browser_state) { ios::TemplateURLServiceFactory::GetForBrowserState( chrome_test_util::GetOriginalBrowserState()); @@ -30928,7 +31275,7 @@ diff --git a/ios/chrome/browser/ui/settings/settings_app_interface.mm b/ios/chro diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm --- a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm +++ b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm -@@ -566,16 +566,16 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -569,16 +569,16 @@ typedef NS_ENUM(NSInteger, ItemType) { TableViewURLItem* item = [[TableViewURLItem alloc] initWithType:ItemTypeURLNoMetadata]; item.title = @"Google Design"; @@ -30948,7 +31295,7 @@ diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.m item.metadata = @"3:42 PM"; [model addItem:item toSectionWithIdentifier:SectionIdentifierURL]; -@@ -595,7 +595,7 @@ typedef NS_ENUM(NSInteger, ItemType) { +@@ -598,7 +598,7 @@ typedef NS_ENUM(NSInteger, ItemType) { item = [[TableViewURLItem alloc] initWithType:ItemTypeURLWithBadgeImage]; item.title = @"Photos - Google Photos"; @@ -30956,7 +31303,7 @@ diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.m + item.URL = [[CrURL alloc] initWithGURL:GURL("https://photos.9oo91e.qjz9zk/")]; item.badgeImage = [UIImage imageNamed:@"table_view_cell_check_mark"]; [model addItem:item toSectionWithIdentifier:SectionIdentifierURL]; - } + diff --git a/ios/chrome/browser/ui/settings/translate_table_view_controller.mm b/ios/chrome/browser/ui/settings/translate_table_view_controller.mm --- a/ios/chrome/browser/ui/settings/translate_table_view_controller.mm +++ b/ios/chrome/browser/ui/settings/translate_table_view_controller.mm @@ -30984,16 +31331,16 @@ diff --git a/ios/chrome/browser/ui/webui/interstitials/interstitial_ui_util.mm b diff --git a/ios/chrome/credential_provider_extension/strings/ios_credential_provider_extension_strings.grd b/ios/chrome/credential_provider_extension/strings/ios_credential_provider_extension_strings.grd --- a/ios/chrome/credential_provider_extension/strings/ios_credential_provider_extension_strings.grd +++ b/ios/chrome/credential_provider_extension/strings/ios_credential_provider_extension_strings.grd -@@ -213,7 +213,7 @@ all other OS specific variables will be false. +@@ -212,7 +212,7 @@ all other OS specific variables will be false. You can use saved passwords in other apps on your device. They're saved to Google Password Manager on this device only. - You can use saved passwords in other apps on your device. They're saved to Google Password Manager for $1example@google.com. + You can use saved passwords in other apps on your device. They're saved to Google Password Manager for $1example@9oo91e.qjz9zk. - - Access the passwords you save in Chrome from any app. -@@ -279,13 +279,13 @@ all other OS specific variables will be false. + + AutoFill is on +@@ -269,13 +269,13 @@ all other OS specific variables will be false. Can't Save Password @@ -31009,7 +31356,7 @@ diff --git a/ios/chrome/credential_provider_extension/strings/ios_credential_pro Your password will be saved to your device. To use passwords on any device, turn on sync in Chrome. -@@ -318,7 +318,7 @@ all other OS specific variables will be false. +@@ -308,7 +308,7 @@ all other OS specific variables will be false. Replace Password? @@ -31076,8 +31423,8 @@ diff --git a/ios/public/provider/chrome/browser/signin/chrome_identity_service.m diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm b/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm --- a/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm +++ b/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm -@@ -27,19 +27,19 @@ NSString* const kCoderHashedGaiaIDKey = @"HashedGaiaID"; - @synthesize hashedGaiaID = _hashedGaiaID; +@@ -54,19 +54,19 @@ NSString* const kCoderHashedGaiaIDKey = @"HashedGaiaID"; + } + (FakeChromeIdentity*)fakeIdentity1 { - return [FakeChromeIdentity identityWithEmail:@"foo1@gmail.com" @@ -31102,26 +31449,27 @@ diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity.mm b diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm --- a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm +++ b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm -@@ -140,7 +140,7 @@ void SetCachedAvatarForIdentity(ChromeIdentity* identity, UIImage* avatar) { - @end +@@ -30,7 +30,7 @@ using base::test::ios::WaitUntilConditionOrTimeout; + + namespace { - namespace ios { -NSString* const kIdentityEmailFormat = @"%@@gmail.com"; +NSString* const kIdentityEmailFormat = @"%@@9ma1l.qjz9zk"; NSString* const kIdentityGaiaIDFormat = @"%@ID"; - FakeChromeIdentityService::FakeChromeIdentityService() + NSString* FakeGetHostedDomainForIdentity(ChromeIdentity* identity) { diff --git a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm --- a/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm +++ b/ios/public/provider/chrome/browser/signin/fake_chrome_identity_service_constants.mm -@@ -10,6 +10,6 @@ +@@ -10,7 +10,7 @@ namespace ios { -NSString* const kManagedIdentityEmailSuffix = @"@google.com"; +NSString* const kManagedIdentityEmailSuffix = @"@9oo91e.qjz9zk"; - } // namespace ios + const char* const kAddFakeIdentitiesArg = "add_fake_identities"; + diff --git a/ios/showcase/alert/sc_alert_coordinator.mm b/ios/showcase/alert/sc_alert_coordinator.mm --- a/ios/showcase/alert/sc_alert_coordinator.mm +++ b/ios/showcase/alert/sc_alert_coordinator.mm @@ -31331,7 +31679,43 @@ diff --git a/media/base/win/mf_initializer.cc b/media/base/win/mf_initializer.cc diff --git a/media/mojo/mojom/stable/native_pixmap_handle_mojom_traits.cc b/media/mojo/mojom/stable/native_pixmap_handle_mojom_traits.cc --- a/media/mojo/mojom/stable/native_pixmap_handle_mojom_traits.cc +++ b/media/mojo/mojom/stable/native_pixmap_handle_mojom_traits.cc -@@ -27,7 +27,7 @@ std::vector& StructTraits< +@@ -27,7 +27,7 @@ uint32_t StructTraits< + decltype( + media::stable::mojom::NativePixmapPlane::stride)>::value, + "Unexpected type for gfx::NativePixmapPlane::stride. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + return plane.stride; + } +@@ -41,7 +41,7 @@ uint64_t StructTraits< + decltype( + media::stable::mojom::NativePixmapPlane::offset)>::value, + "Unexpected type for gfx::NativePixmapPlane::offset. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + return plane.offset; + } +@@ -55,7 +55,7 @@ uint64_t StructTraits< + decltype( + media::stable::mojom::NativePixmapPlane::size)>::value, + "Unexpected type for gfx::NativePixmapPlane::size. If you need to change " +- "this assertion, please contact chromeos-gfx-video@google.com."); ++ "this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + + return plane.size; + } +@@ -68,7 +68,7 @@ mojo::PlatformHandle StructTraits< + std::is_same::value, + "Unexpected type for gfx::NativePixmapPlane::fd. If you need to change " +- "this assertion, please contact chromeos-gfx-video@google.com."); ++ "this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + CHECK(plane.fd.is_valid()); + return mojo::PlatformHandle(std::move(plane.fd)); + } +@@ -98,7 +98,7 @@ std::vector& StructTraits< decltype(::gfx::NativePixmapHandle::planes), decltype(media::stable::mojom::NativePixmapHandle::planes)>::value, "Unexpected type for gfx::NativePixmapHandle::planes. If you need to " @@ -31340,7 +31724,7 @@ diff --git a/media/mojo/mojom/stable/native_pixmap_handle_mojom_traits.cc b/medi return pixmap_handle.planes; } -@@ -42,7 +42,7 @@ StructTraits::value, "Unexpected type for gfx::NativePixmapHandle::modifier. If you need to " @@ -31352,7 +31736,7 @@ diff --git a/media/mojo/mojom/stable/native_pixmap_handle_mojom_traits.cc b/medi diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc b/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc --- a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc +++ b/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -59,7 +59,7 @@ StructTraits::value, "Unexpected type for gfx::ColorSpace::primaries_. If you need to " @@ -31361,7 +31745,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.primaries_; } -@@ -71,7 +71,7 @@ StructTraits::value, "Unexpected type for gfx::ColorSpace::transfer_. If you need to " @@ -31370,7 +31754,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.transfer_; } -@@ -83,7 +83,7 @@ StructTraits::matrix( +@@ -91,7 +91,7 @@ StructTraits::matrix( std::is_same::value, "Unexpected type for gfx::ColorSpace::matrix_. If you need to " @@ -31379,7 +31763,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.matrix_; } -@@ -95,7 +95,7 @@ StructTraits::range( +@@ -103,7 +103,7 @@ StructTraits::range( std::is_same::value, "Unexpected type for gfx::ColorSpace::range_. If you need to " @@ -31388,7 +31772,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.range_; } -@@ -108,7 +108,7 @@ base::span StructTraits< +@@ -116,7 +116,7 @@ base::span StructTraits< float[9]>::value, "Unexpected type for gfx::ColorSpace::custom_primary_matrix_. If you " "need to change this assertion, please contact " @@ -31397,7 +31781,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.custom_primary_matrix_; } -@@ -120,7 +120,7 @@ StructTraits::value, "Unexpected type for gfx::ColorSpace::transfer_params_. If you need to " @@ -31406,7 +31790,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.transfer_params_; } -@@ -160,7 +160,7 @@ const gfx::PointF& StructTraits< +@@ -168,7 +168,7 @@ const gfx::PointF& StructTraits< decltype( media::stable::mojom::ColorVolumeMetadata::primary_r)>::value, "Unexpected type for gfx::ColorVolumeMetadata::primary_r. If you need to " @@ -31415,7 +31799,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.primary_r; } -@@ -176,7 +176,7 @@ const gfx::PointF& StructTraits< +@@ -184,7 +184,7 @@ const gfx::PointF& StructTraits< decltype( media::stable::mojom::ColorVolumeMetadata::primary_g)>::value, "Unexpected type for gfx::ColorVolumeMetadata::primary_g. If you need to " @@ -31424,7 +31808,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.primary_g; } -@@ -192,7 +192,7 @@ const gfx::PointF& StructTraits< +@@ -200,7 +200,7 @@ const gfx::PointF& StructTraits< decltype( media::stable::mojom::ColorVolumeMetadata::primary_b)>::value, "Unexpected type for gfx::ColorVolumeMetadata::primary_b. If you need to " @@ -31433,7 +31817,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.primary_b; } -@@ -209,7 +209,7 @@ const gfx::PointF& StructTraits< +@@ -217,7 +217,7 @@ const gfx::PointF& StructTraits< media::stable::mojom::ColorVolumeMetadata::white_point)>::value, "Unexpected type for gfx::ColorVolumeMetadata::white_point. If you need " "to change this assertion, please contact " @@ -31442,7 +31826,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.white_point; } -@@ -225,7 +225,7 @@ float StructTraits::value, "Unexpected type for gfx::ColorVolumeMetadata::luminance_max. If you " "need to change this assertion, please contact " @@ -31451,7 +31835,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.luminance_max; } -@@ -241,7 +241,7 @@ float StructTraits::value, "Unexpected type for gfx::ColorVolumeMetadata::luminance_min. If you " "need to change this assertion, please contact " @@ -31460,7 +31844,124 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.luminance_min; } -@@ -276,7 +276,7 @@ StructTraits::value, + "Unexpected type for media::DecoderBuffer::timestamp(). If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + if (!input->end_of_stream()) + return input->timestamp(); + return base::TimeDelta(); +@@ -296,7 +296,7 @@ base::TimeDelta StructTraits::value, + "Unexpected type for media::DecoderBuffer::duration(). If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + if (!input->end_of_stream()) + return input->duration(); + return base::TimeDelta(); +@@ -313,7 +313,7 @@ bool StructTraits::value, + "Unexpected type for media::DecoderBuffer::end_of_stream(). If you need " + "to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + return input->end_of_stream(); + } + +@@ -324,7 +324,7 @@ uint32_t StructTraitsdata_size()), size_t>::value, + "Unexpected type for media::DecoderBuffer::data_size(). If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + if (!input->end_of_stream()) + return base::checked_cast(input->data_size()); + return 0u; +@@ -340,7 +340,7 @@ bool StructTraits::value, + "Unexpected type for media::DecoderBuffer::is_key_frame(). If you need " + "to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + if (!input->end_of_stream()) + return input->is_key_frame(); + return false; +@@ -353,11 +353,11 @@ std::vector StructTraitsside_data()), const uint8_t*>::value, + "Unexpected type for media::DecoderBuffer::side_data(). If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + static_assert(std::is_sameside_data_size()), size_t>::value, + "Unexpected type for media::DecoderBuffer::side_data_size(). " + "If you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + if (input->end_of_stream() || !input->side_data()) + return {}; + CHECK_GT(input->side_data_size(), 0u); +@@ -375,14 +375,14 @@ StructTraits::value, + "Unexpected type for media::DecoderBuffer::decrypt_config(). " + "If you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + static_assert( + std::is_same< + decltype(input->decrypt_config()->Clone()), + decltype(media::stable::mojom::DecoderBuffer::decrypt_config)>::value, + "Unexpected type for media::DecoderBuffer::decrypt_config()->Clone(). If " + "you need to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + if (input->end_of_stream() || !input->decrypt_config()) + return nullptr; + std::unique_ptr decrypt_config = +@@ -399,13 +399,13 @@ base::TimeDelta StructTraitsdiscard_padding()), + const std::pair&>::value, + "Unexpected type for input->discard_padding(). If you need to change " +- "this assertion, please contact chromeos-gfx-video@google.com."); ++ "this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + static_assert( + std::is_same< + decltype(input->discard_padding().first), + decltype(media::stable::mojom::DecoderBuffer::front_discard)>::value, + "Unexpected type for input->discard_padding().first. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + if (!input->end_of_stream()) + return input->discard_padding().first; + return base::TimeDelta(); +@@ -419,13 +419,13 @@ base::TimeDelta StructTraitsdiscard_padding()), + const std::pair&>::value, + "Unexpected type for input->discard_padding(). If you need to change " +- "this assertion, please contact chromeos-gfx-video@google.com."); ++ "this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + static_assert( + std::is_same< + decltype(input->discard_padding().second), + decltype(media::stable::mojom::DecoderBuffer::back_discard)>::value, + "Unexpected type for input->discard_padding().second. If you need to " +- "change this assertion, please contact chromeos-gfx-video@google.com."); ++ "change this assertion, please contact chromeos-gfx-video@9oo91e.qjz9zk."); + if (!input->end_of_stream()) + return input->discard_padding().second; + return base::TimeDelta(); +@@ -479,7 +479,7 @@ bool StructTraits>::value, + "Unexpected type for media::DecoderBuffer::DiscardPadding. If you need " + "to change this assertion, please contact " +- "chromeos-gfx-video@google.com."); ++ "chromeos-gfx-video@9oo91e.qjz9zk."); + media::DecoderBuffer::DiscardPadding discard_padding(front_discard, + back_discard); + decoder_buffer->set_discard_padding(discard_padding); +@@ -500,7 +500,7 @@ StructTraits::value, "Unexpected type for media::DecryptConfig::encryption_scheme(). If you " "need to change this assertion, please contact " @@ -31469,7 +31970,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->encryption_scheme(); } -@@ -291,7 +291,7 @@ const std::string& StructTraits::type>:: type>::value, "Unexpected type for media::DecryptConfig::key_id(). If you need to " @@ -31478,7 +31979,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->key_id(); } -@@ -306,7 +306,7 @@ const std::string& StructTraits::type>::type>::value, "Unexpected type for media::DecryptConfig::iv(). If you need to " @@ -31487,7 +31988,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->iv(); } -@@ -323,7 +323,7 @@ StructTraits::type>::type>:: value, "Unexpected type for media::DecryptConfig::subsamples(). If you need to " @@ -31496,7 +31997,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->subsamples(); } -@@ -341,7 +341,7 @@ StructTraits::value, "Unexpected type for media::DecryptConfig::encryption_pattern(). If you " "need to change this assertion, please contact " @@ -31505,7 +32006,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->encryption_pattern(); } -@@ -386,7 +386,7 @@ uint32_t StructTraits< +@@ -610,7 +610,7 @@ uint32_t StructTraits< max_content_light_level)>::value, "Unexpected type for gfx::HDRMetadata::max_content_light_level. If you " "need to change this assertion, please contact " @@ -31514,7 +32015,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.max_content_light_level; } -@@ -401,7 +401,7 @@ StructTraits:: +@@ -625,7 +625,7 @@ StructTraits:: max_frame_average_light_level)>::value, "Unexpected type for gfx::HDRMetadata::max_frame_average_light_level. If " "you need to change this assertion, please contact " @@ -31523,7 +32024,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.max_frame_average_light_level; } -@@ -417,7 +417,7 @@ const gfx::ColorVolumeMetadata& StructTraits< +@@ -641,7 +641,7 @@ const gfx::ColorVolumeMetadata& StructTraits< media::stable::mojom::HDRMetadata::color_volume_metadata)>::value, "Unexpected type for gfx::HDRMetadata::color_volume_metadata. If you " "need to change this assertion, please contact " @@ -31532,7 +32033,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.color_volume_metadata; } -@@ -442,7 +442,7 @@ StructTraits::value, "Unexpected type for media::MediaLogRecord::id. If you " "need to change this assertion, please contact " @@ -31541,7 +32042,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.id; } -@@ -456,7 +456,7 @@ StructTraits::value, "Unexpected type for media::MediaLogRecord::type. If you " "need to change this assertion, please contact " @@ -31550,7 +32051,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.type; } -@@ -469,7 +469,7 @@ const base::Value& StructTraits< +@@ -693,7 +693,7 @@ const base::Value& StructTraits< base::DictionaryValue>::value, "Unexpected type for media::MediaLogRecord::params. If you " "need to change this assertion, please contact " @@ -31559,7 +32060,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.params; } -@@ -483,7 +483,7 @@ StructTraits::value, "Unexpected type for media::MediaLogRecord::time. If you " "need to change this assertion, please contact " @@ -31568,7 +32069,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.time; } -@@ -520,7 +520,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -744,7 +744,7 @@ const gfx::GpuMemoryBufferId& StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandle::id)>::value, "Unexpected type for gfx::GpuMemoryBufferHandle::id. If you " "need to change this assertion, please contact " @@ -31577,7 +32078,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.id; } -@@ -558,7 +558,7 @@ media::stable::mojom::StatusCode StructTraits< +@@ -789,7 +789,7 @@ media::stable::mojom::StatusCode StructTraits< static_assert( std::is_same_v, "Unexpected type for media::internal::StatusData::code. If you need to " @@ -31586,7 +32087,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc // TODO(b/215438024): enforce that this check implies that the input.code // really corresponds to media::DecoderStatusTraits::Codes. -@@ -569,7 +569,7 @@ media::stable::mojom::StatusCode StructTraits< +@@ -800,7 +800,7 @@ media::stable::mojom::StatusCode StructTraits< uint16_t>, "Unexpected underlying type for media::DecoderStatusTraits::Codes. If " "you need to change this assertion, please contact " @@ -31595,7 +32096,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc if (input.code == static_cast(media::DecoderStatusTraits::Codes::kOk)) { return media::stable::mojom::StatusCode::kOk; -@@ -588,7 +588,7 @@ std::string StructTraits::value, "Unexpected type for media::internal::StatusData::group. If you need to " @@ -31604,7 +32105,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc CHECK(input.group == media::DecoderStatusTraits::Group()); -@@ -604,7 +604,7 @@ std::string StructTraits::value, "Unexpected type for media::internal::StatusData::message. If you need " "to change this assertion, please contact " @@ -31613,7 +32114,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.message; } -@@ -618,7 +618,7 @@ base::span StructTraits< +@@ -849,7 +849,7 @@ base::span StructTraits< std::is_same::value, "Unexpected type for media::internal::StatusData::frames. If you need to " @@ -31622,7 +32123,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.frames; } -@@ -634,14 +634,14 @@ absl::optional StructTraits< +@@ -865,14 +865,14 @@ absl::optional StructTraits< media::stable::mojom::StatusData::cause)::value_type>:: type>::value, "Unexpected type for media::internal::StatusData::cause. If you need to " @@ -31639,7 +32140,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc #if BUILDFLAG(USE_VAAPI) static_assert( -@@ -649,24 +649,24 @@ absl::optional StructTraits< +@@ -880,24 +880,24 @@ absl::optional StructTraits< uint16_t>, "Unexpected underlying type for media::VaapiStatusTraits::Codes. If " "you need to change this assertion, please contact " @@ -31668,7 +32169,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc #endif if (input.cause) { -@@ -674,12 +674,12 @@ absl::optional StructTraits< +@@ -905,12 +905,12 @@ absl::optional StructTraits< static_assert( std::is_same_v, "Unexpected type for output_cause.code. If you need to change this " @@ -31683,7 +32184,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc // TODO(b/215438024): enforce that these checks imply that the // output_cause.code really corresponds to media::VaapiStatusTraits::Codes -@@ -712,7 +712,7 @@ const base::Value& StructTraits::value, "Unexpected type for media::internal::StatusData::data::Clone(). If you " "need to change this assertion, please contact " @@ -31692,7 +32193,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.data; } -@@ -725,14 +725,14 @@ bool StructTraitscode), media::StatusCodeType>::value, "Unexpected type for media::internal::StatusData::code. If you need to " @@ -31709,7 +32210,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc switch (data.code()) { case media::stable::mojom::StatusCode::kOk: -@@ -788,7 +788,7 @@ mojo::OptionalAsPointer StructTraits< +@@ -1019,7 +1019,7 @@ mojo::OptionalAsPointer StructTraits< media::stable::mojom::Status::internal)::value_type>:: type>::value, "Unexpected type for media::DecoderStatus::data_. If you need to " @@ -31718,7 +32219,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc CHECK(input.data_ || input.is_ok()); -@@ -821,7 +821,7 @@ StructTraits::value, "Unexpected type for media::SupportedVideoDecoderConfig::profile_min. If " "you need to change this assertion, please contact " @@ -31727,7 +32228,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.profile_min; } -@@ -837,7 +837,7 @@ StructTraits::value, "Unexpected type for media::SupportedVideoDecoderConfig::profile_max. If " "you need to change this assertion, please contact " @@ -31736,7 +32237,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.profile_max; } -@@ -854,7 +854,7 @@ StructTraits::value, "Unexpected type for media::SupportedVideoDecoderConfig::coded_size_min. " "If you need to change this assertion, please contact " @@ -31745,7 +32246,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.coded_size_min; } -@@ -871,7 +871,7 @@ StructTraits::value, "Unexpected type for media::SupportedVideoDecoderConfig::coded_size_max. " "If you need to change this assertion, please contact " @@ -31754,7 +32255,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.coded_size_max; } -@@ -887,7 +887,7 @@ bool StructTraits::value, "Unexpected type for " "media::SupportedVideoDecoderConfig::allow_encrypted. If you need to " @@ -31763,7 +32264,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.allow_encrypted; } -@@ -903,7 +903,7 @@ bool StructTraits::value, "Unexpected type for " "media::SupportedVideoDecoderConfig::require_encrypted. If you need to " @@ -31772,7 +32273,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.require_encrypted; } -@@ -940,7 +940,7 @@ uint32_t StructTraits< +@@ -1171,7 +1171,7 @@ uint32_t StructTraits< decltype(::media::SubsampleEntry::clear_bytes), decltype(media::stable::mojom::SubsampleEntry::clear_bytes)>::value, "Unexpected type for media::SubsampleEntry::clear_bytes. If you need to " @@ -31781,7 +32282,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.clear_bytes; } -@@ -954,7 +954,7 @@ uint32_t StructTraits< +@@ -1185,7 +1185,7 @@ uint32_t StructTraits< decltype(::media::SubsampleEntry::cypher_bytes), decltype(media::stable::mojom::SubsampleEntry::cypher_bytes)>::value, "Unexpected type for media::SubsampleEntry::cypher_bytes. If you need to " @@ -31790,7 +32291,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.cypher_bytes; } -@@ -977,7 +977,7 @@ media::VideoCodec StructTraits< +@@ -1208,7 +1208,7 @@ media::VideoCodec StructTraits< decltype( media::stable::mojom::VideoDecoderConfig::codec)>::value, "Unexpected type for media::VideoDecoderConfig::codec(). If you need to " @@ -31799,7 +32300,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.codec(); } -@@ -993,7 +993,7 @@ media::VideoCodecProfile StructTraits< +@@ -1224,7 +1224,7 @@ media::VideoCodecProfile StructTraits< decltype(media::stable::mojom::VideoDecoderConfig::profile)>::value, "Unexpected type for media::VideoDecoderConfig::profile(). If you need " "to change this assertion, please contact " @@ -31808,7 +32309,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.profile(); } -@@ -1006,7 +1006,7 @@ bool StructTraits::value, "Unexpected type for media::VideoDecoderConfig::alpha_mode(). " "If you need to change this assertion, please contact " @@ -31817,7 +32318,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc // This is deliberately written as a switch so that we get alerted when // someone makes changes to media::VideoDecoderConfig::AlphaMode. -@@ -1032,7 +1032,7 @@ const gfx::Size& StructTraits::type>::value, "Unexpected type for media::VideoDecoderConfig::coded_size(). If you " "need to change this assertion, please contact " @@ -31826,7 +32327,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.coded_size(); } -@@ -1049,7 +1049,7 @@ const gfx::Rect& StructTraits::value, "Unexpected type for media::VideoDecoderConfig::visible_rect(). If you " "need to change this assertion, please contact " @@ -31835,7 +32336,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.visible_rect(); } -@@ -1066,7 +1066,7 @@ const gfx::Size& StructTraits::value, "Unexpected type for media::VideoDecoderConfig::natural_size(). If you " "need to change this assertion, please contact " @@ -31844,7 +32345,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.natural_size(); } -@@ -1083,7 +1083,7 @@ const std::vector& StructTraits< +@@ -1314,7 +1314,7 @@ const std::vector& StructTraits< type>::type>::value, "Unexpected type for media::VideoDecoderConfig::extra_data(). If you " "need to change this assertion, please contact " @@ -31853,7 +32354,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.extra_data(); } -@@ -1099,7 +1099,7 @@ StructTraits::value, "Unexpected type for media::VideoDecoderConfig::encryption_scheme(). If " "you need to change this assertion, please contact " @@ -31862,7 +32363,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.encryption_scheme(); } -@@ -1114,7 +1114,7 @@ StructTraits::value, "Unexpected type for media::VideoDecoderConfig::color_space_info(). If " "you need to change this assertion, please contact " @@ -31871,7 +32372,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.color_space_info().ToGfxColorSpace(); } -@@ -1132,7 +1132,7 @@ const absl::optional& StructTraits< +@@ -1363,7 +1363,7 @@ const absl::optional& StructTraits< type>::value, "Unexpected type for media::VideoDecoderConfig::hdr_metadata(). If you " "need to change this assertion, please contact " @@ -31880,7 +32381,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.hdr_metadata(); } -@@ -1146,7 +1146,7 @@ uint32_t StructTraits< +@@ -1377,7 +1377,7 @@ uint32_t StructTraits< decltype( media::stable::mojom::VideoDecoderConfig::level)>::value, "Unexpected type for media::VideoDecoderConfig::level(). If you need to " @@ -31889,7 +32390,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.level(); } -@@ -1220,7 +1220,7 @@ media::VideoPixelFormat StructTraits::value, "Unexpected type for media::VideoFrame::format(). If you " "need to change this assertion, please contact " @@ -31898,7 +32399,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->format(); } -@@ -1236,7 +1236,7 @@ const gfx::Size& StructTraits::value, "Unexpected type for media::VideoFrame::coded_size(). If you " "need to change this assertion, please contact " @@ -31907,7 +32408,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->coded_size(); } -@@ -1252,7 +1252,7 @@ const gfx::Rect& StructTraits::value, "Unexpected type for media::VideoFrame::visible_rect(). If you " "need to change this assertion, please contact " @@ -31916,7 +32417,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->visible_rect(); } -@@ -1268,7 +1268,7 @@ const gfx::Size& StructTraits::value, "Unexpected type for media::VideoFrame::natural_size(). If you " "need to change this assertion, please contact " @@ -31925,7 +32426,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->natural_size(); } -@@ -1283,7 +1283,7 @@ base::TimeDelta StructTraits::value, "Unexpected type for media::VideoFrame::timestamp(). If you " "need to change this assertion, please contact " @@ -31934,7 +32435,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->timestamp(); } -@@ -1298,7 +1298,7 @@ gfx::ColorSpace StructTraits::value, "Unexpected type for media::VideoFrame::ColorSpace(). If you " "need to change this assertion, please contact " @@ -31943,7 +32444,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->ColorSpace(); } -@@ -1315,7 +1315,7 @@ StructTraits::value, "Unexpected type for media::VideoFrame::hdr_metadata(). If you " "need to change this assertion, please contact " @@ -31952,7 +32453,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->hdr_metadata(); } -@@ -1340,7 +1340,7 @@ StructTraits::type>::value, "Unexpected type for media::VideoFrame::metadata(). If you " "need to change this assertion, please contact " @@ -31961,7 +32462,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input->metadata(); } -@@ -1456,7 +1456,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::allow_overlay. If you " "need to change this assertion, please contact " @@ -31970,7 +32471,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.allow_overlay; } -@@ -1472,7 +1472,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::end_of_stream. If you " "need to change this assertion, please contact " @@ -31979,7 +32480,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.end_of_stream; } -@@ -1488,7 +1488,7 @@ bool StructTraits::value, "Unexpected type for " "media::VideoFrameMetadata::read_lock_fences_enabled. If you need to " @@ -31988,7 +32489,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.read_lock_fences_enabled; } -@@ -1503,7 +1503,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::protected_video. If you " "need to change this assertion, please contact " @@ -31997,7 +32498,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.protected_video; } -@@ -1519,7 +1519,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::hw_protected. If you " "need to change this assertion, please contact " @@ -32006,7 +32507,7 @@ diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc return input.hw_protected; } -@@ -1534,7 +1534,7 @@ bool StructTraits::value, "Unexpected type for media::VideoFrameMetadata::power_efficient. If you " "need to change this assertion, please contact " @@ -32868,7 +33369,7 @@ diff --git a/native_client_sdk/src/web/manifest.html b/native_client_sdk/src/web diff --git a/net/base/network_change_notifier_mac.mm b/net/base/network_change_notifier_mac.mm --- a/net/base/network_change_notifier_mac.mm +++ b/net/base/network_change_notifier_mac.mm -@@ -212,7 +212,7 @@ void NetworkChangeNotifierMac::SetInitialConnectionType() { +@@ -208,7 +208,7 @@ void NetworkChangeNotifierMac::SetInitialConnectionType() { // Try to reach 0.0.0.0. This is the approach taken by Firefox: // @@ -32944,7 +33445,7 @@ diff --git a/net/dns/dns_test_util.h b/net/dns/dns_test_util.h diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -409,7 +409,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -419,7 +419,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { data: "The domain name that is being requested" destination: OTHER destination_other: "The user configured DNS over HTTPS server, which" @@ -33002,7 +33503,7 @@ diff --git a/net/http/webfonts_histogram.cc b/net/http/webfonts_histogram.cc diff --git a/net/log/file_net_log_observer.cc b/net/log/file_net_log_observer.cc --- a/net/log/file_net_log_observer.cc +++ b/net/log/file_net_log_observer.cc -@@ -827,7 +827,7 @@ void FileNetLogObserver::FileWriter::CreateInprogressDirectory() { +@@ -826,7 +826,7 @@ void FileNetLogObserver::FileWriter::CreateInprogressDirectory() { "If logging was interrupted, you can stitch a NetLog file out of the\n" ".inprogress directory manually using:\n" "\n" @@ -33014,7 +33515,7 @@ diff --git a/net/log/file_net_log_observer.cc b/net/log/file_net_log_observer.cc diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_verifier_chromium.cc --- a/net/quic/crypto/proof_verifier_chromium.cc +++ b/net/quic/crypto/proof_verifier_chromium.cc -@@ -199,7 +199,7 @@ ProofVerifierChromium::Job::~Job() { +@@ -200,7 +200,7 @@ ProofVerifierChromium::Job::~Job() { UMA_HISTOGRAM_TIMES("Net.QuicSession.VerifyProofTime", end_time - start_time_); // |hostname_| will always be canonicalized to lowercase. @@ -33026,7 +33527,7 @@ diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc -@@ -2250,10 +2250,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( +@@ -2246,10 +2246,10 @@ QuicStreamFactory::CreateCryptoConfigHandle( quic::QuicCryptoClientConfig* crypto_config = crypto_config_owner->config(); crypto_config->set_user_agent_id(params_.user_agent_id); @@ -33407,7 +33908,7 @@ diff --git a/remoting/host/it2me/it2me_constants.cc b/remoting/host/it2me/it2me_ diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux_me2me_host.py --- a/remoting/host/linux/linux_me2me_host.py +++ b/remoting/host/linux/linux_me2me_host.py -@@ -1882,7 +1882,7 @@ def watch_for_resolution_changes(initial_size): +@@ -1886,7 +1886,7 @@ def watch_for_resolution_changes(initial_size): def setup_argument_parser(): EPILOG = """This script is not intended for use by end-users. To configure Chrome Remote Desktop, please install the app from the Chrome @@ -33416,7 +33917,7 @@ diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux parser = argparse.ArgumentParser( usage="Usage: %(prog)s [options] [ -- [ X server options ] ]", epilog=EPILOG) -@@ -2092,7 +2092,7 @@ def main(): +@@ -2096,7 +2096,7 @@ def main(): "WARNING: This system uses GDM. Some GDM versions have a bug that " "prevents local login while Chrome Remote Desktop is running. If you " "run into this issue, you can stop Chrome Remote Desktop by visiting " @@ -33549,7 +34050,7 @@ diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session. diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd --- a/remoting/resources/remoting_strings.grd +++ b/remoting/resources/remoting_strings.grd -@@ -573,7 +573,7 @@ +@@ -580,7 +580,7 @@ Welcome to Chrome Remote Desktop @@ -33558,7 +34059,7 @@ diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoti Follow the instructions to set up your computer for remote access After setup is complete, refresh this page, then you'll be able to access the computer by choosing your device and entering the PIN -@@ -672,7 +672,7 @@ +@@ -679,7 +679,7 @@ @@ -33567,7 +34068,7 @@ diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoti -@@ -685,7 +685,7 @@ +@@ -692,7 +692,7 @@ @@ -33576,7 +34077,7 @@ diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoti $1My Linux desktop (offline) -@@ -937,7 +937,7 @@ If '$3org.chromium.chromoting.me2me.sh$3org.chromium.chromoting.me2me.sh @@ -33635,7 +34136,7 @@ diff --git a/remoting/tools/zip2msi.py b/remoting/tools/zip2msi.py diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc -@@ -294,7 +294,7 @@ void PingRlzServer(std::string url, +@@ -293,7 +293,7 @@ void PingRlzServer(std::string url, "1- Non-unique cohort tag of when Chromium was installed.\n" "2- Unique machine id on desktop platforms.\n" "3- Whether Google is the default omnibox search.\n" @@ -33695,7 +34196,7 @@ diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -467,7 +467,7 @@ NtQueryObjectFunction g_QueryObject = NULL; +@@ -445,7 +445,7 @@ NtQueryObjectFunction g_QueryObject = NULL; static const char* kDuplicateHandleWarning = "You are attempting to duplicate a privileged handle into a sandboxed" @@ -33864,7 +34365,7 @@ diff --git a/testing/scripts/common.py b/testing/scripts/common.py diff --git a/testing/test.gni b/testing/test.gni --- a/testing/test.gni +++ b/testing/test.gni -@@ -1017,7 +1017,7 @@ set_defaults("test") { +@@ -1090,7 +1090,7 @@ set_defaults("test") { if (is_mac) { # TODO(lgrey): Maybe restore this. # Don't strip tests for visibility into test crashes/hangs. @@ -33994,7 +34495,7 @@ diff --git a/testing/variations/PRESUBMIT.py b/testing/variations/PRESUBMIT.py diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json -@@ -676,7 +676,7 @@ +@@ -648,7 +648,7 @@ { "name": "Enabled_20210611", "params": { @@ -34003,7 +34504,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati }, "enable_features": [ "AutofillAssistantInCctTriggering", -@@ -1282,7 +1282,7 @@ +@@ -1378,7 +1378,7 @@ { "name": "EnabledWithAllowedWebsites_20210922", "params": { @@ -34011,8 +34512,8 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati + "allowed_websites": "https://www.y0u1ub3.qjz9zk|/embed,https://www.9oo91e.qjz9zk|/maps/embed,https://platform.twitter.com|/embed,https://www.redditmedia.com|embed=true,https://www.instagram.com|/embed" }, "enable_features": [ - "AutomaticLazyFrameLoadingToEmbeds" -@@ -2859,7 +2859,7 @@ + "AutomaticLazyFrameLoadingToEmbedUrls", +@@ -2951,7 +2951,7 @@ "params": { "DnsHttpssvcControlDomainWildcard": "true", "DnsHttpssvcEnableQueryOverInsecure": "true", @@ -34021,7 +34522,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "DnsHttpssvcExtraTimeMs": "50", "DnsHttpssvcExtraTimePercent": "20", "DnsHttpssvcUseHttpssvc": "true", -@@ -5648,14 +5648,14 @@ +@@ -6059,14 +6059,14 @@ { "name": "Prefetch_2_20220214", "params": { @@ -34038,16 +34539,16 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "use_speculation_rules": "true" }, "enable_features": [ -@@ -5753,7 +5753,7 @@ +@@ -6176,7 +6176,7 @@ { - "name": "EnabledExploreAndServerRankingSegmentation2", + "name": "EnabledExploreAndServerRankingAndRawTrendingSegmentation2", "params": { - "base_url": "https://chromeupboarding-pa.googleapis.com", + "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "experiment_tag": "{maxLevels : 1, rankTiles : true}", + "experiment_tag": "{maxLevels : 1, rankTiles : true, enableTrending : true, maxTrendingQueries : 8, disableEntityTranslation: true}", "image_prefetch_mode": "top", "is_unmetered_network_required": "false", -@@ -5778,7 +5778,7 @@ +@@ -6201,7 +6201,7 @@ { "name": "EnabledExploreAndTrendingSegmentation2", "params": { @@ -34056,16 +34557,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati "behavioural_targeting": "model_comparison", "experiment_tag": "{maxLevels : 1, enableTrending : true, maxTrendingQueries : 8}", "image_prefetch_mode": "top", -@@ -5805,7 +5805,7 @@ - { - "name": "EnabledExploreAndServerRankingAndRawTrendingSegmentation2", - "params": { -- "base_url": "https://chromeupboarding-pa.googleapis.com", -+ "base_url": "https://chromeupboarding-pa.9oo91eapis.qjz9zk", - "behavioural_targeting": "model_comparison", - "experiment_tag": "{maxLevels : 1, rankTiles : true, enableTrending : true, maxTrendingQueries : 8, disableEntityTranslation: true}", - "image_prefetch_mode": "top", -@@ -7549,7 +7549,7 @@ +@@ -8123,7 +8123,7 @@ { "name": "Enabled", "params": { @@ -35473,7 +35965,7 @@ diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/bl for more details. Note that all output references are relative to the output directory which is specified at build time. --> -@@ -669,14 +669,14 @@ below: +@@ -671,14 +671,14 @@ below: # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at @@ -35490,7 +35982,7 @@ diff --git a/third_party/blink/public/strings/blink_strings.grd b/third_party/bl # # The Initial Developer of the Original Code is # Netscape Communications Corporation. -@@ -685,7 +685,7 @@ below: +@@ -687,7 +687,7 @@ below: # # Contributor(s): # Mitch (original author) @@ -35511,30 +36003,6 @@ diff --git a/third_party/blink/renderer/bindings/PRESUBMIT.py b/third_party/blin for more details about the presubmit API built into gcl. """ -diff --git a/third_party/blink/renderer/bindings/scripts/blink_idl_lexer.py b/third_party/blink/renderer/bindings/scripts/blink_idl_lexer.py ---- a/third_party/blink/renderer/bindings/scripts/blink_idl_lexer.py -+++ b/third_party/blink/renderer/bindings/scripts/blink_idl_lexer.py -@@ -47,7 +47,7 @@ PLY: - http://www.dabeaz.com/ply/ - - Design doc: --http://www.chromium.org/developers/design-documents/idl-compiler#TOC-Front-end -+http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler#TOC-Front-end - """ - - # Disable attribute validation, as lint can't import parent class to check -diff --git a/third_party/blink/renderer/bindings/scripts/blink_idl_parser.py b/third_party/blink/renderer/bindings/scripts/blink_idl_parser.py ---- a/third_party/blink/renderer/bindings/scripts/blink_idl_parser.py -+++ b/third_party/blink/renderer/bindings/scripts/blink_idl_parser.py -@@ -41,7 +41,7 @@ PLY: - http://www.dabeaz.com/ply/ - - Design doc: --http://www.chromium.org/developers/design-documents/idl-compiler#TOC-Front-end -+http://www.ch40m1um.qjz9zk/developers/design-documents/idl-compiler#TOC-Front-end - """ - - # Disable check for line length and Member as Function due to how grammar rules diff --git a/third_party/blink/renderer/bindings/scripts/utilities.py b/third_party/blink/renderer/bindings/scripts/utilities.py --- a/third_party/blink/renderer/bindings/scripts/utilities.py +++ b/third_party/blink/renderer/bindings/scripts/utilities.py @@ -35559,7 +36027,7 @@ diff --git a/third_party/blink/renderer/build/scripts/update_css_ranking.py b/th CSS_RANKING_FILE = "../../core/css/css_properties_ranking.json5" CSS_PROPERTIES = "../../core/css/css_properties.json5" CONFIG_FILE = "../../core/css/css_group_config.json5" -@@ -53,7 +53,7 @@ def update_css_ranking(css_ranking_file, css_ranking_api): +@@ -63,7 +63,7 @@ def update_css_ranking(css_ranking_file, css_ranking_api): "// The popularity ranking of all css properties the first properties is the most\n" ) fw.write( @@ -35580,22 +36048,10 @@ diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.cc b/th "details. Fallback font will be used while loading: " + font->Url().ElidedString())); -diff --git a/third_party/blink/renderer/core/css/svg.css b/third_party/blink/renderer/core/css/svg.css ---- a/third_party/blink/renderer/core/css/svg.css -+++ b/third_party/blink/renderer/core/css/svg.css -@@ -92,7 +92,7 @@ tspan, textPath { - @media ua-forced-colors { - svg { - /* -- TODO(sartang@microsoft.com): Remove forced-color-adjust: none once -+ TODO(sartang@m1cr050ft.qjz9zk): Remove forced-color-adjust: none once - forced-color-adjust: preserve-parent-color is enabled by default. - */ - forced-color-adjust: none; diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc -@@ -365,7 +365,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( +@@ -366,7 +366,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( "Registering mousewheel event as passive due to " "smoothscroll.js usage. The smoothscroll.js library is " "buggy, no longer necessary and degrades performance. See " @@ -35604,7 +36060,7 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_ } return; } -@@ -379,7 +379,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( +@@ -380,7 +380,7 @@ void EventTarget::SetDefaultAddEventListenerOptions( "Added non-passive event listener to a scroll-blocking '%s' event. " "Consider marking event handler as 'passive' to make the page more " "responsive. See " @@ -35628,7 +36084,7 @@ diff --git a/third_party/blink/renderer/core/events/touch_event.cc b/third_party diff --git a/third_party/blink/renderer/core/events/wheel_event.cc b/third_party/blink/renderer/core/events/wheel_event.cc --- a/third_party/blink/renderer/core/events/wheel_event.cc +++ b/third_party/blink/renderer/core/events/wheel_event.cc -@@ -151,7 +151,7 @@ void WheelEvent::preventDefault() { +@@ -152,7 +152,7 @@ void WheelEvent::preventDefault() { String message = "Unable to preventDefault inside passive event listener due to " "target being treated as passive. See " @@ -35642,7 +36098,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ +++ b/third_party/blink/renderer/core/frame/deprecation/deprecation.cc @@ -202,7 +202,7 @@ class DeprecationInfo final { return DeprecationInfo( - id, + DeprecationIssueType::kUntranslated, id, String::Format( - "%s See https://www.chromestatus.com/feature/%s for more details.", + "%s See https://www.ch40mestatus.qjz9zk/feature/%s for more details.", @@ -35650,7 +36106,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ } @@ -229,7 +229,7 @@ class DeprecationInfo final { - id, + DeprecationIssueType::kUntranslated, id, String::Format( "%s is deprecated and will be removed in %s. See " - "https://www.chromestatus.com/feature/%s for more details.", @@ -35659,7 +36115,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ chrome_status_id.Ascii().c_str())); } @@ -246,7 +246,7 @@ class DeprecationInfo final { - id, + DeprecationIssueType::kUntranslated, id, String::Format( "%s is deprecated and will be removed in %s. Please use %s " - "instead. See https://www.chromestatus.com/feature/%s for more " @@ -35667,7 +36123,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ "details.", feature.Ascii().c_str(), MilestoneString(milestone).Ascii().c_str(), replacement.Ascii().c_str(), chrome_status_id.Ascii().c_str())); -@@ -350,7 +350,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -362,7 +362,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "getCurrentPosition() and watchPosition() no longer work on insecure " "origins. To use this feature, you should consider switching your " "application to a secure origin, such as HTTPS. See " @@ -35676,7 +36132,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ case WebFeature::kGeolocationInsecureOriginDeprecatedNotRemoved: case WebFeature::kGeolocationInsecureOriginIframeDeprecatedNotRemoved: -@@ -359,7 +359,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -371,7 +371,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "getCurrentPosition() and watchPosition() are deprecated on insecure " "origins. To use this feature, you should consider switching your " "application to a secure origin, such as HTTPS. See " @@ -35685,7 +36141,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ case WebFeature::kGetUserMediaInsecureOrigin: case WebFeature::kGetUserMediaInsecureOriginIframe: -@@ -367,7 +367,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -379,7 +379,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "GetUserMediaInsecureOrigin", kUnknown, "getUserMedia() no longer works on insecure origins. To use this " "feature, you should consider switching your application to a secure " @@ -35694,7 +36150,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ case WebFeature::kMediaSourceAbortRemove: return DeprecationInfo::WithDetailsAndChromeStatusID( -@@ -397,7 +397,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -409,7 +409,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "NotificationInsecureOrigin", kUnknown, "The Notification API may no longer be used from insecure origins. " "You should consider switching your application to a secure origin, " @@ -35703,7 +36159,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ case WebFeature::kNotificationPermissionRequestedIframe: return DeprecationInfo::WithDetailsAndChromeStatusID( -@@ -540,7 +540,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -552,7 +552,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "SharedArrayBufferConstructedWithoutIsolation", kM92, String::Format("SharedArrayBuffer will require cross-origin " "isolation as of %s. See " @@ -35712,7 +36168,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ "enabling-shared-array-buffer/ for more details.", MilestoneString(kM92).Ascii().c_str())); -@@ -623,7 +623,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -621,7 +621,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "V8SharedArrayBufferConstructedInExtensionWithoutIsolation", kM96, "Extensions should opt into cross-origin isolation to continue using " "SharedArrayBuffer. See " @@ -35721,7 +36177,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ "cross-origin-isolation/."); case WebFeature::kCrossOriginWindowAlert: -@@ -661,7 +661,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -659,7 +659,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "Constructing a VideoFrame without a timestamp is deprecated and " "support will be removed in M99. Please provide a timestamp via " "VideoFrameInit. See " @@ -35730,7 +36186,7 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ "details."); case WebFeature::kDocumentDomainSettingWithoutOriginAgentClusterHeader: -@@ -676,7 +676,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { +@@ -674,7 +674,7 @@ const DeprecationInfo GetDeprecationInfo(const WebFeature feature) { "along with the HTTP response for the document and " "frames. See %s for more details.", MilestoneString(kM106).Ascii().c_str(), @@ -35742,16 +36198,16 @@ diff --git a/third_party/blink/renderer/core/frame/deprecation/deprecation.cc b/ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -1713,7 +1713,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, - "The frame attempting navigation of the top-level window is " - "sandboxed with the 'allow-top-navigation-by-user-activation' " - "flag, but has no user activation (aka gesture). See " -- "https://www.chromestatus.com/feature/5629582019395584."); -+ "https://www.ch40mestatus.qjz9zk/feature/5629582019395584."); +@@ -1728,7 +1728,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, + "The frame attempting navigation of the top-level window is " + "sandboxed with the 'allow-top-navigation-by-user-activation' " + "flag, but has no user activation (aka gesture). See " +- "https://www.chromestatus.com/feature/5629582019395584."); ++ "https://www.ch40mestatus.qjz9zk/feature/5629582019395584."); + } + return false; } - return false; - } -@@ -1814,7 +1814,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, +@@ -1840,7 +1840,7 @@ static bool CanNavigateHelper(LocalFrame& initiating_frame, "The frame attempting navigation is targeting its top-level window, " "but is neither same-origin with its target nor has it received a " "user gesture. See " @@ -35775,7 +36231,7 @@ diff --git a/third_party/blink/renderer/core/html/html_iframe_element.cc b/third diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc -@@ -33,10 +33,10 @@ namespace { +@@ -34,10 +34,10 @@ namespace { const char kWarningUnmuteFailed[] = "Unmuting failed and the element was paused instead because the user " @@ -35833,7 +36289,7 @@ diff --git a/third_party/blink/renderer/core/html/portal/html_portal_element.cc diff --git a/third_party/blink/renderer/core/loader/frame_loader.cc b/third_party/blink/renderer/core/loader/frame_loader.cc --- a/third_party/blink/renderer/core/loader/frame_loader.cc +++ b/third_party/blink/renderer/core/loader/frame_loader.cc -@@ -1726,7 +1726,7 @@ void FrameLoader::ReportLegacyTLSVersion(const KURL& url, +@@ -1767,7 +1767,7 @@ void FrameLoader::ReportLegacyTLSVersion(const KURL& url, "1.1, which are deprecated and will be disabled in the future. Once " "disabled, users will be prevented from loading these resources. " "Servers should enable TLS 1.2 or later. See " @@ -35842,7 +36298,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_loader.cc b/third_part "information."; } else { console_message = -@@ -1735,7 +1735,7 @@ void FrameLoader::ReportLegacyTLSVersion(const KURL& url, +@@ -1776,7 +1776,7 @@ void FrameLoader::ReportLegacyTLSVersion(const KURL& url, "1.1, which are deprecated and will be disabled in the future. Once " "disabled, users will be prevented from loading these resources. The " "server should enable TLS 1.2 or later. See " @@ -35968,7 +36424,7 @@ diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth_error.cc b/t diff --git a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc --- a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc +++ b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc -@@ -538,7 +538,7 @@ void ClipboardPromise::RequestPermission( +@@ -537,7 +537,7 @@ void ClipboardPromise::RequestPermission( constexpr char kFeaturePolicyMessage[] = "The Clipboard API has been blocked because of a permissions policy " @@ -36065,18 +36521,6 @@ diff --git a/third_party/blink/renderer/modules/payments/payment_request.cc b/th const char kUnknownCurrency[] = "ZZZ"; const char kAppStoreBillingLabelPlaceHolder[] = "AppStoreBillingPlaceHolder"; const char kSecurePaymentConfirmationMethod[] = "secure-payment-confirmation"; -diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc ---- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc -+++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc -@@ -334,7 +334,7 @@ webrtc::PeerConnectionInterface::RTCConfiguration ParseConfiguration( - "Plan B SDP semantics is a legacy version of the Session " - "Description Protocol that has severe compatibility issues on " - "modern browsers and is no longer supported. See " -- "https://www.chromestatus.com/feature/5823036655665152 for more " -+ "https://www.ch40mestatus.qjz9zk/feature/5823036655665152 for more " - "details, including the possibility of registering for a " - "Deprecation Trial in order to extend the Plan B deprecation " - "deadline for a limited amount of time."); diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc --- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc +++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc @@ -36098,7 +36542,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c 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 -@@ -587,14 +587,14 @@ bool AudioContext::IsAllowedToStart() const { +@@ -627,14 +627,14 @@ bool AudioContext::IsAllowedToStart() const { mojom::ConsoleMessageSource::kOther, mojom::ConsoleMessageLevel::kWarning, "The AudioContext was not allowed to start. It must be resumed (or " @@ -36532,9 +36976,9 @@ diff --git a/third_party/blink/tools/blinkpy/w3c/test_importer.py b/third_party/ TIMEOUT_SECONDS = 210 * 60 # Sheriff calendar URL, used for getting the ecosystem infra sheriff to cc. --ROTATIONS_URL = 'https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chrome-ecosystem-infra' +-ROTATIONS_URL = 'https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chromium-wpt-two-way-sync' -SHERIFF_EMAIL_FALLBACK = 'weizhong@google.com' -+ROTATIONS_URL = 'https://chrome-ops-rotation-proxy.8pp2p8t.qjz9zk/current/grotation:chrome-ecosystem-infra' ++ROTATIONS_URL = 'https://chrome-ops-rotation-proxy.8pp2p8t.qjz9zk/current/grotation:chromium-wpt-two-way-sync' +SHERIFF_EMAIL_FALLBACK = 'weizhong@9oo91e.qjz9zk' RUBBER_STAMPER_BOT = 'rubber-stamper@appspot.gserviceaccount.com' @@ -36566,10 +37010,22 @@ diff --git a/third_party/blink/tools/blinkpy/w3c/test_importer.py b/third_party/ '/chromium/src/+/main/docs/testing/web_platform_tests.md\n\n') if directory_owners: +diff --git a/third_party/blink/tools/blinkpy/w3c/wpt_results_processor.py b/third_party/blink/tools/blinkpy/w3c/wpt_results_processor.py +--- a/third_party/blink/tools/blinkpy/w3c/wpt_results_processor.py ++++ b/third_party/blink/tools/blinkpy/w3c/wpt_results_processor.py +@@ -153,7 +153,7 @@ class WPTResultsProcessor(object): + failing_results_jsonp (str): Path to write failing JSONP results to. + + See Also: +- https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/json_test_results_format.md ++ https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/docs/testing/json_test_results_format.md + """ + full_results_json = full_results_json or self.fs.join( + self.artifacts_dir, 'full_results.json') diff --git a/third_party/blink/tools/blinkpy/w3c/wpt_uploader.py b/third_party/blink/tools/blinkpy/w3c/wpt_uploader.py --- a/third_party/blink/tools/blinkpy/w3c/wpt_uploader.py +++ b/third_party/blink/tools/blinkpy/w3c/wpt_uploader.py -@@ -73,7 +73,7 @@ class WptReportUploader(object): +@@ -75,7 +75,7 @@ class WptReportUploader(object): """Get a list of fetchUrl for wpt-report from given build. This uses the QueryArtifacts rpc format specified in @@ -36578,16 +37034,16 @@ diff --git a/third_party/blink/tools/blinkpy/w3c/wpt_uploader.py b/third_party/b The response is a list of dicts of the following form: -@@ -92,7 +92,7 @@ class WptReportUploader(object): - +@@ -94,7 +94,7 @@ class WptReportUploader(object): + An example of the url as below: https://results.usercontent.cr.dev/invocations/ \ - task-chromium-swarm.appspot.com-58590ed6228fd611/ \ + task-chromium-swarm.8pp2p8t.qjz9zk-58590ed6228fd611/ \ artifacts/wpt_reports_android_webview_01.json? \ token=AXsiX2kiOiIxNjQxNzYyNzU0MDkxIiwiX3giOiIzNjAwMDAwIn24WM72ciT_oYJG0hGx6MShOXu8SyVxfB_fw - -@@ -127,7 +127,7 @@ class WptReportUploader(object): + +@@ -129,7 +129,7 @@ class WptReportUploader(object): """Gets latest successful build from a CI builder. This uses the SearchBuilds rpc format specified in @@ -36596,7 +37052,7 @@ diff --git a/third_party/blink/tools/blinkpy/w3c/wpt_uploader.py b/third_party/b The response is a list of dicts of the following form: { -@@ -156,7 +156,7 @@ class WptReportUploader(object): +@@ -158,7 +158,7 @@ class WptReportUploader(object): "fields": "builds.*.builder.builder,builds.*.number,builds.*.status,builds.*.id", "pageSize": 10 } @@ -40762,17 +41218,405 @@ diff --git a/third_party/pyjson5/src/setup.py b/third_party/pyjson5/src/setup.py description=long_description.splitlines()[2], long_description=long_description, long_description_content_type='text/markdown', +diff --git a/third_party/rust/aho_corasick/v0_7/BUILD.gn b/third_party/rust/aho_corasick/v0_7/BUILD.gn +--- a/third_party/rust/aho_corasick/v0_7/BUILD.gn ++++ b/third_party/rust/aho_corasick/v0_7/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.7.18" +- cargo_pkg_authors = "Andrew Gallant " ++ cargo_pkg_authors = "Andrew Gallant " + cargo_pkg_name = "aho-corasick" + cargo_pkg_description = "Fast multiple substring searching." + deps = [ "//third_party/rust/memchr/v2:lib" ] +diff --git a/third_party/rust/ansi_term/v0_11/BUILD.gn b/third_party/rust/ansi_term/v0_11/BUILD.gn +--- a/third_party/rust/ansi_term/v0_11/BUILD.gn ++++ b/third_party/rust/ansi_term/v0_11/BUILD.gn +@@ -20,7 +20,7 @@ if (!is_win) { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "0.11.0" +- cargo_pkg_authors = "ogham@bsago.me, Ryan Scheel (Havvy) , Josh Triplett " ++ cargo_pkg_authors = "ogham@bsago.me, Ryan Scheel (Havvy) , Josh Triplett " + cargo_pkg_name = "ansi_term" + cargo_pkg_description = + "Library for ANSI terminal colours and styles (bold, underline)" +diff --git a/third_party/rust/atty/v0_2/BUILD.gn b/third_party/rust/atty/v0_2/BUILD.gn +--- a/third_party/rust/atty/v0_2/BUILD.gn ++++ b/third_party/rust/atty/v0_2/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "0.2.14" +- cargo_pkg_authors = "softprops " ++ cargo_pkg_authors = "softprops " + cargo_pkg_name = "atty" + cargo_pkg_description = "A simple interface for querying atty" + deps = [] +diff --git a/third_party/rust/autocxx/v0_17/BUILD.gn b/third_party/rust/autocxx/v0_17/BUILD.gn +--- a/third_party/rust/autocxx/v0_17/BUILD.gn ++++ b/third_party/rust/autocxx/v0_17/BUILD.gn +@@ -15,7 +15,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2021" + cargo_pkg_version = "0.17.4" +- cargo_pkg_authors = "Adrian Taylor " ++ cargo_pkg_authors = "Adrian Taylor " + cargo_pkg_name = "autocxx" + cargo_pkg_description = "Safe autogenerated interop between Rust and C++" + deps = [ +diff --git a/third_party/rust/autocxx_bindgen/v0_59/BUILD.gn b/third_party/rust/autocxx_bindgen/v0_59/BUILD.gn +--- a/third_party/rust/autocxx_bindgen/v0_59/BUILD.gn ++++ b/third_party/rust/autocxx_bindgen/v0_59/BUILD.gn +@@ -14,7 +14,7 @@ cargo_crate("autocxx_bindgen") { + sources = [ "crate/src/main.rs" ] + edition = "2018" + cargo_pkg_version = "0.59.14" +- cargo_pkg_authors = "Jyun-Yan You , Emilio Cobos Álvarez , Nick Fitzgerald , The Servo project developers, Adrian Taylor " ++ cargo_pkg_authors = "Jyun-Yan You , Emilio Cobos Álvarez , Nick Fitzgerald , The Servo project developers, Adrian Taylor " + cargo_pkg_name = "autocxx-bindgen" + cargo_pkg_description = "Automatically generates Rust FFI bindings to C and C++ libraries. Version adjusted for cxx." + deps = [ +@@ -61,7 +61,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.59.14" +- cargo_pkg_authors = "Jyun-Yan You , Emilio Cobos Álvarez , Nick Fitzgerald , The Servo project developers, Adrian Taylor " ++ cargo_pkg_authors = "Jyun-Yan You , Emilio Cobos Álvarez , Nick Fitzgerald , The Servo project developers, Adrian Taylor " + cargo_pkg_name = "autocxx-bindgen" + cargo_pkg_description = "Automatically generates Rust FFI bindings to C and C++ libraries. Version adjusted for cxx." + deps = [ +diff --git a/third_party/rust/autocxx_engine/v0_17/BUILD.gn b/third_party/rust/autocxx_engine/v0_17/BUILD.gn +--- a/third_party/rust/autocxx_engine/v0_17/BUILD.gn ++++ b/third_party/rust/autocxx_engine/v0_17/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2021" + cargo_pkg_version = "0.17.4" +- cargo_pkg_authors = "Adrian Taylor " ++ cargo_pkg_authors = "Adrian Taylor " + cargo_pkg_name = "autocxx-engine" + cargo_pkg_description = "Safe autogenerated interop between Rust and C++" + deps = [ diff --git a/third_party/rust/autocxx_gen/v0_17/BUILD.gn b/third_party/rust/autocxx_gen/v0_17/BUILD.gn --- a/third_party/rust/autocxx_gen/v0_17/BUILD.gn +++ b/third_party/rust/autocxx_gen/v0_17/BUILD.gn -@@ -18,6 +18,6 @@ cargo_crate("autocxx_gen") { - ] - rustenv = [ - "CARGO_PKG_VERSION=0.17", -- "CARGO_PKG_AUTHORS=adetaylor@chromium.org", -+ "CARGO_PKG_AUTHORS=adetaylor@ch40m1um.qjz9zk", - ] +@@ -13,7 +13,7 @@ cargo_crate("autocxx_gen") { + sources = [ "crate/src/main.rs" ] + edition = "2018" + cargo_pkg_version = "0.17.4" +- cargo_pkg_authors = "Adrian Taylor " ++ cargo_pkg_authors = "Adrian Taylor " + deps = [ + "//third_party/rust/autocxx_engine/v0_17:lib", + "//third_party/rust/clap/v2:lib", +diff --git a/third_party/rust/autocxx_macro/v0_17/BUILD.gn b/third_party/rust/autocxx_macro/v0_17/BUILD.gn +--- a/third_party/rust/autocxx_macro/v0_17/BUILD.gn ++++ b/third_party/rust/autocxx_macro/v0_17/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2021" + cargo_pkg_version = "0.17.4" +- cargo_pkg_authors = "Adrian Taylor " ++ cargo_pkg_authors = "Adrian Taylor " + cargo_pkg_name = "autocxx-macro" + cargo_pkg_description = "Safe autogenerated interop between Rust and C++" + deps = [ +diff --git a/third_party/rust/autocxx_parser/v0_17/BUILD.gn b/third_party/rust/autocxx_parser/v0_17/BUILD.gn +--- a/third_party/rust/autocxx_parser/v0_17/BUILD.gn ++++ b/third_party/rust/autocxx_parser/v0_17/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2021" + cargo_pkg_version = "0.17.4" +- cargo_pkg_authors = "Adrian Taylor " ++ cargo_pkg_authors = "Adrian Taylor " + cargo_pkg_name = "autocxx-parser" + cargo_pkg_description = "Safe autogenerated interop between Rust and C++" + deps = [ +diff --git a/third_party/rust/bindgen/v0_59/BUILD.gn b/third_party/rust/bindgen/v0_59/BUILD.gn +--- a/third_party/rust/bindgen/v0_59/BUILD.gn ++++ b/third_party/rust/bindgen/v0_59/BUILD.gn +@@ -10,7 +10,7 @@ cargo_crate("bindgen") { + sources = [ "crate/src/main.rs" ] + edition = "2018" + cargo_pkg_version = "0.59.2" +- cargo_pkg_authors = "Jyun-Yan You , Emilio Cobos Álvarez , Nick Fitzgerald , The Servo project developers" ++ cargo_pkg_authors = "Jyun-Yan You , Emilio Cobos Álvarez , Nick Fitzgerald , The Servo project developers" + cargo_pkg_name = "bindgen" + cargo_pkg_description = + "Automatically generates Rust FFI bindings to C and C++ libraries." +@@ -59,7 +59,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.59.2" +- cargo_pkg_authors = "Jyun-Yan You , Emilio Cobos Álvarez , Nick Fitzgerald , The Servo project developers" ++ cargo_pkg_authors = "Jyun-Yan You , Emilio Cobos Álvarez , Nick Fitzgerald , The Servo project developers" + cargo_pkg_name = "bindgen" + cargo_pkg_description = + "Automatically generates Rust FFI bindings to C and C++ libraries." +diff --git a/third_party/rust/clap/v2/BUILD.gn b/third_party/rust/clap/v2/BUILD.gn +--- a/third_party/rust/clap/v2/BUILD.gn ++++ b/third_party/rust/clap/v2/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "2.33.3" +- cargo_pkg_authors = "Kevin K. " ++ cargo_pkg_authors = "Kevin K. " + cargo_pkg_name = "clap" + cargo_pkg_description = "A simple to use, efficient, and full-featured Command Line Argument Parser" + deps = [ +diff --git a/third_party/rust/cxx/v1/BUILD.gn b/third_party/rust/cxx/v1/BUILD.gn +--- a/third_party/rust/cxx/v1/BUILD.gn ++++ b/third_party/rust/cxx/v1/BUILD.gn +@@ -15,7 +15,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.57" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "cxx" + cargo_pkg_description = "Safe interop between Rust and C++" + deps = [ +diff --git a/third_party/rust/cxx_gen/v0_7/BUILD.gn b/third_party/rust/cxx_gen/v0_7/BUILD.gn +--- a/third_party/rust/cxx_gen/v0_7/BUILD.gn ++++ b/third_party/rust/cxx_gen/v0_7/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.7.64" +- cargo_pkg_authors = "Adrian Taylor " ++ cargo_pkg_authors = "Adrian Taylor " + cargo_pkg_name = "cxx-gen" + cargo_pkg_description = + "C++ code generator for integrating `cxx` crate into higher level tools." +diff --git a/third_party/rust/cxxbridge_cmd/v1/BUILD.gn b/third_party/rust/cxxbridge_cmd/v1/BUILD.gn +--- a/third_party/rust/cxxbridge_cmd/v1/BUILD.gn ++++ b/third_party/rust/cxxbridge_cmd/v1/BUILD.gn +@@ -10,7 +10,7 @@ cargo_crate("cxxbridge") { + sources = [ "crate/src/main.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.57" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "cxxbridge-cmd" + cargo_pkg_description = + "C++ code generator for integrating `cxx` crate into a non-Cargo build." +@@ -33,7 +33,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.57" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "cxxbridge-cmd" + cargo_pkg_description = + "C++ code generator for integrating `cxx` crate into a non-Cargo build." +diff --git a/third_party/rust/cxxbridge_macro/v1/BUILD.gn b/third_party/rust/cxxbridge_macro/v1/BUILD.gn +--- a/third_party/rust/cxxbridge_macro/v1/BUILD.gn ++++ b/third_party/rust/cxxbridge_macro/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.57" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "cxxbridge-macro" + cargo_pkg_description = "Implementation detail of the `cxx` crate." + deps = [ +diff --git a/third_party/rust/fastrand/v1/BUILD.gn b/third_party/rust/fastrand/v1/BUILD.gn +--- a/third_party/rust/fastrand/v1/BUILD.gn ++++ b/third_party/rust/fastrand/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.7.0" +- cargo_pkg_authors = "Stjepan Glavina " ++ cargo_pkg_authors = "Stjepan Glavina " + cargo_pkg_name = "fastrand" + cargo_pkg_description = "A simple and fast random number generator" } +diff --git a/third_party/rust/heck/v0_4/BUILD.gn b/third_party/rust/heck/v0_4/BUILD.gn +--- a/third_party/rust/heck/v0_4/BUILD.gn ++++ b/third_party/rust/heck/v0_4/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.4.0" +- cargo_pkg_authors = "Without Boats " ++ cargo_pkg_authors = "Without Boats " + cargo_pkg_name = "heck" + cargo_pkg_description = "heck is a case conversion library." + } +diff --git a/third_party/rust/indoc/v1/BUILD.gn b/third_party/rust/indoc/v1/BUILD.gn +--- a/third_party/rust/indoc/v1/BUILD.gn ++++ b/third_party/rust/indoc/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.3" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "indoc" + cargo_pkg_description = "Indented document literals" + deps = [ "//third_party/rust/unindent/v0_1:lib" ] +diff --git a/third_party/rust/itoa/v0_4/BUILD.gn b/third_party/rust/itoa/v0_4/BUILD.gn +--- a/third_party/rust/itoa/v0_4/BUILD.gn ++++ b/third_party/rust/itoa/v0_4/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "0.4.8" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "itoa" + cargo_pkg_description = + "Fast functions for printing integer primitives to an io::Write" +diff --git a/third_party/rust/itoa/v1/BUILD.gn b/third_party/rust/itoa/v1/BUILD.gn +--- a/third_party/rust/itoa/v1/BUILD.gn ++++ b/third_party/rust/itoa/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.1" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "itoa" + cargo_pkg_description = "Fast integer primitive to string conversion" + } +diff --git a/third_party/rust/lazy_static/v1/BUILD.gn b/third_party/rust/lazy_static/v1/BUILD.gn +--- a/third_party/rust/lazy_static/v1/BUILD.gn ++++ b/third_party/rust/lazy_static/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "1.4.0" +- cargo_pkg_authors = "Marvin Löbel " ++ cargo_pkg_authors = "Marvin Löbel " + cargo_pkg_name = "lazy_static" + cargo_pkg_description = + "A macro for declaring lazily evaluated statics in Rust." +diff --git a/third_party/rust/link_cplusplus/v1/BUILD.gn b/third_party/rust/link_cplusplus/v1/BUILD.gn +--- a/third_party/rust/link_cplusplus/v1/BUILD.gn ++++ b/third_party/rust/link_cplusplus/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.5" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "link-cplusplus" + cargo_pkg_description = "Link libstdc++ or libc++ automatically or manually" + build_root = "crate/build.rs" +diff --git a/third_party/rust/memchr/v2/BUILD.gn b/third_party/rust/memchr/v2/BUILD.gn +--- a/third_party/rust/memchr/v2/BUILD.gn ++++ b/third_party/rust/memchr/v2/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "2.4.1" +- cargo_pkg_authors = "Andrew Gallant , bluss" ++ cargo_pkg_authors = "Andrew Gallant , bluss" + cargo_pkg_name = "memchr" + cargo_pkg_description = "Safe interface to memchr." + features = [ "std" ] +diff --git a/third_party/rust/minimal_lexical/v0_2/BUILD.gn b/third_party/rust/minimal_lexical/v0_2/BUILD.gn +--- a/third_party/rust/minimal_lexical/v0_2/BUILD.gn ++++ b/third_party/rust/minimal_lexical/v0_2/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.2.1" +- cargo_pkg_authors = "Alex Huszagh " ++ cargo_pkg_authors = "Alex Huszagh " + cargo_pkg_name = "minimal-lexical" + cargo_pkg_description = "Fast float parsing conversion routines." + features = [ "std" ] +diff --git a/third_party/rust/moveit/v0_4/BUILD.gn b/third_party/rust/moveit/v0_4/BUILD.gn +--- a/third_party/rust/moveit/v0_4/BUILD.gn ++++ b/third_party/rust/moveit/v0_4/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.4.0" +- cargo_pkg_authors = "Miguel Young de la Sota " ++ cargo_pkg_authors = "Miguel Young de la Sota " + cargo_pkg_name = "moveit" + cargo_pkg_description = + "A library for safe, in-place construction of Rust (and C++!) objects." +diff --git a/third_party/rust/once_cell/v1/BUILD.gn b/third_party/rust/once_cell/v1/BUILD.gn +--- a/third_party/rust/once_cell/v1/BUILD.gn ++++ b/third_party/rust/once_cell/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.9.0" +- cargo_pkg_authors = "Aleksey Kladov " ++ cargo_pkg_authors = "Aleksey Kladov " + cargo_pkg_name = "once_cell" + cargo_pkg_description = "Single assignment cells and lazy values." + features = [ +diff --git a/third_party/rust/peeking_take_while/v0_1/BUILD.gn b/third_party/rust/peeking_take_while/v0_1/BUILD.gn +--- a/third_party/rust/peeking_take_while/v0_1/BUILD.gn ++++ b/third_party/rust/peeking_take_while/v0_1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "0.1.2" +- cargo_pkg_authors = "Nick Fitzgerald " ++ cargo_pkg_authors = "Nick Fitzgerald " + cargo_pkg_name = "peeking_take_while" + cargo_pkg_description = "Like `Iterator::take_while`, but calls the predicate on a peeked value. This allows you to use `Iterator::by_ref` and `Iterator::take_while` together, and still get the first value for which the `take_while` predicate returned false after dropping the `by_ref`." + } +diff --git a/third_party/rust/proc_macro2/v1/BUILD.gn b/third_party/rust/proc_macro2/v1/BUILD.gn +--- a/third_party/rust/proc_macro2/v1/BUILD.gn ++++ b/third_party/rust/proc_macro2/v1/BUILD.gn +@@ -20,7 +20,7 @@ cargo_crate("lib") { + edition = "2018" + cargo_pkg_version = "1.0.32" + cargo_pkg_authors = +- "David Tolnay , Alex Crichton " ++ "David Tolnay , Alex Crichton " + cargo_pkg_name = "proc-macro2" + cargo_pkg_description = "A substitute implementation of the compiler's `proc_macro` API to decoupletoken-based libraries from the procedural macro use case." + deps = [ "//third_party/rust/unicode_xid/v0_2:lib" ] +diff --git a/third_party/rust/quote/v1/BUILD.gn b/third_party/rust/quote/v1/BUILD.gn +--- a/third_party/rust/quote/v1/BUILD.gn ++++ b/third_party/rust/quote/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.10" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "quote" + cargo_pkg_description = "Quasi-quoting macro quote!(...)" + deps = [ "//third_party/rust/proc_macro2/v1:lib" ] +diff --git a/third_party/rust/remove_dir_all/v0_5/BUILD.gn b/third_party/rust/remove_dir_all/v0_5/BUILD.gn +--- a/third_party/rust/remove_dir_all/v0_5/BUILD.gn ++++ b/third_party/rust/remove_dir_all/v0_5/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "0.5.3" +- cargo_pkg_authors = "Aaronepower " ++ cargo_pkg_authors = "Aaronepower " + cargo_pkg_name = "remove_dir_all" + cargo_pkg_description = + "A safe, reliable implementation of remove_dir_all for Windows" +diff --git a/third_party/rust/rstest/v0_12/BUILD.gn b/third_party/rust/rstest/v0_12/BUILD.gn +--- a/third_party/rust/rstest/v0_12/BUILD.gn ++++ b/third_party/rust/rstest/v0_12/BUILD.gn +@@ -14,7 +14,7 @@ cargo_crate("test_support") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.12.0" +- cargo_pkg_authors = "Michele d'Amico " ++ cargo_pkg_authors = "Michele d'Amico " + cargo_pkg_name = "rstest" + cargo_pkg_description = "Rust fixture based test framework. It use procedural macroto implement fixtures and table based tests." + deps = [ diff --git a/third_party/rust/rstest/v0_12/crate/docs/head/COPYRIGHT.txt b/third_party/rust/rstest/v0_12/crate/docs/head/COPYRIGHT.txt --- a/third_party/rust/rstest/v0_12/crate/docs/head/COPYRIGHT.txt +++ b/third_party/rust/rstest/v0_12/crate/docs/head/COPYRIGHT.txt @@ -40785,6 +41629,267 @@ diff --git a/third_party/rust/rstest/v0_12/crate/docs/head/COPYRIGHT.txt b/third with Reserved Font Name Fira Sans. Copyright (c) 2014, Telefonica S.A. +diff --git a/third_party/rust/rustc_version/v0_4/BUILD.gn b/third_party/rust/rustc_version/v0_4/BUILD.gn +--- a/third_party/rust/rustc_version/v0_4/BUILD.gn ++++ b/third_party/rust/rustc_version/v0_4/BUILD.gn +@@ -17,7 +17,7 @@ cargo_crate("buildrs_support") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.4.0" +- cargo_pkg_authors = "Dirkjan Ochtman , Marvin Löbel " ++ cargo_pkg_authors = "Dirkjan Ochtman , Marvin Löbel " + cargo_pkg_name = "rustc_version" + cargo_pkg_description = + "A library for querying the version of a installed rustc compiler" +diff --git a/third_party/rust/rustversion/v1/BUILD.gn b/third_party/rust/rustversion/v1/BUILD.gn +--- a/third_party/rust/rustversion/v1/BUILD.gn ++++ b/third_party/rust/rustversion/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.6" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "rustversion" + cargo_pkg_description = + "Conditional compilation according to rustc compiler version" +diff --git a/third_party/rust/ryu/v1/BUILD.gn b/third_party/rust/ryu/v1/BUILD.gn +--- a/third_party/rust/ryu/v1/BUILD.gn ++++ b/third_party/rust/ryu/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.5" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "ryu" + cargo_pkg_description = "Fast floating point to string conversion" + build_root = "crate/build.rs" +diff --git a/third_party/rust/semver/v1/BUILD.gn b/third_party/rust/semver/v1/BUILD.gn +--- a/third_party/rust/semver/v1/BUILD.gn ++++ b/third_party/rust/semver/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.4" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "semver" + cargo_pkg_description = + "Parser and evaluator for Cargo's flavor of Semantic Versioning" +diff --git a/third_party/rust/serde/v1/BUILD.gn b/third_party/rust/serde/v1/BUILD.gn +--- a/third_party/rust/serde/v1/BUILD.gn ++++ b/third_party/rust/serde/v1/BUILD.gn +@@ -15,7 +15,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "1.0.130" +- cargo_pkg_authors = "Erick Tryzelaar , David Tolnay " ++ cargo_pkg_authors = "Erick Tryzelaar , David Tolnay " + cargo_pkg_name = "serde" + cargo_pkg_description = "A generic serialization/deserialization framework" + features = [ "std" ] +diff --git a/third_party/rust/serde_derive/v1/BUILD.gn b/third_party/rust/serde_derive/v1/BUILD.gn +--- a/third_party/rust/serde_derive/v1/BUILD.gn ++++ b/third_party/rust/serde_derive/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "1.0.130" +- cargo_pkg_authors = "Erick Tryzelaar , David Tolnay " ++ cargo_pkg_authors = "Erick Tryzelaar , David Tolnay " + cargo_pkg_name = "serde_derive" + cargo_pkg_description = + "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]" +diff --git a/third_party/rust/serde_json/v1/BUILD.gn b/third_party/rust/serde_json/v1/BUILD.gn +--- a/third_party/rust/serde_json/v1/BUILD.gn ++++ b/third_party/rust/serde_json/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.78" +- cargo_pkg_authors = "Erick Tryzelaar , David Tolnay " ++ cargo_pkg_authors = "Erick Tryzelaar , David Tolnay " + cargo_pkg_name = "serde_json" + cargo_pkg_description = "A JSON serialization file format" + deps = [ +diff --git a/third_party/rust/serde_json_lenient/v0_1/BUILD.gn b/third_party/rust/serde_json_lenient/v0_1/BUILD.gn +--- a/third_party/rust/serde_json_lenient/v0_1/BUILD.gn ++++ b/third_party/rust/serde_json_lenient/v0_1/BUILD.gn +@@ -15,7 +15,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.1.4" +- cargo_pkg_authors = "Adrian Taylor , Michael Bolin , Erick Tryzelaar , David Tolnay " ++ cargo_pkg_authors = "Adrian Taylor , Michael Bolin , Erick Tryzelaar , David Tolnay " + cargo_pkg_name = "serde_json_lenient" + cargo_pkg_description = "A lenient JSON serialization file format" + deps = [ +diff --git a/third_party/rust/shlex/v1/BUILD.gn b/third_party/rust/shlex/v1/BUILD.gn +--- a/third_party/rust/shlex/v1/BUILD.gn ++++ b/third_party/rust/shlex/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "1.1.0" +- cargo_pkg_authors = "comex , Fenhl " ++ cargo_pkg_authors = "comex , Fenhl " + cargo_pkg_name = "shlex" + cargo_pkg_description = + "Split a string into shell words, like Python's shlex." +diff --git a/third_party/rust/strsim/v0_8/BUILD.gn b/third_party/rust/strsim/v0_8/BUILD.gn +--- a/third_party/rust/strsim/v0_8/BUILD.gn ++++ b/third_party/rust/strsim/v0_8/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "0.8.0" +- cargo_pkg_authors = "Danny Guo " ++ cargo_pkg_authors = "Danny Guo " + cargo_pkg_name = "strsim" + cargo_pkg_description = "Implementations of string similarity metrics.Includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, and Jaro-Winkler." + } +diff --git a/third_party/rust/strum_macros/v0_24/BUILD.gn b/third_party/rust/strum_macros/v0_24/BUILD.gn +--- a/third_party/rust/strum_macros/v0_24/BUILD.gn ++++ b/third_party/rust/strum_macros/v0_24/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.24.0" +- cargo_pkg_authors = "Peter Glotfelty " ++ cargo_pkg_authors = "Peter Glotfelty " + cargo_pkg_name = "strum_macros" + cargo_pkg_description = "Helpful macros for working with enums and strings" + deps = [ +diff --git a/third_party/rust/syn/v1/BUILD.gn b/third_party/rust/syn/v1/BUILD.gn +--- a/third_party/rust/syn/v1/BUILD.gn ++++ b/third_party/rust/syn/v1/BUILD.gn +@@ -15,7 +15,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.81" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "syn" + cargo_pkg_description = "Parser for Rust source code" + deps = [ +@@ -48,7 +48,7 @@ cargo_crate("test_support") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.81" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "syn" + cargo_pkg_description = "Parser for Rust source code" + deps = [ +diff --git a/third_party/rust/tempfile/v3/BUILD.gn b/third_party/rust/tempfile/v3/BUILD.gn +--- a/third_party/rust/tempfile/v3/BUILD.gn ++++ b/third_party/rust/tempfile/v3/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "3.3.0" +- cargo_pkg_authors = "Steven Allen , The Rust Project Developers, Ashley Mannix , Jason White " ++ cargo_pkg_authors = "Steven Allen , The Rust Project Developers, Ashley Mannix , Jason White " + cargo_pkg_name = "tempfile" + cargo_pkg_description = + "A library for managing temporary files and directories." +diff --git a/third_party/rust/termcolor/v1/BUILD.gn b/third_party/rust/termcolor/v1/BUILD.gn +--- a/third_party/rust/termcolor/v1/BUILD.gn ++++ b/third_party/rust/termcolor/v1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.1.2" +- cargo_pkg_authors = "Andrew Gallant " ++ cargo_pkg_authors = "Andrew Gallant " + cargo_pkg_name = "termcolor" + cargo_pkg_description = + "A simple cross platform library for writing colored text to a terminal." +diff --git a/third_party/rust/unicode_width/v0_1/BUILD.gn b/third_party/rust/unicode_width/v0_1/BUILD.gn +--- a/third_party/rust/unicode_width/v0_1/BUILD.gn ++++ b/third_party/rust/unicode_width/v0_1/BUILD.gn +@@ -20,7 +20,7 @@ cargo_crate("lib") { + edition = "2015" + cargo_pkg_version = "0.1.9" + cargo_pkg_authors = +- "kwantam , Manish Goregaokar " ++ "kwantam , Manish Goregaokar " + cargo_pkg_name = "unicode-width" + cargo_pkg_description = "Determine displayed width of `char` and `str` typesaccording to Unicode Standard Annex #11 rules." + } +diff --git a/third_party/rust/unicode_xid/v0_2/BUILD.gn b/third_party/rust/unicode_xid/v0_2/BUILD.gn +--- a/third_party/rust/unicode_xid/v0_2/BUILD.gn ++++ b/third_party/rust/unicode_xid/v0_2/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "0.2.2" +- cargo_pkg_authors = "erick.tryzelaar , kwantam , Manish Goregaokar " ++ cargo_pkg_authors = "erick.tryzelaar , kwantam , Manish Goregaokar " + cargo_pkg_name = "unicode-xid" + cargo_pkg_description = "Determine whether characters have the XID_Startor XID_Continue properties according toUnicode Standard Annex #31." + } +diff --git a/third_party/rust/unindent/v0_1/BUILD.gn b/third_party/rust/unindent/v0_1/BUILD.gn +--- a/third_party/rust/unindent/v0_1/BUILD.gn ++++ b/third_party/rust/unindent/v0_1/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.1.7" +- cargo_pkg_authors = "David Tolnay " ++ cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "unindent" + cargo_pkg_description = "Remove a column of leading whitespace from a string" + } +diff --git a/third_party/rust/vec_map/v0_8/BUILD.gn b/third_party/rust/vec_map/v0_8/BUILD.gn +--- a/third_party/rust/vec_map/v0_8/BUILD.gn ++++ b/third_party/rust/vec_map/v0_8/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "0.8.2" +- cargo_pkg_authors = "Alex Crichton , Jorge Aparicio , Alexis Beingessner , Brian Anderson <>, tbu- <>, Manish Goregaokar <>, Aaron Turon , Adolfo Ochagavía <>, Niko Matsakis <>, Steven Fackler <>, Chase Southwood , Eduard Burtescu <>, Florian Wilkens <>, Félix Raimundo <>, Tibor Benke <>, Markus Siemens , Josh Branchaud , Huon Wilson , Corey Farwell , Aaron Liblong <>, Nick Cameron , Patrick Walton , Felix S Klock II <>, Andrew Paseltiner , Sean McArthur , Vadim Petrochenkov <>" ++ cargo_pkg_authors = "Alex Crichton , Jorge Aparicio , Alexis Beingessner , Brian Anderson <>, tbu- <>, Manish Goregaokar <>, Aaron Turon , Adolfo Ochagavía <>, Niko Matsakis <>, Steven Fackler <>, Chase Southwood , Eduard Burtescu <>, Florian Wilkens <>, Félix Raimundo <>, Tibor Benke <>, Markus Siemens , Josh Branchaud , Huon Wilson , Corey Farwell , Aaron Liblong <>, Nick Cameron , Patrick Walton , Felix S Klock II <>, Andrew Paseltiner , Sean McArthur , Vadim Petrochenkov <>" + cargo_pkg_name = "vec_map" + cargo_pkg_description = + "A simple map based on a vector for small integer keys" +diff --git a/third_party/rust/which/v4/BUILD.gn b/third_party/rust/which/v4/BUILD.gn +--- a/third_party/rust/which/v4/BUILD.gn ++++ b/third_party/rust/which/v4/BUILD.gn +@@ -19,7 +19,7 @@ cargo_crate("lib") { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "4.2.4" +- cargo_pkg_authors = "Harry Fei " ++ cargo_pkg_authors = "Harry Fei " + cargo_pkg_name = "which" + cargo_pkg_description = "A Rust equivalent of Unix command 'which'. Locate installed executable in cross platforms." + deps = [ +diff --git a/third_party/rust/winapi/v0_3/BUILD.gn b/third_party/rust/winapi/v0_3/BUILD.gn +--- a/third_party/rust/winapi/v0_3/BUILD.gn ++++ b/third_party/rust/winapi/v0_3/BUILD.gn +@@ -20,7 +20,7 @@ if (is_win) { + sources = [ "crate/src/lib.rs" ] + edition = "2015" + cargo_pkg_version = "0.3.9" +- cargo_pkg_authors = "Peter Atashian " ++ cargo_pkg_authors = "Peter Atashian " + cargo_pkg_name = "winapi" + cargo_pkg_description = "Raw FFI bindings for all of Windows API." + features = [ +diff --git a/third_party/rust/winapi_util/v0_1/BUILD.gn b/third_party/rust/winapi_util/v0_1/BUILD.gn +--- a/third_party/rust/winapi_util/v0_1/BUILD.gn ++++ b/third_party/rust/winapi_util/v0_1/BUILD.gn +@@ -20,7 +20,7 @@ if (is_win) { + sources = [ "crate/src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "0.1.5" +- cargo_pkg_authors = "Andrew Gallant " ++ cargo_pkg_authors = "Andrew Gallant " + cargo_pkg_name = "winapi-util" + cargo_pkg_description = + "A dumping ground for high level safe wrappers over winapi." diff --git a/third_party/tensorflow-text/src/tensorflow_text/core/ops/rouge_l_op.cc b/third_party/tensorflow-text/src/tensorflow_text/core/ops/rouge_l_op.cc --- a/third_party/tensorflow-text/src/tensorflow_text/core/ops/rouge_l_op.cc +++ b/third_party/tensorflow-text/src/tensorflow_text/core/ops/rouge_l_op.cc @@ -41028,7 +42133,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/third_party/pywebsocket3/setup.py b diff --git a/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py b/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py --- a/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py +++ b/third_party/wpt_tools/wpt/tools/webdriver/webdriver/client.py -@@ -629,7 +629,7 @@ class Session(object): +@@ -629,7 +629,7 @@ class Session: We want the tests to run in Edge anyway to help with REC. In order to run the tests in Edge, we need to hack around bug: @@ -41088,59 +42193,74 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to # Always use tip as the tag for nightly; this isn't quite right # but to do better we need the actual build revision, which we # can get if we have an application.ini file -@@ -566,7 +566,7 @@ class Chrome(Browser): - assert chrome_version, "Cannot determine the version of Chrome" - # Remove channel suffixes (e.g. " dev"). - chrome_version = chrome_version.split(' ')[0] -- url = "https://storage.googleapis.com/chrome-wpt-mojom/%s/linux64/mojojs.zip" % chrome_version -+ url = "https://storage.9oo91eapis.qjz9zk/chrome-wpt-mojom/%s/linux64/mojojs.zip" % chrome_version +@@ -533,13 +533,13 @@ class ChromeChromiumBase(Browser): + """Queries Chromium Snapshots and returns the latest Chromium revision number + for the current platform. + """ +- revision_url = ("https://storage.googleapis.com/chromium-browser-snapshots/" ++ revision_url = ("https://storage.9oo91eapis.qjz9zk/chromium-browser-snapshots/" + f"{architecture}/LAST_CHANGE") + return get(revision_url).text.strip() - extracted = os.path.join(dest, "mojojs", "gen") - last_url_file = os.path.join(extracted, "DOWNLOADED_FROM") -@@ -618,9 +618,9 @@ class Chrome(Browser): - # Make sure we use the same revision in an invocation. - architecture = self._chromium_platform_string() - if self._last_change is None: -- revision_url = "https://storage.googleapis.com/chromium-browser-snapshots/%s/LAST_CHANGE" % architecture -+ revision_url = "https://storage.9oo91eapis.qjz9zk/chromium-browser-snapshots/%s/LAST_CHANGE" % architecture - self._last_change = get(revision_url).text.strip() -- return "https://storage.googleapis.com/chromium-browser-snapshots/%s/%s/" % (architecture, self._last_change) -+ return "https://storage.9oo91eapis.qjz9zk/chromium-browser-snapshots/%s/%s/" % (architecture, self._last_change) + def _get_chromium_download_url(self, version=None): + """Format a Chromium Snapshots URL to download a browser component.""" +- url_path = "https://storage.googleapis.com/chromium-browser-snapshots/" ++ url_path = "https://storage.9oo91eapis.qjz9zk/chromium-browser-snapshots/" + architecture = self._chromium_platform_string - def find_nightly_binary(self, dest): - if uname[0] == "Darwin": -@@ -695,25 +695,25 @@ class Chrome(Browser): - # http://chromedriver.chromium.org/downloads/version-selection - parts = chrome_version.split(".") + # If a specific version is passed as an argument, we will use it. +@@ -574,7 +574,7 @@ class ChromeChromiumBase(Browser): + + # Try to find the Chromium build with the same revision. + try: +- omaha = get(f"https://omahaproxy.appspot.com/deps.json?version={version}").json() ++ omaha = get(f"https://omahaproxy.8pp2p8t.qjz9zk/deps.json?version={version}").json() + detected_revision = omaha['chromium_base_position'] + return detected_revision + except requests.RequestException: +@@ -626,7 +626,7 @@ class ChromeChromiumBase(Browser): + chrome_version = self.version(binary=browser_binary) + try: + # MojoJS version url must match the browser binary version exactly. +- url = ("https://storage.googleapis.com/chrome-wpt-mojom/" ++ url = ("https://storage.9oo91eapis.qjz9zk/chrome-wpt-mojom/" + f"{chrome_version}/linux64/mojojs.zip") + # Check the status without downloading the content (this is a streaming request). + get(url) +@@ -852,7 +852,7 @@ class Chrome(ChromeChromiumBase): + def _get_webdriver_url(self, version): + """Get a ChromeDriver API URL to download a version of ChromeDriver that matches + the browser binary version. Version selection is described here: +- https://chromedriver.chromium.org/downloads/version-selection""" ++ https://chromedriver.ch40m1um.qjz9zk/downloads/version-selection""" + filename = f"chromedriver_{self._chromedriver_platform_string}.zip" + + # Remove channel suffixes (e.g. " dev"). +@@ -860,12 +860,12 @@ class Chrome(ChromeChromiumBase): + + parts = version.split(".") assert len(parts) == 4 -- latest_url = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_%s.%s.%s" % tuple(parts[:-1]) -+ latest_url = "https://chromedriver.storage.9oo91eapis.qjz9zk/LATEST_RELEASE_%s.%s.%s" % tuple(parts[:-1]) +- latest_url = ("https://chromedriver.storage.googleapis.com/LATEST_RELEASE_" ++ latest_url = ("https://chromedriver.storage.9oo91eapis.qjz9zk/LATEST_RELEASE_" + f"{'.'.join(parts[:-1])}") try: latest = get(latest_url).text.strip() except requests.RequestException: -- latest_url = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_%s" % parts[0] -+ latest_url = "https://chromedriver.storage.9oo91eapis.qjz9zk/LATEST_RELEASE_%s" % parts[0] +- latest_url = f"https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{parts[0]}" ++ latest_url = f"https://chromedriver.storage.9oo91eapis.qjz9zk/LATEST_RELEASE_{parts[0]}" try: latest = get(latest_url).text.strip() except requests.RequestException: - return None -- return "https://chromedriver.storage.googleapis.com/%s/chromedriver_%s.zip" % ( -+ return "https://chromedriver.storage.9oo91eapis.qjz9zk/%s/chromedriver_%s.zip" % ( - latest, self._chromedriver_platform_string()) +@@ -873,7 +873,7 @@ class Chrome(ChromeChromiumBase): + # version for Chrome Dev, since it is not available through the ChromeDriver API. + # If we've gotten to this point, it is assumed that this is Chrome Dev. + return f"{self._get_chromium_download_url(version)}{filename}" +- return f"https://chromedriver.storage.googleapis.com/{latest}/{filename}" ++ return f"https://chromedriver.storage.9oo91eapis.qjz9zk/{latest}/{filename}" - def _chromium_chromedriver_url(self, chrome_version): - if chrome_version: - try: - # Try to find the Chromium build with the same revision. -- omaha = get("https://omahaproxy.appspot.com/deps.json?version=" + chrome_version).json() -+ omaha = get("https://omahaproxy.8pp2p8t.qjz9zk/deps.json?version=" + chrome_version).json() - revision = omaha['chromium_base_position'] -- url = "https://storage.googleapis.com/chromium-browser-snapshots/%s/%s/chromedriver_%s.zip" % ( -+ url = "https://storage.9oo91eapis.qjz9zk/chromium-browser-snapshots/%s/%s/chromedriver_%s.zip" % ( - self._chromium_platform_string(), revision, self._chromedriver_platform_string()) - # Check the status without downloading the content (this is a streaming request). - get(url) -@@ -895,7 +895,7 @@ class AndroidWebview(ChromeAndroidBase): + def download(self, dest=None, channel=None, rename=None): + raise NotImplementedError("Downloading of Chrome browser binary not implemented.") +@@ -1025,7 +1025,7 @@ class AndroidWebview(ChromeAndroidBase): """Webview-specific interface for Android. Design doc: @@ -41152,7 +42272,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/browser.py b/third_party/wpt_to diff --git a/third_party/wpt_tools/wpt/tools/wpt/run.py b/third_party/wpt_tools/wpt/tools/wpt/run.py --- a/third_party/wpt_tools/wpt/tools/wpt/run.py +++ b/third_party/wpt_tools/wpt/tools/wpt/run.py -@@ -552,7 +552,7 @@ class Edge(BrowserSetup): +@@ -555,7 +555,7 @@ class Edge(BrowserSetup): version to download. Please go to the following URL and install the correct version for your Edge/Windows release somewhere on the %PATH%: @@ -41161,7 +42281,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wpt/run.py b/third_party/wpt_tools/ """) kwargs["webdriver_binary"] = webdriver_binary -@@ -578,7 +578,7 @@ class InternetExplorer(BrowserSetup): +@@ -581,7 +581,7 @@ class InternetExplorer(BrowserSetup): version to download. Please go to the following URL and install the driver for Internet Explorer somewhere on the %PATH%: @@ -41184,7 +42304,7 @@ diff --git a/third_party/wpt_tools/wpt/tools/wptrunner/requirements.txt b/third_ diff --git a/third_party/wpt_tools/wpt/tools/wptrunner/setup.py b/third_party/wpt_tools/wpt/tools/wptrunner/setup.py --- a/third_party/wpt_tools/wpt/tools/wptrunner/setup.py +++ b/third_party/wpt_tools/wpt/tools/wptrunner/setup.py -@@ -28,7 +28,7 @@ setup(name=PACKAGE_NAME, +@@ -24,7 +24,7 @@ setup(name=PACKAGE_NAME, version=PACKAGE_VERSION, description="Harness for running the W3C web-platform-tests against various products", author='Mozilla Automation and Testing Team', @@ -41337,7 +42457,7 @@ diff --git a/tools/android/checkxmlstyle/PRESUBMIT.py b/tools/android/checkxmlst diff --git a/tools/android/checkxmlstyle/checkxmlstyle.py b/tools/android/checkxmlstyle/checkxmlstyle.py --- a/tools/android/checkxmlstyle/checkxmlstyle.py +++ b/tools/android/checkxmlstyle/checkxmlstyle.py -@@ -376,7 +376,7 @@ def _CheckTextAppearance(input_api, output_api): +@@ -437,7 +437,7 @@ def _CheckTextAppearance(input_api, output_api): ... @@ -41346,7 +42466,7 @@ diff --git a/tools/android/checkxmlstyle/checkxmlstyle.py b/tools/android/checkx src/chrome/android/java/res/OWNERS for questions. See https://crbug.com/775198 for more information. ''', errors) -@@ -401,7 +401,7 @@ def _CheckNewTextAppearance(input_api, output_api): +@@ -462,7 +462,7 @@ def _CheckNewTextAppearance(input_api, output_api): If you are removing or editing an existing text appearance style, or your new text appearance style is approved by UX, please bypass this check. @@ -41355,7 +42475,7 @@ diff --git a/tools/android/checkxmlstyle/checkxmlstyle.py b/tools/android/checkx src/chrome/android/java/res/OWNERS for questions. See https://crbug.com/775198 for more information. ''', errors) -@@ -491,7 +491,7 @@ def _CheckStringResourceQuotesPunctuations(input_api, output_api): +@@ -552,7 +552,7 @@ def _CheckStringResourceQuotesPunctuations(input_api, output_api): Please reach out to the UX designer/writer in your team to double check which punctuation should be correctly used. Ignore this warning if UX has confirmed. @@ -41364,7 +42484,7 @@ diff --git a/tools/android/checkxmlstyle/checkxmlstyle.py b/tools/android/checkx ''' return _checkStringResourcePunctuations( re.compile(u'[\u0022\u0027\u0060\u00B4]'), warning, input_api, output_api) -@@ -508,7 +508,7 @@ def _CheckStringResourceEllipsisPunctuations(input_api, output_api): +@@ -569,7 +569,7 @@ def _CheckStringResourceEllipsisPunctuations(input_api, output_api): Please reach out to the UX designer/writer in your team to double check which punctuation should be correctly used. Ignore this warning if UX has confirmed. @@ -41657,21 +42777,21 @@ diff --git a/tools/binary_size/libsupersize/viewer/static/viewer.html b/tools/bi Super Size Tiger View -- -+ +- ++ @@ -23,7 +23,7 @@ + - -- -@@ -72,7 +72,7 @@ +@@ -73,7 +73,7 @@ Upload data @@ -41680,15 +42800,15 @@ diff --git a/tools/binary_size/libsupersize/viewer/static/viewer.html b/tools/bi title="FAQ" id="faq" target="_blank">

--

You are trying to access a private size file. Please sign in with your @google.com account.

-+

You are trying to access a private size file. Please sign in with your @9oo91e.qjz9zk account.

+
+-
You are trying to access a private size file. Please sign in with your @google.com ++
You are trying to access a private size file. Please sign in with your @9oo91e.qjz9zk + account. +
-
-
diff --git a/tools/binary_size/libsupersize/viewer/upload_html_viewer.py b/tools/binary_size/libsupersize/viewer/upload_html_viewer.py --- a/tools/binary_size/libsupersize/viewer/upload_html_viewer.py +++ b/tools/binary_size/libsupersize/viewer/upload_html_viewer.py @@ -41704,7 +42824,7 @@ diff --git a/tools/binary_size/libsupersize/viewer/upload_html_viewer.py b/tools diff --git a/tools/binary_size/libsupersize/zip_util.py b/tools/binary_size/libsupersize/zip_util.py --- a/tools/binary_size/libsupersize/zip_util.py +++ b/tools/binary_size/libsupersize/zip_util.py -@@ -128,7 +128,7 @@ def ReadZipInfoExtraFieldLength(zip_file, zip_info): +@@ -137,7 +137,7 @@ def ReadZipInfoExtraFieldLength(zip_file, zip_info): def MeasureApkSignatureBlock(zip_file): """Measures the size of the v2 / v3 signing block. @@ -41716,7 +42836,16 @@ diff --git a/tools/binary_size/libsupersize/zip_util.py b/tools/binary_size/libs diff --git a/tools/binary_size/trybot_commit_size_checker.py b/tools/binary_size/trybot_commit_size_checker.py --- a/tools/binary_size/trybot_commit_size_checker.py +++ b/tools/binary_size/trybot_commit_size_checker.py -@@ -371,7 +371,7 @@ PASSING Checks: +@@ -14,7 +14,7 @@ mkdir tmp + tools/binary_size/trybot_commit_size_checker.py \ + --author Batman \ + --review-subject "Testing 123" \ +- --review-url "https://google.com" \ ++ --review-url "https://9oo91e.qjz9zk" \ + --size-config-json-name \ + out/binary-size-build/config/Trichrome_size_config.json \ + --before-dir out/binary-size-results/$HASH1 \ +@@ -420,7 +420,7 @@ PASSING Checks: {} To understand what those checks are and how to pass them, see: @@ -41799,7 +42928,7 @@ diff --git a/tools/bisect-builds.py b/tools/bisect-builds.py SEARCH_PATTERN = { 'chromium': CHROMIUM_SEARCH_PATTERN, -@@ -1151,7 +1151,7 @@ def main(): +@@ -1155,7 +1155,7 @@ def main(): '\n' 'Revision numbers should use\n' ' SVN revisions (e.g. 123456) for chromium builds, from trunk.\n' @@ -42150,7 +43279,7 @@ diff --git a/tools/chrome_extensions/open_my_editor/ext/manifest.json b/tools/ch diff --git a/tools/clang/scripts/build.py b/tools/clang/scripts/build.py --- a/tools/clang/scripts/build.py +++ b/tools/clang/scripts/build.py -@@ -526,7 +526,7 @@ def main(): +@@ -538,7 +538,7 @@ def main(): print('Android NDK not found at ' + ANDROID_NDK_DIR) print('The Android NDK is needed to build a Clang whose -fsanitize=address') print('works on Android. See ') @@ -42159,7 +43288,7 @@ diff --git a/tools/clang/scripts/build.py b/tools/clang/scripts/build.py print('for how to install the NDK, or pass --without-android.') return 1 -@@ -537,7 +537,7 @@ def main(): +@@ -549,7 +549,7 @@ def main(): print('target_os section in your .gclient and running hooks, ') print('or pass --without-fuchsia.') print( @@ -42284,18 +43413,18 @@ diff --git a/tools/code_coverage/coverage.py b/tools/code_coverage/coverage.py 'components=Infra%3ETest%3ECodeCoverage') # String to replace with actual llvm profile path. -diff --git a/tools/coverity/coverity.py b/tools/coverity/coverity.py ---- a/tools/coverity/coverity.py -+++ b/tools/coverity/coverity.py -@@ -19,7 +19,7 @@ Usage examples: - - For a full list of options, pass the '--help' switch. - --See http://support.microsoft.com/kb/308569 for running this script as a -+See http://support.m1cr050ft.qjz9zk/kb/308569 for running this script as a - Scheduled Task on Windows XP. +diff --git a/tools/code_coverage/create_js_source_maps/PRESUBMIT.py b/tools/code_coverage/create_js_source_maps/PRESUBMIT.py +--- a/tools/code_coverage/create_js_source_maps/PRESUBMIT.py ++++ b/tools/code_coverage/create_js_source_maps/PRESUBMIT.py +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + """create_js_source_maps presubmit script. +-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for ++See http://dev.ch40m1um.qjz9zk/developers/how-tos/depottools/presubmit-scripts for + details on the presubmit API built into gcl. """ + USE_PYTHON3 = True diff --git a/tools/cr/cr/base/android.py b/tools/cr/cr/base/android.py --- a/tools/cr/cr/base/android.py +++ b/tools/cr/cr/base/android.py @@ -43831,7 +44960,7 @@ diff --git a/tools/json_to_struct/PRESUBMIT.py b/tools/json_to_struct/PRESUBMIT. diff --git a/tools/licenses.py b/tools/licenses.py --- a/tools/licenses.py +++ b/tools/licenses.py -@@ -149,36 +149,36 @@ ADDITIONAL_PATHS = ( +@@ -149,42 +149,42 @@ ADDITIONAL_PATHS = ( SPECIAL_CASES = { os.path.join('native_client'): { "Name": "native client", @@ -43867,6 +44996,13 @@ diff --git a/tools/licenses.py b/tools/licenses.py # Absolute path here is resolved as relative to the source root. "License File": "/LICENSE.chromium_os", }, + os.path.join('third_party', 'ipcz'): { + "Name": "ipcz", +- "URL" : "https://chromium.googlesource.com/chromium/src/third_party/ipcz", ++ "URL" : "https://chromium.9oo91esource.qjz9zk/chromium/src/third_party/ipcz", + "License": "BSD", + "License File": "/third_party/ipcz/LICENSE", + }, os.path.join('third_party', 'lss'): { "Name": "linux-syscall-support", - "URL": "http://code.google.com/p/linux-syscall-support/", @@ -43874,7 +45010,7 @@ diff --git a/tools/licenses.py b/tools/licenses.py "License": "BSD", "License File": "/LICENSE", }, -@@ -192,7 +192,7 @@ SPECIAL_CASES = { +@@ -198,7 +198,7 @@ SPECIAL_CASES = { 'boringssl'): { "Name": "BoringSSL", @@ -43883,7 +45019,7 @@ diff --git a/tools/licenses.py b/tools/licenses.py "License": "BSDish", "License File": "/third_party/boringssl/src/LICENSE", }, -@@ -212,12 +212,12 @@ SPECIAL_CASES = { +@@ -218,12 +218,12 @@ SPECIAL_CASES = { }, os.path.join('third_party', 'pdfium'): { "Name": "PDFium", @@ -43898,7 +45034,7 @@ diff --git a/tools/licenses.py b/tools/licenses.py }, os.path.join('third_party', 'scons-2.0.1'): { "Name": "scons-2.0.1", -@@ -233,7 +233,7 @@ SPECIAL_CASES = { +@@ -239,7 +239,7 @@ SPECIAL_CASES = { }, os.path.join('third_party', 'crashpad', 'crashpad', 'third_party', 'lss'): { "Name": "linux-syscall-support", @@ -43907,7 +45043,7 @@ diff --git a/tools/licenses.py b/tools/licenses.py "License": "BSD", "License File": "NOT_SHIPPED", }, -@@ -241,7 +241,7 @@ SPECIAL_CASES = { +@@ -247,7 +247,7 @@ SPECIAL_CASES = { 'mini_chromium'): { "Name": "mini_chromium", @@ -43916,7 +45052,7 @@ diff --git a/tools/licenses.py b/tools/licenses.py "License": "BSD", "License File": "NOT_SHIPPED", }, -@@ -260,7 +260,7 @@ SPECIAL_CASES = { +@@ -266,7 +266,7 @@ SPECIAL_CASES = { }, os.path.join('third_party', 'v8-i18n'): { "Name": "Internationalization Library for v8", @@ -43925,7 +45061,7 @@ diff --git a/tools/licenses.py b/tools/licenses.py "License": "Apache 2.0", }, os.path.join('third_party', 'blink'): { -@@ -276,19 +276,19 @@ SPECIAL_CASES = { +@@ -282,19 +282,19 @@ SPECIAL_CASES = { }, os.path.join('third_party', 'webpagereplay'): { "Name": "webpagereplay", @@ -43948,7 +45084,7 @@ diff --git a/tools/licenses.py b/tools/licenses.py "License": "BSD", }, os.path.join('v8', 'strongtalk'): { -@@ -316,13 +316,13 @@ SPECIAL_CASES = { +@@ -322,13 +322,13 @@ SPECIAL_CASES = { }, os.path.join('tools', 'telemetry', 'third_party', 'gsutil'): { "Name": "gsutil", @@ -43964,7 +45100,7 @@ diff --git a/tools/licenses.py b/tools/licenses.py "License": "Apache 2.0 and compatible licenses", "License Android Compatible": "yes", "License File": "/third_party/swiftshader/LICENSE.txt", -@@ -716,7 +716,7 @@ def GenerateCredits(file_template_file, +@@ -728,7 +728,7 @@ def GenerateCredits(file_template_file, # Start from Chromium's LICENSE file chromium_license_metadata = { 'Name': 'The Chromium Project', @@ -44012,21 +45148,21 @@ diff --git a/tools/mac/power/scenarios.py b/tools/mac/power/scenarios.py "idle_on_youtube") -@@ -189,10 +189,10 @@ class NavigationScenario(ScenarioWithBrowserOSADriver): - NAVIGATED_SITES = [ - "https://amazon.com", - "https://www.amazon.com/s?k=computer&ref=nb_sb_noss_2", -- "https://google.com", "https://www.google.com/search?q=computers", -- "https://www.youtube.com", -- "https://www.youtube.com/results?search_query=computers", -- "https://docs.google.com/document/d/1Ll-8Nvo6JlhzKEttst8GHWCc7_A8Hluy2fX99cy4Sfg/edit?usp=sharing" -+ "https://9oo91e.qjz9zk", "https://www.9oo91e.qjz9zk/search?q=computers", -+ "https://www.y0u1ub3.qjz9zk", -+ "https://www.y0u1ub3.qjz9zk/results?search_query=computers", -+ "https://docs.9oo91e.qjz9zk/document/d/1Ll-8Nvo6JlhzKEttst8GHWCc7_A8Hluy2fX99cy4Sfg/edit?usp=sharing" - ] - - def __init__(self, +@@ -250,10 +250,10 @@ def MakeScenarioDriver(scenario_name, + NAVIGATED_SITES = [ + "https://amazon.com", + "https://www.amazon.com/s?k=computer&ref=nb_sb_noss_2", +- "https://google.com", "https://www.google.com/search?q=computers", +- "https://www.youtube.com", +- "https://www.youtube.com/results?search_query=computers", +- "https://docs.google.com/document/d/1Ll-8Nvo6JlhzKEttst8GHWCc7_A8Hluy2fX99cy4Sfg/edit?usp=sharing" ++ "https://9oo91e.qjz9zk", "https://www.9oo91e.qjz9zk/search?q=computers", ++ "https://www.y0u1ub3.qjz9zk", ++ "https://www.y0u1ub3.qjz9zk/results?search_query=computers", ++ "https://docs.9oo91e.qjz9zk/document/d/1Ll-8Nvo6JlhzKEttst8GHWCc7_A8Hluy2fX99cy4Sfg/edit?usp=sharing" + ] + elif "navigation_heavy_sites" == scenario_name: + NAVIGATED_SITES = [ diff --git a/tools/mb/mb.py b/tools/mb/mb.py --- a/tools/mb/mb.py +++ b/tools/mb/mb.py @@ -44051,7 +45187,7 @@ diff --git a/tools/mb/mb.py b/tools/mb/mb.py diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl -@@ -4039,11 +4039,11 @@ +@@ -4092,11 +4092,11 @@ # Used to pass the list of files to instrument for coverage to the compile # wrapper. See: @@ -45019,6 +46155,18 @@ diff --git a/tools/variations/bisect_variations.py b/tools/variations/bisect_var "variations_cmd.txt" is the command line switches data saved from chrome://version/?show-variations-cmd. +diff --git a/tools/visual_debugger/app.html b/tools/visual_debugger/app.html +--- a/tools/visual_debugger/app.html ++++ b/tools/visual_debugger/app.html +@@ -112,7 +112,7 @@ + + + +- ++ + + + diff --git a/tools/web_dev_style/css_checker.py b/tools/web_dev_style/css_checker.py --- a/tools/web_dev_style/css_checker.py +++ b/tools/web_dev_style/css_checker.py @@ -45058,8 +46206,8 @@ diff --git a/tools/web_dev_style/html_checker.py b/tools/web_dev_style/html_chec diff --git a/tools/web_dev_style/js_checker.py b/tools/web_dev_style/js_checker.py --- a/tools/web_dev_style/js_checker.py +++ b/tools/web_dev_style/js_checker.py -@@ -84,10 +84,10 @@ class JSChecker(object): - return [self.output_api.PresubmitError(output)] if output else [] +@@ -104,10 +104,10 @@ class JSChecker(object): + return results def VariableNameCheck(self, i, line): - """See the style guide. http://goo.gl/eQiXVW""" @@ -45071,7 +46219,7 @@ diff --git a/tools/web_dev_style/js_checker.py b/tools/web_dev_style/js_checker. def _GetErrorHighlight(self, start, length): """Takes a start position and a length, and produces a row of "^"s to -@@ -97,7 +97,7 @@ class JSChecker(object): +@@ -117,7 +117,7 @@ class JSChecker(object): def RunChecks(self): """Check for violations of the Chromium JavaScript style guide. See @@ -45080,7 +46228,7 @@ diff --git a/tools/web_dev_style/js_checker.py b/tools/web_dev_style/js_checker. """ results = [] -@@ -137,6 +137,6 @@ class JSChecker(object): +@@ -157,6 +157,6 @@ class JSChecker(object): if results: results.append(self.output_api.PresubmitNotifyResult( "See the JavaScript style guide at " @@ -45258,7 +46406,7 @@ diff --git a/ui/accessibility/extensions/chromevoxclassic/manifest.json.jinja2 b diff --git a/ui/accessibility/extensions/strings/accessibility_extensions_strings.grd b/ui/accessibility/extensions/strings/accessibility_extensions_strings.grd --- a/ui/accessibility/extensions/strings/accessibility_extensions_strings.grd +++ b/ui/accessibility/extensions/strings/accessibility_extensions_strings.grd -@@ -232,7 +232,7 @@ +@@ -233,7 +233,7 @@ Default color scheme: @@ -45492,7 +46640,7 @@ diff --git a/ui/file_manager/image_loader/piex/Makefile b/ui/file_manager/image_ diff --git a/ui/gl/gl_image_io_surface_egl.mm b/ui/gl/gl_image_io_surface_egl.mm --- a/ui/gl/gl_image_io_surface_egl.mm +++ b/ui/gl/gl_image_io_surface_egl.mm -@@ -181,7 +181,7 @@ void GLImageIOSurfaceEGL::ReleaseTexImage(unsigned target) { +@@ -174,7 +174,7 @@ void GLImageIOSurfaceEGL::ReleaseTexImage(unsigned target) { bool GLImageIOSurfaceEGL::BindTexImageImpl(unsigned target, unsigned internalformat) { @@ -45567,7 +46715,7 @@ diff --git a/ui/strings/ui_strings.grd b/ui/strings/ui_strings.grd for more details. Note that all output references are relative to the output directory which is specified at build time. --> -@@ -962,7 +962,7 @@ need to be translated for each locale.--> +@@ -967,7 +967,7 @@ need to be translated for each locale.--> {DAYS, plural, =0 {Active today} =1 {Active 1 day ago} other {Active # days ago}} diff --git a/build/patches/Block-gateway-attacks-via-websockets.patch b/build/patches/Block-gateway-attacks-via-websockets.patch index e7aa77b4..3a25e5bd 100644 --- a/build/patches/Block-gateway-attacks-via-websockets.patch +++ b/build/patches/Block-gateway-attacks-via-websockets.patch @@ -45,7 +45,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -373,6 +373,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable, +@@ -374,6 +374,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable, const String& message = g_empty_string, const String& source_file = g_empty_string) const {} @@ -67,7 +67,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -558,6 +558,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const { +@@ -546,6 +546,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const { return should_block_request; } @@ -97,7 +97,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h -@@ -178,6 +178,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, +@@ -171,6 +171,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override; std::unique_ptr CreateWebSocketHandshakeThrottle() override; diff --git a/build/patches/Block-qjz9zk-or-trk-requests.patch b/build/patches/Block-qjz9zk-or-trk-requests.patch index a6a1f640..e7cd24cc 100644 --- a/build/patches/Block-qjz9zk-or-trk-requests.patch +++ b/build/patches/Block-qjz9zk-or-trk-requests.patch @@ -26,7 +26,7 @@ This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -57,6 +57,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme( +@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme( if (base::IsStringASCII(scheme) && (ProfileIOData::IsHandledProtocol(scheme) || base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) || @@ -117,7 +117,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1048,6 +1048,8 @@ component("net") { +@@ -1033,6 +1033,8 @@ component("net") { "url_request/url_request_http_job.cc", "url_request/url_request_http_job.h", "url_request/url_request_interceptor.cc", @@ -226,7 +226,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc -@@ -48,6 +48,7 @@ +@@ -47,6 +47,7 @@ #include "net/socket/network_binding_client_socket_factory.h" #include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/static_http_user_agent_settings.h" @@ -234,7 +234,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_job_factory.h" -@@ -616,6 +617,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { +@@ -626,6 +627,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { job_factory->SetProtocolHandler(scheme_handler.first, std::move(scheme_handler.second)); } diff --git a/build/patches/Bookmarks-select-all-menu-entry.patch b/build/patches/Bookmarks-select-all-menu-entry.patch index 9ae25296..51a47cf0 100644 --- a/build/patches/Bookmarks-select-all-menu-entry.patch +++ b/build/patches/Bookmarks-select-all-menu-entry.patch @@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm 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 -@@ -242,6 +242,9 @@ CHAR_LIMIT guidelines: +@@ -243,6 +243,9 @@ CHAR_LIMIT guidelines: Sites diff --git a/build/patches/Bromite-AdBlockUpdaterService.patch b/build/patches/Bromite-AdBlockUpdaterService.patch index b90aca3b..61dfa8f4 100644 --- a/build/patches/Bromite-AdBlockUpdaterService.patch +++ b/build/patches/Bromite-AdBlockUpdaterService.patch @@ -58,7 +58,7 @@ Fix RestoreForeignSessionTab by recreating the tab (issue #681) diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -486,6 +486,7 @@ chrome_java_resources = [ +@@ -473,6 +473,7 @@ chrome_java_resources = [ "java/res/layout/account_chooser_dialog_title.xml", "java/res/layout/account_divider_preference.xml", "java/res/layout/account_management_account_row.xml", @@ -66,7 +66,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/layout/auto_sign_in_first_run_dialog.xml", "java/res/layout/autofill_billing_address_dropdown.xml", "java/res/layout/autofill_card_unmask_prompt.xml", -@@ -680,6 +681,7 @@ chrome_java_resources = [ +@@ -667,6 +668,7 @@ chrome_java_resources = [ "java/res/values/values.xml", "java/res/xml/about_chrome_preferences.xml", "java/res/xml/account_management_preferences.xml", @@ -77,7 +77,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -898,6 +898,8 @@ chrome_java_sources = [ +@@ -904,6 +904,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java", "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java", @@ -408,19 +408,19 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java -@@ -802,7 +802,7 @@ public class TabModelImpl extends TabModelJniBridge { +@@ -670,7 +670,7 @@ public class TabModelImpl extends TabModelJniBridge { + protected boolean createTabWithWebContents( Tab parent, Profile profile, WebContents webContents) { return getTabCreator(profile.isOffTheRecord()) - .createTabWithWebContents( -- parent, webContents, TabLaunchType.FROM_LONGPRESS_BACKGROUND); -+ parent, webContents, TabLaunchType.FROM_LINK); +- .createTabWithWebContents(parent, webContents, TabLaunchType.FROM_RECENT_TABS); ++ .createTabWithWebContents(parent, webContents, TabLaunchType.FROM_LINK); } @Override diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -11534,6 +11534,16 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11873,6 +11873,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Never show this again. @@ -492,7 +492,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1065,6 +1065,26 @@ BrowserProcessImpl::component_updater() { +@@ -1068,6 +1068,26 @@ BrowserProcessImpl::component_updater() { return component_updater_.get(); } @@ -541,7 +541,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1727,6 +1727,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1730,6 +1730,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // will be initialized when the app enters foreground mode. variations_service->set_policy_pref_service(profile->GetPrefs()); @@ -579,7 +579,7 @@ diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/brows diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -272,6 +272,14 @@ public class CachedFeatureFlags { +@@ -270,6 +270,14 @@ public class CachedFeatureFlags { ChromeFeatureList.isEnabled(ChromeFeatureList.BACKGROUND_THREAD_POOL)); } @@ -594,7 +594,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /** * Caches flags that must take effect on startup but are set via native code. */ -@@ -489,5 +497,7 @@ public class CachedFeatureFlags { +@@ -487,5 +495,7 @@ public class CachedFeatureFlags { @NativeMethods interface Natives { boolean isNetworkServiceWarmUpEnabled(); @@ -605,7 +605,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -437,6 +437,8 @@ SystemNetworkContextManager::SystemNetworkContextManager( +@@ -436,6 +436,8 @@ SystemNetworkContextManager::SystemNetworkContextManager( ssl_config_service_manager_(local_state_), proxy_config_monitor_(local_state_), stub_resolver_config_reader_(local_state_) { @@ -614,7 +614,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows #if !BUILDFLAG(IS_ANDROID) // QuicAllowed was not part of Android policy. const base::Value* value = -@@ -517,6 +519,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { +@@ -516,6 +518,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { StubResolverConfigReader::RegisterPrefs(registry); @@ -640,7 +640,7 @@ diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser 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 -@@ -214,6 +214,20 @@ CHAR_LIMIT guidelines: +@@ -215,6 +215,20 @@ CHAR_LIMIT guidelines: Enter VR @@ -664,7 +664,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 -@@ -2280,6 +2280,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; +@@ -2318,6 +2318,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; // capture devices without prompt. const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; @@ -677,7 +677,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 -@@ -31,6 +31,7 @@ extern const char kDownloadRestrictions[]; +@@ -32,6 +32,7 @@ extern const char kDownloadBubbleEnabled[]; extern const char kForceEphemeralProfiles[]; extern const char kHomePageIsNewTabPage[]; extern const char kHomePage[]; @@ -1457,7 +1457,7 @@ new file mode 100644 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc -@@ -652,6 +652,17 @@ ContentSubresourceFilterThrottleManager:: +@@ -666,6 +666,17 @@ ContentSubresourceFilterThrottleManager:: throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(), ad_tagging_state); } @@ -1478,7 +1478,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/components/subresource_filter/content/browser/ruleset_service.cc --- a/components/subresource_filter/content/browser/ruleset_service.cc +++ b/components/subresource_filter/content/browser/ruleset_service.cc -@@ -46,9 +46,7 @@ namespace { +@@ -45,9 +45,7 @@ namespace { void RecordIndexAndWriteRulesetResult( RulesetService::IndexAndWriteRulesetResult result) { @@ -1489,7 +1489,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ } // Implements operations on a `sentinel file`, which is used as a safeguard to -@@ -228,10 +226,13 @@ RulesetService::RulesetService( +@@ -227,10 +225,13 @@ RulesetService::RulesetService( RulesetService::~RulesetService() {} void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded( @@ -1505,7 +1505,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ // Trying to store a ruleset with the same version for a second time would // not only be futile, but would fail on Windows due to "File System // Tunneling" as long as the previously stored copy of the rules is still -@@ -241,13 +242,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded( +@@ -240,13 +241,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded( if (most_recently_indexed_version.IsCurrentFormatVersion() && most_recently_indexed_version.content_version == unindexed_ruleset_info.content_version) { @@ -1522,7 +1522,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ return; } -@@ -266,6 +270,18 @@ IndexedRulesetVersion RulesetService::GetMostRecentlyIndexedVersion() const { +@@ -265,6 +269,18 @@ IndexedRulesetVersion RulesetService::GetMostRecentlyIndexedVersion() const { IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( const base::FilePath& indexed_ruleset_base_dir, const UnindexedRulesetInfo& unindexed_ruleset_info) { @@ -1541,7 +1541,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, base::BlockingType::MAY_BLOCK); -@@ -273,6 +289,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( +@@ -272,6 +288,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( unindexed_ruleset_info); if (!unindexed_ruleset_stream_generator.ruleset_stream()) { @@ -1549,7 +1549,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ RecordIndexAndWriteRulesetResult( IndexAndWriteRulesetResult::FAILED_OPENING_UNINDEXED_RULESET); return IndexedRulesetVersion(); -@@ -286,6 +303,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( +@@ -285,6 +302,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( indexed_ruleset_base_dir, indexed_version); if (!base::CreateDirectory(indexed_ruleset_version_dir)) { @@ -1557,7 +1557,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ RecordIndexAndWriteRulesetResult( IndexAndWriteRulesetResult::FAILED_CREATING_VERSION_DIR); return IndexedRulesetVersion(); -@@ -311,6 +329,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( +@@ -310,6 +328,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( RulesetIndexer indexer; if (!(*g_index_ruleset_func)(&unindexed_ruleset_stream_generator, &indexer)) { @@ -1565,7 +1565,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ RecordIndexAndWriteRulesetResult( IndexAndWriteRulesetResult::FAILED_PARSING_UNINDEXED_RULESET); return IndexedRulesetVersion(); -@@ -331,6 +350,8 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( +@@ -330,6 +349,8 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( if (result != IndexAndWriteRulesetResult::SUCCESS) return IndexedRulesetVersion(); @@ -1574,7 +1574,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ DCHECK(indexed_version.IsValid()); return indexed_version; } -@@ -455,6 +476,7 @@ void RulesetService::IndexAndStoreRuleset( +@@ -454,6 +475,7 @@ void RulesetService::IndexAndStoreRuleset( void RulesetService::OnWrittenRuleset(WriteRulesetCallback result_callback, const IndexedRulesetVersion& version) { DCHECK(!result_callback.is_null()); @@ -1582,7 +1582,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ if (!version.IsValid()) return; version.SaveToPrefs(local_state_); -@@ -467,7 +489,6 @@ void RulesetService::OpenAndPublishRuleset( +@@ -466,7 +488,6 @@ void RulesetService::OpenAndPublishRuleset( IndexedRulesetLocator::GetRulesetDataFilePath( IndexedRulesetLocator::GetSubdirectoryPathForVersion( indexed_ruleset_base_dir_, version)); diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index b0120f1c..f4c5a21e 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -45,7 +45,7 @@ diff --git a/build/android/java/templates/BuildConfig.template b/build/android/j diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -1977,6 +1977,9 @@ if (enable_java_templates) { +@@ -2018,6 +2018,9 @@ if (enable_java_templates) { ] } } @@ -58,7 +58,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -801,6 +801,9 @@ chrome_java_sources = [ +@@ -807,6 +807,9 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java", "java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java", "java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java", @@ -1512,15 +1512,15 @@ new file mode 100644 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -254,6 +254,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -249,6 +249,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &kNewWindowAppMenu, &kNotificationPermissionVariant, - &kOfflineIndicatorV2, &kPageAnnotationsService, + &kInlineUpdateFlow, &kBookmarksImprovedSaveFlow, &kBookmarksRefresh, &kProbabilisticCryptidRenderer, -@@ -676,6 +677,9 @@ const base::Feature kIncognitoReauthenticationForAndroid{ +@@ -660,6 +661,9 @@ const base::Feature kIncognitoReauthenticationForAndroid{ const base::Feature kIncognitoScreenshot{"IncognitoScreenshot", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -1533,7 +1533,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 -@@ -106,6 +106,7 @@ extern const base::Feature kImmersiveUiMode; +@@ -101,6 +101,7 @@ extern const base::Feature kImmersiveUiMode; extern const base::Feature kIncognitoReauthenticationForAndroid; extern const base::Feature kIncognitoScreenshot; extern const base::Feature kImprovedA2HS; @@ -1544,7 +1544,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 -@@ -367,6 +367,7 @@ public abstract class ChromeFeatureList { +@@ -363,6 +363,7 @@ public abstract class ChromeFeatureList { public static final String INCOGNITO_REAUTHENTICATION_FOR_ANDROID = "IncognitoReauthenticationForAndroid"; public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot"; @@ -1555,7 +1555,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1836,6 +1836,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1840,6 +1840,12 @@ Your Google account may have other forms of browsing history like searches and a Chrome updates are no longer supported for this version of Android @@ -1568,7 +1568,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -3323,7 +3329,10 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

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

<resetlink>reset sync

Android version is unsupported diff --git a/build/patches/Client-hints-overrides.patch b/build/patches/Client-hints-overrides.patch index a5c9b080..177da4ae 100644 --- a/build/patches/Client-hints-overrides.patch +++ b/build/patches/Client-hints-overrides.patch @@ -9,19 +9,23 @@ use Google Chrome branding for client hints chrome/browser/prefs/browser_prefs.cc | 2 +- components/embedder_support/user_agent_utils.cc | 4 +--- content/browser/client_hints/client_hints.cc | 3 ++- + content/browser/loader/navigation_url_loader_impl.cc | 5 +++++ content/common/user_agent.cc | 9 +-------- content/public/common/content_features.cc | 2 +- services/network/public/cpp/client_hints.cc | 1 + - services/network/public/cpp/features.cc | 2 +- + services/network/public/cpp/features.cc | 6 ++++++ + services/network/public/cpp/features.h | 3 +++ + services/network/url_loader.cc | 3 ++- + services/network/url_loader_unittest.cc | 3 ++- third_party/blink/common/client_hints/client_hints.cc | 1 + .../blink/common/client_hints/enabled_client_hints.cc | 4 +++- third_party/blink/common/features.cc | 4 ++-- - 10 files changed, 14 insertions(+), 18 deletions(-) + 14 files changed, 31 insertions(+), 19 deletions(-) diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -747,7 +747,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) { +@@ -765,7 +765,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) { registry->RegisterListPref(prefs::kUsedPolicyCertificates); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -33,9 +37,9 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -225,9 +225,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( - int major_version_number = 0; - DCHECK(base::StringToInt(major_version, &major_version_number)); +@@ -226,9 +226,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( + bool parse_result = base::StringToInt(major_version, &major_version_number); + DCHECK(parse_result); absl::optional brand; -#if !BUILDFLAG(CHROMIUM_BRANDING) - brand = version_info::GetProductName(); @@ -47,7 +51,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc --- a/content/browser/client_hints/client_hints.cc +++ b/content/browser/client_hints/client_hints.cc -@@ -424,7 +424,8 @@ void AddPrefersColorSchemeHeader(net::HttpRequestHeaders* headers, +@@ -433,7 +433,8 @@ void AddPrefersColorSchemeHeader(net::HttpRequestHeaders* headers, is_dark_mode ? "dark" : "light"); } @@ -57,10 +61,25 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie return network::IsOriginPotentiallyTrustworthy(origin); } +diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc +--- a/content/browser/loader/navigation_url_loader_impl.cc ++++ b/content/browser/loader/navigation_url_loader_impl.cc +@@ -983,6 +983,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( + const std::vector& accept_ch_frame, + OnAcceptCHFrameReceivedCallback callback) { + received_accept_ch_frame_ = true; ++ if (!base::FeatureList::IsEnabled(network::features::kAcceptCHFrame)) { ++ std::move(callback).Run(net::OK); ++ return; ++ } ++ + LogAcceptCHFrameStatus(AcceptCHFrameRestart::kFramePresent); + + // Given that this is happening in the middle of navigation, there should diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc -@@ -283,14 +283,7 @@ std::string BuildUserAgentFromProduct(const std::string& product) { +@@ -300,14 +300,7 @@ std::string BuildUserAgentFromProduct(const std::string& product) { } std::string BuildModelInfo() { @@ -86,12 +105,12 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; - // Puts save-data header in the holdback mode. This disables sending of - // save-data header to origins, and to the renderer processes within Chrome. + // Enable debugging the issue crbug.com/1201355 + const base::Feature kDebugHistoryInterventionNoUserActivation{ diff --git a/services/network/public/cpp/client_hints.cc b/services/network/public/cpp/client_hints.cc --- a/services/network/public/cpp/client_hints.cc +++ b/services/network/public/cpp/client_hints.cc -@@ -97,6 +97,7 @@ const DecodeMap& GetDecodeMap() { +@@ -98,6 +98,7 @@ const DecodeMap& GetDecodeMap() { absl::optional> ParseClientHintsHeader(const std::string& header) { @@ -102,26 +121,69 @@ diff --git a/services/network/public/cpp/client_hints.cc b/services/network/publ diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -185,7 +185,7 @@ const base::Feature kWebSocketReassembleShortMessages{ - // See: - // https://tools.ietf.org/html/draft-davidben-http-client-hint-reliability-02#section-4.3 - const base::Feature kAcceptCHFrame{"AcceptCHFrame", -- base::FEATURE_ENABLED_BY_DEFAULT}; -+ base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -181,6 +181,12 @@ const base::FeatureParam kPlatformProvidedTrustTokenIssuance{ + const base::Feature kWebSocketReassembleShortMessages{ + "WebSocketReassembleShortMessages", base::FEATURE_ENABLED_BY_DEFAULT}; ++// Enable support for ACCEPT_CH H2/3 frame as part of Client Hint Reliability. ++// See: ++// https://tools.ietf.org/html/draft-davidben-http-client-hint-reliability-02#section-4.3 ++const base::Feature kAcceptCHFrame{"AcceptCHFrame", ++ base::FEATURE_DISABLED_BY_DEFAULT}; ++ const base::Feature kSCTAuditingRetryReports{"SCTAuditingRetryReports", base::FEATURE_ENABLED_BY_DEFAULT}; + +diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h +--- a/services/network/public/cpp/features.h ++++ b/services/network/public/cpp/features.h +@@ -66,6 +66,9 @@ extern const base::FeatureParam kPlatformProvidedTrustTokenIssuance; + COMPONENT_EXPORT(NETWORK_CPP) + extern const base::Feature kWebSocketReassembleShortMessages; + ++COMPONENT_EXPORT(NETWORK_CPP) ++extern const base::Feature kAcceptCHFrame; ++ + COMPONENT_EXPORT(NETWORK_CPP) + extern const base::Feature kSCTAuditingRetryReports; + +diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc +--- a/services/network/url_loader.cc ++++ b/services/network/url_loader.cc +@@ -1149,7 +1149,8 @@ int URLLoader::OnConnected(net::URLRequest* url_request, + return net::ERR_FAILED; + } + +- if (!accept_ch_frame_observer_ || info.accept_ch_frame.empty()) { ++ if (!accept_ch_frame_observer_ || info.accept_ch_frame.empty() || ++ !base::FeatureList::IsEnabled(features::kAcceptCHFrame)) { + return net::OK; + } + +diff --git a/services/network/url_loader_unittest.cc b/services/network/url_loader_unittest.cc +--- a/services/network/url_loader_unittest.cc ++++ b/services/network/url_loader_unittest.cc +@@ -686,7 +686,8 @@ class URLLoaderTest : public testing::Test { + net::URLRequestFailedJob::AddUrlHandler(); + + scoped_feature_list_.InitWithFeatures( +- /*enabled_features=*/{net::features::kRecordRadioWakeupTrigger}, ++ /*enabled_features=*/{features::kAcceptCHFrame, ++ net::features::kRecordRadioWakeupTrigger}, + /*disabled_features=*/{}); + } + ~URLLoaderTest() override { diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc -@@ -116,6 +116,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount = +@@ -118,6 +118,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount = std::size(kWebEffectiveConnectionTypeMapping); bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) { + if ((true)) return false; switch (type) { + case network::mojom::WebClientHintsType::kSaveData: case network::mojom::WebClientHintsType::kUA: - case network::mojom::WebClientHintsType::kUAMobile: diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/third_party/blink/common/client_hints/enabled_client_hints.cc --- a/third_party/blink/common/client_hints/enabled_client_hints.cc +++ b/third_party/blink/common/client_hints/enabled_client_hints.cc @@ -133,7 +195,7 @@ diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/thi switch (type) { case WebClientHintsType::kUA: case WebClientHintsType::kUAArch: -@@ -132,7 +133,7 @@ bool IsOriginTrialEnabled(const GURL& url, +@@ -136,7 +137,7 @@ bool IsOriginTrialEnabled(const GURL& url, } // namespace bool EnabledClientHints::IsEnabled(const WebClientHintsType type) const { @@ -142,7 +204,7 @@ diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/thi } void EnabledClientHints::SetIsEnabled(const WebClientHintsType type, -@@ -165,6 +166,7 @@ void EnabledClientHints::SetIsEnabled( +@@ -169,6 +170,7 @@ void EnabledClientHints::SetIsEnabled( std::vector EnabledClientHints::GetEnabledHints() const { std::vector hints; @@ -153,7 +215,7 @@ diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/thi diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -161,7 +161,7 @@ const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent", +@@ -156,7 +156,7 @@ const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent", // An experimental replacement for the `User-Agent` header, defined in // https://tools.ietf.org/html/draft-west-ua-client-hints. const base::Feature kUserAgentClientHint{"UserAgentClientHint", @@ -162,7 +224,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea // Enable `sec-ch-ua-full-version-list` client hint. const base::Feature kUserAgentClientHintFullVersionList{ -@@ -773,7 +773,7 @@ const base::Feature kResamplingScrollEvents{"ResamplingScrollEvents", +@@ -767,7 +767,7 @@ const base::Feature kResamplingScrollEvents{"ResamplingScrollEvents", const base::Feature kAllowClientHintsToThirdParty { "AllowClientHintsToThirdParty", #if BUILDFLAG(IS_ANDROID) diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index 1daefb7d..f7d02bdf 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -427,7 +427,7 @@ new file mode 100644 + @ContentSettingValues + Integer value = site.getContentSetting(browserContextHandle, type); + -+ return new AlertDialog.Builder(context, R.style.Theme_Chromium_AlertDialog) ++ return new AlertDialog.Builder(context, R.style.ThemeOverlay_BrowserUI_AlertDialog) + .setPositiveButton(R.string.cancel, null) + .setNegativeButton(R.string.remove, + (dialog, which) -> { @@ -972,7 +972,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. #if BUILDFLAG(IS_ANDROID) #include "media/base/android/media_drm_bridge.h" -@@ -678,7 +680,10 @@ void ContentSettingsRegistry::Register( +@@ -688,7 +690,10 @@ void ContentSettingsRegistry::Register( Platforms platforms, ContentSettingsInfo::IncognitoBehavior incognito_behavior, ContentSettingsInfo::StorageBehavior storage_behavior, @@ -984,7 +984,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. // Ensure that nothing has been registered yet for the given type. DCHECK(!website_settings_registry_->Get(type)); -@@ -687,7 +692,9 @@ void ContentSettingsRegistry::Register( +@@ -697,7 +702,9 @@ void ContentSettingsRegistry::Register( website_settings_registry_->Register( type, name, std::move(default_value), sync_status, WebsiteSettingsInfo::NOT_LOSSY, scoping_type, platforms, @@ -1177,7 +1177,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. #include "components/content_settings/core/browser/content_settings_registry.h" #include "components/content_settings/core/browser/content_settings_utils.h" #include "components/content_settings/core/browser/host_content_settings_map.h" -@@ -162,6 +163,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, +@@ -164,6 +165,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, return true; } @@ -1193,7 +1193,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. const bool is_incognito = web_contents->GetBrowserContext()->IsOffTheRecord(); #if BUILDFLAG(IS_ANDROID) // Special geolocation DSE settings apply only on Android, so make sure it -@@ -962,7 +972,18 @@ void PageInfo::PresentSitePermissions() { +@@ -964,7 +974,18 @@ void PageInfo::PresentSitePermissions() { PermissionInfo permission_info; HostContentSettingsMap* content_settings = GetContentSettings(); DCHECK(web_contents_); diff --git a/build/patches/Revert-Disable-Dictionary-suggestions-for-the-Omnibox.patch b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch similarity index 99% rename from build/patches/Revert-Disable-Dictionary-suggestions-for-the-Omnibox.patch rename to build/patches/Dictionary-suggestions-for-the-Omnibox.patch index 51476e05..8c4d1058 100644 --- a/build/patches/Revert-Disable-Dictionary-suggestions-for-the-Omnibox.patch +++ b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch @@ -1,6 +1,8 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 19 Mar 2022 10:53:24 +0100 -Subject: Revert "Disable Dictionary suggestions for the Omnibox" +Subject: Dictionary suggestions for the Omnibox + +Revert "Disable Dictionary suggestions for the Omnibox" This reverts commit d3ec2b2d25066ec089f8351a44b919ded4270e83. --- @@ -959,7 +961,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java -@@ -206,8 +206,7 @@ public abstract class UrlBar extends AutocompleteEditText { +@@ -207,8 +207,7 @@ public abstract class UrlBar extends AutocompleteEditText { // the first draw. setFocusable(false); setFocusableInTouchMode(false); diff --git a/build/patches/Disable-AGSA-by-default.patch b/build/patches/Disable-AGSA-by-default.patch index 333e0e85..065ff54a 100644 --- a/build/patches/Disable-AGSA-by-default.patch +++ b/build/patches/Disable-AGSA-by-default.patch @@ -10,8 +10,8 @@ Subject: Disable AGSA by default 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 -@@ -649,7 +649,7 @@ const base::Feature kEnableMixedContentDownloadDialog{ - "EnableMixedContentDownloadDialog", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -636,7 +636,7 @@ const base::Feature kDynamicColorButtonsAndroid{ + "DynamicColorButtonsAndroid", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kExperimentsForAgsa{"ExperimentsForAgsa", - base::FEATURE_ENABLED_BY_DEFAULT}; @@ -22,7 +22,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -91,7 +91,7 @@ public class CachedFeatureFlags { +@@ -90,7 +90,7 @@ public class CachedFeatureFlags { .put(ChromeFeatureList.READ_LATER, false) .put(ChromeFeatureList.CCT_REMOVE_REMOTE_VIEW_IDS, true) .put(ChromeFeatureList.CCT_INCOGNITO, true) @@ -30,6 +30,6 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f + .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, false) .put(ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, false) .put(ChromeFeatureList.OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, false) - .put(ChromeFeatureList.APP_TO_WEB_ATTRIBUTION, false) + .put(ChromeFeatureList.NEW_WINDOW_APP_MENU, true) -- 2.25.1 diff --git a/build/patches/Disable-Accessibility-service-by-default.patch b/build/patches/Disable-Accessibility-service-by-default.patch index ac61fea1..bc088d34 100644 --- a/build/patches/Disable-Accessibility-service-by-default.patch +++ b/build/patches/Disable-Accessibility-service-by-default.patch @@ -12,7 +12,7 @@ Subject: Disable Accessibility service by default 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 -@@ -1416,6 +1416,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1420,6 +1420,12 @@ Your Google account may have other forms of browsing history like searches and a Check now diff --git a/build/patches/Disable-AsyncDNS-by-default.patch b/build/patches/Disable-AsyncDNS-by-default.patch index 5644fb13..733674ef 100644 --- a/build/patches/Disable-AsyncDNS-by-default.patch +++ b/build/patches/Disable-AsyncDNS-by-default.patch @@ -11,7 +11,7 @@ This feature is detrimental to privacy, see also: diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -101,12 +101,8 @@ const base::Feature kArcPiGhostWindow{"ArcPiGhostWindow", +@@ -95,12 +95,8 @@ const base::Feature kArcPiGhostWindow{"ArcPiGhostWindow", // Enables the built-in DNS resolver. const base::Feature kAsyncDns { diff --git a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch index cc497140..608f27e6 100644 --- a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch +++ b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch @@ -9,7 +9,7 @@ Subject: Disable DRM media origin IDs preprovisioning 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 -@@ -679,7 +679,7 @@ const base::Feature kMediaDrmPersistentLicense{ +@@ -703,7 +703,7 @@ const base::Feature kMediaDrmPersistentLicense{ // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs // which will trigger provisioning process after MediaDrmBridge is created. const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", diff --git a/build/patches/Disable-FLoC-and-privacy-sandbox.patch b/build/patches/Disable-FLoC-and-privacy-sandbox.patch index f650ecbe..680f9de6 100644 --- a/build/patches/Disable-FLoC-and-privacy-sandbox.patch +++ b/build/patches/Disable-FLoC-and-privacy-sandbox.patch @@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -2829,6 +2829,9 @@ bool ChromeContentBrowserClient::IsConversionMeasurementOperationAllowed( +@@ -2824,6 +2824,9 @@ bool ChromeContentBrowserClient::IsConversionMeasurementOperationAllowed( const url::Origin* impression_origin, const url::Origin* conversion_origin, const url::Origin* reporting_origin) { @@ -106,7 +106,7 @@ diff --git a/chrome/browser/privacy_sandbox/generated_floc_pref.cc b/chrome/brow diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc -@@ -496,18 +496,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id, +@@ -497,18 +497,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id, if (!visit_id) return; @@ -129,7 +129,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc --- a/components/history/core/browser/history_service.cc +++ b/components/history/core/browser/history_service.cc -@@ -393,7 +393,7 @@ void HistoryService::AddPage(const GURL& url, +@@ -394,7 +394,7 @@ void HistoryService::AddPage(const GURL& url, AddPage(HistoryAddPageArgs( url, time, context_id, nav_entry_id, referrer, redirects, transition, !ui::PageTransitionIsMainFrame(transition), visit_source, diff --git a/build/patches/Disable-TLS-resumption.patch b/build/patches/Disable-TLS-resumption.patch index e7581566..87f0267b 100644 --- a/build/patches/Disable-TLS-resumption.patch +++ b/build/patches/Disable-TLS-resumption.patch @@ -36,7 +36,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 -@@ -4342,6 +4342,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4472,6 +4472,12 @@ const FeatureEntry kFeatureEntries[] = { {"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName, flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll, FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)}, @@ -52,7 +52,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 -@@ -950,6 +950,14 @@ const char kEnableTLS13EarlyDataDescription[] = +@@ -922,6 +922,14 @@ const char kEnableTLS13EarlyDataDescription[] = "during the handshake when resuming a connection to a compatible TLS 1.3 " "server."; @@ -70,7 +70,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 -@@ -549,6 +549,12 @@ extern const char kEnableSyncRequiresPoliciesLoadedDescription[]; +@@ -532,6 +532,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[]; extern const char kEnableTLS13EarlyDataName[]; extern const char kEnableTLS13EarlyDataDescription[]; @@ -86,7 +86,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -92,6 +92,12 @@ const base::FeatureParam kUseDnsHttpsSvcbExtraTimePercent{ +@@ -112,6 +112,12 @@ const base::FeatureParam kUseDnsHttpsSvcbExtraTimePercent{ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -102,7 +102,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h -@@ -153,6 +153,12 @@ NET_EXPORT extern const base::FeatureParam +@@ -175,6 +175,12 @@ NET_EXPORT extern const base::FeatureParam // Enables TLS 1.3 early data. NET_EXPORT extern const base::Feature kEnableTLS13EarlyData; @@ -114,11 +114,11 @@ diff --git a/net/base/features.h b/net/base/features.h + // Enables the TLS Encrypted ClientHello feature. // https://datatracker.ietf.org/doc/html/draft-ietf-tls-esni-13 - // + NET_EXPORT extern const base::Feature kEncryptedClientHello; diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc -@@ -233,6 +233,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params, +@@ -232,6 +232,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params, next_protos_.push_back(kProtoHTTP11); @@ -130,8 +130,8 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc @@ -73,6 +73,7 @@ - #include "net/third_party/quiche/src/quic/core/quic_utils.h" - #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" + #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h" + #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h" #include "third_party/boringssl/src/include/openssl/aead.h" +#include "third_party/boringssl/src/include/openssl/ssl.h" #include "url/gurl.h" @@ -176,7 +176,7 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc // Refcounted class that owns quic::QuicCryptoClientConfig and tracks how many // consumers are using it currently. When the last reference is freed, the // QuicCryptoClientConfigHandle informs the owning QuicStreamFactory, moves it -@@ -2213,7 +2246,7 @@ QuicStreamFactory::CreateCryptoConfigHandle( +@@ -2209,7 +2242,7 @@ QuicStreamFactory::CreateCryptoConfigHandle( sct_auditing_delegate_, HostsFromOrigins(params_.origins_to_force_quic_on), actual_network_isolation_key), @@ -279,7 +279,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h --- a/net/socket/ssl_client_socket_impl.h +++ b/net/socket/ssl_client_socket_impl.h -@@ -129,6 +129,8 @@ class SSLClientSocketImpl : public SSLClientSocket, +@@ -130,6 +130,8 @@ class SSLClientSocketImpl : public SSLClientSocket, friend class SSLClientSocket; friend class SSLContext; diff --git a/build/patches/Disable-UA-full-version.patch b/build/patches/Disable-UA-full-version.patch index ee2e066b..3fb8a9d6 100644 --- a/build/patches/Disable-UA-full-version.patch +++ b/build/patches/Disable-UA-full-version.patch @@ -19,7 +19,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h" #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h" #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h" -@@ -37,6 +39,16 @@ void MaybeRecordMetric(bool record_identifiability, +@@ -39,6 +41,16 @@ void MaybeRecordMetric(bool record_identifiability, .Record(execution_context->UkmRecorder()); } @@ -36,7 +36,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ } // namespace NavigatorUAData::NavigatorUAData(ExecutionContext* context) -@@ -75,7 +87,7 @@ void NavigatorUAData::SetFullVersionList( +@@ -77,7 +89,7 @@ void NavigatorUAData::SetFullVersionList( const UserAgentBrandList& full_version_list) { for (const auto& brand_version : full_version_list) { AddBrandFullVersion(String::FromUTF8(brand_version.brand), @@ -45,7 +45,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ } } -@@ -97,7 +109,7 @@ void NavigatorUAData::SetModel(const String& model) { +@@ -99,7 +111,7 @@ void NavigatorUAData::SetModel(const String& model) { } void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) { diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch index f294eb67..1f99b5d7 100644 --- a/build/patches/Disable-all-predictors-code.patch +++ b/build/patches/Disable-all-predictors-code.patch @@ -11,11 +11,11 @@ Subject: Disable all predictors code .../core/optimization_guide_features.cc | 20 +++++++++---------- .../core/prediction_model_download_manager.cc | 4 +++- .../core/prediction_model_fetcher_impl.cc | 1 + - components/optimization_guide/features.gni | 3 +-- + components/optimization_guide/features.gni | 4 +--- components/permissions/features.cc | 2 +- .../segmentation_platform/public/features.cc | 2 +- third_party/blink/common/features.cc | 2 +- - 12 files changed, 25 insertions(+), 19 deletions(-) + 12 files changed, 25 insertions(+), 20 deletions(-) diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/browser/optimization_guide/chrome_hints_manager.cc --- a/chrome/browser/optimization_guide/chrome_hints_manager.cc @@ -42,7 +42,7 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service. diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -781,7 +781,7 @@ const base::Feature kPermissionAuditing{"PermissionAuditing", +@@ -788,7 +788,7 @@ const base::Feature kPermissionAuditing{"PermissionAuditing", // Enables using the prediction service for permission prompts. We will keep // this feature in order to allow us to update the holdback chance via finch. const base::Feature kPermissionPredictions{"PermissionPredictions", @@ -51,7 +51,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc // The holdback chance is 30% but it can also be configured/updated // through finch if needed. -@@ -792,7 +792,7 @@ const base::FeatureParam kPermissionPredictionsHoldbackChance( +@@ -799,7 +799,7 @@ const base::FeatureParam kPermissionPredictionsHoldbackChance( // Enables using the prediction service for geolocation permission prompts. const base::Feature kPermissionGeolocationPredictions{ @@ -74,7 +74,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc --- a/components/optimization_guide/core/hints_manager.cc +++ b/components/optimization_guide/core/hints_manager.cc -@@ -1183,6 +1183,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( +@@ -1211,6 +1211,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( proto::OptimizationType optimization_type, OptimizationMetadata* optimization_metadata) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -87,7 +87,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc --- a/components/optimization_guide/core/optimization_guide_features.cc +++ b/components/optimization_guide/core/optimization_guide_features.cc -@@ -64,7 +64,7 @@ bool IsSupportedLocaleForFeature(const std::string locale, +@@ -79,7 +79,7 @@ bool IsSupportedLocaleForFeature(const std::string locale, // Enables the syncing of the Optimization Hints component, which provides // hints for what optimizations can be applied on a page load. const base::Feature kOptimizationHints{"OptimizationHints", @@ -96,7 +96,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b // Feature flag that contains a feature param that specifies the field trials // that are allowed to be sent up to the Optimization Guide Server. -@@ -73,12 +73,12 @@ const base::Feature kOptimizationHintsFieldTrials{ +@@ -88,12 +88,12 @@ const base::Feature kOptimizationHintsFieldTrials{ // Enables fetching from a remote Optimization Guide Service. const base::Feature kRemoteOptimizationGuideFetching{ @@ -111,7 +111,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b #else // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) base::FEATURE_DISABLED_BY_DEFAULT #endif // BUILDFLAG(IS_ANDROID) -@@ -92,15 +92,15 @@ const base::Feature kContextMenuPerformanceInfoAndRemoteHintFetching{ +@@ -107,15 +107,15 @@ const base::Feature kContextMenuPerformanceInfoAndRemoteHintFetching{ // Enables the prediction of optimization targets. const base::Feature kOptimizationTargetPrediction{ @@ -130,7 +130,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b #endif // !BUILD_WITH_TFLITE_LIB }; -@@ -126,7 +126,7 @@ const base::Feature kPageEntitiesModelResetOnShutdown{ +@@ -141,7 +141,7 @@ const base::Feature kPageEntitiesModelResetOnShutdown{ // Enables push notification of hints. const base::Feature kPushNotifications{"OptimizationGuidePushNotifications", @@ -139,7 +139,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b // This feature flag does not turn off any behavior, it is only used for // experiment parameters. -@@ -138,12 +138,12 @@ const base::Feature kOptimizationGuideMetadataValidation{ +@@ -153,12 +153,12 @@ const base::Feature kOptimizationGuideMetadataValidation{ "OptimizationGuideMetadataValidation", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kPageTopicsBatchAnnotations{ @@ -154,7 +154,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b const base::Feature kBatchAnnotationsValidation{ "BatchAnnotationsValidation", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -370,7 +370,7 @@ size_t MaxURLKeyedHintCacheSize() { +@@ -389,7 +389,7 @@ size_t MaxURLKeyedHintCacheSize() { bool ShouldPersistHintsToDisk() { return GetFieldTrialParamByFeatureAsBool(kOptimizationHints, @@ -166,7 +166,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b diff --git a/components/optimization_guide/core/prediction_model_download_manager.cc b/components/optimization_guide/core/prediction_model_download_manager.cc --- a/components/optimization_guide/core/prediction_model_download_manager.cc +++ b/components/optimization_guide/core/prediction_model_download_manager.cc -@@ -47,7 +47,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key"; +@@ -46,7 +46,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key"; // we require models to come from. constexpr uint8_t kPublisherKeyHash[] = { 0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa, @@ -175,7 +175,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage 0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a}; const net::NetworkTrafficAnnotationTag kOptimizationGuidePredictionModelsTrafficAnnotation = -@@ -104,6 +104,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default; +@@ -106,6 +106,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default; void PredictionModelDownloadManager::StartDownload( const GURL& download_url, proto::OptimizationTarget optimization_target) { @@ -183,7 +183,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage download::DownloadParams download_params; download_params.client = download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS; -@@ -229,6 +230,7 @@ void PredictionModelDownloadManager::OnDownloadFailed(const std::string& guid) { +@@ -240,6 +241,7 @@ void PredictionModelDownloadManager::OnDownloadFailed( absl::optional> PredictionModelDownloadManager::ProcessDownload( const base::FilePath& file_path) { @@ -194,7 +194,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage diff --git a/components/optimization_guide/core/prediction_model_fetcher_impl.cc b/components/optimization_guide/core/prediction_model_fetcher_impl.cc --- a/components/optimization_guide/core/prediction_model_fetcher_impl.cc +++ b/components/optimization_guide/core/prediction_model_fetcher_impl.cc -@@ -50,6 +50,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels( +@@ -51,6 +51,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels( proto::RequestContext request_context, const std::string& locale, ModelsFetchedCallback models_fetched_callback) { @@ -205,12 +205,13 @@ diff --git a/components/optimization_guide/core/prediction_model_fetcher_impl.cc diff --git a/components/optimization_guide/features.gni b/components/optimization_guide/features.gni --- a/components/optimization_guide/features.gni +++ b/components/optimization_guide/features.gni -@@ -7,8 +7,7 @@ import("//build/config/chrome_build.gni") +@@ -10,9 +10,7 @@ if (is_android) { declare_args() { # This enables build with TFLite library. # Currently only available for Desktop and Android. -- build_with_tflite_lib = is_android || (is_win && target_cpu != "arm64") || -- is_linux || is_mac || is_chromeos || is_fuchsia +- build_with_tflite_lib = +- is_android || (is_win && target_cpu != "arm64") || is_linux || is_mac || +- is_chromeos || is_fuchsia || is_ios + build_with_tflite_lib = false # You can set the variable 'build_with_internal_optimization_guide' to true @@ -242,7 +243,7 @@ diff --git a/components/segmentation_platform/public/features.cc b/components/se diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -185,7 +185,7 @@ const base::Feature kViewportHeightClientHintHeader{ +@@ -180,7 +180,7 @@ const base::Feature kViewportHeightClientHintHeader{ const base::Feature kNavigationPredictor { "NavigationPredictor", #if BUILDFLAG(IS_ANDROID) diff --git a/build/patches/Disable-all-promo-dialogs.patch b/build/patches/Disable-all-promo-dialogs.patch index 9166137e..70f53c86 100644 --- a/build/patches/Disable-all-promo-dialogs.patch +++ b/build/patches/Disable-all-promo-dialogs.patch @@ -9,7 +9,7 @@ Subject: Disable all promo dialogs diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -876,7 +876,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -863,7 +863,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { * displayed. */ private boolean triggerPromo(boolean intentWithEffect) { @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) { return false; } -@@ -911,8 +911,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -898,8 +898,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { preferenceManager.writeBoolean( ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true); } diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index add258ed..6af80b82 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -8,67 +8,22 @@ the handling of attributions via intents between apps. This patch enforces the deactivation by preventing the report from being sent and being saved to disk, although it is currently in uncalled code. --- - chrome/android/java/AndroidManifest.xml | 8 -------- - .../AttributionIntentHandlerFactory.java | 9 +-------- .../flags/android/chrome_feature_list.cc | 2 +- .../embedder_support/origin_trials/features.cc | 3 ++- .../render_view_context_menu_base.cc | 3 --- .../aggregatable_report_sender.cc | 17 ++++++++--------- - .../browser/android/navigation_handle_proxy.cc | 10 ---------- - .../attribution_reporting/attribution_host.cc | 9 --------- - .../attribution_reporting/attribution_host.h | 3 --- - .../attribution_host_utils.cc | 6 ++++++ .../attribution_report_network_sender.cc | 15 ++++++++------- .../attribution_storage_sql.cc | 2 +- - .../navigation_controller_android.cc | 16 ---------------- content/browser/storage_partition_impl.cc | 7 +------ - .../browser/AttributionReporterImpl.java | 4 ---- content/public/browser/navigation_controller.cc | 1 - third_party/blink/common/features.cc | 2 +- .../platform/runtime_enabled_features.json5 | 9 ++++++++- - 18 files changed, 37 insertions(+), 89 deletions(-) + 10 files changed, 30 insertions(+), 31 deletions(-) -diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml ---- a/chrome/android/java/AndroidManifest.xml -+++ b/chrome/android/java/AndroidManifest.xml -@@ -1300,14 +1300,6 @@ by a child template that "extends" this file. - android:readPermission="android.permission.GLOBAL_SEARCH" /> - - -- -- -- -- - {% block base_application_definitions %} - {% endblock %} - {% block extra_application_definitions_for_test %} -diff --git a/chrome/browser/attribution_reporting/android/internal/java/src/org/chromium/chrome/browser/attribution_reporting/AttributionIntentHandlerFactory.java b/chrome/browser/attribution_reporting/android/internal/java/src/org/chromium/chrome/browser/attribution_reporting/AttributionIntentHandlerFactory.java ---- a/chrome/browser/attribution_reporting/android/internal/java/src/org/chromium/chrome/browser/attribution_reporting/AttributionIntentHandlerFactory.java -+++ b/chrome/browser/attribution_reporting/android/internal/java/src/org/chromium/chrome/browser/attribution_reporting/AttributionIntentHandlerFactory.java -@@ -26,14 +26,7 @@ public class AttributionIntentHandlerFactory { - * @return an AttributionIntentHandler instance. - */ - public static AttributionIntentHandler getInstance() { -- if (CachedFeatureFlags.isEnabled(ChromeFeatureList.APP_TO_WEB_ATTRIBUTION)) { -- if (sIntentHandler == null) { -- sIntentHandler = new AttributionIntentHandlerImpl(sValidator); -- } -- return sIntentHandler; -- } else { -- return new NoopAttributionIntentHandler(); -- } -+ return new NoopAttributionIntentHandler(); - } - - public static void setInputEventValidatorForTesting(Predicate validator) { 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 -@@ -452,7 +452,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption", +@@ -442,7 +442,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kAppToWebAttribution{"AppToWebAttribution", @@ -141,81 +96,6 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b -} // namespace content \ No newline at end of file +} // namespace content -diff --git a/content/browser/android/navigation_handle_proxy.cc b/content/browser/android/navigation_handle_proxy.cc ---- a/content/browser/android/navigation_handle_proxy.cc -+++ b/content/browser/android/navigation_handle_proxy.cc -@@ -31,16 +31,6 @@ NavigationHandleProxy::NavigationHandleProxy( - base::android::ScopedJavaLocalRef impression_byte_buffer = nullptr; - - // Scoped to out-live the java call as this uses a DirectByteBuffer. -- std::vector byte_vector; -- if (cpp_navigation_handle_->GetImpression()) { -- blink::mojom::ImpressionPtr impression = -- AttributionHost::MojoImpressionFromImpression( -- *cpp_navigation_handle_->GetImpression()); -- byte_vector = blink::mojom::Impression::Serialize(&impression); -- impression_byte_buffer = base::android::ScopedJavaLocalRef( -- env, env->NewDirectByteBuffer(byte_vector.data(), byte_vector.size())); -- base::android::CheckException(env); -- } - java_navigation_handle_ = Java_NavigationHandle_Constructor( - env, reinterpret_cast(this), - url::GURLAndroid::FromNativeGURL(env, cpp_navigation_handle_->GetURL()), -diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc ---- a/content/browser/attribution_reporting/attribution_host.cc -+++ b/content/browser/attribution_reporting/attribution_host.cc -@@ -444,15 +444,6 @@ void AttributionHost::BindReceiver( - conversion_host->receivers_.Bind(rfh, std::move(receiver)); - } - --// static --blink::mojom::ImpressionPtr AttributionHost::MojoImpressionFromImpression( -- const blink::Impression& impression) { -- return blink::mojom::Impression::New( -- impression.conversion_destination, impression.reporting_origin, -- impression.impression_data, impression.expiry, impression.priority, -- impression.attribution_src_token); --} -- - WEB_CONTENTS_USER_DATA_KEY_IMPL(AttributionHost); - - } // namespace content -diff --git a/content/browser/attribution_reporting/attribution_host.h b/content/browser/attribution_reporting/attribution_host.h ---- a/content/browser/attribution_reporting/attribution_host.h -+++ b/content/browser/attribution_reporting/attribution_host.h -@@ -57,9 +57,6 @@ class CONTENT_EXPORT AttributionHost - const url::Origin& impression_origin, - const blink::Impression& impression); - -- static blink::mojom::ImpressionPtr MojoImpressionFromImpression( -- const blink::Impression& impression); -- - private: - friend class AttributionHostTestPeer; - friend class WebContentsUserData; -diff --git a/content/browser/attribution_reporting/attribution_host_utils.cc b/content/browser/attribution_reporting/attribution_host_utils.cc ---- a/content/browser/attribution_reporting/attribution_host_utils.cc -+++ b/content/browser/attribution_reporting/attribution_host_utils.cc -@@ -20,6 +20,8 @@ - #include "url/gurl.h" - #include "url/origin.h" - -+// will change in attribution_host_utils.cc -+ - namespace content { - - namespace attribution_host_utils { -@@ -68,6 +70,10 @@ absl::optional ParseImpressionFromApp( - // Java API should have rejected these already. - DCHECK(!source_event_id.empty() && !destination.empty()); - -+ // no impression from app -+ if ((true)) -+ return absl::nullopt; -+ - blink::Impression impression; - if (!base::StringToUint64(source_event_id, &impression.impression_data)) - return absl::nullopt; diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc --- a/content/browser/attribution_reporting/attribution_report_network_sender.cc +++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc @@ -251,7 +131,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc --- a/content/browser/attribution_reporting/attribution_storage_sql.cc +++ b/content/browser/attribution_reporting/attribution_storage_sql.cc -@@ -372,7 +372,7 @@ void AttributionStorageSql::RunInMemoryForTesting() { +@@ -358,7 +358,7 @@ void AttributionStorageSql::RunInMemoryForTesting() { } // static @@ -260,38 +140,12 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/ AttributionStorageSql::AttributionStorageSql( const base::FilePath& path_to_database, -diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/content/browser/renderer_host/navigation_controller_android.cc ---- a/content/browser/renderer_host/navigation_controller_android.cc -+++ b/content/browser/renderer_host/navigation_controller_android.cc -@@ -319,22 +319,6 @@ void NavigationControllerAndroid::LoadUrl( - if (input_start != 0) - params.input_start = base::TimeTicks::FromUptimeMillis(input_start); - -- if (source_package_name) { -- DCHECK(!params.initiator_origin); -- // At the moment, source package name is only used for attribution. -- DCHECK(attribution_source_event_id); -- params.initiator_origin = OriginFromAndroidPackageName( -- ConvertJavaStringToUTF8(env, source_package_name)); -- -- params.impression = attribution_host_utils::ParseImpressionFromApp( -- ConvertJavaStringToUTF8(env, attribution_source_event_id), -- ConvertJavaStringToUTF8(env, attribution_destination), -- attribution_report_to -- ? ConvertJavaStringToUTF8(env, attribution_report_to) -- : "", -- attribution_expiry); -- } -- - params.override_user_agent = static_cast( - user_agent_override_option); - diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc -@@ -1307,12 +1307,7 @@ void StoragePartitionImpl::Initialize( - bucket_context_ = base::MakeRefCounted(); - bucket_context_->Initialize(quota_manager_proxy); +@@ -1304,12 +1304,7 @@ void StoragePartitionImpl::Initialize( + + bucket_manager_ = std::make_unique(quota_manager_proxy); - // The Conversion Measurement API is not available in Incognito mode. - if (!is_in_memory() && @@ -303,27 +157,6 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage if (base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) { interest_group_manager_ = std::make_unique( -diff --git a/content/public/android/java/src/org/chromium/content/browser/AttributionReporterImpl.java b/content/public/android/java/src/org/chromium/content/browser/AttributionReporterImpl.java ---- a/content/public/android/java/src/org/chromium/content/browser/AttributionReporterImpl.java -+++ b/content/public/android/java/src/org/chromium/content/browser/AttributionReporterImpl.java -@@ -22,8 +22,6 @@ public class AttributionReporterImpl extends AttributionReporter { - public void reportAttributionForCurrentNavigation(WebContents webContents, - String sourcePackageName, String sourceEventId, String destination, String reportTo, - long expiry) { -- AttributionReporterImplJni.get().reportAttributionForCurrentNavigation( -- webContents, sourcePackageName, sourceEventId, destination, reportTo, expiry); - } - - /** -@@ -33,8 +31,6 @@ public class AttributionReporterImpl extends AttributionReporter { - public void reportAppImpression(BrowserContextHandle browserContext, String sourcePackageName, - String sourceEventId, String destination, String reportTo, long expiry, - long eventTime) { -- AttributionReporterImplJni.get().reportAppImpression(browserContext, sourcePackageName, -- sourceEventId, destination, reportTo, expiry, eventTime); - } - - @NativeMethods diff --git a/content/public/browser/navigation_controller.cc b/content/public/browser/navigation_controller.cc --- a/content/public/browser/navigation_controller.cc +++ b/content/public/browser/navigation_controller.cc @@ -338,7 +171,7 @@ diff --git a/content/public/browser/navigation_controller.cc b/content/public/br diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -42,7 +42,7 @@ const base::Feature kCSSContainerQueries{"CSSContainerQueries", +@@ -49,7 +49,7 @@ const base::Feature kCSSContainerQueries{"CSSContainerQueries", // Controls whether the Conversion Measurement API infrastructure is enabled. const base::Feature kConversionMeasurement{"ConversionMeasurement", @@ -364,7 +197,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 { name: "AbortSignalThrowIfAborted", status: "stable", -@@ -496,7 +503,7 @@ +@@ -482,7 +489,7 @@ }, { name: "ConversionMeasurement", diff --git a/build/patches/Disable-feeds-support-by-default.patch b/build/patches/Disable-feeds-support-by-default.patch index 148b8908..30c1202e 100644 --- a/build/patches/Disable-feeds-support-by-default.patch +++ b/build/patches/Disable-feeds-support-by-default.patch @@ -29,7 +29,7 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -83,7 +83,7 @@ public class CachedFeatureFlags { +@@ -82,7 +82,7 @@ public class CachedFeatureFlags { .put(ChromeFeatureList.TAB_TO_GTS_ANIMATION, true) .put(ChromeFeatureList.TEST_DEFAULT_DISABLED, false) .put(ChromeFeatureList.TEST_DEFAULT_ENABLED, true) diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index c309c36d..07908cf4 100644 --- a/build/patches/Disable-fetching-of-all-field-trials.patch +++ b/build/patches/Disable-fetching-of-all-field-trials.patch @@ -50,7 +50,7 @@ diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/s diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc -@@ -190,6 +190,8 @@ ChromeMetricsServicesManagerClient::GetMetricsStateManagerForTesting() { +@@ -189,6 +189,8 @@ ChromeMetricsServicesManagerClient::GetMetricsStateManagerForTesting() { void ChromeMetricsServicesManagerClient::CreateFallbackSamplingTrial( version_info::Channel channel, base::FeatureList* feature_list) { @@ -62,7 +62,7 @@ diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/ diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc --- a/components/ukm/ukm_recorder_impl.cc +++ b/components/ukm/ukm_recorder_impl.cc -@@ -191,6 +191,9 @@ UkmRecorderImpl::~UkmRecorderImpl() = default; +@@ -192,6 +192,9 @@ UkmRecorderImpl::~UkmRecorderImpl() = default; void UkmRecorderImpl::CreateFallbackSamplingTrial( bool is_stable_channel, base::FeatureList* feature_list) { @@ -87,7 +87,7 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari diff --git a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java --- a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java +++ b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java -@@ -75,7 +75,7 @@ public class VariationsSeedFetcher { +@@ -80,7 +80,7 @@ public class VariationsSeedFetcher { } private static final String VARIATIONS_SERVER_URL = @@ -96,7 +96,7 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari private static final int READ_TIMEOUT = 3000; // time in ms private static final int REQUEST_TIMEOUT = 1000; // time in ms -@@ -271,29 +271,13 @@ public class VariationsSeedFetcher { +@@ -337,29 +337,13 @@ public class VariationsSeedFetcher { */ public void fetchSeed(String restrictMode, String milestone, String channel) { assert !ThreadUtils.runningOnUiThread(); @@ -130,7 +130,7 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari } private void recordFetchResultOrCode(int resultOrCode) { -@@ -320,7 +304,7 @@ public class VariationsSeedFetcher { +@@ -402,7 +386,7 @@ public class VariationsSeedFetcher { * @param curSeedInfo optional currently saved seed info to set the `If-None-Match` header. * @return the object holds the request result and seed data with its related header fields. */ @@ -154,7 +154,7 @@ diff --git a/components/variations/net/omnibox_http_headers.cc b/components/vari diff --git a/components/variations/net/variations_http_headers.cc b/components/variations/net/variations_http_headers.cc --- a/components/variations/net/variations_http_headers.cc +++ b/components/variations/net/variations_http_headers.cc -@@ -238,6 +238,9 @@ class VariationsHeaderHelper { +@@ -257,6 +257,9 @@ class VariationsHeaderHelper { VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete; bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) { diff --git a/build/patches/Disable-idle-detection.patch b/build/patches/Disable-idle-detection.patch index 2ad3e0d4..ef9409ec 100644 --- a/build/patches/Disable-idle-detection.patch +++ b/build/patches/Disable-idle-detection.patch @@ -9,7 +9,7 @@ Subject: Disable idle detection 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 -@@ -422,7 +422,7 @@ const base::Feature kGreaseUACH{"GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -426,7 +426,7 @@ const base::Feature kGreaseUACH{"GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT}; // this feature, the experimental web platform features flag should be set, // or the site should obtain an Origin Trial token. const base::Feature kIdleDetection{"IdleDetection", diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch index 32d8feb6..5fc9f0db 100644 --- a/build/patches/Disable-media-router-and-remoting-by-default.patch +++ b/build/patches/Disable-media-router-and-remoting-by-default.patch @@ -3,15 +3,14 @@ Date: Thu, 4 Jul 2019 19:08:52 -0400 Subject: Disable media router and remoting by default --- - .../media/router/media_router_feature.cc | 25 ++++++------------- - chrome/browser/profiles/profile.cc | 2 +- + .../media/router/media_router_feature.cc | 27 ++++++------------- chrome/browser/profiles/profile_impl.cc | 2 +- - 3 files changed, 9 insertions(+), 20 deletions(-) + 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc --- a/chrome/browser/media/router/media_router_feature.cc +++ b/chrome/browser/media/router/media_router_feature.cc -@@ -49,26 +49,15 @@ const base::Feature kGlobalMediaControlsCastStartStop{ +@@ -50,26 +50,15 @@ const base::Feature kGlobalMediaControlsCastStartStop{ #endif // !BUILDFLAG(IS_ANDROID) @@ -44,7 +43,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse #if !BUILDFLAG(IS_ANDROID) if (!base::FeatureList::IsEnabled(kMediaRouter)) return false; -@@ -92,7 +81,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) { +@@ -93,7 +82,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) { return allowed; } return true; @@ -53,22 +52,19 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse #if !BUILDFLAG(IS_ANDROID) void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { -diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc ---- a/chrome/browser/profiles/profile.cc -+++ b/chrome/browser/profiles/profile.cc -@@ -350,7 +350,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -106,7 +95,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { + PrefRegistry::PUBLIC); - #if !BUILDFLAG(IS_ANDROID) registry->RegisterBooleanPref( - media_router::prefs::kMediaRouterMediaRemotingEnabled, true); -+ media_router::prefs::kMediaRouterMediaRemotingEnabled, false); ++ media_router::prefs::kMediaRouterMediaRemotingEnabled, false); // disabled in Bromite registry->RegisterListPref( media_router::prefs::kMediaRouterTabMirroringSources); - #endif + diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -419,7 +419,7 @@ void ProfileImpl::RegisterProfilePrefs( +@@ -417,7 +417,7 @@ void ProfileImpl::RegisterProfilePrefs( #endif registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false); diff --git a/build/patches/Disable-plugins-enumeration.patch b/build/patches/Disable-plugins-enumeration.patch index 0848a475..08d69f6d 100644 --- a/build/patches/Disable-plugins-enumeration.patch +++ b/build/patches/Disable-plugins-enumeration.patch @@ -9,7 +9,7 @@ Subject: Disable plugins enumeration diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -1883,9 +1883,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -1913,9 +1913,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { } PluginData* LocalFrame::GetPluginData() const { diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index 56326732..0794f077 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -72,6 +72,7 @@ Disable CrowdDeny feature chrome/common/safe_browsing/BUILD.gn | 7 -- .../chrome_content_renderer_client.cc | 2 + chrome/test/BUILD.gn | 2 - + .../save_password_leak_detection_delegate.cc | 14 ---- .../installer_policies/BUILD.gn | 2 - .../permissions/permission_request_manager.cc | 5 +- .../safe_browsing/content/browser/BUILD.gn | 1 - @@ -87,7 +88,7 @@ Disable CrowdDeny feature .../file_system_access_permission_context.h | 6 -- weblayer/BUILD.gn | 1 - weblayer/test/BUILD.gn | 1 - - 81 files changed, 188 insertions(+), 701 deletions(-) + 82 files changed, 188 insertions(+), 715 deletions(-) diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml --- a/chrome/android/java/res/xml/google_services_preferences.xml @@ -253,12 +254,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/Usa --- a/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java @@ -48,11 +48,6 @@ public class UsageStatsConsentDialog { - .with(ModalDialogProperties.MESSAGE, + .with(ModalDialogProperties.MESSAGE_PARAGRAPH_1, resources.getString(R.string.usage_stats_revocation_explanation)) .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources, R.string.remove); - } else { - builder.with(ModalDialogProperties.TITLE, resources, R.string.usage_stats_consent_title) -- .with(ModalDialogProperties.MESSAGE, +- .with(ModalDialogProperties.MESSAGE_PARAGRAPH_1, - resources.getString(R.string.usage_stats_consent_prompt)) - .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources, R.string.show); } @@ -278,16 +279,16 @@ diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/and diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -307,8 +307,6 @@ static_library("browser") { +@@ -305,8 +305,6 @@ static_library("browser") { "complex_tasks/task_tab_helper.h", - "component_updater/autofill_regex_component_installer.cc", - "component_updater/autofill_regex_component_installer.h", + "component_updater/autofill_regex_remover.cc", + "component_updater/autofill_regex_remover.h", - "component_updater/chrome_client_side_phishing_component_installer.cc", - "component_updater/chrome_client_side_phishing_component_installer.h", "component_updater/chrome_component_updater_configurator.cc", "component_updater/chrome_component_updater_configurator.h", "component_updater/chrome_origin_trials_component_installer.cc", -@@ -319,8 +317,6 @@ static_library("browser") { +@@ -317,8 +315,6 @@ static_library("browser") { "component_updater/component_updater_utils.h", "component_updater/crl_set_component_installer.cc", "component_updater/crl_set_component_installer.h", @@ -296,7 +297,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "component_updater/first_party_sets_component_installer.cc", "component_updater/first_party_sets_component_installer.h", "component_updater/mei_preload_component_installer.cc", -@@ -1088,8 +1084,6 @@ static_library("browser") { +@@ -1094,8 +1090,6 @@ static_library("browser") { "permissions/adaptive_quiet_notification_permission_ui_enabler.h", "permissions/chrome_permissions_client.cc", "permissions/chrome_permissions_client.h", @@ -305,7 +306,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "permissions/crowd_deny_preload_data.cc", "permissions/crowd_deny_preload_data.h", "permissions/crowd_deny_safe_browsing_request.cc", -@@ -1450,15 +1444,6 @@ static_library("browser") { +@@ -1456,15 +1450,6 @@ static_library("browser") { "renderer_host/chrome_navigation_ui_data.h", "renderer_preferences_util.cc", "renderer_preferences_util.h", @@ -321,7 +322,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "resource_coordinator/resource_coordinator_parts.cc", "resource_coordinator/resource_coordinator_parts.h", "resource_coordinator/session_restore_policy.cc", -@@ -2196,11 +2181,8 @@ static_library("browser") { +@@ -2208,11 +2193,8 @@ static_library("browser") { "//components/reporting/util:status_macros", "//components/reporting/util:status_proto", "//components/reporting/util:task_runner_context", @@ -333,7 +334,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", -@@ -3270,12 +3252,6 @@ static_library("browser") { +@@ -3292,12 +3274,6 @@ static_library("browser") { "profiles/profile_manager_android.cc", "profiles/profile_manager_android.h", "query_tiles/android/tile_provider_factory.cc", @@ -346,7 +347,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "safe_browsing/android/password_reuse_controller_android.cc", "safe_browsing/android/password_reuse_controller_android.h", "safe_browsing/android/safe_browsing_referring_app_bridge_android.cc", -@@ -3724,8 +3700,6 @@ static_library("browser") { +@@ -3752,8 +3728,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -355,7 +356,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "download/download_dir_policy_handler.cc", "download/download_dir_policy_handler.h", "download/download_dir_util.cc", -@@ -7717,8 +7691,6 @@ static_library("test_support") { +@@ -7773,8 +7747,6 @@ static_library("test_support") { "//components/reporting/util:status_macros", "//components/reporting/util:status_proto", "//components/reporting/util:task_runner_context", @@ -439,7 +440,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -70,7 +70,6 @@ +@@ -71,7 +71,6 @@ #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" @@ -447,7 +448,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -107,7 +106,6 @@ +@@ -110,7 +109,6 @@ #include "components/prefs/json_pref_store.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -455,7 +456,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro #include "components/sessions/core/session_id_generator.h" #include "components/subresource_filter/content/browser/ruleset_service.h" #include "components/translate/core/browser/translate_download_manager.h" -@@ -391,8 +389,6 @@ void BrowserProcessImpl::StartTearDown() { +@@ -394,8 +392,6 @@ void BrowserProcessImpl::StartTearDown() { metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -464,7 +465,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro network_time_tracker_.reset(); #if BUILDFLAG(ENABLE_PLUGINS) plugins_resource_service_.reset(); -@@ -1026,14 +1022,6 @@ StatusTray* BrowserProcessImpl::status_tray() { +@@ -1029,14 +1025,6 @@ StatusTray* BrowserProcessImpl::status_tray() { return status_tray_.get(); } @@ -479,7 +480,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1271,23 +1259,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() { +@@ -1284,23 +1272,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() { } void BrowserProcessImpl::CreateSafeBrowsingService() { @@ -527,7 +528,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -613,10 +613,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -617,10 +617,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -543,7 +544,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -102,6 +102,7 @@ +@@ -104,6 +104,7 @@ #include "chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h" #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" #include "chrome/browser/renderer_preferences_util.h" @@ -551,7 +552,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/safe_browsing/certificate_reporting_service.h" #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" -@@ -109,6 +110,7 @@ +@@ -111,6 +112,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/url_checker_delegate_impl.h" #include "chrome/browser/safe_browsing/url_lookup_service_factory.h" @@ -559,7 +560,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/search/search.h" #include "chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.h" #include "chrome/browser/sharing/sms/sms_remote_fetcher.h" -@@ -960,9 +962,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { +@@ -966,9 +968,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { class CertificateReportingServiceCertReporter : public SSLCertReporter { public: explicit CertificateReportingServiceCertReporter( @@ -570,7 +571,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch CertificateReportingServiceCertReporter( const CertificateReportingServiceCertReporter&) = delete; -@@ -974,11 +974,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter { +@@ -980,11 +980,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter { // SSLCertReporter implementation void ReportInvalidCertificateChain( const std::string& serialized_report) override { @@ -582,7 +583,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch }; #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -1230,14 +1228,6 @@ void MaybeAddThrottle( +@@ -1236,14 +1234,6 @@ void MaybeAddThrottle( throttles->push_back(std::move(maybe_throttle)); } @@ -597,7 +598,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch void MaybeAddThrottles( std::vector> additional, std::vector>* combined) { -@@ -1489,7 +1479,9 @@ void ChromeContentBrowserClient::PostAfterStartupTask( +@@ -1495,7 +1485,9 @@ void ChromeContentBrowserClient::PostAfterStartupTask( InitNetworkContextsParentDirectory(); DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -607,7 +608,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch } bool ChromeContentBrowserClient::IsBrowserStartupComplete() { -@@ -2199,7 +2191,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2205,7 +2197,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( } #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) @@ -616,7 +617,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #else bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2335,6 +2327,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2336,6 +2328,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( command_line->AppendSwitch( switches::kSharedArrayBufferUnrestrictedAccessAllowed); } @@ -626,7 +627,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #endif if (!prefs->GetBoolean(prefs::kSandboxExternalProtocolBlocked)) command_line->AppendSwitch(kDisableSandboxExternalProtocolSwitch); -@@ -4340,6 +4335,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4332,6 +4327,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( &throttles); #endif @@ -634,7 +635,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch // g_browser_process->safe_browsing_service() may be null in unittests. safe_browsing::SafeBrowsingUIManager* ui_manager = g_browser_process->safe_browsing_service() -@@ -4355,6 +4351,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4347,6 +4343,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( std::make_unique( handle)); } @@ -642,7 +643,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -@@ -5741,6 +5738,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( +@@ -5743,6 +5740,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -650,7 +651,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch // Should not bypass safe browsing check if the check is for enterprise // lookup. if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled) -@@ -5761,6 +5759,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( +@@ -5763,6 +5761,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( } return safe_browsing_url_checker_delegate_; @@ -660,7 +661,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -5768,24 +5769,28 @@ ChromeContentBrowserClient::GetUrlLookupService( +@@ -5770,24 +5771,28 @@ ChromeContentBrowserClient::GetUrlLookupService( content::BrowserContext* browser_context, bool is_enterprise_lookup_enabled, bool is_consumer_lookup_enabled) { @@ -693,7 +694,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -892,9 +892,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -887,9 +887,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { // Parts are deleted in the reverse order they are added. std::vector extra_parts_; @@ -716,7 +717,7 @@ diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b // Helper method for ExposeInterfacesToRenderer() that checks the latest // SafeBrowsing pref value on the UI thread before hopping over to the IO // thread. -@@ -183,6 +184,7 @@ void MaybeCreateSafeBrowsingForRenderer( +@@ -172,6 +173,7 @@ void MaybeCreateSafeBrowsingForRenderer( allowlist_domains), std::move(receiver))); } @@ -761,15 +762,15 @@ diff --git a/chrome/browser/component_updater/file_type_policies_component_insta diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc --- a/chrome/browser/component_updater/registration.cc +++ b/chrome/browser/component_updater/registration.cc -@@ -15,7 +15,6 @@ +@@ -16,7 +16,6 @@ #include "chrome/browser/buildflags.h" #include "chrome/browser/component_updater/app_provisioning_component_installer.h" - #include "chrome/browser/component_updater/autofill_regex_component_installer.h" + #include "chrome/browser/component_updater/autofill_regex_remover.h" -#include "chrome/browser/component_updater/chrome_client_side_phishing_component_installer.h" #include "chrome/browser/component_updater/chrome_origin_trials_component_installer.h" #include "chrome/browser/component_updater/crl_set_component_installer.h" #include "chrome/browser/component_updater/crowd_deny_component_installer.h" -@@ -34,7 +33,6 @@ +@@ -36,7 +35,6 @@ #include "components/component_updater/installer_policies/autofill_states_component_installer.h" #include "components/component_updater/installer_policies/on_device_head_suggest_component_installer.h" #include "components/component_updater/installer_policies/optimization_hints_component_installer.h" @@ -777,7 +778,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c #include "components/nacl/common/buildflags.h" #include "device/vr/buildflags/buildflags.h" #include "ppapi/buildflags/buildflags.h" -@@ -184,9 +182,6 @@ void RegisterComponentsForUpdate() { +@@ -191,9 +189,6 @@ void RegisterComponentsForUpdate() { MaybeRegisterPKIMetadataComponent(cus); @@ -787,15 +788,15 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c #if BUILDFLAG(IS_CHROMEOS_ASH) RegisterSmartDimComponent(cus); RegisterAppProvisioningComponent(cus); -@@ -206,8 +201,6 @@ void RegisterComponentsForUpdate() { +@@ -212,8 +207,6 @@ void RegisterComponentsForUpdate() { + RegisterAutofillStatesComponent(cus, g_browser_process->local_state()); - RegisterAutofillRegexComponent(cus); -- - RegisterClientSidePhishingComponent(cus); - } - - } // namespace component_updater +- + #if BUILDFLAG(IS_LINUX) + RegisterScreenAIComponent(cus, g_browser_process->local_state()); + #endif // BUILDFLAG(IS_LINUX) diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -928,7 +929,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom void ChromeDownloadManagerDelegate::GetMixedContentStatus( download::DownloadItem* download, -@@ -1545,8 +1533,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( +@@ -1538,8 +1526,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif @@ -940,7 +941,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom if (ShouldBlockFile(target_info->danger_type, item)) { MaybeReportDangerousDownloadBlocked( download_prefs_->download_restriction(), "DANGEROUS_FILE_TYPE", -@@ -1555,6 +1546,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( +@@ -1548,6 +1539,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( // A dangerous type would take precedence over the blocking of the file. target_info->danger_type = download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS; } @@ -948,7 +949,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom base::FilePath target_path = target_info->target_path; -@@ -1697,7 +1689,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport( +@@ -1673,7 +1665,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport( service->MaybeSendDangerousDownloadOpenedReport(download, show_download_in_folder); } @@ -956,7 +957,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom if (!download->GetAutoOpened()) { download::DownloadContent download_content = download::DownloadContentFromMimeType(download->GetMimeType(), false); -@@ -1705,6 +1696,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport( +@@ -1681,6 +1672,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport( download->GetDangerType(), download_content, base::Time::Now(), download->GetEndTime(), show_download_in_folder); } @@ -1017,7 +1018,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -32,7 +32,9 @@ +@@ -33,7 +33,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/chrome_user_population_helper.h" #include "chrome/browser/safe_browsing/download_protection/deep_scanning_request.h" @@ -1027,7 +1028,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" -@@ -41,8 +43,10 @@ +@@ -42,8 +44,10 @@ #include "components/download/public/common/download_item.h" #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" @@ -1038,7 +1039,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item_utils.h" -@@ -56,7 +60,9 @@ +@@ -57,7 +61,9 @@ using download::DownloadItem; using MixedContentStatus = download::DownloadItem::MixedContentStatus; @@ -1048,7 +1049,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow namespace { -@@ -86,9 +92,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data { +@@ -87,9 +93,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data { // for the file type. bool should_prefer_opening_in_browser_; @@ -1060,7 +1061,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow // Whether the download is currently being revived. bool is_being_revived_; -@@ -125,7 +133,9 @@ DownloadItemModelData::DownloadItemModelData() +@@ -126,7 +134,9 @@ DownloadItemModelData::DownloadItemModelData() : should_show_in_shelf_(true), was_ui_notified_(false), should_prefer_opening_in_browser_(false), @@ -1070,7 +1071,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow is_being_revived_(false) {} } // namespace -@@ -399,6 +409,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { +@@ -417,6 +427,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { data->should_prefer_opening_in_browser_ = preference; } @@ -1078,7 +1079,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { const DownloadItemModelData* data = DownloadItemModelData::Get(download_); return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS; -@@ -409,6 +420,7 @@ void DownloadItemModel::SetDangerLevel( +@@ -427,6 +438,7 @@ void DownloadItemModel::SetDangerLevel( DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } @@ -1086,7 +1087,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow download::DownloadItem::MixedContentStatus DownloadItemModel::GetMixedContentStatus() const { -@@ -625,9 +637,6 @@ bool DownloadItemModel::IsCommandEnabled( +@@ -643,9 +655,6 @@ bool DownloadItemModel::IsCommandEnabled( // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -1109,7 +1110,7 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/down // Implementation of DownloadUIModel that wrappers around a |DownloadItem*|. As // such, the caller is expected to ensure that the |download| passed into the -@@ -64,9 +66,11 @@ class DownloadItemModel : public DownloadUIModel, +@@ -65,9 +67,11 @@ class DownloadItemModel : public DownloadUIModel, void SetWasUINotified(bool should_notify) override; bool ShouldPreferOpeningInBrowser() const override; void SetShouldPreferOpeningInBrowser(bool preference) override; @@ -1144,7 +1145,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download namespace { -@@ -251,14 +255,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) { +@@ -252,14 +256,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) { base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) + extension); @@ -1160,7 +1161,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download } } -@@ -477,10 +474,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(const GURL& url, +@@ -479,10 +476,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(const GURL& url, bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); @@ -1198,7 +1199,7 @@ diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -30,9 +30,11 @@ +@@ -29,9 +29,11 @@ #include "components/download/public/common/download_interrupt_reasons.h" #include "components/history/core/browser/history_service.h" #include "components/prefs/pref_service.h" @@ -1210,7 +1211,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" -@@ -66,13 +68,16 @@ +@@ -65,13 +67,16 @@ using content::BrowserThread; using download::DownloadItem; using download::DownloadPathReservationTracker; @@ -1227,7 +1228,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow // Condenses the results from HistoryService::GetVisibleVisitCountToHost() to a // single bool. A host is considered visited before if prior visible visits were // found in history and the first such visit was earlier than the most recent -@@ -83,6 +88,7 @@ void VisitCountsToVisitedBefore(base::OnceCallback callback, +@@ -82,6 +87,7 @@ void VisitCountsToVisitedBefore(base::OnceCallback callback, result.success && result.count > 0 && (result.first_visit.LocalMidnight() < base::Time::Now().LocalMidnight())); } @@ -1235,7 +1236,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow #if BUILDFLAG(IS_WIN) // Keeps track of whether Adobe Reader is up to date. -@@ -107,7 +113,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer( +@@ -106,7 +112,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer( create_target_directory_(false), conflict_action_(conflict_action), danger_type_(download->GetDangerType()), @@ -1245,7 +1246,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow virtual_path_(initial_virtual_path), is_filetype_handled_safely_(false), #if BUILDFLAG(IS_ANDROID) -@@ -298,12 +306,14 @@ base::FilePath DownloadTargetDeterminer::GenerateFileName() const { +@@ -297,12 +305,14 @@ base::FilePath DownloadTargetDeterminer::GenerateFileName() const { download_->GetURL(), download_->GetContentDisposition(), referrer_charset, suggested_filename, sniffed_mime_type, default_filename); @@ -1261,7 +1262,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow // If no mime type or explicitly specified a name, don't replace file // extension. -@@ -842,6 +852,7 @@ DownloadTargetDeterminer::Result +@@ -841,6 +851,7 @@ DownloadTargetDeterminer::Result return CONTINUE; } @@ -1269,7 +1270,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow // First determine the danger level assuming that the user doesn't have any // prior visits to the referrer recoreded in history. The resulting danger // level would be ALLOW_ON_USER_GESTURE if the level depends on the visit -@@ -878,6 +889,7 @@ DownloadTargetDeterminer::Result +@@ -877,6 +888,7 @@ DownloadTargetDeterminer::Result // invalid, then assume the referrer has not been visited before. if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; @@ -1277,7 +1278,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow return CONTINUE; } -@@ -885,6 +897,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( +@@ -884,6 +896,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); @@ -1285,7 +1286,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow safe_browsing::RecordDownloadFileTypeAttributes( safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( virtual_path_.BaseName(), download_->GetURL(), -@@ -896,6 +909,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( +@@ -895,6 +908,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( if (danger_level_ != DownloadFileType::NOT_DANGEROUS && danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; @@ -1293,7 +1294,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow DoLoop(); } -@@ -994,7 +1008,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( +@@ -993,7 +1007,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( << " Intermediate:" << intermediate_path_.AsUTF8Unsafe() << " Confirmation reason:" << static_cast(confirmation_reason_) << " Danger type:" << danger_type_ @@ -1303,7 +1304,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow << " Result:" << static_cast(result); std::unique_ptr target_info(new DownloadTargetInfo); -@@ -1006,7 +1022,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( +@@ -1005,7 +1021,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( ? DownloadItem::TARGET_DISPOSITION_PROMPT : DownloadItem::TARGET_DISPOSITION_OVERWRITE); target_info->danger_type = danger_type_; @@ -1313,7 +1314,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow target_info->intermediate_path = intermediate_path_; target_info->mime_type = mime_type_; target_info->is_filetype_handled_safely = is_filetype_handled_safely_; -@@ -1101,54 +1119,11 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const { +@@ -1100,54 +1118,11 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const { DownloadItem::TARGET_DISPOSITION_PROMPT); } @@ -1369,7 +1370,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow } absl::optional -@@ -1162,6 +1137,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { +@@ -1161,6 +1136,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { EventType::DANGEROUS_DOWNLOAD_BYPASS) : absl::nullopt; } @@ -1468,7 +1469,7 @@ diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/dow diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc --- a/chrome/browser/download/download_ui_model.cc +++ b/chrome/browser/download/download_ui_model.cc -@@ -34,7 +34,9 @@ +@@ -36,7 +36,9 @@ using download::DownloadItem; using offline_items_collection::FailState; @@ -1478,7 +1479,7 @@ diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/downl namespace { -@@ -441,12 +443,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() const { +@@ -443,12 +445,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() const { void DownloadUIModel::SetShouldPreferOpeningInBrowser(bool preference) {} @@ -1503,10 +1504,10 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" +#endif - - #if !BUILDFLAG(IS_ANDROID) - #include "chrome/browser/download/download_commands.h" -@@ -237,6 +239,7 @@ class DownloadUIModel { + #include "ui/base/models/image_model.h" + #include "ui/color/color_id.h" + #include "ui/gfx/vector_icon_types.h" +@@ -300,6 +302,7 @@ class DownloadUIModel { // Change what's returned by ShouldPreferOpeningInBrowser to |preference|. virtual void SetShouldPreferOpeningInBrowser(bool preference); @@ -1514,7 +1515,7 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo // Return the danger level determined during download target determination. // The value returned here is independent of the danger level as determined by // the Safe Browsing. -@@ -245,6 +248,7 @@ class DownloadUIModel { +@@ -308,6 +311,7 @@ class DownloadUIModel { // Change what's returned by GetDangerLevel(). virtual void SetDangerLevel( safe_browsing::DownloadFileType::DangerLevel danger_level); @@ -1533,7 +1534,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b #include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_open_prompt.h" #include "chrome/browser/download/download_prefs.h" -@@ -1276,9 +1275,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {} +@@ -1277,9 +1276,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {} DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} @@ -1543,7 +1544,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { std::unique_ptr params( downloads::AcceptDanger::Params::Create(args())); -@@ -1316,42 +1312,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) { +@@ -1317,42 +1313,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) { return; } RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); @@ -1629,7 +1630,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -1254,21 +1254,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() { +@@ -1264,21 +1264,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() { GetExtensionStatus::Params::Create(args())); EXTENSION_FUNCTION_VALIDATE(params); @@ -1684,7 +1685,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey -@@ -1134,6 +1138,7 @@ void ChromeFileSystemAccessPermissionContext::ConfirmSensitiveDirectoryAccess( +@@ -1137,6 +1141,7 @@ void ChromeFileSystemAccessPermissionContext::ConfirmSensitiveDirectoryAccess( std::move(callback))); } @@ -1692,7 +1693,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( std::unique_ptr item, content::GlobalRenderFrameHostId frame_id, -@@ -1155,6 +1160,7 @@ void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( +@@ -1158,6 +1163,7 @@ void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( }, base::SequencedTaskRunnerHandle::Get(), std::move(callback)))); } @@ -1745,7 +1746,7 @@ diff --git a/chrome/browser/lookalikes/lookalike_url_controller_client.cc b/chro diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -846,9 +846,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { +@@ -861,9 +861,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -1758,7 +1759,7 @@ diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/br diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc --- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc -@@ -138,9 +138,6 @@ void TrialComparisonCertVerifierController::SendTrialReport( +@@ -137,9 +137,6 @@ void TrialComparisonCertVerifierController::SendTrialReport( std::string serialized_report; if (!report.Serialize(&serialized_report)) return; @@ -1771,7 +1772,7 @@ diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/c diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -811,21 +811,13 @@ autofill::LanguageCode ChromePasswordManagerClient::GetPageLanguage() const { +@@ -852,21 +852,13 @@ autofill::LanguageCode ChromePasswordManagerClient::GetPageLanguage() const { safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { @@ -1794,7 +1795,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b } #endif // defined(ON_FOCUS_PING_ENABLED) -@@ -835,22 +827,9 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry( +@@ -876,22 +868,9 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry( const std::vector& matching_reused_credentials, bool password_field_exists) { @@ -1817,7 +1818,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b } #if !BUILDFLAG(IS_ANDROID) -@@ -1433,6 +1412,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( +@@ -1474,6 +1453,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( is_enabled = false; } @@ -1825,7 +1826,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Disable password -@@ -1443,6 +1423,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( +@@ -1484,6 +1464,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -1855,7 +1856,7 @@ diff --git a/chrome/browser/permissions/abusive_origin_permission_revocation_req diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc -@@ -17,7 +17,6 @@ +@@ -19,7 +19,6 @@ #include "chrome/browser/metrics/ukm_background_recorder_service.h" #include "chrome/browser/permissions/abusive_origin_permission_revocation_request.h" #include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h" @@ -1863,7 +1864,7 @@ diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/br #include "chrome/browser/permissions/permission_actions_history_factory.h" #include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h" #include "chrome/browser/permissions/permission_manager_factory.h" -@@ -236,19 +235,6 @@ permissions::IconId ChromePermissionsClient::GetOverrideIconId( +@@ -294,19 +293,6 @@ permissions::IconId ChromePermissionsClient::GetOverrideIconId( return PermissionsClient::GetOverrideIconId(request_type); } @@ -1886,7 +1887,7 @@ diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/br diff --git a/chrome/browser/permissions/chrome_permissions_client.h b/chrome/browser/permissions/chrome_permissions_client.h --- a/chrome/browser/permissions/chrome_permissions_client.h +++ b/chrome/browser/permissions/chrome_permissions_client.h -@@ -49,9 +49,6 @@ class ChromePermissionsClient : public permissions::PermissionsClient { +@@ -50,9 +50,6 @@ class ChromePermissionsClient : public permissions::PermissionsClient { GetUkmSourceIdCallback callback) override; permissions::IconId GetOverrideIconId( permissions::RequestType request_type) override; @@ -1921,7 +1922,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "build/chromecast_buildflags.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/about_flags.h" -@@ -1241,7 +1242,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1276,7 +1277,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); @@ -1942,7 +1943,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "chrome/browser/safe_browsing/tailored_security/tailored_security_service_factory.h" #include "chrome/browser/search_engines/template_url_fetcher_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -@@ -319,7 +318,6 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -324,7 +323,6 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS_LACROS) CertDbInitializerFactory::GetInstance(); #endif @@ -1950,7 +1951,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #if !BUILDFLAG(IS_ANDROID) ChromeBrowsingDataLifetimeManagerFactory::GetInstance(); #endif -@@ -528,7 +526,9 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -537,7 +535,9 @@ void ChromeBrowserMainExtraPartsProfiles:: SystemExtensionsProviderFactory::GetInstance(); #endif TabRestoreServiceFactory::GetInstance(); @@ -1963,7 +1964,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -93,7 +93,6 @@ +@@ -91,7 +91,6 @@ #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" @@ -1971,7 +1972,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" -@@ -624,6 +623,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { +@@ -623,6 +622,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { mojo::PendingRemote pref_validation_delegate; @@ -1979,7 +1980,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p scoped_refptr safe_browsing_service( g_browser_process->safe_browsing_service()); if (safe_browsing_service.get()) { -@@ -635,7 +635,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { +@@ -634,7 +634,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { pref_validation_delegate.InitWithNewPipeAndPassReceiver()); } } @@ -2007,7 +2008,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser", -@@ -90,6 +90,7 @@ static_library("safe_browsing") { +@@ -91,6 +91,7 @@ static_library("safe_browsing") { "//extensions/browser", ] } @@ -2015,7 +2016,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -175,7 +176,6 @@ static_library("safe_browsing") { +@@ -176,7 +177,6 @@ static_library("safe_browsing") { "//components/safe_browsing/content/browser/triggers:ad_sampler_trigger", "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger", "//components/safe_browsing/content/browser/triggers:trigger_throttler", @@ -2199,7 +2200,7 @@ diff --git a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc b/chro diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc -@@ -798,11 +798,6 @@ void DownloadProtectionService::RequestFinished(DeepScanningRequest* request) { +@@ -797,11 +797,6 @@ void DownloadProtectionService::RequestFinished(DeepScanningRequest* request) { deep_scanning_requests_.erase(it); } @@ -2222,7 +2223,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/download_protectio #include "chrome/browser/safe_browsing/download_protection/deep_scanning_request.h" #include "chrome/browser/safe_browsing/download_protection/download_protection_observer.h" #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" -@@ -316,10 +315,6 @@ class DownloadProtectionService { +@@ -313,10 +312,6 @@ class DownloadProtectionService { void OnDangerousDownloadOpened(const download::DownloadItem* item, Profile* profile); @@ -2265,7 +2266,7 @@ diff --git a/chrome/browser/safety_check/android/java/src/org/chromium/chrome/br import org.chromium.chrome.browser.safety_check.SafetyCheckProperties.PasswordsState; import org.chromium.chrome.browser.safety_check.SafetyCheckProperties.SafeBrowsingState; import org.chromium.chrome.browser.safety_check.SafetyCheckProperties.UpdatesState; -@@ -178,18 +177,6 @@ class SafetyCheckMediator implements PasswordCheck.Observer { +@@ -179,18 +178,6 @@ class SafetyCheckMediator implements PasswordCheck.Observer { // Set the listener for clicking the Safe Browsing element. mModel.set(SafetyCheckProperties.SAFE_BROWSING_CLICK_LISTENER, (Preference.OnPreferenceClickListener) (p) -> { @@ -2375,7 +2376,7 @@ diff --git a/chrome/browser/subresource_filter/chrome_content_subresource_filter 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 -@@ -536,7 +536,6 @@ static_library("ui") { +@@ -546,7 +546,6 @@ static_library("ui") { "//components/renderer_context_menu", "//components/resources", "//components/safe_browsing/content/browser", @@ -2383,7 +2384,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser/db:database_manager", -@@ -4171,7 +4170,6 @@ static_library("ui") { +@@ -4219,7 +4218,6 @@ static_library("ui") { "views/download/bubble/download_dialog_view.h", "views/download/bubble/download_toolbar_button_view.cc", "views/download/bubble/download_toolbar_button_view.h", @@ -2429,7 +2430,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -408,12 +408,6 @@ CHAR_LIMIT guidelines: +@@ -409,12 +409,6 @@ CHAR_LIMIT guidelines: For more settings that relate to privacy, security, and data collection, see <link>Google services</link> @@ -2442,7 +2443,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -4681,9 +4675,6 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

<link>Make searches and browsing better</link> must be turned on @@ -2455,7 +2456,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -61,14 +61,18 @@ +@@ -64,14 +64,18 @@ #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_key.h" @@ -2474,7 +2475,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sessions/session_tab_helper_factory.h" #include "chrome/browser/ssl/chrome_security_blocking_page_factory.h" -@@ -124,9 +128,11 @@ +@@ -132,9 +136,11 @@ #include "components/performance_manager/public/performance_manager.h" #include "components/permissions/features.h" #include "components/permissions/permission_request_manager.h" @@ -2486,7 +2487,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "components/site_engagement/content/site_engagement_helper.h" #include "components/site_engagement/content/site_engagement_service.h" #include "components/tracing/common/tracing_switches.h" -@@ -368,6 +374,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -390,6 +396,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -2494,7 +2495,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents( web_contents, HostContentSettingsMapFactory::GetForProfile(profile), safe_browsing::SafeBrowsingNavigationObserverManagerFactory:: -@@ -385,6 +392,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -407,6 +414,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents( profile, web_contents); ReputationWebContentsObserver::CreateForWebContents(web_contents); @@ -2595,9 +2596,9 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -92,7 +92,9 @@ - #include "components/page_load_metrics/renderer/metrics_render_frame_observer.h" +@@ -95,7 +95,9 @@ #include "components/paint_preview/buildflags/buildflags.h" + #include "components/password_manager/core/common/password_manager_features.h" #include "components/safe_browsing/buildflags.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/renderer/threat_dom_details.h" @@ -2608,7 +2609,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1302,7 +1302,6 @@ if (!is_android) { +@@ -1314,7 +1314,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2616,7 +2617,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", -@@ -5687,7 +5686,6 @@ test("unit_tests") { +@@ -5819,7 +5818,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2624,6 +2625,33 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:mock_password_protection", "//components/safe_browsing/content/browser/web_ui", +diff --git a/components/autofill_assistant/browser/save_password_leak_detection_delegate.cc b/components/autofill_assistant/browser/save_password_leak_detection_delegate.cc +--- a/components/autofill_assistant/browser/save_password_leak_detection_delegate.cc ++++ b/components/autofill_assistant/browser/save_password_leak_detection_delegate.cc +@@ -63,23 +63,9 @@ void SavePasswordLeakDetectionDelegate::StartLeakCheck( + LeakDetectionStatus(LeakDetectionStatusCode::ABORTED), false); + } + +- leak_check_ = leak_factory_->TryCreateLeakCheck( +- this, client_->GetIdentityManager(), client_->GetURLLoaderFactory(), +- client_->GetChannel()); +- if (!leak_check_) { + std::move(callback).Run(LeakDetectionStatus(LeakDetectionStatusCode::OTHER), + false); + return; +- } +- +- callback_ = std::move(callback); +- // TODO (crbug.com/1310169): Add a metric that measures turn-around time. +- leak_detection_timer_.Start( +- FROM_HERE, timeout, +- base::BindOnce(&SavePasswordLeakDetectionDelegate::OnLeakDetectionTimeout, +- base::Unretained(this))); +- leak_check_->Start(credential.url, credential.username_value, +- credential.password_value); + } + + // Url, username and password parameters from the interface are not used. diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn --- a/components/component_updater/installer_policies/BUILD.gn +++ b/components/component_updater/installer_policies/BUILD.gn @@ -2639,7 +2667,7 @@ diff --git a/components/component_updater/installer_policies/BUILD.gn b/componen diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc --- a/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc -@@ -594,10 +594,7 @@ PermissionRequestManager::PermissionRequestManager( +@@ -599,10 +599,7 @@ PermissionRequestManager::PermissionRequestManager( view_(nullptr), tab_is_hidden_(web_contents->GetVisibility() == content::Visibility::HIDDEN), @@ -2678,8 +2706,8 @@ diff --git a/components/safe_browsing/content/common/file_type_policies.cc b/com diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc --- a/components/safe_browsing/core/common/features.cc +++ b/components/safe_browsing/core/common/features.cc -@@ -156,7 +156,7 @@ constexpr base::FeatureParam kShouldFillOldPhishGuardProto{ - &kPasswordProtectionForSignedInUsers, "DeprecateOldProto", false}; +@@ -132,7 +132,7 @@ const base::Feature kSendSampledPingsForProtegoAllowlistDomains{ + base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kSuspiciousSiteTriggerQuotaFeature{ - "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -2775,7 +2803,7 @@ diff --git a/content/browser/file_system_access/file_system_access_file_writer_i diff --git a/content/browser/file_system_access/safe_move_helper.cc b/content/browser/file_system_access/safe_move_helper.cc --- a/content/browser/file_system_access/safe_move_helper.cc +++ b/content/browser/file_system_access/safe_move_helper.cc -@@ -137,8 +137,7 @@ SafeMoveHelper::SafeMoveHelper( +@@ -139,8 +139,7 @@ SafeMoveHelper::SafeMoveHelper( dest_url_(dest_url), options_(options), quarantine_connection_callback_( @@ -2785,7 +2813,7 @@ diff --git a/content/browser/file_system_access/safe_move_helper.cc b/content/br SafeMoveHelper::~SafeMoveHelper() = default; -@@ -152,14 +151,9 @@ void SafeMoveHelper::Start(SafeMoveHelperCallback callback) { +@@ -154,14 +153,9 @@ void SafeMoveHelper::Start(SafeMoveHelperCallback callback) { return; } @@ -2800,7 +2828,7 @@ diff --git a/content/browser/file_system_access/safe_move_helper.cc b/content/br } void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) { -@@ -179,44 +173,6 @@ void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) { +@@ -181,44 +175,6 @@ void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) { std::move(wrapped_callback), source_url())); } @@ -2906,7 +2934,7 @@ diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn --- a/weblayer/test/BUILD.gn +++ b/weblayer/test/BUILD.gn -@@ -242,7 +242,6 @@ test("weblayer_browsertests") { +@@ -241,7 +241,6 @@ test("weblayer_browsertests") { "//components/page_info/android", "//components/safe_browsing/android:safe_browsing_api_handler", "//components/safe_browsing/content/browser", diff --git a/build/patches/Disable-safety-check.patch b/build/patches/Disable-safety-check.patch index 21b8bf26..24318579 100644 --- a/build/patches/Disable-safety-check.patch +++ b/build/patches/Disable-safety-check.patch @@ -3,17 +3,17 @@ Date: Sun, 6 Mar 2022 17:39:15 +0100 Subject: Disable safety check --- - chrome/android/BUILD.gn | 3 --- + chrome/android/BUILD.gn | 5 ----- chrome/android/chrome_java_sources.gni | 1 - .../browser/app/omnibox/OmniboxPedalDelegateImpl.java | 8 -------- .../chrome/browser/settings/SettingsActivity.java | 6 ------ chrome/browser/BUILD.gn | 1 - - 5 files changed, 19 deletions(-) + 5 files changed, 21 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -406,7 +406,6 @@ android_library("chrome_java") { +@@ -405,7 +405,6 @@ android_library("chrome_java") { "//chrome/browser/privacy_sandbox/android:java", "//chrome/browser/profiles/android:java", "//chrome/browser/safe_browsing/android:java", @@ -21,26 +21,28 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/search_engines/android:java", "//chrome/browser/segmentation_platform:factory_java", "//chrome/browser/settings:java", -@@ -1011,7 +1010,6 @@ junit_binary("chrome_junit_tests") { +@@ -999,8 +998,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/preferences:java", "//chrome/browser/preferences:preferences_junit_tests", "//chrome/browser/profiles/android:java", - "//chrome/browser/safety_check/android:java", - "//chrome/browser/safety_check/android:junit", +- "//chrome/browser/safety_check/android:junit", "//chrome/browser/search_engines/android:java", "//chrome/browser/share:java", -@@ -1398,7 +1396,6 @@ android_library("chrome_test_java") { + "//chrome/browser/signin/services/android:java", +@@ -1380,8 +1377,6 @@ android_library("chrome_test_java") { "//chrome/browser/profiles/android:java", "//chrome/browser/safe_browsing/android:java", "//chrome/browser/safe_browsing/android:javatests", - "//chrome/browser/safety_check/android:java", - "//chrome/browser/safety_check/android:javatests", +- "//chrome/browser/safety_check/android:javatests", "//chrome/browser/search_engines/android:java", "//chrome/browser/settings:java", + "//chrome/browser/settings:javatests", diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -935,7 +935,6 @@ chrome_java_sources = [ +@@ -941,7 +941,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java", @@ -51,7 +53,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java -@@ -26,7 +26,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate; +@@ -27,7 +27,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate; import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalSuggestionViewProperties.PedalIcon; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; @@ -59,7 +61,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; import org.chromium.components.browser_ui.settings.SettingsLauncher; -@@ -72,12 +71,6 @@ public class OmniboxPedalDelegateImpl implements OmniboxPedalDelegate { +@@ -77,12 +76,6 @@ public class OmniboxPedalDelegateImpl implements OmniboxPedalDelegate { startActivity(intent); } break; @@ -72,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn case OmniboxPedalType.MANAGE_SITE_SETTINGS: settingsLauncher.launchSettingsActivity(mActivity, SiteSettings.class); break; -@@ -153,7 +146,6 @@ public class OmniboxPedalDelegateImpl implements OmniboxPedalDelegate { +@@ -158,7 +151,6 @@ public class OmniboxPedalDelegateImpl implements OmniboxPedalDelegate { case OmniboxPedalType.MANAGE_PASSWORDS: case OmniboxPedalType.UPDATE_CREDIT_CARD: case OmniboxPedalType.LAUNCH_INCOGNITO: @@ -93,7 +95,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings; import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate; import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager; -@@ -372,9 +369,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -370,9 +367,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity fragmentHelpAndFeedbackLauncher.setHelpAndFeedbackLauncher( HelpAndFeedbackLauncherImpl.getInstance()); } @@ -106,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3347,7 +3347,6 @@ static_library("browser") { +@@ -3370,7 +3370,6 @@ static_library("browser") { "//chrome/browser/privacy_sandbox/android:jni_headers", "//chrome/browser/reading_list/android", "//chrome/browser/safe_browsing/android:safe_browsing_enums", diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index c1953623..2f64853f 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -183,6 +183,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kCCTClientDataHeader, &kCCTExternalLinkHandling, &kCCTIncognito, @@ -48,7 +48,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCCTIncognitoAvailableToThirdParty, &kCCTNewDownloadTab, &kCCTPostMessageAPI, -@@ -531,6 +532,9 @@ const base::Feature kChromeSharingHubLaunchAdjacent{ +@@ -524,6 +525,9 @@ const base::Feature kChromeSharingHubLaunchAdjacent{ const base::Feature kChromeSurveyNextAndroid{"ChromeSurveyNextAndroid", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -72,7 +72,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 -@@ -248,6 +248,7 @@ public abstract class ChromeFeatureList { +@@ -246,6 +246,7 @@ public abstract class ChromeFeatureList { public static final String CCT_NEW_DOWNLOAD_TAB = "CCTNewDownloadTab"; public static final String CCT_POST_MESSAGE_API = "CCTPostMessageAPI"; public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect"; @@ -95,7 +95,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json -@@ -1817,6 +1817,21 @@ +@@ -1962,6 +1962,21 @@ ] } ], diff --git a/build/patches/Disable-some-signed-exchange-features.patch b/build/patches/Disable-some-signed-exchange-features.patch index e35b12de..f016e9a7 100644 --- a/build/patches/Disable-some-signed-exchange-features.patch +++ b/build/patches/Disable-some-signed-exchange-features.patch @@ -9,7 +9,7 @@ Subject: Disable some signed exchange 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 -@@ -838,7 +838,7 @@ const base::Feature kSharedArrayBufferOnDesktop{ +@@ -846,7 +846,7 @@ const base::Feature kSharedArrayBufferOnDesktop{ // Signed Exchange Reporting for distributors // https://www.chromestatus.com/feature/5687904902840320 const base::Feature kSignedExchangeReportingForDistributors{ @@ -18,7 +18,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c // Subresource prefetching+loading via Signed HTTP Exchange // https://www.chromestatus.com/feature/5126805474246656 -@@ -848,7 +848,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{ +@@ -856,7 +856,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{ // Origin-Signed HTTP Exchanges (for WebPackage Loading) // https://www.chromestatus.com/feature/5745285984681984 const base::Feature kSignedHTTPExchange{"SignedHTTPExchange", diff --git a/build/patches/Disable-support-for-RAR-files-inspection.patch b/build/patches/Disable-support-for-RAR-files-inspection.patch index 534df0b9..e90eb17a 100644 --- a/build/patches/Disable-support-for-RAR-files-inspection.patch +++ b/build/patches/Disable-support-for-RAR-files-inspection.patch @@ -11,7 +11,7 @@ Subject: Disable support for RAR files inspection diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc -@@ -97,7 +97,7 @@ void FileAnalyzer::Start(const base::FilePath& target_path, +@@ -96,7 +96,7 @@ void FileAnalyzer::Start(const base::FilePath& target_path, if (inspection_type == DownloadFileType::ZIP) { StartExtractZipFeatures(); } else if (inspection_type == DownloadFileType::RAR) { diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch index 0e80e73b..7db13fad 100644 --- a/build/patches/Disable-text-fragments-by-default.patch +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -19,7 +19,7 @@ Revert "[Text Fragment] Unflag fragment directive removal." 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 -@@ -5514,6 +5514,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5583,6 +5583,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableWebAuthenticationPasskeysUIExperimentDescription, kOsDesktop, FEATURE_VALUE_TYPE(device::kWebAuthPasskeysUIExperiment)}, @@ -34,9 +34,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2490,6 +2490,11 @@ - // deep into the future to allow for experiments. - "expiry_milestone": 90 +@@ -2492,6 +2492,11 @@ + "owners": [ "alionadangla", "bwwilliams", "bling-flags@google.com"], + "expiry_milestone": 105 }, + { + "name": "enable-text-fragment-anchor", @@ -44,12 +44,12 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js + "expiry_milestone": -1 + }, { - "name": "enable-new-download-api", - "owners": [ "sdefresne", "bling-flags@google.com" ], + "name": "enable-payment-request-basic-card", + "owners": [ "web-payments-team@google.com" ], diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1276,6 +1276,10 @@ const char kEnableRestrictedWebApisDescription[] = +@@ -1231,6 +1231,10 @@ const char kEnableRestrictedWebApisDescription[] = "Enable the restricted web APIs for dev trial. This will be replaced with " "permission policies to control the capabilities afterwards."; @@ -63,7 +63,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 -@@ -716,6 +716,9 @@ extern const char +@@ -687,6 +687,9 @@ extern const char extern const char kEnableRestrictedWebApisName[]; extern const char kEnableRestrictedWebApisDescription[]; @@ -88,7 +88,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -279,7 +279,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() { +@@ -282,7 +282,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() { features::kSignedExchangeSubresourcePrefetch}, {wf::EnableSkipTouchEventFilter, blink::features::kSkipTouchEventFilter}, {wf::EnableSubresourceWebBundles, features::kSubresourceWebBundles}, @@ -100,7 +100,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -462,7 +462,7 @@ const base::Feature kStorageAccessAPI{"StorageAccessAPI", +@@ -450,7 +450,7 @@ const base::Feature kStorageAccessAPI{"StorageAccessAPI", // Enable text snippets in URL fragments. https://crbug.com/919204. const base::Feature kTextFragmentAnchor{"TextFragmentAnchor", @@ -112,7 +112,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -4113,9 +4113,14 @@ void Document::SetURL(const KURL& url) { +@@ -4164,9 +4164,14 @@ void Document::SetURL(const KURL& url) { TRACE_EVENT1("navigation", "Document::SetURL", "url", new_url.GetString().Utf8()); @@ -178,7 +178,7 @@ diff --git a/third_party/blink/renderer/core/fragment_directive/text_fragment_an 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 -@@ -2297,8 +2297,7 @@ +@@ -2290,8 +2290,7 @@ }, { name: "TextFragmentIdentifiers", diff --git a/build/patches/Disable-third-party-cookies-by-default.patch b/build/patches/Disable-third-party-cookies-by-default.patch index 4db43923..b6a5e3a5 100644 --- a/build/patches/Disable-third-party-cookies-by-default.patch +++ b/build/patches/Disable-third-party-cookies-by-default.patch @@ -9,7 +9,7 @@ Subject: Disable third-party cookies by default diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc --- a/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc -@@ -63,7 +63,7 @@ void CookieSettings::RegisterProfilePrefs( +@@ -64,7 +64,7 @@ void CookieSettings::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterIntegerPref( prefs::kCookieControlsMode, diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch index 7c684402..4ab1b334 100644 --- a/build/patches/Disable-third-party-origin-trials.patch +++ b/build/patches/Disable-third-party-origin-trials.patch @@ -59,7 +59,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -6846,7 +6846,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() { +@@ -6965,7 +6965,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() { void NavigationRequest::ForceEnableOriginTrials( const std::vector& trials) { DCHECK(!HasCommitted()); @@ -70,7 +70,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -469,10 +469,6 @@ void FillNavigationParamsRequest( +@@ -471,10 +471,6 @@ void FillNavigationParamsRequest( common_params.initiator_origin.value(); } @@ -81,7 +81,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra navigation_params->was_discarded = commit_params.was_discarded; navigation_params->document_ukm_source_id = commit_params.document_ukm_source_id; -@@ -505,12 +501,6 @@ void FillNavigationParamsRequest( +@@ -507,12 +503,6 @@ void FillNavigationParamsRequest( navigation_params->web_bundle_claimed_url = commit_params.web_bundle_claimed_url; @@ -94,7 +94,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra if (!commit_params.early_hints_preloaded_resources.empty()) { navigation_params->early_hints_preloaded_resources = WebVector(); for (const auto& resource : commit_params.early_hints_preloaded_resources) { -@@ -557,11 +547,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( +@@ -559,11 +549,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( info->url_request.GetURLRequestExtraData().get()); DCHECK(url_request_extra_data); @@ -106,7 +106,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra blink::NavigationDownloadPolicy download_policy; download_policy.ApplyDownloadFramePolicy( info->is_opener_navigation, info->url_request.HasUserGesture(), -@@ -579,7 +564,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( +@@ -581,7 +566,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( info->url_request.HasUserGesture(), info->url_request.HasTextFragmentToken(), info->should_check_main_world_content_security_policy, @@ -147,7 +147,7 @@ diff --git a/content/shell/common/shell_origin_trial_policy.cc b/content/shell/c diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/third_party/blink/common/origin_trials/trial_token_validator.cc --- a/third_party/blink/common/origin_trials/trial_token_validator.cc +++ b/third_party/blink/common/origin_trials/trial_token_validator.cc -@@ -210,6 +210,7 @@ TrialTokenValidator::GetValidTokens(const url::Origin& origin, +@@ -242,6 +242,7 @@ TrialTokenValidator::GetValidTokens(const url::Origin& origin, // static bool TrialTokenValidator::IsTrialPossibleOnOrigin(const GURL& url) { @@ -158,7 +158,7 @@ diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/t diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc --- a/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc -@@ -151,31 +151,18 @@ Vector CopyInitiatorOriginTrials( +@@ -158,31 +158,18 @@ Vector CopyInitiatorOriginTrials( WebVector CopyInitiatorOriginTrials( const Vector& initiator_origin_trial_features) { WebVector result; @@ -190,7 +190,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p return result; } -@@ -2526,10 +2513,6 @@ void DocumentLoader::CreateParserPostCommit() { +@@ -2564,10 +2551,6 @@ void DocumentLoader::CreateParserPostCommit() { OriginTrialFeature::kTouchEventFeatureDetection); } diff --git a/build/patches/Disable-various-metrics.patch b/build/patches/Disable-various-metrics.patch index c107d6c0..da0a62ef 100644 --- a/build/patches/Disable-various-metrics.patch +++ b/build/patches/Disable-various-metrics.patch @@ -21,9 +21,9 @@ Fix startup crash for debug builds (uazo) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java -@@ -45,7 +45,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity { - - static final String OPEN_ADVANCED_SYNC_SETTINGS = "OpenAdvancedSyncSettings"; +@@ -43,7 +43,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity { + static final String SHOW_SEARCH_ENGINE_PAGE = "ShowSearchEnginePage"; + static final String SHOW_SYNC_CONSENT_PAGE = "ShowSyncConsent"; - public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = true; + public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = false; @@ -108,7 +108,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -985,7 +985,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -988,7 +988,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { #endif // BUILDFLAG(IS_CHROMEOS_ASH) registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, @@ -120,7 +120,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -60,7 +60,6 @@ +@@ -62,7 +62,6 @@ #include "chrome/browser/hid/chrome_hid_delegate.h" #include "chrome/browser/interstitials/enterprise_util.h" #include "chrome/browser/lifetime/browser_shutdown.h" @@ -128,7 +128,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/media/audio_service_util.h" #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h" -@@ -4167,16 +4166,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4165,16 +4164,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( content::NavigationHandle* handle) { std::vector> throttles; @@ -145,7 +145,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if BUILDFLAG(IS_CHROMEOS_ASH) MaybeAddThrottle( ash::WebTimeLimitNavigationThrottle::MaybeCreateThrottleFor(handle), -@@ -4269,10 +4258,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4267,10 +4256,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles); } @@ -159,7 +159,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc -@@ -75,7 +75,7 @@ namespace internal { +@@ -74,7 +74,7 @@ namespace internal { // recording and reporting are enabled. If the feature is enabled, but no // consent is given, then there will be no recording or reporting. const base::Feature kMetricsReportingFeature{"MetricsReporting", diff --git a/build/patches/Do-not-build-API-keys-infobar.patch b/build/patches/Do-not-build-API-keys-infobar.patch index fc33fead..2a540cd8 100644 --- a/build/patches/Do-not-build-API-keys-infobar.patch +++ b/build/patches/Do-not-build-API-keys-infobar.patch @@ -9,7 +9,7 @@ Subject: Do not build API keys infobar 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 -@@ -1244,8 +1244,6 @@ static_library("ui") { +@@ -1257,8 +1257,6 @@ static_library("ui") { "singleton_tabs.h", "startup/automation_infobar_delegate.cc", "startup/automation_infobar_delegate.h", diff --git a/build/patches/Do-not-hide-component-extensions.patch b/build/patches/Do-not-hide-component-extensions.patch index 472a0784..3a0d79b7 100644 --- a/build/patches/Do-not-hide-component-extensions.patch +++ b/build/patches/Do-not-hide-component-extensions.patch @@ -9,7 +9,7 @@ Subject: Do not hide component extensions diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc -@@ -469,9 +469,8 @@ bool Extension::ShouldDisplayInNewTabPage() const { +@@ -457,9 +457,8 @@ bool Extension::ShouldDisplayInNewTabPage() const { } bool Extension::ShouldExposeViaManagementAPI() const { diff --git a/build/patches/Do-not-link-with-libatomic.patch b/build/patches/Do-not-link-with-libatomic.patch index e6c35374..3a3c40a4 100644 --- a/build/patches/Do-not-link-with-libatomic.patch +++ b/build/patches/Do-not-link-with-libatomic.patch @@ -11,7 +11,7 @@ This patch allows building with use_sysroot=false diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1494,7 +1494,7 @@ mixed_component("base") { +@@ -1488,7 +1488,7 @@ mixed_component("base") { if (!use_sysroot && (is_android || ((is_linux || is_chromeos) && !is_chromecast)) && host_toolchain != "//build/toolchain/cros:host") { diff --git a/build/patches/Do-not-store-passwords-by-default.patch b/build/patches/Do-not-store-passwords-by-default.patch index bf875897..97c5be9b 100644 --- a/build/patches/Do-not-store-passwords-by-default.patch +++ b/build/patches/Do-not-store-passwords-by-default.patch @@ -9,7 +9,7 @@ Subject: Do not store passwords by default diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -204,10 +204,10 @@ bool HasMutedCredentials(base::span credentials, +@@ -210,10 +210,10 @@ bool HasMutedCredentials(const std::vector& credentials, void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/build/patches/DoH-improvements.patch b/build/patches/DoH-improvements.patch index 650ee650..f3394257 100644 --- a/build/patches/DoH-improvements.patch +++ b/build/patches/DoH-improvements.patch @@ -80,7 +80,7 @@ diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -3137,6 +3137,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) { +@@ -3317,6 +3317,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) { bool changed = dns_client_->SetConfigOverrides(std::move(overrides)); if (changed) { diff --git a/build/patches/Enable-Certificate-Transparency.patch b/build/patches/Enable-Certificate-Transparency.patch index 035d76fc..7de5fa19 100644 --- a/build/patches/Enable-Certificate-Transparency.patch +++ b/build/patches/Enable-Certificate-Transparency.patch @@ -22,8 +22,8 @@ Disable CT reporting 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 -@@ -8131,6 +8131,11 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWebBluetoothBondOnDemandDescription, kOsWin | kOsLinux, +@@ -8164,6 +8164,11 @@ const FeatureEntry kFeatureEntries[] = { + kOsWin | kOsLinux | kOsLacros, FEATURE_VALUE_TYPE(features::kWebBluetoothBondOnDemand)}, + {"certificate-transparency-enabled", @@ -51,7 +51,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.cc b/chrome/browser/component_updater/pki_metadata_component_installer.cc --- a/chrome/browser/component_updater/pki_metadata_component_installer.cc +++ b/chrome/browser/component_updater/pki_metadata_component_installer.cc -@@ -59,7 +59,8 @@ const char kGoogleOperatorName[] = "Google"; +@@ -61,7 +61,8 @@ const char kGoogleOperatorName[] = "Google"; // The extension id is: efniojlnjndmcbiieegkicadnoecjjef const uint8_t kPKIMetadataPublicKeySHA256[32] = { 0x45, 0xd8, 0xe9, 0xbd, 0x9d, 0x3c, 0x21, 0x88, 0x44, 0x6a, 0x82, @@ -64,7 +64,7 @@ diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.c diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -5944,6 +5944,10 @@ const char kUIDebugToolsDescription[] = +@@ -5917,6 +5917,10 @@ const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; #endif @@ -78,7 +78,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 -@@ -3455,6 +3455,9 @@ extern const char kUIDebugToolsName[]; +@@ -3436,6 +3436,9 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif @@ -91,7 +91,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -889,7 +889,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( +@@ -885,7 +885,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { if (certificate_transparency_enabled_for_testing_.has_value()) return certificate_transparency_enabled_for_testing_.value(); @@ -99,7 +99,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows // TODO(carlosil): Figure out if we can/should remove the OFFICIAL_BUILD and // GOOGLE_CHROME_BRANDING checks now that enforcement does not rely on build // dates, and allow embedders to enforce. -@@ -903,9 +902,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { +@@ -899,9 +898,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { #else return true; #endif @@ -125,7 +125,7 @@ diff --git a/chrome/browser/ssl/sct_reporting_service.cc b/chrome/browser/ssl/sc diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -881,7 +881,7 @@ const base::Feature kSchedulerConfiguration{"SchedulerConfiguration", +@@ -887,7 +887,7 @@ const base::Feature kSchedulerConfiguration{"SchedulerConfiguration", // should be sampled. Default sampling rate is 1/10,000 certificates. #if BUILDFLAG(IS_ANDROID) const base::Feature kSCTAuditing{"SCTAuditing", @@ -195,7 +195,7 @@ diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.cc diff --git a/services/network/network_context.cc b/services/network/network_context.cc --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -2558,7 +2558,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2624,7 +2624,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( // TransportSecurityState. Since no requests have been made yet, safe to do // this even after the call to Build(). @@ -204,8 +204,8 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont net::NetworkTrafficAnnotationTag traffic_annotation = net::DefineNetworkTrafficAnnotation("domain_security_policy", R"( semantics { -@@ -2605,7 +2605,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( - #endif // BUILDFLAG(IS_ANDROID) +@@ -2666,7 +2666,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( + } #if BUILDFLAG(IS_CT_SUPPORTED) - if (params_->enable_expect_ct_reporting) { @@ -213,7 +213,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont LazyCreateExpectCTReporter(result.url_request_context.get()); result.url_request_context->transport_security_state()->SetExpectCTReporter( expect_ct_reporter_.get()); -@@ -2617,9 +2617,13 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2678,9 +2678,13 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( result.url_request_context->transport_security_state() ->SetRequireCTDelegate(require_ct_delegate_.get()); } @@ -243,7 +243,7 @@ diff --git a/services/network/public/cpp/features.gni b/services/network/public/ diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/network/sct_auditing/sct_auditing_handler.cc --- a/services/network/sct_auditing/sct_auditing_handler.cc +++ b/services/network/sct_auditing/sct_auditing_handler.cc -@@ -106,6 +106,9 @@ void SCTAuditingHandler::MaybeEnqueueReport( +@@ -105,6 +105,9 @@ void SCTAuditingHandler::MaybeEnqueueReport( const net::X509Certificate* validated_certificate_chain, const net::SignedCertificateTimestampAndStatusList& signed_certificate_timestamps) { @@ -253,7 +253,7 @@ diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/ne if (mode_ == mojom::SCTAuditingMode::kDisabled) { return; } -@@ -297,6 +300,9 @@ void SCTAuditingHandler::AddReporter( +@@ -294,6 +297,9 @@ void SCTAuditingHandler::AddReporter( absl::optional sct_metadata, std::unique_ptr backoff_entry) { DCHECK(foreground_runner_->RunsTasksInCurrentSequence()); diff --git a/build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture-by-default.patch b/build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture.patch similarity index 93% rename from build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture-by-default.patch rename to build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture.patch index 87d64659..2c524bf7 100644 --- a/build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture-by-default.patch +++ b/build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture.patch @@ -1,6 +1,6 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Tue, 25 May 2021 19:33:41 +0200 -Subject: Enable IntentBlockExternalFormRedirectsNoGesture by default +Subject: Enable IntentBlockExternalFormRedirectsNoGesture --- .../external_intents/android/external_intents_features.cc | 2 +- diff --git a/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch b/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch index 69da06d6..eb4653f5 100644 --- a/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch +++ b/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch @@ -10,7 +10,7 @@ Subject: Enable SPPI for devices with enough memory diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -938,11 +938,7 @@ const base::Feature kShow10_10ObsoleteInfobar{ +@@ -937,11 +937,7 @@ const base::Feature kSharesheetCopyToClipboard{ // browser_features, as they are only used on the browser side. const base::Feature kSitePerProcess { "SitePerProcess", diff --git a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch index f2d24f1d..ea8227de 100644 --- a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch +++ b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch @@ -15,7 +15,7 @@ SitePerProcess: always consider enterprise policies applicable. 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 -@@ -3863,9 +3863,6 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4016,9 +4016,6 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid, FEATURE_VALUE_TYPE( site_isolation::features::kSiteIsolationForPasswordSites)}, @@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1295,7 +1295,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1301,7 +1301,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath()); registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0); registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); @@ -37,7 +37,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch registry->RegisterBooleanPref(prefs::kTabFreezingEnabled, true); registry->RegisterIntegerPref(prefs::kSCTAuditingHashdanceReportCount, 0); } -@@ -1309,7 +1309,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( +@@ -1315,7 +1315,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( // user policy in addition to the same named ones in Local State (which are // used for mapping the command-line flags). registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); @@ -68,7 +68,7 @@ diff --git a/components/site_isolation/site_isolation_policy.cc b/components/sit 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 -@@ -949,7 +949,7 @@ const base::Feature kStorageServiceOutOfProcess{ +@@ -953,7 +953,7 @@ const base::Feature kStopVideoCaptureOnScreenLock{ // Controls whether site isolation should use origins instead of scheme and // eTLD+1. const base::Feature kStrictOriginIsolation{"StrictOriginIsolation", diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index 8ce15a98..a1977a04 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -11,7 +11,7 @@ Unexpire #darken-websites-checkbox-in-themes-setting 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 -@@ -1080,9 +1080,9 @@ +@@ -1091,9 +1091,9 @@ "expiry_milestone": 110 }, { diff --git a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch index f7962a2a..cf02ec1b 100644 --- a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch +++ b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch @@ -42,7 +42,7 @@ Excerpt from https://github.com/bromite/bromite/issues/226 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -350,6 +350,10 @@ config("compiler") { +@@ -345,6 +345,10 @@ config("compiler") { } } diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index 01ad3a0a..23234d36 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -38,7 +38,7 @@ See also: https://github.com/bromite/bromite/issues/547 diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc --- a/android_webview/browser/aw_contents.cc +++ b/android_webview/browser/aw_contents.cc -@@ -336,6 +336,7 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) { +@@ -335,6 +335,7 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) { autofill::AutofillProvider::is_download_manager_disabled_for_testing() ? autofill::AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER : autofill::AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER, @@ -50,7 +50,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -459,6 +459,7 @@ android_library("chrome_java") { - "//components/autofill/android:prefeditor_autofill_java", + "//components/autofill_assistant/android:public_dependencies_java", "//components/autofill_assistant/android:public_java", "//components/autofill_assistant/browser:proto_java", + "//components/android_autofill/browser:java", @@ -60,7 +60,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -@@ -54,13 +54,18 @@ import java.lang.annotation.Retention; +@@ -55,13 +55,18 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Locale; @@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage @IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN, TrustedVaultBannerState.OPTED_IN}) @Retention(RetentionPolicy.SOURCE) -@@ -87,6 +92,12 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -88,6 +93,12 @@ public class PasswordSettings extends PreferenceFragmentCompat public static final String PREF_TRUSTED_VAULT_BANNER = "trusted_vault_banner"; public static final String PREF_KEY_MANAGE_ACCOUNT_LINK = "manage_account_link"; @@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage private static final String PREF_KEY_CATEGORY_SAVED_PASSWORDS = "saved_passwords"; private static final String PREF_KEY_CATEGORY_EXCEPTIONS = "exceptions"; private static final String PREF_KEY_SAVED_PASSWORDS_NO_TEXT = "saved_passwords_no_text"; -@@ -116,6 +127,8 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -117,6 +128,8 @@ public class PasswordSettings extends PreferenceFragmentCompat private String mSearchQuery; private Preference mLinkPref; private ChromeSwitchPreference mSavePasswordsSwitch; @@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage private ChromeSwitchPreference mAutoSignInSwitch; private ChromeBasePreference mCheckPasswords; private ChromeBasePreference mTrustedVaultBanner; -@@ -287,6 +300,7 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -288,6 +301,7 @@ public class PasswordSettings extends PreferenceFragmentCompat } createSavePasswordsSwitch(); @@ -110,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage createAutoSignInCheckbox(); if (mPasswordCheck != null) { createCheckPasswords(); -@@ -522,6 +536,71 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -525,6 +539,71 @@ public class PasswordSettings extends PreferenceFragmentCompat getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_SERVICE)); } @@ -279,9 +279,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java -@@ -19,6 +19,10 @@ import org.chromium.ui.base.DropDataContentProvider; - import org.chromium.ui.base.ViewAndroidDelegate; - import org.chromium.ui.base.WindowAndroid; +@@ -19,6 +19,10 @@ import org.chromium.ui.base.WindowAndroid; + import org.chromium.ui.dragdrop.DragStateTracker; + import org.chromium.ui.dragdrop.DropDataContentProvider; +import android.util.SparseArray; +import android.view.autofill.AutofillValue; @@ -291,7 +291,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr * Implementation of the abstract class {@link ViewAndroidDelegate} for Chrome. */ @@ -149,4 +153,14 @@ public class TabViewAndroidDelegate extends ViewAndroidDelegate { - getContentView().removeOnDragListener(getDragStateTrackerInternal()); + getContentView().removeOnDragListener(getDragStateTracker()); } } + @@ -308,9 +308,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2401,6 +2401,14 @@ static_library("browser") { - "//ui/webui/resources/cr_components/most_visited:mojom", - "//ui/webui/resources/js/browser_command:mojo_bindings", +@@ -2410,6 +2410,14 @@ static_library("browser") { + "//ui/web_dialogs", + "//ui/webui", ] + + if (is_android) { @@ -326,7 +326,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc --- a/chrome/browser/android/tab_android.cc +++ b/chrome/browser/android/tab_android.cc -@@ -66,6 +66,13 @@ +@@ -67,6 +67,13 @@ #include "url/android/gurl_android.h" #include "url/gurl.h" @@ -340,7 +340,7 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_ using base::android::AttachCurrentThread; using base::android::ConvertUTF8ToJavaString; using base::android::JavaParamRef; -@@ -444,3 +451,23 @@ static void JNI_TabImpl_Init(JNIEnv* env, const JavaParamRef& obj) { +@@ -447,3 +454,23 @@ static void JNI_TabImpl_Init(JNIEnv* env, const JavaParamRef& obj) { // This will automatically bind to the Java object and pass ownership there. new TabAndroid(env, obj); } @@ -392,7 +392,7 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom 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 -@@ -586,6 +586,12 @@ CHAR_LIMIT guidelines: +@@ -590,6 +590,12 @@ CHAR_LIMIT guidelines: Save passwords @@ -408,7 +408,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -155,6 +155,9 @@ +@@ -164,6 +164,9 @@ #include "chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h" #include "chrome/browser/video_tutorials/video_tutorial_tab_helper.h" #include "content/public/common/content_features.h" @@ -418,7 +418,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #else #include "chrome/browser/accuracy_tips/accuracy_service_factory.h" #include "chrome/browser/banners/app_banner_manager_desktop.h" -@@ -293,7 +296,10 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -314,7 +317,10 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { web_contents, autofill::ChromeAutofillClient::FromWebContents(web_contents), g_browser_process->GetApplicationLocale(), @@ -427,7 +427,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc + /*enable_browser_autofill_manager*/ true, + base::BindRepeating(&autofill::AndroidAutofillManager::Create)); + - if (BreadcrumbsStatus::IsEnabled()) + if (breadcrumbs::IsEnabled()) BreadcrumbManagerTabHelper::CreateForWebContents(web_contents); chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents); diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc @@ -455,7 +455,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } if (client && ShouldEnableHeavyFormDataScraping(client->GetChannel())) { GetAutofillAgent()->EnableHeavyFormDataScraping(); -@@ -343,6 +346,8 @@ void ContentAutofillDriver::FormsSeenImpl( +@@ -338,6 +341,8 @@ void ContentAutofillDriver::FormsSeenImpl( const std::vector& updated_forms, const std::vector& removed_forms) { autofill_manager_->OnFormsSeen(updated_forms, removed_forms); @@ -464,7 +464,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } void ContentAutofillDriver::SetFormToBeProbablySubmittedImpl( -@@ -365,6 +370,8 @@ void ContentAutofillDriver::FormSubmittedImpl(const FormData& form, +@@ -360,6 +365,8 @@ void ContentAutofillDriver::FormSubmittedImpl(const FormData& form, } autofill_manager_->OnFormSubmitted(form, known_success, source); @@ -473,7 +473,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } void ContentAutofillDriver::TextFieldDidChangeImpl( -@@ -373,6 +380,8 @@ void ContentAutofillDriver::TextFieldDidChangeImpl( +@@ -368,6 +375,8 @@ void ContentAutofillDriver::TextFieldDidChangeImpl( const gfx::RectF& bounding_box, base::TimeTicks timestamp) { autofill_manager_->OnTextFieldDidChange(form, field, bounding_box, timestamp); @@ -482,7 +482,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } void ContentAutofillDriver::TextFieldDidScrollImpl( -@@ -380,6 +389,8 @@ void ContentAutofillDriver::TextFieldDidScrollImpl( +@@ -375,6 +384,8 @@ void ContentAutofillDriver::TextFieldDidScrollImpl( const FormFieldData& field, const gfx::RectF& bounding_box) { autofill_manager_->OnTextFieldDidScroll(form, field, bounding_box); @@ -491,7 +491,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } void ContentAutofillDriver::SelectControlDidChangeImpl( -@@ -387,6 +398,8 @@ void ContentAutofillDriver::SelectControlDidChangeImpl( +@@ -382,6 +393,8 @@ void ContentAutofillDriver::SelectControlDidChangeImpl( const FormFieldData& field, const gfx::RectF& bounding_box) { autofill_manager_->OnSelectControlDidChange(form, field, bounding_box); @@ -500,7 +500,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } void ContentAutofillDriver::AskForValuesToFillImpl( -@@ -397,15 +410,22 @@ void ContentAutofillDriver::AskForValuesToFillImpl( +@@ -392,15 +405,22 @@ void ContentAutofillDriver::AskForValuesToFillImpl( bool autoselect_first_suggestion) { autofill_manager_->OnAskForValuesToFill(id, form, field, bounding_box, autoselect_first_suggestion); @@ -523,7 +523,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } void ContentAutofillDriver::FocusOnFormFieldImpl( -@@ -413,25 +433,35 @@ void ContentAutofillDriver::FocusOnFormFieldImpl( +@@ -408,25 +428,35 @@ void ContentAutofillDriver::FocusOnFormFieldImpl( const FormFieldData& field, const gfx::RectF& bounding_box) { autofill_manager_->OnFocusOnFormField(form, field, bounding_box); @@ -559,7 +559,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } void ContentAutofillDriver::FillFormForAssistantImpl( -@@ -652,13 +682,21 @@ void ContentAutofillDriver::DidNavigateFrame( +@@ -647,13 +677,21 @@ void ContentAutofillDriver::DidNavigateFrame( if (autofill_router_) // Can be nullptr only in tests. autofill_router_->UnregisterDriver(this); autofill_manager_->Reset(); @@ -655,7 +655,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory ContentAutofillDriverFactory::~ContentAutofillDriverFactory() = default; -@@ -111,7 +114,7 @@ ContentAutofillDriver* ContentAutofillDriverFactory::DriverForFrame( +@@ -118,7 +121,7 @@ ContentAutofillDriver* ContentAutofillDriverFactory::DriverForFrame( if (render_frame_host->IsRenderFrameCreated()) { driver = std::make_unique( render_frame_host, client(), app_locale_, &router_, @@ -695,7 +695,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc --- a/components/autofill/content/renderer/password_autofill_agent.cc +++ b/components/autofill/content/renderer/password_autofill_agent.cc -@@ -784,7 +784,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange( +@@ -795,7 +795,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange( void PasswordAutofillAgent::TrackAutofilledElement( const blink::WebFormControlElement& element) { @@ -765,18 +765,18 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component @Nullable EventOffsetHandler eventOffsetHandler, @Nullable WebContents webContents) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + return new ContentViewWithAutofill(context, eventOffsetHandler, webContents); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - return new ContentViewApi23(context, eventOffsetHandler, webContents); - } -@@ -585,4 +592,43 @@ public class ContentView extends FrameLayout - if (wcax != null) wcax.onProvideVirtualStructure(structure, false); - } + return new ContentView(context, eventOffsetHandler, webContents); + } + +@@ -573,4 +580,43 @@ public class ContentView extends FrameLayout + private boolean webContentsAttached() { + return hasValidWebContents() && mWebContents.getTopLevelNativeWindow() != null; } + + /** + * API level 26 implementation that includes autofill. + */ -+ public static class ContentViewWithAutofill extends ContentViewApi23 { ++ public static class ContentViewWithAutofill extends ContentView { + private ViewAndroidDelegate viewAndroidDelegate; + + private ContentViewWithAutofill(Context context, EventOffsetHandler eventOffsetHandler, WebContents webContents) { @@ -815,8 +815,8 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java --- a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java +++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java -@@ -27,6 +27,10 @@ import org.chromium.base.annotations.JNINamespace; - import org.chromium.base.compat.ApiHelperForN; +@@ -31,6 +31,10 @@ import org.chromium.ui.dragdrop.DragStateTracker; + import org.chromium.ui.dragdrop.DropDataAndroid; import org.chromium.ui.mojom.CursorType; +import android.util.SparseArray; @@ -826,7 +826,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b /** * Class to acquire, position, and remove anchor views from the implementing View. */ -@@ -526,4 +530,8 @@ public class ViewAndroidDelegate { +@@ -523,4 +527,8 @@ public class ViewAndroidDelegate { public static void setDragAndDropDelegateForTest(DragAndDropDelegate testDelegate) { sDragAndDropTestDelegate = testDelegate; } @@ -838,7 +838,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b diff --git a/weblayer/browser/tab_impl.cc b/weblayer/browser/tab_impl.cc --- a/weblayer/browser/tab_impl.cc +++ b/weblayer/browser/tab_impl.cc -@@ -1400,7 +1400,8 @@ void TabImpl::InitializeAutofillDriver() { +@@ -1401,7 +1401,8 @@ void TabImpl::InitializeAutofillDriver() { autofill::ContentAutofillDriverFactory::CreateForWebContentsAndDelegate( web_contents, AutofillClientImpl::FromWebContents(web_contents), i18n::GetApplicationLocale(), enable_autofill_download_manager, diff --git a/build/patches/Enable-network-isolation-features.patch b/build/patches/Enable-network-isolation-features.patch index d91d37cf..d00cc1f0 100644 --- a/build/patches/Enable-network-isolation-features.patch +++ b/build/patches/Enable-network-isolation-features.patch @@ -13,7 +13,7 @@ PartitionNelAndReportingByNetworkIsolationKey diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -102,14 +102,14 @@ const base::Feature kSplitCacheByIncludeCredentials{ +@@ -122,14 +122,14 @@ const base::Feature kSplitCacheByIncludeCredentials{ "SplitCacheByIncludeCredentials", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kSplitCacheByNetworkIsolationKey{ @@ -31,7 +31,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc const base::Feature kForceIsolationInfoFrameOriginToTopLevelFrame{ "ForceIsolationInfoFrameOriginToTopLevelFrame", -@@ -117,19 +117,19 @@ const base::Feature kForceIsolationInfoFrameOriginToTopLevelFrame{ +@@ -137,19 +137,19 @@ const base::Feature kForceIsolationInfoFrameOriginToTopLevelFrame{ const base::Feature kPartitionHttpServerPropertiesByNetworkIsolationKey{ "PartitionHttpServerPropertiesByNetworkIsolationKey", diff --git a/build/patches/Enable-prefetch-privacy-changes-by-default.patch b/build/patches/Enable-prefetch-privacy-changes-by-default.patch index cb9f952b..a69c7a60 100644 --- a/build/patches/Enable-prefetch-privacy-changes-by-default.patch +++ b/build/patches/Enable-prefetch-privacy-changes-by-default.patch @@ -9,7 +9,7 @@ Subject: Enable prefetch-privacy-changes by default diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -491,7 +491,7 @@ const base::Feature kComputePressure{"ComputePressure", +@@ -485,7 +485,7 @@ const base::Feature kComputePressure{"ComputePressure", // Prefetch request properties are updated to be privacy-preserving. See // crbug.com/988956. const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges", diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index efbd95bc..20637766 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -27,7 +27,7 @@ See also: https://github.com/bromite/bromite/issues/1062 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -622,6 +622,7 @@ chrome_java_resources = [ +@@ -609,6 +609,7 @@ chrome_java_resources = [ "java/res/layout/share_sheet_content.xml", "java/res/layout/share_sheet_item.xml", "java/res/layout/sharing_device_picker.xml", @@ -38,7 +38,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -959,6 +959,7 @@ chrome_java_sources = [ +@@ -965,6 +965,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java", @@ -49,7 +49,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -805,6 +805,24 @@ by a child template that "extends" this file. +@@ -801,6 +801,24 @@ by a child template that "extends" this file. @@ -308,8 +308,8 @@ new file mode 100644 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 -@@ -5992,6 +5992,10 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(share::kSharingDesktopScreenshotsEdit)}, +@@ -6060,6 +6060,10 @@ const FeatureEntry kFeatureEntries[] = { + "DesktopSharePreview")}, #endif + {"shared-intent-ui", flag_descriptions::kSharedIntentUIName, @@ -322,7 +322,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 -@@ -2435,6 +2435,11 @@ const char kIsolateOriginsDescription[] = +@@ -2372,6 +2372,11 @@ const char kIsolateOriginsDescription[] = "Requires dedicated processes for an additional set of origins, " "specified as a comma-separated list."; @@ -337,7 +337,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 -@@ -1395,6 +1395,9 @@ extern const char kIsolateOriginsDescription[]; +@@ -1350,6 +1350,9 @@ extern const char kIsolateOriginsDescription[]; extern const char kIsolationByDefaultName[]; extern const char kIsolationByDefaultDescription[]; @@ -350,7 +350,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 -@@ -267,6 +267,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -261,6 +261,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kRelatedSearchesAlternateUx, &kRelatedSearchesInBar, &kRelatedSearchesSimplifiedUx, @@ -358,7 +358,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kRelatedSearchesUi, &kSearchEnginePromoExistingDevice, &kSearchEnginePromoExistingDeviceV2, -@@ -696,6 +697,9 @@ const base::Feature kSearchEnginePromoNewDevice{ +@@ -680,6 +681,9 @@ const base::Feature kSearchEnginePromoNewDevice{ const base::Feature kSearchEnginePromoNewDeviceV2{ "SearchEnginePromo.NewDeviceVer2", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -371,7 +371,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 -@@ -135,6 +135,7 @@ extern const base::Feature kSearchEnginePromoExistingDeviceV2; +@@ -129,6 +129,7 @@ extern const base::Feature kSearchEnginePromoExistingDeviceV2; extern const base::Feature kSearchEnginePromoNewDevice; extern const base::Feature kSearchEnginePromoNewDeviceV2; extern const base::Feature kServiceManagerForBackgroundPrefetch; @@ -382,7 +382,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 -@@ -483,6 +483,7 @@ public abstract class ChromeFeatureList { +@@ -481,6 +481,7 @@ public abstract class ChromeFeatureList { public static final String SERVICE_MANAGER_FOR_DOWNLOAD = "ServiceManagerForDownload"; public static final String SHARE_BUTTON_IN_TOP_TOOLBAR = "ShareButtonInTopToolbar"; public static final String SHARED_CLIPBOARD_UI = "SharedClipboardUI"; @@ -393,7 +393,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4662,6 +4662,19 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

diff --git a/build/patches/Enable-user-agent-freeze-by-default.patch b/build/patches/Enable-user-agent-freeze-by-default.patch index f586eefb..274f4364 100644 --- a/build/patches/Enable-user-agent-freeze-by-default.patch +++ b/build/patches/Enable-user-agent-freeze-by-default.patch @@ -9,7 +9,7 @@ Subject: Enable user-agent freeze by default diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -102,7 +102,7 @@ const base::Feature kFreezePurgeMemoryAllPagesFrozen{ +@@ -103,7 +103,7 @@ const base::Feature kFreezePurgeMemoryAllPagesFrozen{ // Freezes the user-agent as part of https://github.com/WICG/ua-client-hints. const base::Feature kReduceUserAgent{"ReduceUserAgent", diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index d19a6abb..bc95fe42 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -228,8 +228,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -269,6 +269,10 @@ android_resources("chrome_app_java_resources") { + "//third_party/androidx:androidx_gridlayout_gridlayout_java", "//third_party/androidx:androidx_preference_preference_java", - "//third_party/androidx:androidx_recyclerview_recyclerview_java", ] + + # this need to be into android_resources("chrome_app_java_resources") section because @@ -272,7 +272,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo import java.io.File; -@@ -420,6 +421,11 @@ public class DownloadUtils { +@@ -417,6 +418,11 @@ public class DownloadUtils { public static boolean openFile(String filePath, String mimeType, String downloadGuid, OTRProfileID otrProfileID, String originalUrl, String referrer, @DownloadOpenSource int source, Context context) { @@ -324,7 +324,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3490,6 +3490,11 @@ static_library("browser") { +@@ -3515,6 +3515,11 @@ static_library("browser") { ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ] } @@ -339,7 +339,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -149,6 +149,7 @@ +@@ -147,6 +147,7 @@ #include "components/translate/core/browser/translate_ranker_impl.h" #include "components/translate/core/common/translate_util.h" #include "components/ui_devtools/switches.h" @@ -347,8 +347,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/version_info/version_info.h" #include "components/viz/common/features.h" #include "components/viz/common/switches.h" -@@ -6902,6 +6903,10 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(chromeos::features::kClipboardHistoryScreenshotNudge)}, +@@ -6932,6 +6933,10 @@ const FeatureEntry kFeatureEntries[] = { + chromeos::features::kClipboardHistoryNudgeSessionReset)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) + {"enable-userscripts-log", flag_descriptions::kEnableLoggingUserScriptsName, @@ -374,7 +374,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -5784,6 +5784,11 @@ const char kQuickCommandsDescription[] = +@@ -5739,6 +5739,11 @@ const char kQuickCommandsDescription[] = #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_FUCHSIA) @@ -389,7 +389,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 -@@ -3342,6 +3342,9 @@ extern const char kQuickCommandsDescription[]; +@@ -3310,6 +3310,9 @@ extern const char kQuickCommandsDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // defined (OS_FUCHSIA) @@ -402,7 +402,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -238,6 +238,7 @@ +@@ -241,6 +241,7 @@ #include "components/ntp_tiles/popular_sites_impl.h" #include "components/permissions/contexts/geolocation_permission_context_android.h" #include "components/query_tiles/tile_service_prefs.h" @@ -410,7 +410,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #else // BUILDFLAG(IS_ANDROID) #include "chrome/browser/cart/cart_service.h" #include "chrome/browser/device_api/device_service_impl.h" -@@ -1269,6 +1270,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1304,6 +1305,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, translate::TranslatePrefs::RegisterProfilePrefs(registry); omnibox::RegisterProfilePrefs(registry); ZeroSuggestProvider::RegisterProfilePrefs(registry); @@ -432,7 +432,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -236,6 +236,8 @@ +@@ -238,6 +238,8 @@ #include "chrome/browser/ui/cocoa/screentime/screentime_features.h" #endif @@ -441,7 +441,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc namespace chrome { void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) { -@@ -558,6 +560,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -567,6 +569,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); @@ -452,7 +452,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -113,6 +113,8 @@ +@@ -115,6 +115,8 @@ #include "extensions/common/manifest.h" #endif @@ -461,7 +461,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile #if BUILDFLAG(ENABLE_SESSION_SERVICE) #include "chrome/browser/sessions/app_session_service_factory.h" #include "chrome/browser/sessions/session_service_factory.h" -@@ -1653,6 +1655,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, +@@ -1664,6 +1666,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, } #endif @@ -484,10 +484,10 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil +#include "components/user_scripts/browser/user_script_prefs.h" + - namespace { - - #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -106,6 +108,7 @@ RendererUpdater::RendererUpdater(Profile* profile) + RendererUpdater::RendererUpdater(Profile* profile) + : profile_(profile), + is_off_the_record_(profile_->IsOffTheRecord()), +@@ -51,6 +53,7 @@ RendererUpdater::RendererUpdater(Profile* profile) force_google_safesearch_.Init(prefs::kForceGoogleSafeSearch, pref_service); force_youtube_restrict_.Init(prefs::kForceYouTubeRestrict, pref_service); allowed_domains_for_apps_.Init(prefs::kAllowedDomainsForApps, pref_service); @@ -495,18 +495,18 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil pref_change_registrar_.Init(pref_service); pref_change_registrar_.Add( -@@ -120,6 +123,10 @@ RendererUpdater::RendererUpdater(Profile* profile) +@@ -65,6 +68,10 @@ RendererUpdater::RendererUpdater(Profile* profile) prefs::kAllowedDomainsForApps, base::BindRepeating(&RendererUpdater::UpdateAllRenderers, - base::Unretained(this), kUpdateDynamicParams)); + base::Unretained(this))); + pref_change_registrar_.Add( + user_scripts::prefs::kUserScriptsEnabled, + base::BindRepeating(&RendererUpdater::UpdateAllRenderers, -+ base::Unretained(this), kUpdateDynamicParams)); ++ base::Unretained(this))); } RendererUpdater::~RendererUpdater() { -@@ -301,5 +308,6 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() +@@ -188,5 +195,6 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() const { return chrome::mojom::DynamicParams::New( force_google_safesearch_.GetValue(), force_youtube_restrict_.GetValue(), @@ -517,7 +517,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profiles/renderer_updater.h --- a/chrome/browser/profiles/renderer_updater.h +++ b/chrome/browser/profiles/renderer_updater.h -@@ -108,6 +108,7 @@ class RendererUpdater : public KeyedService, +@@ -93,6 +93,7 @@ class RendererUpdater : public KeyedService, // Prefs that we sync to the renderers. BooleanPrefMember force_google_safesearch_; @@ -528,7 +528,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profile diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -91,6 +91,7 @@ +@@ -93,6 +93,7 @@ #include "components/security_interstitials/content/urls.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/site_engagement/content/site_engagement_service.h" @@ -536,7 +536,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/content_client.h" -@@ -799,6 +800,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -816,6 +817,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUIVersionHost) return &NewWebUI; @@ -549,14 +549,14 @@ diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni --- a/chrome/chrome_paks.gni +++ b/chrome/chrome_paks.gni @@ -110,6 +110,7 @@ template("chrome_extra_paks") { + "$root_gen_dir/skia/skia_resources.pak", + "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak", "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak", - "$root_gen_dir/ui/resources/webui_generated_resources.pak", - "$root_gen_dir/ui/resources/webui_resources.pak", + "$root_gen_dir/chrome/userscripts_browser_resources.pak", + "$root_gen_dir/ui/resources/webui_generated_resources.pak", ] deps = [ - "//base/tracing/protos:chrome_track_event_resources", -@@ -129,6 +130,7 @@ template("chrome_extra_paks") { +@@ -130,6 +131,7 @@ template("chrome_extra_paks") { "//third_party/blink/public:devtools_inspector_resources", "//third_party/blink/public:resources", "//ui/resources", @@ -578,7 +578,7 @@ diff --git a/chrome/common/renderer_configuration.mojom b/chrome/common/renderer diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -140,6 +140,7 @@ static_library("renderer") { +@@ -141,6 +141,7 @@ static_library("renderer") { "//components/feed:feature_list", "//components/feed/content/renderer:feed_renderer", "//components/history_clusters/core", @@ -589,7 +589,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -239,6 +239,9 @@ +@@ -242,6 +242,9 @@ #include "chrome/renderer/supervised_user/supervised_user_error_page_controller_delegate_impl.h" #endif @@ -599,7 +599,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer using autofill::AutofillAgent; using autofill::PasswordAutofillAgent; using autofill::PasswordGenerationAgent; -@@ -411,6 +414,12 @@ void ChromeContentRendererClient::RenderThreadStarted() { +@@ -414,6 +417,12 @@ void ChromeContentRendererClient::RenderThreadStarted() { WebString::FromASCII(extensions::kExtensionScheme)); #endif @@ -612,7 +612,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_SPELLCHECK) if (!spellcheck_) InitSpellCheck(); -@@ -542,6 +551,13 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -543,6 +552,13 @@ void ChromeContentRendererClient::RenderFrameCreated( render_frame, registry); #endif @@ -626,7 +626,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_PLUGINS) new PepperHelper(render_frame); #endif -@@ -1522,7 +1538,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( +@@ -1531,7 +1547,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentStart( render_frame); // |render_frame| might be dead by now. @@ -641,7 +641,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentEnd( -@@ -1531,7 +1554,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( +@@ -1540,7 +1563,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentEnd( render_frame); // |render_frame| might be dead by now. @@ -656,7 +656,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentIdle( -@@ -1540,7 +1570,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( +@@ -1549,7 +1579,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentIdle( render_frame); // |render_frame| might be dead by now. @@ -674,27 +674,27 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc --- a/chrome/renderer/chrome_render_thread_observer.cc +++ b/chrome/renderer/chrome_render_thread_observer.cc -@@ -58,6 +58,8 @@ +@@ -57,6 +57,8 @@ #include "third_party/blink/public/web/web_security_policy.h" #include "third_party/blink/public/web/web_view.h" +#include "components/user_scripts/renderer/user_scripts_renderer_client.h" + #if BUILDFLAG(ENABLE_EXTENSIONS) - #include "chrome/renderer/extensions/extension_localization_peer.h" + #include "extensions/renderer/localization_peer.h" #endif -@@ -255,6 +257,7 @@ void ChromeRenderThreadObserver::SetInitialConfiguration( +@@ -254,6 +256,7 @@ void ChromeRenderThreadObserver::SetInitialConfiguration( void ChromeRenderThreadObserver::SetConfiguration( chrome::mojom::DynamicParamsPtr params) { *GetDynamicConfigParams() = std::move(*params); + user_scripts::UserScriptsRendererClient::GetInstance()->ConfigurationUpdated(); } - void ChromeRenderThreadObserver::SetContentSettingRules( + void ChromeRenderThreadObserver::OnRendererConfigurationAssociatedRequest( diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -333,6 +333,7 @@ +@@ -335,6 +335,7 @@ @@ -10628,7 +10628,7 @@ new file mode 100755 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec -@@ -645,6 +645,12 @@ +@@ -649,6 +649,12 @@ "components/autofill/core/browser/autofill_address_rewriter_resources.grd":{ "includes": [3720] }, diff --git a/build/patches/Hardening-against-incognito-mode-detection.patch b/build/patches/Hardening-against-incognito-mode-detection.patch index 371d85e9..36e45aba 100644 --- a/build/patches/Hardening-against-incognito-mode-detection.patch +++ b/build/patches/Hardening-against-incognito-mode-detection.patch @@ -9,7 +9,7 @@ Subject: Hardening against incognito mode detection diff --git a/storage/browser/quota/quota_settings.cc b/storage/browser/quota/quota_settings.cc --- a/storage/browser/quota/quota_settings.cc +++ b/storage/browser/quota/quota_settings.cc -@@ -29,7 +29,7 @@ const int64_t kMBytes = 1024 * 1024; +@@ -28,7 +28,7 @@ const int64_t kMBytes = 1024 * 1024; const int kRandomizedPercentage = 10; const double kDefaultPerHostRatio = 0.75; const double kIncognitoQuotaRatioLowerBound = 0.15; diff --git a/build/patches/Hide-passwords-manager-link.patch b/build/patches/Hide-passwords-manager-link.patch index ab39a5cc..c843e4f5 100644 --- a/build/patches/Hide-passwords-manager-link.patch +++ b/build/patches/Hide-passwords-manager-link.patch @@ -10,7 +10,7 @@ Hide leak check menu entry (csagan5) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -@@ -186,7 +186,7 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -187,7 +187,7 @@ public class PasswordSettings extends PreferenceFragmentCompat @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -19,7 +19,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage computeTrustedVaultBannerState(); } -@@ -338,7 +338,7 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -339,7 +339,7 @@ public class PasswordSettings extends PreferenceFragmentCompat return; } @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage PreferenceGroup passwordParent; if (mSearchQuery == null) { -@@ -418,7 +418,7 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -419,7 +419,7 @@ public class PasswordSettings extends PreferenceFragmentCompat return; } diff --git a/build/patches/History-number-of-days-privacy-setting.patch b/build/patches/History-number-of-days-privacy-setting.patch index 5e769c10..19d11a05 100644 --- a/build/patches/History-number-of-days-privacy-setting.patch +++ b/build/patches/History-number-of-days-privacy-setting.patch @@ -202,7 +202,7 @@ diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn --- a/chrome/browser/preferences/BUILD.gn +++ b/chrome/browser/preferences/BUILD.gn -@@ -41,6 +41,7 @@ java_cpp_strings("java_pref_names_srcjar") { +@@ -42,6 +42,7 @@ java_cpp_strings("java_pref_names_srcjar") { "//components/safe_browsing/core/common/safe_browsing_prefs.cc", "//components/signin/public/base/signin_pref_names.cc", "//components/translate/core/browser/translate_pref_names.cc", @@ -213,7 +213,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -373,6 +373,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -371,6 +371,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, void ProfileImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false); @@ -224,7 +224,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1055,6 +1055,18 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1059,6 +1059,18 @@ Your Google account may have other forms of browsing history like searches and a Browsing history @@ -354,7 +354,7 @@ diff --git a/components/history/core/browser/expire_history_backend.h b/componen diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc -@@ -972,6 +972,20 @@ void HistoryBackend::InitImpl( +@@ -973,6 +973,20 @@ void HistoryBackend::InitImpl( LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time); } @@ -378,19 +378,19 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his diff --git a/components/history/core/browser/history_backend.h b/components/history/core/browser/history_backend.h --- a/components/history/core/browser/history_backend.h +++ b/components/history/core/browser/history_backend.h -@@ -219,6 +219,8 @@ class HistoryBackend : public base::RefCountedThreadSafe, +@@ -220,6 +220,8 @@ class HistoryBackend : public base::RefCountedThreadSafe, void Init(bool force_fail, const HistoryDatabaseParams& history_database_params); + void SetExpireDaysThreshold(int days); + // Notification that the history system is shutting down. This will break - // the refs owned by the delegate and any pending transaction so it will + // the refs owned by the delegate and any pending transaction, so it will // actually be deleted. diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc --- a/components/history/core/browser/history_service.cc +++ b/components/history/core/browser/history_service.cc -@@ -36,6 +36,9 @@ +@@ -35,6 +35,9 @@ #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" @@ -400,7 +400,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his #include "components/history/core/browser/download_row.h" #include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_backend_client.h" -@@ -1064,6 +1067,9 @@ void HistoryService::Cleanup() { +@@ -1065,6 +1068,9 @@ void HistoryService::Cleanup() { return; } @@ -410,7 +410,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his NotifyHistoryServiceBeingDeleted(); weak_ptr_factory_.InvalidateWeakPtrs(); -@@ -1128,6 +1134,33 @@ bool HistoryService::Init( +@@ -1129,6 +1135,33 @@ bool HistoryService::Init( return true; } diff --git a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch index 5ba4ef3f..6a9fc47f 100644 --- a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch +++ b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch @@ -21,7 +21,7 @@ Send a random key press to circumvent idle status detection diff --git a/third_party/blink/renderer/core/dom/build.gni b/third_party/blink/renderer/core/dom/build.gni --- a/third_party/blink/renderer/core/dom/build.gni +++ b/third_party/blink/renderer/core/dom/build.gni -@@ -170,6 +170,8 @@ blink_core_sources_dom = [ +@@ -171,6 +171,8 @@ blink_core_sources_dom = [ "has_invalidation_flags.h", "icon_url.cc", "icon_url.h", @@ -33,7 +33,7 @@ diff --git a/third_party/blink/renderer/core/dom/build.gni b/third_party/blink/r diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -276,6 +276,7 @@ +@@ -282,6 +282,7 @@ #include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h" #include "third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h" #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h" @@ -41,7 +41,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h" #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h" #include "third_party/blink/renderer/core/page/spatial_navigation_controller.h" -@@ -344,6 +345,8 @@ +@@ -350,6 +351,8 @@ #include "third_party/blink/renderer/platform/wtf/text/string_buffer.h" #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h" @@ -50,7 +50,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #ifndef NDEBUG using WeakDocumentSet = blink::HeapHashSet>; static WeakDocumentSet& LiveDocumentSet(); -@@ -6600,6 +6603,64 @@ void Document::setAllowDeclarativeShadowRoots(bool val) { +@@ -6645,6 +6648,64 @@ void Document::setAllowDeclarativeShadowRoots(bool val) { val ? AllowState::kAllow : AllowState::kDeny; } @@ -115,7 +115,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink void Document::FinishedParsing() { DCHECK(!GetScriptableDocumentParser() || !parser_->IsParsing()); DCHECK(!GetScriptableDocumentParser() || ready_state_ != kLoading); -@@ -6657,6 +6718,10 @@ void Document::FinishedParsing() { +@@ -6701,6 +6762,10 @@ void Document::FinishedParsing() { if (frame->IsMainFrame() && ShouldMarkFontPerformance()) FontPerformance::MarkDomContentLoaded(); @@ -129,7 +129,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -1888,6 +1888,9 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -1915,6 +1915,9 @@ class CORE_EXPORT Document : public ContainerNode, void AddAXContext(AXContext*); void RemoveAXContext(AXContext*); @@ -164,7 +164,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/html/html_script_element.cc b/third_party/blink/renderer/core/html/html_script_element.cc --- a/third_party/blink/renderer/core/html/html_script_element.cc +++ b/third_party/blink/renderer/core/html/html_script_element.cc -@@ -183,6 +183,11 @@ void HTMLScriptElement::setTextContent(const String& string) { +@@ -185,6 +185,11 @@ void HTMLScriptElement::setTextContent(const String& string) { script_text_internal_slot_ = ParkableString(string.Impl()); } diff --git a/build/patches/JIT-site-settings.patch b/build/patches/JIT-site-settings.patch index 8b0991d3..4dc4a277 100644 --- a/build/patches/JIT-site-settings.patch +++ b/build/patches/JIT-site-settings.patch @@ -396,7 +396,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -603,7 +603,7 @@ void ContentSettingsRegistry::Init() { +@@ -613,7 +613,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); Register(ContentSettingsType::JAVASCRIPT_JIT, "javascript-jit", @@ -428,7 +428,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -120,6 +120,7 @@ ContentSettingsType kPermissionType[] = { +@@ -122,6 +122,7 @@ ContentSettingsType kPermissionType[] = { ContentSettingsType::VR, ContentSettingsType::AR, ContentSettingsType::IDLE_DETECTION, @@ -436,7 +436,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. }; // Determines whether to show permission |type| in the Page Info UI. Only -@@ -153,6 +154,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, +@@ -155,6 +156,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, return true; } diff --git a/build/patches/Keep-empty-tabs-between-sessions.patch b/build/patches/Keep-empty-tabs-between-sessions.patch index ea9e8f8f..7341f042 100644 --- a/build/patches/Keep-empty-tabs-between-sessions.patch +++ b/build/patches/Keep-empty-tabs-between-sessions.patch @@ -10,7 +10,7 @@ Subject: Keep empty tabs between sessions 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 -@@ -802,19 +802,6 @@ public class TabPersistentStore { +@@ -797,19 +797,6 @@ public class TabPersistentStore { mTabsToMigrate.add(tab); } } else { @@ -33,7 +33,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java -@@ -551,9 +551,6 @@ public class CriticalPersistedTabData extends PersistedTabData { +@@ -564,9 +564,6 @@ public class CriticalPersistedTabData extends PersistedTabData { if (getUrl() == null || getUrl().isEmpty()) { return false; } diff --git a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch index 729cdc7a..ecb72c7f 100644 --- a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -13,7 +13,7 @@ See also: 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 -@@ -3745,9 +3745,9 @@ +@@ -3603,9 +3603,9 @@ "expiry_milestone": 105 }, { diff --git a/build/patches/Logcat-crash-reports-UI.patch b/build/patches/Logcat-crash-reports-UI.patch index 1ecaf6ec..336b0016 100644 --- a/build/patches/Logcat-crash-reports-UI.patch +++ b/build/patches/Logcat-crash-reports-UI.patch @@ -155,7 +155,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -622,6 +622,7 @@ static_library("ui") { +@@ -632,6 +632,7 @@ static_library("ui") { "//third_party/re2", "//third_party/webrtc_overrides:webrtc_component", "//third_party/zlib", @@ -791,7 +791,7 @@ diff --git a/components/minidump_uploader/android/java/src/org/chromium/componen diff --git a/components/upload_list/text_log_upload_list.cc b/components/upload_list/text_log_upload_list.cc --- a/components/upload_list/text_log_upload_list.cc +++ b/components/upload_list/text_log_upload_list.cc -@@ -109,6 +109,7 @@ std::unique_ptr TryParseCsvLogEntry( +@@ -110,6 +110,7 @@ std::unique_ptr TryParseCsvLogEntry( } auto info = std::make_unique(components[1], upload_time); diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index fe7e0554..4e5994d9 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -3,17 +3,47 @@ Date: Sat, 2 May 2020 00:25:25 +0200 Subject: Modify default preferences --- - chrome/browser/background/background_mode_manager.cc | 2 +- - chrome/browser/chrome_content_browser_client.cc | 2 +- - chrome/browser/prefetch/prefetch_prefs.h | 2 +- - chrome/browser/profiles/profile.cc | 2 +- - .../resources/settings/reset_page/reset_profile_dialog.html | 2 +- - chrome/browser/ui/browser_ui_prefs.cc | 6 +++--- - components/bookmarks/browser/bookmark_utils.cc | 2 +- - components/bookmarks/browser/features.cc | 2 +- - components/safe_browsing/core/common/safe_browsing_prefs.cc | 4 ++-- - 9 files changed, 12 insertions(+), 12 deletions(-) + chrome/browser/about_flags.cc | 6 ++++++ + .../background/background_mode_manager.cc | 2 +- + .../browser/chrome_content_browser_client.cc | 2 +- + chrome/browser/flag_descriptions.cc | 4 ++++ + chrome/browser/flag_descriptions.h | 3 +++ + chrome/browser/prefetch/prefetch_prefs.h | 2 +- + chrome/browser/profiles/profile.cc | 2 +- + .../reset_page/reset_profile_dialog.html | 2 +- + chrome/browser/ui/browser_ui_prefs.cc | 6 +++--- + components/bookmarks/browser/BUILD.gn | 2 ++ + components/bookmarks/browser/bookmark_utils.cc | 8 ++++++-- + components/bookmarks/browser/features.cc | 16 ++++++++++++++++ + components/bookmarks/browser/features.h | 18 ++++++++++++++++++ + .../core/common/safe_browsing_prefs.cc | 4 ++-- + 14 files changed, 65 insertions(+), 12 deletions(-) + create mode 100644 components/bookmarks/browser/features.cc + create mode 100644 components/bookmarks/browser/features.h +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 +@@ -73,6 +73,7 @@ + #include "components/autofill/core/common/autofill_switches.h" + #include "components/autofill/core/common/autofill_util.h" + #include "components/autofill_assistant/browser/features.h" ++#include "components/bookmarks/browser/features.h" + #include "components/browser_sync/browser_sync_switches.h" + #include "components/browsing_data/core/features.h" + #include "components/certificate_transparency/ct_features.h" +@@ -5317,6 +5318,11 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(chrome::android::kBookmarkBottomSheet)}, + #endif + ++ {"apps-shortcut-default-off", ++ flag_descriptions::kAppsShortcutDefaultOffName, ++ flag_descriptions::kAppsShortcutDefaultOffDescription, kOsDesktop, ++ FEATURE_VALUE_TYPE(bookmarks::features::kAppsShortcutDefaultOff)}, ++ + {"tab-groups-new-badge-promo", + flag_descriptions::kTabGroupsNewBadgePromoName, + flag_descriptions::kTabGroupsNewBadgePromoDescription, kOsDesktop, diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc @@ -29,7 +59,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1315,7 +1315,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1321,7 +1321,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -38,6 +68,33 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch // Register user prefs for mapping SitePerProcess and IsolateOrigins in // user policy in addition to the same named ones in Local State (which are // used for mapping the command-line flags). +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 +@@ -2480,6 +2480,10 @@ const char kTabToGTSAnimationAndroidDescription[] = + "Allows users to see an animation when entering or leaving the " + "Grid Tab Switcher on phones."; + ++const char kAppsShortcutDefaultOffName[] = "Apps Shortcut Default Off"; ++const char kAppsShortcutDefaultOffDescription[] = ++ "Changes the apps shortcut on the bookmarks bar to default to off."; ++ + const char kTabGroupsNewBadgePromoName[] = "Tab Groups 'New' Badge Promo"; + const char kTabGroupsNewBadgePromoDescription[] = + "Causes a 'New' badge to appear on the entry point for creating a tab " +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 +@@ -1400,6 +1400,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[]; + extern const char kTabToGTSAnimationAndroidName[]; + extern const char kTabToGTSAnimationAndroidDescription[]; + ++extern const char kAppsShortcutDefaultOffName[]; ++extern const char kAppsShortcutDefaultOffDescription[]; ++ + extern const char kTabGroupsNewBadgePromoName[]; + extern const char kTabGroupsNewBadgePromoDescription[]; + diff --git a/chrome/browser/prefetch/prefetch_prefs.h b/chrome/browser/prefetch/prefetch_prefs.h --- a/chrome/browser/prefetch/prefetch_prefs.h +++ b/chrome/browser/prefetch/prefetch_prefs.h @@ -53,7 +110,7 @@ diff --git a/chrome/browser/prefetch/prefetch_prefs.h b/chrome/browser/prefetch/ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -276,7 +276,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -278,7 +278,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, @@ -92,30 +149,97 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup); registry->RegisterDictionaryPref(prefs::kAppWindowPlacement); +diff --git a/components/bookmarks/browser/BUILD.gn b/components/bookmarks/browser/BUILD.gn +--- a/components/bookmarks/browser/BUILD.gn ++++ b/components/bookmarks/browser/BUILD.gn +@@ -21,6 +21,7 @@ static_library("browser") { + "bookmark_undo_delegate.h", + "bookmark_undo_provider.h", + "bookmark_utils.h", ++ "features.h", + "history_bookmark_model.h", + "model_loader.h", + "scoped_group_bookmark_actions.h", +@@ -43,6 +44,7 @@ static_library("browser") { + "bookmark_node_data.cc", + "bookmark_storage.cc", + "bookmark_utils.cc", ++ "features.cc", + "model_loader.cc", + "scoped_group_bookmark_actions.cc", + "titled_url_index.cc", diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -438,7 +438,7 @@ bool DoesBookmarkContainWords(const std::u16string& title, +@@ -24,6 +24,7 @@ + #include "build/build_config.h" + #include "components/bookmarks/browser/bookmark_client.h" + #include "components/bookmarks/browser/bookmark_model.h" ++#include "components/bookmarks/browser/features.h" + #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" + #include "components/bookmarks/common/bookmark_pref_names.h" + #include "components/pref_registry/pref_registry_syncable.h" +@@ -436,11 +437,14 @@ bool DoesBookmarkContainWords(const std::u16string& title, + void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( - prefs::kShowBookmarkBar, -- false, +- prefs::kShowBookmarkBar, false, ++ prefs::kShowBookmarkBar, + true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true); registry->RegisterBooleanPref( +- prefs::kShowAppsShortcutInBookmarkBar, false, ++ prefs::kShowAppsShortcutInBookmarkBar, ++ base::FeatureList::IsEnabled(features::kAppsShortcutDefaultOff) ? false ++ : true, + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + registry->RegisterBooleanPref( + prefs::kShowManagedBookmarksInBookmarkBar, true, diff --git a/components/bookmarks/browser/features.cc b/components/bookmarks/browser/features.cc ---- a/components/bookmarks/browser/features.cc +new file mode 100644 +--- /dev/null +++ b/components/bookmarks/browser/features.cc -@@ -10,7 +10,7 @@ namespace features { - // Changes the apps shortcut on the bookmarks bar to default to off. - // https://crbug.com/1236793 - const base::Feature kAppsShortcutDefaultOff{"AppsShortcutDefaultOff", -- base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -0,0 +1,16 @@ ++// Copyright 2021 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "components/bookmarks/browser/features.h" ++ ++namespace bookmarks { ++namespace features { ++ ++// Changes the apps shortcut on the bookmarks bar to default to off. ++// https://crbug.com/1236793 ++const base::Feature kAppsShortcutDefaultOff{"AppsShortcutDefaultOff", + base::FEATURE_ENABLED_BY_DEFAULT}; - - } // namespace features - } // namespace bookmarks ++ ++} // namespace features ++} // namespace bookmarks +diff --git a/components/bookmarks/browser/features.h b/components/bookmarks/browser/features.h +new file mode 100644 +--- /dev/null ++++ b/components/bookmarks/browser/features.h +@@ -0,0 +1,18 @@ ++// Copyright 2021 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef COMPONENTS_BOOKMARKS_BROWSER_FEATURES_H_ ++#define COMPONENTS_BOOKMARKS_BROWSER_FEATURES_H_ ++ ++#include "base/feature_list.h" ++ ++namespace bookmarks { ++namespace features { ++ ++extern const base::Feature kAppsShortcutDefaultOff; ++ ++} // namespace features ++} // namespace bookmarks ++ ++#endif // COMPONENTS_BOOKMARKS_BROWSER_FEATURES_H_ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index b324500c..1c62e48d 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -130,7 +130,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -4258,6 +4258,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { +@@ -4246,6 +4246,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { if (scroll_delta.IsZero()) return false; @@ -143,7 +143,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java -@@ -44,6 +44,7 @@ import org.chromium.components.feature_engagement.FeatureConstants; +@@ -45,6 +45,7 @@ import org.chromium.components.feature_engagement.FeatureConstants; import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; @@ -151,7 +151,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import java.util.List; -@@ -126,7 +127,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T +@@ -127,7 +128,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T */ @Override public void initializeWithNative(Activity activity, @@ -161,7 +161,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser if (UmaSessionStats.isMetricsServiceAvailable()) { UmaSessionStats.registerSyntheticFieldTrial( ChromeFeatureList.TAB_GROUPS_ANDROID + SYNTHETIC_TRIAL_POSTFIX, -@@ -162,7 +164,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T +@@ -163,7 +165,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T mMediator = new TabGroupUiMediator(mActivity, visibilityController, this, mModel, mTabModelSelector, mTabCreatorManager, mOverviewModeBehaviorSupplier, mIncognitoStateProvider, dialogController, mActivityLifecycleDispatcher, @@ -538,7 +538,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -776,6 +776,14 @@ public abstract class ChromeActivity +@@ -775,6 +775,14 @@ public abstract class ChromeActivity ImageView shadowImage = findViewById(R.id.toolbar_shadow); if (shadowImage == null) return; @@ -556,7 +556,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java -@@ -99,6 +99,7 @@ public class ChromeCachedFlags { +@@ -98,6 +98,7 @@ public class ChromeCachedFlags { add(ChromeFeatureList.INSTANT_START); add(ChromeFeatureList.INSTANCE_SWITCHER); add(ChromeFeatureList.INTEREST_FEED_V2); @@ -576,7 +576,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp import java.util.ArrayList; import java.util.HashSet; -@@ -295,6 +297,10 @@ public class CompositorViewHolder extends FrameLayout +@@ -296,6 +298,10 @@ public class CompositorViewHolder extends FrameLayout WebContents webContents = mTabVisible.getWebContents(); if (webContents == null) return; EventForwarder forwarder = webContents.getEventForwarder(); @@ -590,7 +590,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java -@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer; +@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer; import org.chromium.chrome.features.start_surface.StartSurface; import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; @@ -598,12 +598,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo /** * {@link LayoutManagerChromeTablet} is the specialization of {@link LayoutManagerChrome} for -@@ -59,7 +60,8 @@ public class LayoutManagerChromeTablet extends LayoutManagerChrome { +@@ -61,7 +62,8 @@ public class LayoutManagerChromeTablet extends LayoutManagerChrome { jankTracker, startSurfaceScrimAnchor, scrimCoordinator); - mTabStripLayoutHelperManager = new StripLayoutHelperManager( -- host.getContext(), this, mHost.getLayoutRenderHost(), () -> mLayerTitleCache); -+ host.getContext(), this, mHost.getLayoutRenderHost(), () -> mLayerTitleCache, + mTabStripLayoutHelperManager = new StripLayoutHelperManager(host.getContext(), this, +- mHost.getLayoutRenderHost(), () -> mLayerTitleCache, lifecycleDispatcher); ++ mHost.getLayoutRenderHost(), () -> mLayerTitleCache, lifecycleDispatcher, + /*browserControlsManagerSupplier*/ () -> getBrowserControlsManager()); addSceneOverlay(mTabStripLayoutHelperManager); @@ -650,7 +650,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java -@@ -333,7 +333,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate +@@ -340,7 +340,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate // position 0 is on the left. Account for that in the offset calculation. boolean isRtl = LocalizationUtils.isLayoutRtl(); boolean useUnadjustedScrollOffset = isRtl != isLeft; @@ -662,8 +662,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java -@@ -50,6 +50,9 @@ import org.chromium.components.browser_ui.widget.animation.Interpolators; - import org.chromium.ui.base.LocalizationUtils; +@@ -55,6 +55,9 @@ import org.chromium.ui.base.LocalizationUtils; + import org.chromium.ui.base.PageTransition; import org.chromium.ui.resources.ResourceManager; import org.chromium.url.GURL; +import org.chromium.chrome.browser.fullscreen.BrowserControlsManager; @@ -672,7 +672,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over import java.util.List; -@@ -110,9 +113,13 @@ public class StripLayoutHelperManager implements SceneOverlay { +@@ -118,9 +121,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa private final String mDefaultTitle; private final Supplier mLayerTitleCacheSupplier; @@ -686,7 +686,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over if (mModelSelectorButton.onDown(x, y)) return; if (mStripScrim.isVisible()) return; getActiveStripLayoutHelper().onDown(time(), x, y, fromMouse, buttons); -@@ -132,6 +139,7 @@ public class StripLayoutHelperManager implements SceneOverlay { +@@ -140,6 +147,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa @Override public void drag(float x, float y, float dx, float dy, float tx, float ty) { @@ -694,7 +694,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over mModelSelectorButton.drag(x, y); if (mStripScrim.isVisible()) return; getActiveStripLayoutHelper().drag(time(), x, y, dx, dy, tx, ty); -@@ -139,6 +147,7 @@ public class StripLayoutHelperManager implements SceneOverlay { +@@ -147,6 +155,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa @Override public void click(float x, float y, boolean fromMouse, int buttons) { @@ -702,7 +702,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over long time = time(); if (mModelSelectorButton.click(x, y)) { mModelSelectorButton.handleClick(time); -@@ -150,13 +159,13 @@ public class StripLayoutHelperManager implements SceneOverlay { +@@ -158,13 +167,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa @Override public void fling(float x, float y, float velocityX, float velocityY) { @@ -718,26 +718,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over getActiveStripLayoutHelper().onLongPress(time(), x, y); } -@@ -225,7 +234,8 @@ public class StripLayoutHelperManager implements SceneOverlay { - * @param layerTitleCacheSupplier A supplier of the cache that holds the title textures. +@@ -243,7 +252,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa */ public StripLayoutHelperManager(Context context, LayoutUpdateHost updateHost, -- LayoutRenderHost renderHost, Supplier layerTitleCacheSupplier) { -+ LayoutRenderHost renderHost, Supplier layerTitleCacheSupplier, + LayoutRenderHost renderHost, Supplier layerTitleCacheSupplier, +- ActivityLifecycleDispatcher lifecycleDispatcher) { ++ ActivityLifecycleDispatcher lifecycleDispatcher, + Supplier browserControlsManagerSupplier) { mUpdateHost = updateHost; mLayerTitleCacheSupplier = layerTitleCacheSupplier; mTabStripTreeProvider = new TabStripSceneLayer(context); -@@ -237,6 +247,8 @@ public class StripLayoutHelperManager implements SceneOverlay { - - mNormalHelper = new StripLayoutHelper(context, updateHost, renderHost, false); - mIncognitoHelper = new StripLayoutHelper(context, updateHost, renderHost, true); +@@ -285,6 +295,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa + new StripLayoutHelper(context, updateHost, renderHost, false, mModelSelectorButton); + mIncognitoHelper = + new StripLayoutHelper(context, updateHost, renderHost, true, mModelSelectorButton); + mBrowserControlsManagerSupplier = browserControlsManagerSupplier; + mDpToPx = context.getResources().getDisplayMetrics().density; - CompositorOnClickHandler selectorClickHandler = new CompositorOnClickHandler() { - @Override -@@ -319,9 +331,13 @@ public class StripLayoutHelperManager implements SceneOverlay { + onContextChanged(context); + } +@@ -354,9 +366,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa Tab selectedTab = mTabModelSelector.getCurrentModel().getTabAt( mTabModelSelector.getCurrentModel().index()); int selectedTabId = selectedTab == null ? TabModel.INVALID_TAB_INDEX : selectedTab.getId(); @@ -752,7 +752,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over return mTabStripTreeProvider; } -@@ -354,7 +370,17 @@ public class StripLayoutHelperManager implements SceneOverlay { +@@ -389,7 +405,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa mNormalHelper.onSizeChanged(mWidth, mHeight); mIncognitoHelper.onSizeChanged(mWidth, mHeight); @@ -989,7 +989,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -@@ -95,6 +95,8 @@ import org.chromium.content_public.browser.NavigationEntry; +@@ -94,6 +94,8 @@ import org.chromium.content_public.browser.NavigationEntry; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.mojom.WindowOpenDisposition; @@ -998,7 +998,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. import java.util.List; -@@ -546,10 +548,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -543,10 +545,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide // + topControlsDistanceToRest| will give the margin for the current animation frame. final int topControlsDistanceToRest = mBrowserControlsStateProvider.getContentOffset() - mBrowserControlsStateProvider.getTopControlsHeight(); @@ -1016,7 +1016,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. if (topMargin != layoutParams.topMargin || bottomMargin != layoutParams.bottomMargin) { layoutParams.topMargin = topMargin; -@@ -572,7 +579,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -569,7 +576,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide * strip. */ private int getToolbarExtraYOffset() { @@ -1096,7 +1096,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java -@@ -67,6 +67,11 @@ import org.chromium.ui.base.WindowDelegate; +@@ -68,6 +68,11 @@ import org.chromium.ui.base.WindowDelegate; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.url.GURL; @@ -1108,7 +1108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se import java.lang.ref.WeakReference; /** Queries the user's default search engine and shows autocomplete suggestions. */ -@@ -178,6 +183,11 @@ public class SearchActivity extends AsyncInitializationActivity +@@ -179,6 +184,11 @@ public class SearchActivity extends AsyncInitializationActivity mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById( R.id.search_location_bar); View anchorView = mContentView.findViewById(R.id.toolbar); @@ -1120,7 +1120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se OverrideUrlLoadingDelegate overrideUrlLoadingDelegate = (String url, @PageTransition int transition, String postDataType, byte[] postData, boolean incognito) -> { -@@ -185,7 +195,7 @@ public class SearchActivity extends AsyncInitializationActivity +@@ -186,7 +196,7 @@ public class SearchActivity extends AsyncInitializationActivity return true; }; // clang-format off @@ -1132,7 +1132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java -@@ -256,6 +256,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -254,6 +254,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity if (fragment instanceof INeedSnackbarManager) { ((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager); } @@ -1198,7 +1198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -172,6 +172,9 @@ import org.chromium.url.GURL; +@@ -173,6 +173,9 @@ import org.chromium.url.GURL; import java.util.List; @@ -1208,7 +1208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar /** * Contains logic for managing the toolbar visual component. This class manages the interactions * with the rest of the application to ensure the toolbar is always visually up to date. -@@ -605,7 +608,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -609,7 +612,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve }; // clang-format off LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator( @@ -1217,7 +1217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel, mActionModeController.getActionModeCallback(), new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider, -@@ -849,11 +852,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -856,11 +859,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve // the height won't be measured by the background image. if (mControlContainer.getBackground() == null) { setControlContainerTopMargin(getToolbarExtraYOffset()); @@ -1231,7 +1231,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener); mLayoutChangeListener = null; } -@@ -1245,13 +1250,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -1256,13 +1261,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve return mLocationBar.getOmniboxStub().isUrlBarFocused(); } @@ -1259,7 +1259,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController, mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector, mTabContentManager, mCompositorViewHolder, -@@ -1260,8 +1277,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -1271,8 +1288,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve mBottomControlsCoordinatorSupplier.set( new BottomControlsCoordinator(mActivity, mWindowAndroid, mLayoutManager, mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer, @@ -1271,7 +1271,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar } /** -@@ -1985,6 +2003,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -2007,6 +2025,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve private void setControlContainerTopMargin(int margin) { final ViewGroup.MarginLayoutParams layoutParams = ((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams()); @@ -1330,7 +1330,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContai 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 -@@ -6588,6 +6588,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6625,6 +6625,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kImpulseScrollAnimationsDescription, kOsAll, FEATURE_VALUE_TYPE(features::kImpulseScrollAnimations)}, @@ -1431,7 +1431,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1577,6 +1577,10 @@ const char kImpulseScrollAnimationsDescription[] = +@@ -1516,6 +1516,10 @@ const char kImpulseScrollAnimationsDescription[] = "Replaces the default scroll animation with Impulse-style scroll " "animations."; @@ -1445,7 +1445,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 -@@ -900,6 +900,9 @@ extern const char kCompositorThreadedScrollbarScrollingDescription[]; +@@ -861,6 +861,9 @@ extern const char kCompositorThreadedScrollbarScrollingDescription[]; extern const char kImpulseScrollAnimationsName[]; extern const char kImpulseScrollAnimationsDescription[]; @@ -1498,9 +1498,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse #include "base/metrics/field_trial_params.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/feature_guide/notifications/feature_notification_guide_service.h" -@@ -250,6 +251,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kKitKatSupported, +@@ -246,6 +247,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kLensCameraAssistedSearch, + &kLensOnQuickActionSearchWidget, &kLocationBarModelOptimizations, + &features::kMoveTopToolbarToBottom, &kNewWindowAppMenu, @@ -1509,7 +1509,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -106,6 +106,7 @@ public class CachedFeatureFlags { +@@ -104,6 +104,7 @@ public class CachedFeatureFlags { .put(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS, false) .put(ChromeFeatureList.TAB_GROUPS_FOR_TABLETS, false) .put(ChromeFeatureList.TAB_STRIP_IMPROVEMENTS, false) @@ -1517,7 +1517,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f .build(); /** -@@ -204,6 +205,23 @@ public class CachedFeatureFlags { +@@ -202,6 +203,23 @@ public class CachedFeatureFlags { SharedPreferencesManager.getInstance().writeBoolean(preferenceName, isEnabledInNative); } @@ -1541,7 +1541,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /** * Forces a feature to be enabled or disabled for testing. * -@@ -497,6 +515,7 @@ public class CachedFeatureFlags { +@@ -495,6 +513,7 @@ public class CachedFeatureFlags { @NativeMethods interface Natives { @@ -1552,9 +1552,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -408,6 +408,8 @@ public abstract class ChromeFeatureList { - public static final String MOBILE_IDENTITY_CONSISTENCY_PROMOS = - "MobileIdentityConsistencyPromos"; +@@ -405,6 +405,8 @@ public abstract class ChromeFeatureList { + public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError"; + public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; + public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM = + "MoveTopToolbarToBottom"; @@ -1656,16 +1656,16 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow private LocationBarMediator mLocationBarMediator; private View mUrlBar; private View mDeleteButton; -@@ -140,7 +141,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse - * MerchantTrustSignalsCoordinator}. Can be null if a store icon shouldn't be shown, +@@ -141,7 +142,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse * such as when called from a search activity. + * @param reportExceptionCallback A {@link Callback} to report exceptions. */ - public LocationBarCoordinator(View locationBarLayout, View autocompleteAnchorView, + public LocationBarCoordinator(View locationBarLayout, View autocompleteAnchorView, View containerView, ObservableSupplier profileObservableSupplier, PrivacyPreferencesManager privacyPreferencesManager, LocationBarDataProvider locationBarDataProvider, ActionMode.Callback actionModeCallback, -@@ -170,6 +171,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse +@@ -172,6 +173,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse mActivityLifecycleDispatcher = activityLifecycleDispatcher; mActivityLifecycleDispatcher.register(this); mAutocompleteAnchorView = autocompleteAnchorView; @@ -1673,7 +1673,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow mUrlBar = mLocationBarLayout.findViewById(R.id.url_bar); // TODO(crbug.com/1151513): Inject LocaleManager instance to LocationBarCoordinator instead -@@ -369,6 +371,11 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse +@@ -378,6 +380,11 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse return mAutocompleteAnchorView; } @@ -1698,7 +1698,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** * Coordinates the interactions with the UrlBar text component. */ -@@ -210,7 +213,13 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc +@@ -217,7 +220,13 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc // to show or hide keyboard anyway. This may happen when we schedule keyboard hide, and // receive a second request to hide the keyboard instantly. if (showKeyboard) { @@ -1780,7 +1780,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; -@@ -935,7 +938,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, +@@ -936,7 +939,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, public void onSuggestionDropdownScroll() { if (mDropdownViewInfoListBuilder.hasFullyConcealedElements()) { mSuggestionsListScrolled = true; @@ -1869,7 +1869,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 -@@ -1396,6 +1396,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1400,6 +1400,12 @@ Your Google account may have other forms of browsing history like searches and a Force Tablet Mode @@ -2317,13 +2317,13 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ #include "cc/layers/layer.h" #include "cc/layers/surface_layer.h" @@ -461,6 +462,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( - // factor. Thus, |top_content_offset| in CSS pixels is also in DIPs. - float top_content_offset = - metadata.top_controls_height * metadata.top_controls_shown_ratio; + ime_adapter_android_->UpdateFrameInfo(metadata.selection.start, dip_scale, + top_shown_pix); + } + if (base::FeatureList::IsEnabled(::features::kMoveTopToolbarToBottom)) + top_content_offset = 0; - float top_shown_pix = top_content_offset * to_pix; - if (ime_adapter_android_) { + if (!gesture_listener_manager_) + return; -- 2.25.1 diff --git a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch index 75a0178e..d46e60dd 100644 --- a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch +++ b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch @@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -441,6 +441,10 @@ CHAR_LIMIT guidelines: +@@ -442,6 +442,10 @@ CHAR_LIMIT guidelines: No statistics or crash reports are sent to Google diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch index a1e774b9..a39c7584 100644 --- a/build/patches/Multiple-fingerprinting-mitigations.patch +++ b/build/patches/Multiple-fingerprinting-mitigations.patch @@ -55,7 +55,7 @@ Added flag --fingerprinting-canvas-image-data-noise to disable Canvas image data diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2325,6 +2325,7 @@ static_library("browser") { +@@ -2338,6 +2338,7 @@ static_library("browser") { "//services/device/public/cpp:device_features", "//services/device/public/cpp/serial:switches", "//services/device/public/cpp/usb", @@ -66,7 +66,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -185,6 +185,7 @@ +@@ -183,6 +183,7 @@ #include "services/media_session/public/cpp/features.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" @@ -74,7 +74,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "storage/browser/quota/quota_features.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/forcedark/forcedark_switches.h" -@@ -3047,6 +3048,20 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3191,6 +3192,20 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebrtcUseMinMaxVEADimensionsName, flag_descriptions::kWebrtcUseMinMaxVEADimensionsDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kWebRtcUseMinMaxVEADimensions)}, @@ -98,7 +98,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -229,6 +229,7 @@ source_set("browser") { +@@ -231,6 +231,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -109,7 +109,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -201,6 +201,7 @@ +@@ -202,6 +202,7 @@ #include "url/gurl.h" #include "url/origin.h" @@ -117,7 +117,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content #if BUILDFLAG(IS_ANDROID) #include "content/browser/android/java_interfaces_impl.h" #include "content/browser/font_unique_name_lookup/font_unique_name_lookup_service.h" -@@ -3242,6 +3243,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3238,6 +3239,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDisableBreakpad, switches::kDisableDatabases, switches::kDisableFileSystem, @@ -141,7 +141,7 @@ diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -39,6 +39,8 @@ +@@ -40,6 +40,8 @@ #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" @@ -150,7 +150,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. #if BUILDFLAG(IS_ANDROID) #include "base/android/build_info.h" #endif -@@ -528,6 +530,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs( +@@ -523,6 +525,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs( if (!command_line.HasSwitch(switches::kDisableYUVImageDecoding) && base::FeatureList::IsEnabled( blink::features::kDecodeLossyWebPImagesToYUV)) { @@ -167,7 +167,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -213,6 +213,9 @@ class WebRuntimeFeatures { +@@ -214,6 +214,9 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableAutomationControlled(bool); BLINK_PLATFORM_EXPORT static void EnableAutoplayIgnoresWebAudio(bool); BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool); @@ -185,10 +185,10 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #include "base/debug/dump_without_crashing.h" #include "base/metrics/histogram_functions.h" +#include "base/rand_util.h" + #include "base/notreached.h" #include "base/time/time.h" #include "cc/input/overscroll_behavior.h" - #include "cc/input/scroll_snap_data.h" -@@ -2178,6 +2179,23 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { +@@ -2170,6 +2171,23 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { #if DCHECK_IS_ON() AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */); #endif @@ -215,7 +215,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -482,6 +482,10 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -496,6 +496,10 @@ class CORE_EXPORT Document : public ContainerNode, has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -226,7 +226,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2196,6 +2200,9 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -2232,6 +2236,9 @@ class CORE_EXPORT Document : public ContainerNode, base::ElapsedTimer start_time_; @@ -239,7 +239,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2062,6 +2062,7 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2052,6 +2052,7 @@ void Element::ClientQuads(Vector& quads) const { quads.push_back(element_layout_object->LocalToAbsoluteQuad( gfx::QuadF(element_layout_object->ObjectBoundingBox()))); } @@ -247,7 +247,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ return; } -@@ -2069,6 +2070,11 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2059,6 +2060,11 @@ void Element::ClientQuads(Vector& quads) const { if (element_layout_object->IsBoxModelObject() || element_layout_object->IsBR()) element_layout_object->AbsoluteQuads(quads); @@ -259,7 +259,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ } DOMRectList* Element::getClientRects() { -@@ -2100,6 +2106,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { +@@ -2090,6 +2096,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -349,7 +349,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" #include "third_party/blink/renderer/platform/graphics/stroke_data.h" #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h" -@@ -2047,6 +2048,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2046,6 +2047,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -363,7 +363,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -916,9 +916,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -917,9 +917,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { TextDirection direction = ToTextDirection(GetState().GetDirection(), canvas()); @@ -383,7 +383,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1591,7 +1591,9 @@ component("platform") { +@@ -1596,7 +1596,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -394,7 +394,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re allow_circular_includes_from = [ "//third_party/blink/renderer/platform/blob", -@@ -1659,6 +1661,7 @@ component("platform") { +@@ -1664,6 +1666,7 @@ component("platform") { "//third_party/blink/public/strings", "//third_party/blink/renderer/platform/wtf", "//third_party/ced", @@ -405,8 +405,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -667,4 +667,16 @@ void WebRuntimeFeatures::EnableCLSScrollAnchoring(bool enable) { - RuntimeEnabledFeatures::SetCLSScrollAnchoringEnabled(enable); +@@ -677,4 +677,16 @@ void WebRuntimeFeatures::EnableWebAuthenticationRemoteDesktopSupport( + enable); } +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) { @@ -468,7 +468,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc namespace blink { scoped_refptr StaticBitmapImage::Create( -@@ -79,4 +84,154 @@ void StaticBitmapImage::DrawHelper(cc::PaintCanvas* canvas, +@@ -113,4 +118,154 @@ void StaticBitmapImage::DrawHelper(cc::PaintCanvas* canvas, WebCoreClampingModeToSkiaRectConstraint(draw_options.clamping_mode)); } @@ -626,7 +626,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h -@@ -36,6 +36,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image { +@@ -37,6 +37,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image { StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {} @@ -638,7 +638,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h 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 -@@ -1098,6 +1098,15 @@ +@@ -1091,6 +1091,15 @@ origin_trial_allows_third_party: true, status: "experimental", }, diff --git a/build/patches/Open-YouTube-links-in-Bromite.patch b/build/patches/Open-YouTube-links-in-Bromite.patch index cfa64cde..38b0e7b1 100644 --- a/build/patches/Open-YouTube-links-in-Bromite.patch +++ b/build/patches/Open-YouTube-links-in-Bromite.patch @@ -10,7 +10,7 @@ See https://github.com/bromite/bromite/issues/1472 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java -@@ -1331,6 +1331,12 @@ public class ExternalNavigationHandler { +@@ -1347,6 +1347,12 @@ public class ExternalNavigationHandler { OverrideUrlLoadingAsyncActionType.UI_GATING_BROWSER_NAVIGATION); } diff --git a/build/patches/OpenSearch-miscellaneous.patch b/build/patches/OpenSearch-miscellaneous.patch index 96845b3f..b618c2e5 100644 --- a/build/patches/OpenSearch-miscellaneous.patch +++ b/build/patches/OpenSearch-miscellaneous.patch @@ -135,7 +135,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/chrome_render_frame_observer.cc --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -13,6 +13,7 @@ +@@ -14,6 +14,7 @@ #include "base/bind.h" #include "base/command_line.h" @@ -143,7 +143,7 @@ diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/c #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" -@@ -202,6 +203,7 @@ void ChromeRenderFrameObserver::DidFinishLoad() { +@@ -250,6 +251,7 @@ void ChromeRenderFrameObserver::DidFinishLoad() { GURL osdd_url = frame->GetDocument().OpenSearchDescriptionURL(); if (!osdd_url.is_empty()) { @@ -203,7 +203,7 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -277,7 +277,10 @@ class TemplateURLService : public WebDataServiceConsumer, +@@ -278,7 +278,10 @@ class TemplateURLService : public WebDataServiceConsumer, void UpdateProviderFavicons(const GURL& potential_search_url, const GURL& favicon_url); @@ -215,7 +215,7 @@ diff --git a/components/search_engines/template_url_service.h b/components/searc // regardless of |url| if the default search provider is managed by policy or // controlled by an extension. bool CanMakeDefault(const TemplateURL* url) const; -@@ -607,9 +610,6 @@ class TemplateURLService : public WebDataServiceConsumer, +@@ -608,9 +611,6 @@ class TemplateURLService : public WebDataServiceConsumer, // SetKeywordSearchTermsForURL is invoked. void UpdateKeywordSearchTermsForURL(const URLVisitedDetails& details); diff --git a/build/patches/Partition-DNS-requests-by-top-frame-NIK.patch b/build/patches/Partition-DNS-requests-by-top-frame-NIK.patch index f9ffe426..a2e37860 100644 --- a/build/patches/Partition-DNS-requests-by-top-frame-NIK.patch +++ b/build/patches/Partition-DNS-requests-by-top-frame-NIK.patch @@ -30,16 +30,16 @@ See also: net/base/isolation_info.proto | 4 +++- net/base/network_isolation_key.cc | 16 ++++++++++++++++ net/base/network_isolation_key.h | 19 +++++++++++++++---- - net/dns/dns_transaction.cc | 24 ++++++++++++++++++++---- + net/dns/dns_transaction.cc | 23 +++++++++++++++++++---- net/dns/dns_transaction.h | 4 +++- net/dns/host_resolver_manager.cc | 21 +++++++++++++++++---- net/socket/ssl_client_socket_impl.cc | 6 ++++++ - 14 files changed, 149 insertions(+), 15 deletions(-) + 14 files changed, 148 insertions(+), 15 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7574,6 +7574,18 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7598,6 +7598,18 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kUIDebugTools), }, #endif @@ -61,9 +61,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 -@@ -2480,6 +2480,15 @@ const char kWebOTPCrossDeviceName[] = "WebOTP Cross Device"; - const char kWebOTPCrossDeviceDescription[] = - "Enable the WebOTP API to work across devices"; +@@ -2413,6 +2413,15 @@ const char kSmoothScrollingName[] = "Smooth Scrolling"; + const char kSmoothScrollingDescription[] = + "Animate smoothly when scrolling page content."; +const char kSplitDnsByNetworkIsolationKeyName[] = "DNS Requests Partitioning"; +const char kSplitDnsByNetworkIsolationKeyDescription[] = @@ -80,9 +80,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1419,6 +1419,12 @@ extern const char kSmoothScrollingDescription[]; - extern const char kWebOTPCrossDeviceName[]; - extern const char kWebOTPCrossDeviceDescription[]; +@@ -1371,6 +1371,12 @@ extern const char kSiteIsolationOptOutChoiceOptOut[]; + extern const char kSmoothScrollingName[]; + extern const char kSmoothScrollingDescription[]; +extern const char kSplitDnsByNetworkIsolationKeyName[]; +extern const char kSplitDnsByNetworkIsolationKeyDescription[]; @@ -96,7 +96,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -107,6 +107,12 @@ const base::Feature kIsCleartextPermitted{"IsCleartextPermitted", +@@ -127,6 +127,12 @@ const base::Feature kIsCleartextPermitted{"IsCleartextPermitted", const base::Feature kNetworkQualityEstimator{"NetworkQualityEstimator", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -112,7 +112,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h -@@ -170,6 +170,12 @@ NET_EXPORT extern const base::Feature kEncryptedClientHello; +@@ -189,6 +189,12 @@ NET_EXPORT extern const base::Feature kEncryptedClientHello; // quality estimator (NQE). NET_EXPORT extern const base::Feature kNetworkQualityEstimator; @@ -307,7 +307,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc #include "net/base/idempotency.h" #include "net/base/io_buffer.h" #include "net/base/ip_address.h" -@@ -442,6 +443,12 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -452,6 +453,12 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { LOAD_MINIMAL_HEADERS | LOAD_BYPASS_PROXY); request_->set_allow_credentials(false); request_->set_isolation_info(isolation_info); @@ -320,7 +320,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc } DnsHTTPAttempt(const DnsHTTPAttempt&) = delete; -@@ -1012,6 +1019,8 @@ class DnsOverHttpsProbeRunner : public DnsProbeRunner { +@@ -1022,6 +1029,8 @@ class DnsOverHttpsProbeRunner : public DnsProbeRunner { session_.get(), doh_server_index, formatted_probe_hostname_, dns_protocol::kTypeA, nullptr /* opt_rdata */, &probe_stats->probe_attempts, context_->url_request_context(), @@ -329,7 +329,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc context_->isolation_info(), RequestPriority::DEFAULT_PRIORITY); DnsAttempt* probe_attempt = probe_stats->probe_attempts.back().get(); -@@ -1105,7 +1114,8 @@ class DnsTransactionImpl : public DnsTransaction, +@@ -1114,7 +1123,8 @@ class DnsTransactionImpl : public DnsTransaction, bool secure, SecureDnsMode secure_dns_mode, ResolveContext* resolve_context, @@ -339,7 +339,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc : session_(session), hostname_(std::move(hostname)), qtype_(qtype), -@@ -1119,7 +1129,8 @@ class DnsTransactionImpl : public DnsTransaction, +@@ -1127,7 +1137,8 @@ class DnsTransactionImpl : public DnsTransaction, attempts_count_(0), had_tcp_retry_(false), resolve_context_(resolve_context->AsSafeRef()), @@ -348,8 +348,8 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc + network_isolation_key_(network_isolation_key) { DCHECK(session_.get()); DCHECK(!hostname_.empty()); - DCHECK(!callback_.is_null()); -@@ -1367,6 +1378,8 @@ class DnsTransactionImpl : public DnsTransaction, + DCHECK(!IsIPLiteral(hostname_)); +@@ -1374,6 +1385,8 @@ class DnsTransactionImpl : public DnsTransaction, ConstructDnsHTTPAttempt( session_.get(), doh_server_index, qnames_.front(), qtype_, opt_rdata_, &attempts_, resolve_context_->url_request_context(), @@ -358,7 +358,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc resolve_context_->isolation_info(), request_priority_); ++attempts_count_; int rv = attempts_.back()->Start(base::BindOnce( -@@ -1693,6 +1706,8 @@ class DnsTransactionImpl : public DnsTransaction, +@@ -1708,6 +1721,8 @@ class DnsTransactionImpl : public DnsTransaction, base::SafeRef resolve_context_; RequestPriority request_priority_; @@ -367,18 +367,16 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc THREAD_CHECKER(thread_checker_); }; -@@ -1714,11 +1729,12 @@ class DnsTransactionFactoryImpl : public DnsTransactionFactory { +@@ -1728,10 +1743,10 @@ class DnsTransactionFactoryImpl : public DnsTransactionFactory { bool secure, SecureDnsMode secure_dns_mode, ResolveContext* resolve_context, - bool fast_timeout) override { -+ bool fast_timeout, -+ const NetworkIsolationKey& network_isolation_key) override { ++ bool fast_timeout, const NetworkIsolationKey& network_isolation_key) override { return std::make_unique( - session_.get(), std::move(hostname), qtype, std::move(callback), - net_log, opt_rdata_.get(), secure, secure_dns_mode, resolve_context, -- fast_timeout); -+ fast_timeout, network_isolation_key); + session_.get(), std::move(hostname), qtype, net_log, opt_rdata_.get(), +- secure, secure_dns_mode, resolve_context, fast_timeout); ++ secure, secure_dns_mode, resolve_context, fast_timeout, network_isolation_key); } std::unique_ptr CreateDohProbeRunner( @@ -393,7 +391,7 @@ diff --git a/net/dns/dns_transaction.h b/net/dns/dns_transaction.h #include "net/dns/public/secure_dns_mode.h" #include "net/dns/record_rdata.h" #include "third_party/abseil-cpp/absl/types/optional.h" -@@ -119,7 +120,8 @@ class NET_EXPORT_PRIVATE DnsTransactionFactory { +@@ -117,7 +118,8 @@ class NET_EXPORT_PRIVATE DnsTransactionFactory { bool secure, SecureDnsMode secure_dns_mode, ResolveContext* resolve_context, @@ -406,7 +404,7 @@ diff --git a/net/dns/dns_transaction.h b/net/dns/dns_transaction.h 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 -@@ -1308,7 +1308,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr { +@@ -1262,7 +1262,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr { Delegate* delegate, const NetLogWithSource& job_net_log, const base::TickClock* tick_clock, @@ -416,7 +414,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc : client_(client), host_(std::move(host)), resolve_context_(resolve_context->AsSafeRef()), -@@ -1318,7 +1319,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr { +@@ -1272,7 +1273,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr { net_log_(job_net_log), tick_clock_(tick_clock), task_start_time_(tick_clock_->NowTicks()), @@ -426,17 +424,17 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc DCHECK(client_); DCHECK(delegate_); -@@ -1449,7 +1451,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr { - base::Unretained(this), tick_clock_->NowTicks(), - dns_query_type, request_port), - net_log_, secure_, secure_dns_mode_, &*resolve_context_, +@@ -1489,7 +1491,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr { + std::move(transaction_hostname), + DnsQueryTypeToQtype(transaction_info.type), net_log_, secure_, + secure_dns_mode_, &*resolve_context_, - fallback_available_ /* fast_timeout */); + fallback_available_ /* fast_timeout */, + network_isolation_key_); - trans->SetRequestPriority(delegate_->priority()); - return trans; - } -@@ -1984,6 +1987,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr { + transaction_info.transaction->SetRequestPriority(delegate_->priority()); + + auto transaction_info_it = +@@ -2111,6 +2114,8 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr { // task completes unsuccessfully. Used as a signal that underlying // transactions should timeout more quickly. bool fallback_available_; @@ -445,7 +443,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc }; //----------------------------------------------------------------------------- -@@ -2550,7 +2555,8 @@ class HostResolverManager::Job : public PrioritizedDispatcher::Job, +@@ -2679,7 +2684,8 @@ class HostResolverManager::Job : public PrioritizedDispatcher::Job, dns_task_ = std::make_unique( resolver_->dns_client_.get(), key_.host, key_.query_types, &*key_.resolve_context, secure, key_.secure_dns_mode, this, net_log_, @@ -455,7 +453,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc dns_task_->StartNextTransaction(); // Schedule a second transaction, if needed. DoH queries can bypass the // dispatcher and start all of their transactions immediately. -@@ -2826,6 +2832,13 @@ class HostResolverManager::Job : public PrioritizedDispatcher::Job, +@@ -2971,6 +2977,13 @@ class HostResolverManager::Job : public PrioritizedDispatcher::Job, net_log_.EndEventWithNetErrorCode( NetLogEventType::HOST_RESOLVER_MANAGER_JOB, results.error()); diff --git a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch index 06e05ba1..2b9fd6d5 100644 --- a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch +++ b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch @@ -27,7 +27,7 @@ diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -439,7 +439,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -449,7 +449,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { // avoid deadlock and enable the use of preconfigured IP addresses. request_->SetSecureDnsPolicy(SecureDnsPolicy::kBootstrap); request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE | @@ -62,7 +62,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque AddExtraHeaders(); -@@ -605,6 +609,7 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -602,6 +606,7 @@ void URLRequestHttpJob::AddExtraHeaders() { if (request_->Supports(SourceStream::SourceType::TYPE_DEFLATE)) { advertised_encoding_names.push_back("deflate"); } @@ -70,7 +70,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque // Advertise "br" encoding only if transferred data is opaque to proxy. if (request()->context()->enable_brotli() && request_->Supports(SourceStream::SourceType::TYPE_BROTLI)) { -@@ -613,6 +618,7 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -610,6 +615,7 @@ void URLRequestHttpJob::AddExtraHeaders() { advertised_encoding_names.push_back("br"); } } @@ -78,7 +78,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque if (!advertised_encoding_names.empty()) { // Tell the server what compression formats are supported. request_info_.extra_headers.SetHeader( -@@ -622,7 +628,7 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -619,7 +625,7 @@ void URLRequestHttpJob::AddExtraHeaders() { } } diff --git a/build/patches/Reintroduce-override_build_timestamp.patch b/build/patches/Reintroduce-override_build_timestamp.patch index deb89d4e..4d4a58e3 100644 --- a/build/patches/Reintroduce-override_build_timestamp.patch +++ b/build/patches/Reintroduce-override_build_timestamp.patch @@ -14,7 +14,7 @@ Use (overriden) build timestamp for chrome_version_id diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3949,8 +3949,13 @@ action("build_date") { +@@ -3836,8 +3836,13 @@ action("build_date") { args = [ rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir), diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index ddcc69cb..dd3911d5 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -46,7 +46,9 @@ Parts of this patch were developed by csagan5, uazo and others. .../language/settings/LanguageSettings.java | 6 - .../prefetch/prefetch_service_factory.cc | 16 - .../browser/password_manager/android/BUILD.gn | 2 - - ...PasswordStoreAndroidBackendBridgeImpl.java | 21 - + .../PasswordManagerAndroidBackendUtil.java | 30 +- + .../PasswordSettingsUpdaterBridge.java | 13 +- + ...PasswordStoreAndroidBackendBridgeImpl.java | 5 - ...swordSyncControllerDelegateBridgeImpl.java | 7 - .../push_messaging_service_factory.cc | 8 +- chrome/browser/ui/BUILD.gn | 3 - @@ -102,7 +104,7 @@ Parts of this patch were developed by csagan5, uazo and others. third_party/android_deps/BUILD.gn | 540 +----------------- .../preconditions/javatests/BUILD.gn | 1 - .../gms/ChromiumPlayServicesAvailability.java | 10 +- - 80 files changed, 68 insertions(+), 2340 deletions(-) + 82 files changed, 71 insertions(+), 2364 deletions(-) delete mode 100644 components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java delete mode 100644 components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java @@ -146,7 +148,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//cc:cc_java", "//chrome/android/features/keyboard_accessory:public_java", -@@ -606,7 +598,6 @@ android_library("chrome_java") { +@@ -607,7 +599,6 @@ android_library("chrome_java") { "//skia/public/mojom:mojom_java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:chromium_play_services_availability_java", @@ -154,7 +156,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:com_google_guava_listenablefuture_java", "//third_party/android_deps:dagger_java", -@@ -937,10 +928,6 @@ junit_binary("chrome_junit_tests") { +@@ -927,10 +918,6 @@ junit_binary("chrome_junit_tests") { ":chrome_jni_headers", ":chrome_public_android_manifest", ":delegate_public_impl_java", @@ -165,7 +167,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", -@@ -1317,13 +1304,6 @@ android_library("chrome_test_java") { +@@ -1302,13 +1289,6 @@ android_library("chrome_test_java") { ":chrome_test_util_java", ":chrome_test_util_jni", ":delegate_public_impl_java", @@ -179,7 +181,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base/test:test_support_java", -@@ -2405,7 +2385,6 @@ android_library("browser_java_test_support") { +@@ -2386,7 +2366,6 @@ android_library("browser_java_test_support") { ] deps = [ ":chrome_java", @@ -187,17 +189,17 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:jni_java", -@@ -2555,9 +2534,7 @@ android_library("base_monochrome_module_java") { +@@ -2535,9 +2514,7 @@ android_library("base_monochrome_module_java") { + # is in a DFM. android_library("base_module_java") { sources = [ - "../browser/attribution_reporting/android/java/src/org/chromium/chrome/browser/attribution_reporting/AttributionReportingProvider.java", - "java/src/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java", "java/src/org/chromium/chrome/app/TrichromeZygotePreload.java", - "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java", "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java", "java/src/org/chromium/chrome/browser/DeferredStartupHandler.java", "java/src/org/chromium/chrome/browser/base/DexFixer.java", -@@ -2568,8 +2545,6 @@ android_library("base_module_java") { +@@ -2548,8 +2525,6 @@ android_library("base_module_java") { "java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java", "java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java", "java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java", @@ -206,7 +208,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java", "java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java", "java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java", -@@ -2594,16 +2569,10 @@ android_library("base_module_java") { +@@ -2574,17 +2549,11 @@ android_library("base_module_java") { "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java", "java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java", "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java", @@ -214,6 +216,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn - "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundService.java", - "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java", "java/src/org/chromium/chrome/browser/tracing/TracingNotificationService.java", + "java/src/org/chromium/chrome/browser/webapps/WebApkInstallCoordinatorService.java", ] deps = [ ":chrome_base_module_resources", @@ -223,15 +226,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//chrome/browser/download/android:file_provider_java", "//chrome/browser/flags:java", -@@ -2616,7 +2585,6 @@ android_library("base_module_java") { +@@ -2597,7 +2566,6 @@ android_library("base_module_java") { "//components/media_router/browser/android:cast_options_provider_java", "//components/minidump_uploader:minidump_uploader_java", "//components/module_installer/android:module_installer_java", - "//third_party/android_deps:com_google_android_play_core_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_collection_collection_java", - "//third_party/androidx:androidx_fragment_fragment_java", -@@ -2638,7 +2606,6 @@ android_library("base_module_java") { + "//ui/android:ui_no_recycler_view_java", +@@ -2617,7 +2585,6 @@ android_library("base_module_java") { # Deps to pull services into base module. # TODO(crbug.com/1126301): Consider moving these to the chrome module to # reduce base dex size. @@ -250,7 +253,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java", "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java", "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java", -@@ -936,10 +935,6 @@ chrome_java_sources = [ +@@ -942,10 +941,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/searchwidget/SearchType.java", "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java", "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivity.java", @@ -298,7 +301,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} -@@ -747,16 +742,6 @@ by a child template that "extends" this file. +@@ -743,16 +738,6 @@ by a child template that "extends" this file. @@ -315,7 +318,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro @@ -331,7 +334,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro @@ -358,7 +361,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1053,28 +1009,10 @@ by a child template that "extends" this file. +@@ -1049,28 +1005,10 @@ by a child template that "extends" this file. android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE"/> @@ -387,7 +390,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1293,12 +1231,6 @@ by a child template that "extends" this file. +@@ -1299,12 +1237,6 @@ by a child template that "extends" this file. {% endif %} @@ -482,7 +485,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVer diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java -@@ -16,7 +16,6 @@ import org.chromium.chrome.browser.notifications.scheduler.NotificationScheduler +@@ -15,7 +15,6 @@ import org.chromium.chrome.browser.notifications.scheduler.NotificationScheduler import org.chromium.chrome.browser.offlinepages.OfflineBackgroundTask; import org.chromium.chrome.browser.offlinepages.prefetch.PrefetchBackgroundTask; import org.chromium.chrome.browser.omaha.OmahaService; @@ -490,7 +493,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task import org.chromium.chrome.browser.webapps.WebApkUpdateTask; import org.chromium.components.background_task_scheduler.BackgroundTask; import org.chromium.components.background_task_scheduler.BackgroundTaskFactory; -@@ -57,8 +56,6 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory { +@@ -56,8 +55,6 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory { switch (taskId) { case TaskIds.OMAHA_JOB_ID: return new OmahaService(); @@ -891,10 +894,10 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/ import("//chrome/android/modules/buildflags.gni") -import( - "//chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni") - import("//chrome/android/modules/extra_icu/extra_icu_module.gni") import("//chrome/android/modules/stack_unwinder/stack_unwinder_module.gni") import("//chrome/android/modules/test_dummy/test_dummy_module.gni") -@@ -66,7 +64,6 @@ if (!disable_autofill_assistant_dfm) { + import("//device/vr/buildflags/buildflags.gni") +@@ -64,7 +62,6 @@ if (!disable_autofill_assistant_dfm) { if (!disable_tab_ui_dfm) { monochrome_module_descs += [ tab_ui_module_desc ] } @@ -905,7 +908,7 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -6781,8 +6781,6 @@ static_library("browser") { +@@ -6836,8 +6836,6 @@ static_library("browser") { "offline_pages/offliner_helper.h", "offline_pages/offliner_user_data.cc", "offline_pages/offliner_user_data.h", @@ -955,7 +958,7 @@ diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java -@@ -457,12 +457,6 @@ public class AppLanguagePromoDialog { +@@ -464,12 +464,6 @@ public class AppLanguagePromoDialog { mLoadingModal.set(ModalDialogProperties.CUSTOM_VIEW, customView); @@ -968,7 +971,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse boolean isSelectedCurrentUI = AppLocaleUtils.isAppLanguagePref(selectedLanguage.getCode()); if (!isSelectedCurrentUI) { // Only record isTopLanguage if the app language has changed. -@@ -470,23 +464,6 @@ public class AppLanguagePromoDialog { +@@ -477,23 +471,6 @@ public class AppLanguagePromoDialog { } AndroidLanguageMetricsBridge.reportAppLanguagePromptLanguage( selectedLanguage.isSystemDefault() ? "" : selectedLanguage.getCode()); @@ -1069,7 +1072,7 @@ diff --git a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn --- a/chrome/browser/password_manager/android/BUILD.gn +++ b/chrome/browser/password_manager/android/BUILD.gn -@@ -63,7 +63,6 @@ android_library("java") { +@@ -65,7 +65,6 @@ android_library("java") { ":android_backend_java_enums", ":java_resources", ":settings_interface_java", @@ -1077,51 +1080,127 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p "//base:base_java", "//chrome/browser/device_reauth/android:java", "//chrome/browser/flags:java", -@@ -143,7 +142,6 @@ junit_binary("password_manager_junit_tests") { - ":backend_interface_public_impl_java", +@@ -153,7 +152,6 @@ junit_binary("password_manager_junit_tests") { ":java", + ":public_impl_java", ":settings_interface_java", - "$google_play_services_package:google_play_services_basement_java", "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", -diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java ---- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java -+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java -@@ -9,8 +9,6 @@ import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper - import android.accounts.Account; +diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerAndroidBackendUtil.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerAndroidBackendUtil.java +--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerAndroidBackendUtil.java ++++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerAndroidBackendUtil.java +@@ -7,9 +7,6 @@ import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper + import android.app.PendingIntent; -import com.google.android.gms.common.api.ApiException; +-import com.google.android.gms.common.api.ResolvableApiException; +- + import org.chromium.base.Log; + + /** +@@ -25,33 +22,10 @@ class PasswordManagerAndroidBackendUtil { + if (exception instanceof PasswordStoreAndroidBackend.BackendException) { + return ((PasswordStoreAndroidBackend.BackendException) exception).errorCode; + } +- if (exception instanceof ApiException) { +- return AndroidBackendErrorType.EXTERNAL_ERROR; +- } + return AndroidBackendErrorType.UNCATEGORIZED; + } + + static int getApiErrorCode(Exception exception) { +- if (exception instanceof ApiException) { +- return ((ApiException) exception).getStatusCode(); +- } +- return 0; // '0' means SUCCESS. +- } +- +- static void handleResolvableApiException(ResolvableApiException exception) { +- if (!usesUnifiedPasswordManagerUI()) return; +- +- // No special resolution for the authentication errors is needed since the user has already +- // been prompted to reauthenticate by Google services and Sync in Chrome. +- if (exception.getStatusCode() == ChromeSyncStatusCode.AUTH_ERROR_RESOLVABLE) return; +- +- // For all other resolvable errors, an intent is launched allowing the user to fix the +- // broken state. +- PendingIntent pendingIntent = exception.getResolution(); +- try { +- pendingIntent.send(); +- } catch (PendingIntent.CanceledException e) { +- Log.e(TAG, "Can not launch error resolution intent", e); +- } ++ return 13; // '13' means ERROR + } +-} +\ No newline at end of file ++} +diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSettingsUpdaterBridge.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSettingsUpdaterBridge.java +--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSettingsUpdaterBridge.java ++++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSettingsUpdaterBridge.java +@@ -9,7 +9,6 @@ import static org.chromium.chrome.browser.password_manager.PasswordManagerSettin + + import android.accounts.Account; + -import com.google.android.gms.common.api.ResolvableApiException; import com.google.common.base.Optional; - import org.chromium.base.Log; -@@ -123,25 +121,6 @@ class PasswordStoreAndroidBackendBridgeImpl { - error = ((PasswordStoreAndroidBackend.BackendException) exception).errorCode; - } + import org.chromium.base.annotations.CalledByNative; +@@ -101,11 +100,6 @@ public class PasswordSettingsUpdaterBridge { + int error = PasswordManagerAndroidBackendUtil.getBackendError(exception); + int apiErrorCode = PasswordManagerAndroidBackendUtil.getApiErrorCode(exception); -- if (exception instanceof ApiException) { -- error = AndroidBackendErrorType.EXTERNAL_ERROR; -- api_error_code = ((ApiException) exception).getStatusCode(); -- -- if (usesUnifiedPasswordManagerUI() && exception instanceof ResolvableApiException -- && api_error_code != ChromeSyncStatusCode.AUTH_ERROR_RESOLVABLE) { -- // Backend error is user-recoverable, launch pending intent to allow the user to -- // resolve it. Resolution for the authentication errors is not launched as -- // user is requested to reauthenticate by Google services and Sync in Chrome. -- ResolvableApiException resolvableApiException = (ResolvableApiException) exception; -- PendingIntent pendingIntent = resolvableApiException.getResolution(); -- try { -- pendingIntent.send(); -- } catch (PendingIntent.CanceledException e) { -- Log.e(TAG, "Can not launch error resolution intent", e); -- } -- } +- if (exception instanceof ResolvableApiException) { +- PasswordManagerAndroidBackendUtil.handleResolvableApiException( +- (ResolvableApiException) exception); - } - + PasswordSettingsUpdaterBridgeJni.get().onSettingFetchingError( + mNativeSettingsUpdaterBridge, setting, error, apiErrorCode); + } +@@ -123,11 +117,6 @@ public class PasswordSettingsUpdaterBridge { + int error = PasswordManagerAndroidBackendUtil.getBackendError(exception); + int apiErrorCode = PasswordManagerAndroidBackendUtil.getApiErrorCode(exception); + +- if (exception instanceof ResolvableApiException) { +- PasswordManagerAndroidBackendUtil.handleResolvableApiException( +- (ResolvableApiException) exception); +- } +- + PasswordSettingsUpdaterBridgeJni.get().onFailedSettingChange( + mNativeSettingsUpdaterBridge, setting, error, apiErrorCode); + } +@@ -154,4 +143,4 @@ public class PasswordSettingsUpdaterBridge { + void onFailedSettingChange(long nativePasswordSettingsUpdaterAndroidBridgeImpl, int setting, + int error, int apiErrorCode); + } +-} +\ No newline at end of file ++} +diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java +--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java ++++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java +@@ -6,7 +6,6 @@ package org.chromium.chrome.browser.password_manager; + + import android.accounts.Account; + +-import com.google.android.gms.common.api.ResolvableApiException; + import com.google.common.base.Optional; + + import org.chromium.base.annotations.CalledByNative; +@@ -113,10 +112,6 @@ class PasswordStoreAndroidBackendBridgeImpl { + int error = PasswordManagerAndroidBackendUtil.getBackendError(exception); + int apiErrorCode = PasswordManagerAndroidBackendUtil.getApiErrorCode(exception); + +- if (exception instanceof ResolvableApiException) { +- PasswordManagerAndroidBackendUtil.handleResolvableApiException( +- (ResolvableApiException) exception); +- } PasswordStoreAndroidBackendBridgeImplJni.get().onError( - mNativeBackendBridge, jobId, error, api_error_code); + mNativeBackendBridge, jobId, error, apiErrorCode); } diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java @@ -1168,7 +1247,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/c 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 -@@ -248,8 +248,6 @@ static_library("ui") { +@@ -255,8 +255,6 @@ static_library("ui") { "webui/flags/flags_ui.h", "webui/flags/flags_ui_handler.cc", "webui/flags/flags_ui_handler.h", @@ -1177,7 +1256,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "webui/internals/internals_ui.cc", "webui/internals/internals_ui.h", "webui/interstitials/interstitial_ui.cc", -@@ -479,7 +477,6 @@ static_library("ui") { +@@ -488,7 +486,6 @@ static_library("ui") { "//components/feedback/content", "//components/find_in_page", "//components/flags_ui", @@ -1188,7 +1267,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -40,7 +40,6 @@ +@@ -41,7 +41,6 @@ #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h" #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h" #include "chrome/browser/ui/webui/flags/flags_ui.h" @@ -1196,7 +1275,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "chrome/browser/ui/webui/internals/internals_ui.h" #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h" #include "chrome/browser/ui/webui/invalidations/invalidations_ui.h" -@@ -746,8 +745,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -761,8 +760,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUIFlagsHost) return &NewWebUI; @@ -1208,7 +1287,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn --- a/chrome/test/android/BUILD.gn +++ b/chrome/test/android/BUILD.gn -@@ -305,8 +305,6 @@ android_library("chrome_java_test_support") { +@@ -306,8 +306,6 @@ android_library("chrome_java_test_support") { ] deps = [ @@ -3525,7 +3604,7 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi "//base:base_java", "//components/externalauth/android:java", "//net/android:net_java", -@@ -27,7 +25,6 @@ android_library("java") { +@@ -26,7 +24,6 @@ android_library("java") { "java/src/org/chromium/components/signin/AccountManagerFacade.java", "java/src/org/chromium/components/signin/AccountManagerFacadeImpl.java", "java/src/org/chromium/components/signin/AccountManagerFacadeProvider.java", @@ -3533,7 +3612,7 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi "java/src/org/chromium/components/signin/AccountRestrictionPatternReceiver.java", "java/src/org/chromium/components/signin/AccountUtils.java", "java/src/org/chromium/components/signin/AccountsChangeObserver.java", -@@ -161,7 +158,6 @@ java_library("junit") { +@@ -162,7 +159,6 @@ java_library("junit") { deps = [ ":java", ":signin_java_test_support", @@ -3654,7 +3733,7 @@ diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn -@@ -136,10 +136,6 @@ android_library("content_main_dex_java") { +@@ -135,10 +135,6 @@ android_library("content_main_dex_java") { android_library("content_full_java") { deps = [ ":content_main_dex_java", @@ -3668,7 +3747,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn 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 -@@ -1093,8 +1093,8 @@ const base::Feature kWebAssemblyTrapHandler { +@@ -1097,8 +1097,8 @@ const base::Feature kWebAssemblyTrapHandler { // Controls whether CTAP2 devices can communicate via the WebAuthentication API // using pairingless BLE protocol. // https://w3c.github.io/webauthn @@ -3682,7 +3761,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -2960,10 +2960,6 @@ if (is_android) { +@@ -2950,10 +2950,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ @@ -3709,17 +3788,17 @@ diff --git a/device/BUILD.gn b/device/BUILD.gn diff --git a/device/fido/features.cc b/device/fido/features.cc --- a/device/fido/features.cc +++ b/device/fido/features.cc -@@ -22,8 +22,8 @@ const base::Feature kWebAuthUseNativeWinApi{"WebAuthenticationUseNativeWinApi", - extern const base::Feature kWebAuthCableSecondFactor{ - "WebAuthenticationCableSecondFactor", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -19,8 +19,8 @@ const base::Feature kWebAuthUseNativeWinApi{"WebAuthenticationUseNativeWinApi", + base::FEATURE_ENABLED_BY_DEFAULT}; + #endif // BUILDFLAG(IS_WIN) -extern const base::Feature kWebAuthPhoneSupport{ - "WebAuthenticationPhoneSupport", base::FEATURE_ENABLED_BY_DEFAULT}; +extern const base::Feature kWebAuthPhoneSupport{ // disabled by default in Bromite + "WebAuthenticationPhoneSupport", base::FEATURE_DISABLED_BY_DEFAULT}; // ^ - extern const base::Feature kWebAuthCableDisco{ - "WebAuthenticationCableDisco", base::FEATURE_DISABLED_BY_DEFAULT}; + extern const base::Feature kWebAuthPasskeysUI{ + "WebAuthenticationPasskeysUI", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni --- a/remoting/android/client_java_tmpl.gni +++ b/remoting/android/client_java_tmpl.gni @@ -3789,7 +3868,7 @@ diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD. diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn --- a/third_party/android_deps/BUILD.gn +++ b/third_party/android_deps/BUILD.gn -@@ -68,7 +68,6 @@ if (!limit_android_deps) { +@@ -79,7 +79,6 @@ if (!limit_android_deps) { ":org_robolectric_shadowapi_java", ":org_robolectric_shadows_framework_java", ":org_robolectric_shadows_multidex_java", @@ -3797,7 +3876,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. ":org_robolectric_utils_java", ":org_robolectric_utils_reflector_java", -@@ -87,7 +86,7 @@ if (!limit_android_deps) { +@@ -98,7 +97,7 @@ if (!limit_android_deps) { android_library("chromium_play_services_availability_java") { sources = [ "util/org/chromium/gms/ChromiumPlayServicesAvailability.java" ] @@ -3806,7 +3885,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. } android_library("chromium_play_services_availability_shadows_java") { -@@ -987,210 +986,6 @@ if (!limit_android_deps) { +@@ -998,210 +997,6 @@ if (!limit_android_deps) { resource_overlay = true } @@ -4017,7 +4096,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. android_aar_prebuilt("com_google_android_material_material_java") { aar_path = -@@ -1236,60 +1031,6 @@ if (!limit_android_deps) { +@@ -1247,60 +1042,6 @@ if (!limit_android_deps) { ] } @@ -4078,7 +4157,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. java_prebuilt("com_google_flatbuffers_flatbuffers_java_java") { jar_path = "libs/com_google_flatbuffers_flatbuffers_java/flatbuffers-java-2.0.3.jar" -@@ -1461,19 +1202,6 @@ if (!limit_android_deps) { +@@ -1491,19 +1232,6 @@ if (!limit_android_deps) { deps += [ ":com_android_support_multidex_java" ] } @@ -4098,7 +4177,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. java_prebuilt("org_robolectric_utils_java") { jar_path = "libs/org_robolectric_utils/utils-4.7.3.jar" -@@ -1820,272 +1548,6 @@ if (!limit_android_deps) { +@@ -1850,272 +1578,6 @@ if (!limit_android_deps) { deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ] } diff --git a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch index bc05cb67..6c4456b8 100644 --- a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch +++ b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch @@ -9,7 +9,7 @@ Subject: Remove blocklisted URLs upon bookmark creation diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -141,6 +141,8 @@ import org.chromium.chrome.browser.night_mode.SystemNightModeMonitor; +@@ -140,6 +140,8 @@ import org.chromium.chrome.browser.night_mode.SystemNightModeMonitor; import org.chromium.chrome.browser.night_mode.WebContentsDarkModeController; import org.chromium.chrome.browser.night_mode.WebContentsDarkModeMessageController; import org.chromium.chrome.browser.ntp.NewTabPageUma; @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.chrome.browser.offlinepages.OfflinePageUtils; import org.chromium.chrome.browser.offlinepages.indicator.OfflineIndicatorController; import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper; -@@ -247,6 +249,8 @@ import org.chromium.ui.widget.Toast; +@@ -246,6 +248,8 @@ import org.chromium.ui.widget.Toast; import org.chromium.url.GURL; import org.chromium.webapk.lib.client.WebApkNavigationClient; @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -@@ -296,6 +300,7 @@ public abstract class ChromeActivity +@@ -295,6 +299,7 @@ public abstract class ChromeActivity private UmaSessionStats mUmaSessionStats; private ContextReporter mContextReporter; @@ -35,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv private boolean mPartnerBrowserRefreshNeeded; -@@ -1483,6 +1488,11 @@ public abstract class ChromeActivity +@@ -1482,6 +1487,11 @@ public abstract class ChromeActivity mCompositorViewHolderSupplier.set(null); } @@ -47,7 +47,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv onDestroyInternal(); if (mDidAddPolicyChangeListener) { -@@ -1837,6 +1847,13 @@ public abstract class ChromeActivity +@@ -1833,6 +1843,13 @@ public abstract class ChromeActivity // Defense in depth against the UI being erroneously enabled. BookmarkBridge bridge = mBookmarkBridgeSupplier.get(); diff --git a/build/patches/Remove-contextual-search-manager.patch b/build/patches/Remove-contextual-search-manager.patch index 9b56295b..ee75f43c 100644 --- a/build/patches/Remove-contextual-search-manager.patch +++ b/build/patches/Remove-contextual-search-manager.patch @@ -70,7 +70,7 @@ Subject: Remove contextual search manager diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1602,20 +1602,10 @@ group("strings") { +@@ -1584,20 +1584,10 @@ group("strings") { } if (is_android) { @@ -102,9 +102,9 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/crash/android:java", "//components/dom_distiller/content/browser/android:dom_distiller_content_java", "//components/dom_distiller/core/android:dom_distiller_core_java", -@@ -660,11 +659,9 @@ android_library("chrome_java") { +@@ -656,11 +655,9 @@ android_library("chrome_java") { + ":chrome_strict_mode_switch", ":resource_id_javagen", - ":sync_user_settings_enums_java", ":vr_build_config", - "//chrome:assist_ranker_prediction_enum_javagen", "//chrome:instant_apps_reasons_enum_javagen", @@ -114,7 +114,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome:supervised_user_url_filter_enum_javagen", "//chrome/browser:screenshot_mode_enum", "//chrome/browser:sharing_dialog_type_generated_enum", -@@ -3841,18 +3838,12 @@ generate_jni("chrome_jni_headers") { +@@ -3829,18 +3826,12 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java", "java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java", @@ -132,7 +132,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn - "java/src/org/chromium/chrome/browser/contextualsearch/CtrSuppression.java", "java/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceImpl.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java", - "java/src/org/chromium/chrome/browser/device_dialog/ChromeBluetoothChooserAndroidDelegate.java", + "java/src/org/chromium/chrome/browser/datareduction/DataSaverOSSetting.java", diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni @@ -144,7 +144,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/drawable-hdpi/cvc_icon.png", "java/res/drawable-hdpi/cvc_icon_amex.png", "java/res/drawable-hdpi/down_arrow.png", -@@ -108,7 +107,6 @@ chrome_java_resources = [ +@@ -106,7 +105,6 @@ chrome_java_resources = [ "java/res/drawable-mdpi/btn_tab_close_normal.png", "java/res/drawable-mdpi/btn_tabstrip_new_tab.png", "java/res/drawable-mdpi/btn_tabstrip_switch_normal.png", @@ -152,7 +152,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/drawable-mdpi/cvc_icon.png", "java/res/drawable-mdpi/cvc_icon_amex.png", "java/res/drawable-mdpi/down_arrow.png", -@@ -193,7 +191,6 @@ chrome_java_resources = [ +@@ -190,7 +188,6 @@ chrome_java_resources = [ "java/res/drawable-xhdpi/btn_tab_close_normal.png", "java/res/drawable-xhdpi/btn_tabstrip_new_tab.png", "java/res/drawable-xhdpi/btn_tabstrip_switch_normal.png", @@ -160,7 +160,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/drawable-xhdpi/cvc_icon.png", "java/res/drawable-xhdpi/cvc_icon_amex.png", "java/res/drawable-xhdpi/down_arrow.png", -@@ -264,7 +261,6 @@ chrome_java_resources = [ +@@ -259,7 +256,6 @@ chrome_java_resources = [ "java/res/drawable-xxhdpi/btn_tab_close_normal.png", "java/res/drawable-xxhdpi/btn_tabstrip_new_tab.png", "java/res/drawable-xxhdpi/btn_tabstrip_switch_normal.png", @@ -168,7 +168,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/drawable-xxhdpi/cvc_icon.png", "java/res/drawable-xxhdpi/cvc_icon_amex.png", "java/res/drawable-xxhdpi/down_arrow.png", -@@ -335,7 +331,6 @@ chrome_java_resources = [ +@@ -328,7 +324,6 @@ chrome_java_resources = [ "java/res/drawable-xxxhdpi/btn_tab_close_normal.png", "java/res/drawable-xxxhdpi/btn_tabstrip_new_tab.png", "java/res/drawable-xxxhdpi/btn_tabstrip_switch_normal.png", @@ -176,7 +176,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/drawable-xxxhdpi/cvc_icon.png", "java/res/drawable-xxxhdpi/cvc_icon_amex.png", "java/res/drawable-xxxhdpi/down_arrow.png", -@@ -532,16 +527,6 @@ chrome_java_resources = [ +@@ -519,16 +514,6 @@ chrome_java_resources = [ "java/res/layout/context_menu_header.xml", "java/res/layout/context_menu_row.xml", "java/res/layout/context_menu_share_row.xml", @@ -193,7 +193,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/layout/custom_tabs_bottombar.xml", "java/res/layout/custom_tabs_bottombar_item.xml", "java/res/layout/custom_tabs_control_container.xml", -@@ -698,8 +683,6 @@ chrome_java_resources = [ +@@ -685,8 +670,6 @@ chrome_java_resources = [ "java/res/xml/autofill_assistant_preferences.xml", "java/res/xml/bookmark_widget_info.xml", "java/res/xml/clear_browsing_data_preferences_tab.xml", @@ -205,7 +205,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -303,22 +303,6 @@ chrome_java_sources = [ +@@ -305,22 +305,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManager.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelRepaddingTextView.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelTextViewInflater.java", @@ -228,7 +228,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java", -@@ -360,7 +344,6 @@ chrome_java_sources = [ +@@ -362,7 +346,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripStacker.java", "java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabLoadTracker.java", "java/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java", @@ -236,7 +236,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java", "java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java", "java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java", -@@ -386,50 +369,6 @@ chrome_java_sources = [ +@@ -388,50 +371,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java", "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUtils.java", "java/src/org/chromium/chrome/browser/contextmenu/LensChipDelegate.java", @@ -857,7 +857,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1651,7 +1651,7 @@ public class ChromeTabbedActivity extends ChromeActivity extends AsyncInitializationActivity @@ -897,7 +897,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv SnackbarManageable, SceneChangeObserver, StatusBarColorController.StatusBarColorProvider, AppMenuDelegate, AppMenuBlocker, MenuOrKeyboardActionController, CompositorViewHolder.Initializer, -@@ -323,8 +320,6 @@ public abstract class ChromeActivity +@@ -322,8 +319,6 @@ public abstract class ChromeActivity new ObservableSupplierImpl<>(); protected final UnownedUserDataSupplier mInsetObserverViewSupplier = new InsetObserverViewSupplier(); @@ -906,7 +906,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv private SnackbarManager mSnackbarManager; // Timestamp in ms when initial layout inflation begins -@@ -516,7 +511,7 @@ public abstract class ChromeActivity +@@ -515,7 +510,7 @@ public abstract class ChromeActivity // clang-format off return new RootUiCoordinator(this, null, getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkBridgeSupplier, @@ -915,7 +915,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), () -> null, mBrowserControlsManagerSupplier.get(), getWindowAndroid(), -@@ -985,14 +980,6 @@ public abstract class ChromeActivity +@@ -984,14 +979,6 @@ public abstract class ChromeActivity mCompositorViewHolderSupplier.get().onNativeLibraryReady( getWindowAndroid(), getTabContentManager()); @@ -930,7 +930,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv TraceEvent.end("ChromeActivity:CompositorInitialization"); } -@@ -1472,11 +1459,6 @@ public abstract class ChromeActivity +@@ -1471,11 +1458,6 @@ public abstract class ChromeActivity @SuppressLint("NewApi") @Override protected final void onDestroy() { @@ -942,7 +942,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv if (mSnackbarManager != null) { SnackbarManagerProvider.detach(mSnackbarManager); } -@@ -2093,13 +2075,6 @@ public abstract class ChromeActivity +@@ -2089,13 +2071,6 @@ public abstract class ChromeActivity return mCompositorViewHolderSupplier.get(); } @@ -956,7 +956,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv /** * Exits the fullscreen mode, if any. Does nothing if no fullscreen is present. * @return Whether the fullscreen mode is currently showing. -@@ -2142,15 +2117,6 @@ public abstract class ChromeActivity +@@ -2138,15 +2113,6 @@ public abstract class ChromeActivity } mActivityTabProvider.setLayoutStateProvider(layoutManager); @@ -972,7 +972,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv } /** -@@ -2333,18 +2299,6 @@ public abstract class ChromeActivity +@@ -2329,18 +2295,6 @@ public abstract class ChromeActivity return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null; } @@ -1013,7 +1013,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo import org.chromium.chrome.browser.compositor.layouts.Layout.Orientation; import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; -@@ -271,8 +270,7 @@ public class LayoutManagerImpl implements ManagedLayoutManager, LayoutUpdateHost +@@ -276,8 +275,7 @@ public class LayoutManagerImpl implements ManagedLayoutManager, LayoutUpdateHost // it causes relocation tab strip scene layer. StripLayoutHelperManager.class, ScrollingBottomViewSceneLayer.class, @@ -1239,7 +1239,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.chrome.browser.continuous_search.ContinuousSearchContainerCoordinator; import org.chromium.chrome.browser.continuous_search.ContinuousSearchContainerCoordinator.HeightObserver; import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils; -@@ -254,7 +253,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -252,7 +251,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @NonNull ActivityTabProvider tabProvider, @NonNull ObservableSupplier profileSupplier, @NonNull ObservableSupplier bookmarkBridgeSupplier, @@ -1248,7 +1248,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab @NonNull ObservableSupplier tabModelSelectorSupplier, @NonNull OneshotSupplier startSurfaceSupplier, @NonNull OneshotSupplier intentMetadataOneshotSupplier, -@@ -289,7 +288,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -287,7 +286,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @NonNull OmniboxPedalDelegate omniboxPedalDelegate, boolean initializeUiWithIncognitoColors) { super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider, @@ -1393,7 +1393,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2034,9 +2034,6 @@ static_library("browser") { +@@ -2045,9 +2045,6 @@ static_library("browser") { "//components/content_settings/core/browser", "//components/content_settings/core/common", "//components/contextual_search:buildflags", @@ -1403,7 +1403,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/continuous_search/browser", "//components/continuous_search/common/public/mojom", "//components/cookie_config", -@@ -2619,8 +2616,6 @@ static_library("browser") { +@@ -2636,8 +2633,6 @@ static_library("browser") { "android/compositor/decoration_title.h", "android/compositor/layer/content_layer.cc", "android/compositor/layer/content_layer.h", @@ -1412,7 +1412,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/compositor/layer/layer.h", "android/compositor/layer/overlay_panel_layer.cc", "android/compositor/layer/overlay_panel_layer.h", -@@ -2641,8 +2636,6 @@ static_library("browser") { +@@ -2658,8 +2653,6 @@ static_library("browser") { "android/compositor/resources/resource_factory.cc", "android/compositor/resources/toolbar_resource.cc", "android/compositor/resources/toolbar_resource.h", @@ -1421,7 +1421,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/compositor/scene_layer/continuous_search_scene_layer.cc", "android/compositor/scene_layer/continuous_search_scene_layer.h", "android/compositor/scene_layer/overscroll_scene_layer.cc", -@@ -2667,28 +2660,6 @@ static_library("browser") { +@@ -2684,28 +2677,6 @@ static_library("browser") { "android/content/content_utils.cc", "android/context_menu/context_menu_native_delegate_impl.cc", "android/context_menu/context_menu_native_delegate_impl.h", @@ -1450,7 +1450,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/cookies/cookies_fetcher_util.cc", "android/customtabs/client_data_header_web_contents_observer.cc", "android/customtabs/client_data_header_web_contents_observer.h", -@@ -3266,8 +3237,6 @@ static_library("browser") { +@@ -3288,8 +3259,6 @@ static_library("browser") { "safe_browsing/android/safe_browsing_referring_app_bridge_android.h", "safe_browsing/android/safe_browsing_settings_launcher_android.cc", "safe_browsing/android/safe_browsing_settings_launcher_android.h", @@ -1462,7 +1462,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1721,23 +1721,6 @@ const FeatureEntry::FeatureVariation kExploreSitesVariations[] = { +@@ -1720,23 +1720,6 @@ const FeatureEntry::FeatureVariation kExploreSitesVariations[] = { std::size(kExploreSitesDenseTitleBottom), nullptr}, {"Dense Title Right", kExploreSitesDenseTitleRight, std::size(kExploreSitesDenseTitleRight), nullptr}}; @@ -1486,7 +1486,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::FeatureParam kRelatedSearchesUrl = {"stamp", "1Ru"}; const FeatureEntry::FeatureParam kRelatedSearchesContent = {"stamp", "1Rc"}; -@@ -3085,65 +3068,6 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3229,65 +3212,6 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, #if BUILDFLAG(IS_ANDROID) @@ -1555,7 +1555,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -115,7 +115,6 @@ +@@ -116,7 +116,6 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/first_run/android/first_run_prefs.h" #include "chrome/browser/lens/android/lens_prefs.h" @@ -1563,22 +1563,22 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc #else // BUILDFLAG(IS_ANDROID) #include "chrome/browser/download/default_download_dir_policy_handler.h" #include "chrome/browser/download/download_auto_open_policy_handler.h" -@@ -1786,10 +1785,7 @@ std::unique_ptr BuildHandlerList( - key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, - chrome_schema)); +@@ -1739,10 +1738,7 @@ std::unique_ptr BuildHandlerList( + std::make_unique(key::kURLBlocklist)); + // Policies for all platforms - End -#if BUILDFLAG(IS_ANDROID) - handlers->AddHandler( - std::make_unique()); --#else // BUILDFLAG(IS_ANDROID) +-#else +#if !BUILDFLAG(IS_ANDROID) - handlers->AddHandler( - std::make_unique()); - handlers->AddHandler(std::make_unique()); + handlers->AddHandler(std::make_unique( + key::kClearBrowsingDataOnExitList, + browsing_data::prefs::kClearBrowsingDataOnExitList, chrome_schema)); 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 -@@ -785,49 +785,6 @@ CHAR_LIMIT guidelines: +@@ -789,49 +789,6 @@ CHAR_LIMIT guidelines: Privacy and security @@ -1628,7 +1628,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro “Do Not Track” -@@ -3861,41 +3818,6 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -1673,7 +1673,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -297,7 +297,6 @@ test("components_unittests") { +@@ -307,7 +307,6 @@ test("components_unittests") { "//components/certificate_transparency:unit_tests", "//components/content_capture/browser:unit_tests", "//components/content_settings/browser:unit_tests", @@ -1684,7 +1684,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc --- a/content/browser/browser_interface_binders.cc +++ b/content/browser/browser_interface_binders.cc -@@ -164,7 +164,6 @@ +@@ -165,7 +165,6 @@ #include "content/browser/renderer_host/render_widget_host_view_android.h" #include "services/device/public/mojom/nfc.mojom.h" #include "third_party/blink/public/mojom/hid/hid.mojom.h" @@ -1695,7 +1695,7 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn --- a/third_party/blink/public/mojom/BUILD.gn +++ b/third_party/blink/public/mojom/BUILD.gn -@@ -841,8 +841,8 @@ mojom("android_mojo_bindings") { +@@ -855,8 +855,8 @@ mojom("android_mojo_bindings") { # This Android unhandled-tap feature uses another mojo source, add it in. if (enable_unhandled_tap) { sources += [ "unhandled_tap_notifier/unhandled_tap_notifier.mojom" ] diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index ffda5dda..c3171c72 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -39,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2410,16 +2410,6 @@ public abstract class ChromeActivity +@@ -2406,16 +2406,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); diff --git a/build/patches/Remove-mremap-from-seccomp-baseline-policy.patch b/build/patches/Remove-mremap-from-seccomp-baseline-policy.patch index d486fe71..b5be8a49 100644 --- a/build/patches/Remove-mremap-from-seccomp-baseline-policy.patch +++ b/build/patches/Remove-mremap-from-seccomp-baseline-policy.patch @@ -12,9 +12,9 @@ See also: diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc --- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc +++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc -@@ -98,7 +98,6 @@ ResultExpr BaselinePolicyAndroid::EvaluateSyscall(int sysno) const { +@@ -160,7 +160,6 @@ ResultExpr BaselinePolicyAndroid::EvaluateSyscall(int sysno) const { + case __NR_getdents64: case __NR_getpriority: - case __NR_ioctl: case __NR_membarrier: // https://crbug.com/966433 - case __NR_mremap: #if defined(__i386__) diff --git a/build/patches/Remove-signin-integrations.patch b/build/patches/Remove-signin-integrations.patch index 2869a62b..6c3d1802 100644 --- a/build/patches/Remove-signin-integrations.patch +++ b/build/patches/Remove-signin-integrations.patch @@ -18,7 +18,7 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions() >>> impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a --- chrome/android/BUILD.gn | 1 - - chrome/android/chrome_java_sources.gni | 32 ---- + chrome/android/chrome_java_sources.gni | 31 --- .../PriceTrackingUtilities.java | 5 +- .../browser/feed/FeedSurfaceCoordinator.java | 5 +- .../browser/feed/FeedSurfaceMediator.java | 79 +------- @@ -65,8 +65,9 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions() .../signin/ConfirmSyncDataStateMachine.java | 16 +- .../ui/signin/SignOutDialogFragment.java | 13 -- .../ui/signin/SigninPromoController.java | 15 +- + .../ui/signin/SyncConsentFragmentBase.java | 53 +----- .../WebSigninAccountPickerDelegate.java | 24 --- - .../ui/signin/fre/SigninFirstRunMediator.java | 47 +---- + .../ui/signin/fre/SigninFirstRunMediator.java | 52 +---- .../strings/android_chrome_strings.grd | 18 -- .../core/browser/leak_detection_delegate.cc | 2 +- .../core/browser/password_form_manager.cc | 34 +--- @@ -77,12 +78,12 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions() .../signin/SystemAccountManagerDelegate.java | 25 +-- .../net/HttpNegotiateAuthenticator.java | 88 +-------- .../chromoting/base/OAuthTokenFetcher.java | 2 - - 60 files changed, 48 insertions(+), 1410 deletions(-) + 61 files changed, 50 insertions(+), 1465 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -3903,7 +3903,6 @@ generate_jni("chrome_jni_headers") { +@@ -3892,7 +3892,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java", @@ -93,7 +94,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -609,14 +609,11 @@ chrome_java_sources = [ +@@ -612,14 +612,11 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/firstrun/FirstRunPage.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunPagerAdapter.java", @@ -108,7 +109,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java", "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java", "java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java", -@@ -706,7 +703,6 @@ chrome_java_sources = [ +@@ -709,7 +706,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/infobar/SubPanelListener.java", "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBarDelegate.java", @@ -116,7 +117,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/infobar/TextViewEllipsizerSafe.java", "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java", -@@ -816,7 +812,6 @@ chrome_java_sources = [ +@@ -822,7 +818,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionView.java", "java/src/org/chromium/chrome/browser/ntp/SnapScrollHelperImpl.java", "java/src/org/chromium/chrome/browser/ntp/TitleUtil.java", @@ -124,7 +125,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxContainerView.java", "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxCoordinator.java", "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java", -@@ -1025,16 +1020,6 @@ chrome_java_sources = [ +@@ -1031,15 +1026,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java", "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java", @@ -136,12 +137,11 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java - "java/src/org/chromium/chrome/browser/signin/SyncConsentActivity.java", - "java/src/org/chromium/chrome/browser/signin/SyncConsentActivityLauncherImpl.java", - "java/src/org/chromium/chrome/browser/signin/SyncConsentFragment.java", -- "java/src/org/chromium/chrome/browser/signin/SyncConsentFragmentBase.java", - "java/src/org/chromium/chrome/browser/signin/SyncPromoView.java", "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java", "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java", "java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java", -@@ -1074,23 +1059,6 @@ chrome_java_sources = [ +@@ -1079,23 +1065,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java", "java/src/org/chromium/chrome/browser/survey/SurveyController.java", "java/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridge.java", @@ -190,7 +190,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java -@@ -806,10 +806,7 @@ public class FeedSurfaceCoordinator +@@ -807,10 +807,7 @@ public class FeedSurfaceCoordinator @Override public boolean isSignedIn() { @@ -395,7 +395,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ return itemList; } -@@ -1032,11 +966,6 @@ public class FeedSurfaceMediator +@@ -1043,11 +977,6 @@ public class FeedSurfaceMediator updateSectionHeader(); } @@ -437,7 +437,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} {% endblock %} -@@ -533,15 +528,6 @@ by a child template that "extends" this file. +@@ -529,15 +524,6 @@ by a child template that "extends" this file. TODO(crbug.com/1093292): investigate why @android:style/Theme.NoDisplay can't be used here. --> @@ -453,7 +453,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% endif %} @@ -600,7 +600,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabAssociatedApp; -@@ -676,9 +672,6 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -315,9 +311,6 @@ public abstract class ChromeActivity private boolean mRemoveWindowBackgroundDone; protected AccessibilityVisibilityHandler mAccessibilityVisibilityHandler; @@ -661,7 +661,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv // The PictureInPictureController is initialized lazily https://crbug.com/729738. private PictureInPictureController mPictureInPictureController; -@@ -1094,61 +1087,6 @@ public abstract class ChromeActivity +@@ -1093,61 +1086,6 @@ public abstract class ChromeActivity return StatusBarColorController.UNDEFINED_STATUS_BAR_COLOR; } @@ -723,7 +723,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv @Override public void onResumeWithNative() { // TODO(b/182286787): Clean-up once fixed session resume order is verified. -@@ -1282,14 +1220,6 @@ public abstract class ChromeActivity +@@ -1281,14 +1219,6 @@ public abstract class ChromeActivity if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) { if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect(); } @@ -738,7 +738,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv super.onStopWithNative(); } -@@ -1380,11 +1310,6 @@ public abstract class ChromeActivity +@@ -1379,11 +1309,6 @@ public abstract class ChromeActivity .recordUserFontPrefOnStartup(); }); @@ -750,7 +750,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv // GSA connection is not needed on low-end devices because Icing is disabled. if (!SysUtils.isLowEndDevice()) { if (isActivityFinishingOrDestroyed()) return; -@@ -1399,7 +1324,6 @@ public abstract class ChromeActivity +@@ -1398,7 +1323,6 @@ public abstract class ChromeActivity GSAAccountChangeListener.create(AppHooks.get().createGsaHelper()); } mGSAAccountChangeListener.connect(); @@ -1369,7 +1369,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM @@ -96,12 +83,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, mRecentlyClosedTabManager = sRecentlyClosedTabManagerForTests != null ? sRecentlyClosedTabManagerForTests - : new RecentlyClosedBridge(profile); + : new RecentlyClosedBridge(profile, tabModelSelector); - mSignInManager = IdentityServicesProvider.get().getSigninManager(mProfile); - - mProfileDataCache = ProfileDataCache.createWithDefaultImageSizeAndNoBadge(context); @@ -1377,8 +1377,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM - SigninAccessPoint.RECENT_TABS, SyncConsentActivityLauncherImpl.get()); - mSyncService = SyncService.get(); - mRecentlyClosedTabManager.setTabsUpdatedRunnable(this::updateRecentlyClosedTabs); - updateRecentlyClosedTabs(); + mRecentlyClosedTabManager.setEntriesUpdatedRunnable(this::updateRecentlyClosedEntries); + updateRecentlyClosedEntries(); @@ -110,9 +91,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, updateForeignSessions(); mForeignSessionHelper.triggerSessionSync(); @@ -1545,7 +1545,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -@@ -39,8 +39,6 @@ import org.chromium.chrome.browser.preferences.Pref; +@@ -40,8 +40,6 @@ import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; @@ -1554,7 +1554,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage import org.chromium.components.browser_ui.settings.ChromeBasePreference; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.SearchUtils; -@@ -62,7 +60,7 @@ import java.util.Locale; +@@ -63,7 +61,7 @@ import java.util.Locale; */ public class PasswordSettings extends PreferenceFragmentCompat implements PasswordManagerHandler.PasswordListObserver, @@ -1563,7 +1563,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage @IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN, TrustedVaultBannerState.OPTED_IN}) @Retention(RetentionPolicy.SOURCE) -@@ -159,10 +157,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -160,10 +158,6 @@ public class PasswordSettings extends PreferenceFragmentCompat setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getStyledContext())); PasswordManagerHandlerProvider.getInstance().addObserver(this); @@ -1574,7 +1574,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage setHasOptionsMenu(true); // Password Export might be optional but Search is always present. mManagePasswordsReferrer = getReferrerFromInstanceStateOrLaunchBundle(savedInstanceState); -@@ -466,9 +460,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -467,9 +461,6 @@ public class PasswordSettings extends PreferenceFragmentCompat public void onDestroy() { super.onDestroy(); @@ -1584,7 +1584,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage // The component should only be destroyed when the activity has been closed by the user // (e.g. by pressing on the back button) and not when the activity is temporarily destroyed // by the system. -@@ -577,34 +568,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -582,34 +573,6 @@ public class PasswordSettings extends PreferenceFragmentCompat } private void displayManageAccountLink() { @@ -1619,7 +1619,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage } private Context getStyledContext() { -@@ -615,43 +578,11 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -620,43 +583,11 @@ public class PasswordSettings extends PreferenceFragmentCompat return UserPrefs.get(Profile.getLastUsedRegularProfile()); } @@ -1884,7 +1884,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe private void updateSearchEnginePreference() { if (!TemplateUrlServiceFactory.get().isLoaded()) { ChromeBasePreference searchEnginePref = -@@ -333,28 +243,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -337,28 +247,6 @@ public class MainSettings extends PreferenceFragmentCompat pref.setSummary(isOn ? R.string.text_on : R.string.text_off); } @@ -1913,7 +1913,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe // TemplateUrlService.LoadListener implementation. @Override public void onTemplateUrlServiceLoaded() { -@@ -362,11 +250,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -366,11 +254,6 @@ public class MainSettings extends PreferenceFragmentCompat updateSearchEnginePreference(); } @@ -1936,7 +1936,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; -@@ -365,9 +364,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -363,9 +362,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity HelpAndFeedbackLauncherImpl.getInstance()); } if (fragment instanceof SafetyCheckSettingsFragment) { @@ -1991,7 +1991,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider; import org.chromium.chrome.browser.ui.tablet.emptybackground.EmptyBackgroundViewWrapper; import org.chromium.chrome.browser.vr.VrModuleProvider; -@@ -914,21 +912,4 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -901,21 +899,4 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { return isShowingPromo; } */ return false; } @@ -2050,7 +2050,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToC diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2897,8 +2897,6 @@ static_library("browser") { +@@ -2914,8 +2914,6 @@ static_library("browser") { "android/signin/fre_mobile_identity_consistency_field_trial.h", "android/signin/signin_bridge.cc", "android/signin/signin_bridge.h", @@ -2059,7 +2059,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/signin/signin_metrics_utils.cc", "android/signin/unified_consent_service_bridge.cc", "android/signin/web_signin_bridge.cc", -@@ -3279,8 +3277,6 @@ static_library("browser") { +@@ -3301,8 +3299,6 @@ static_library("browser") { "sharing/sms/sms_fetch_request_handler.h", "shell_integration_android.cc", "signin/identity_services_provider_android.cc", @@ -2068,7 +2068,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "ssl/chrome_security_state_client.cc", "ssl/chrome_security_state_client.h", "ssl/chrome_security_state_model_delegate.cc", -@@ -3295,8 +3291,6 @@ static_library("browser") { +@@ -3317,8 +3313,6 @@ static_library("browser") { "sync/glue/synced_window_delegate_android.h", "sync/glue/synced_window_delegates_getter_android.cc", "sync/glue/synced_window_delegates_getter_android.h", @@ -2077,7 +2077,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "sync/trusted_vault_client_android.cc", "sync/trusted_vault_client_android.h", "tab/web_contents_state.cc", -@@ -6121,10 +6115,6 @@ static_library("browser") { +@@ -6181,10 +6175,6 @@ static_library("browser") { "signin/signin_global_error.h", "signin/signin_global_error_factory.cc", "signin/signin_global_error_factory.h", @@ -2119,8 +2119,8 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b -#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/sync/sync_service_factory.h" #include "chrome/browser/translate/chrome_translate_client.h" - #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h" -@@ -79,8 +78,6 @@ + #include "chrome/browser/ui/passwords/password_generation_popup_controller_impl.h" +@@ -80,8 +79,6 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/safe_browsing/buildflags.h" #include "components/sessions/content/content_record_password_state.h" @@ -2129,7 +2129,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b #include "components/site_isolation/site_isolation_policy.h" #include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_user_settings.h" -@@ -895,10 +892,6 @@ favicon::FaviconService* ChromePasswordManagerClient::GetFaviconService() { +@@ -936,10 +933,6 @@ favicon::FaviconService* ChromePasswordManagerClient::GetFaviconService() { profile_, ServiceAccessType::EXPLICIT_ACCESS); } @@ -2143,7 +2143,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h --- a/chrome/browser/password_manager/chrome_password_manager_client.h +++ b/chrome/browser/password_manager/chrome_password_manager_client.h -@@ -242,7 +242,6 @@ class ChromePasswordManagerClient +@@ -251,7 +251,6 @@ class ChromePasswordManagerClient password_manager::PasswordRequirementsService* GetPasswordRequirementsService() override; favicon::FaviconService* GetFaviconService() override; @@ -2478,18 +2478,18 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogFragment.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogFragment.java --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogFragment.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogFragment.java -@@ -19,7 +19,6 @@ import org.chromium.base.metrics.RecordHistogram; +@@ -22,7 +22,6 @@ import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics; import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; -import org.chromium.chrome.browser.signin.services.SigninManager; import org.chromium.chrome.browser.signin.services.SigninMetricsUtils; import org.chromium.components.signin.GAIAServiceType; - -@@ -69,12 +68,6 @@ public class SignOutDialogFragment - mGaiaServiceType = - getArguments().getInt(SHOW_GAIA_SERVICE_TYPE_EXTRA, mGaiaServiceType); - } + import org.chromium.components.user_prefs.UserPrefs; +@@ -91,12 +90,6 @@ public class SignOutDialogFragment + assert getArguments() != null; + mActionType = getArguments().getInt(ACTION_TYPE); + mGaiaServiceType = getArguments().getInt(SHOW_GAIA_SERVICE_TYPE_EXTRA, mGaiaServiceType); - String domain = IdentityServicesProvider.get() - .getSigninManager(Profile.getLastUsedRegularProfile()) - .getManagementDomain(); @@ -2499,13 +2499,13 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows return createDialog(); } -@@ -110,12 +103,6 @@ public class SignOutDialogFragment +@@ -152,12 +145,6 @@ public class SignOutDialogFragment if (which == AlertDialog.BUTTON_POSITIVE) { SigninMetricsUtils.logProfileAccountManagementMenu( ProfileAccountManagementMetrics.SIGNOUT_SIGNOUT, mGaiaServiceType); - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager( - Profile.getLastUsedRegularProfile()); -- if (signinManager.getManagementDomain() == null) { +- if (mWipeUserData != null) { - RecordHistogram.recordBooleanHistogram( - "Signin.UserRequestedWipeDataOnSignout", mWipeUserData.isChecked()); - } @@ -2537,6 +2537,90 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows } /** +diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java +--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java ++++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java +@@ -206,35 +206,8 @@ public abstract class SyncConsentFragmentBase + // this method replaces onSyncAccepted(), the field can be set directly. + protected void signinAndEnableSync( + String accountName, boolean settingsClicked, Runnable callback) { +- AccountManagerFacadeProvider.getInstance().getAccounts().then(accounts -> { +- @Nullable +- Account account = AccountUtils.findAccountByName(accounts, accountName); +- if (account == null) { +- callback.run(); +- return; +- } +- SigninManager signinManager = IdentityServicesProvider.get().getSigninManager( +- Profile.getLastUsedRegularProfile()); +- signinManager.signinAndEnableSync( +- mSigninAccessPoint, account, new SigninManager.SignInCallback() { +- @Override +- public void onSignInComplete() { +- UnifiedConsentServiceBridge.setUrlKeyedAnonymizedDataCollectionEnabled( +- Profile.getLastUsedRegularProfile(), true); +- if (!settingsClicked) { +- SyncService.get().setFirstSetupComplete( +- SyncFirstSetupCompleteSource.BASIC_FLOW); +- } +- closeAndMaybeOpenSyncSettings(settingsClicked); +- callback.run(); +- } +- +- @Override +- public void onSignInAborted() { +- callback.run(); +- } +- }); +- }); ++ // do nothing ++ callback.run(); + } + + @Override +@@ -282,10 +255,6 @@ public abstract class SyncConsentFragmentBase + : ProfileDataCache.createWithDefaultImageSizeAndNoBadge(requireContext()); + mProfileDataCache.addObserver(mProfileDataCacheObserver); + +- IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .addSignInStateObserver(this); +- + // By default this is set to true so that when system back button is pressed user action + // is recorded in onDestroy(). + mRecordUndoSignin = true; +@@ -296,9 +265,6 @@ public abstract class SyncConsentFragmentBase + @Override + public void onDestroy() { + super.onDestroy(); +- IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .removeSignInStateObserver(this); + mProfileDataCache.removeObserver(mProfileDataCacheObserver); + if (mConfirmSyncDataStateMachine != null) { + mConfirmSyncDataStateMachine.cancel(/* isBeingDestroyed = */ true); +@@ -537,21 +503,6 @@ public abstract class SyncConsentFragmentBase + + // Don't start sign-in if this fragment has been destroyed. + if (mDestroyed) return; +- +- SigninManager signinManager = +- IdentityServicesProvider.get().getSigninManager( +- Profile.getLastUsedRegularProfile()); +- signinManager.runAfterOperationInProgress(() -> { +- if (wipeData) { +- signinManager.wipeSyncUserData(() -> { +- onSyncAccepted(mSelectedAccountName, settingsClicked, +- () -> mIsSigninInProgress = false); +- }); +- } else { +- onSyncAccepted(mSelectedAccountName, settingsClicked, +- () -> mIsSigninInProgress = false); +- } +- }); + } + + @Override diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java @@ -2602,10 +2686,12 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows if (!mPrivacyPreferencesManager.isUsageAndCrashReportingPermittedByPolicy()) { // If metrics reporting is disabled by policy then there is at least one policy. -@@ -177,32 +173,6 @@ class SigninFirstRunMediator implements AccountsChangeObserver, ProfileDataCache +@@ -175,58 +171,12 @@ class SigninFirstRunMediator implements AccountsChangeObserver, ProfileDataCache + TextUtils.equals(mDefaultAccountName, mSelectedAccountName) + ? MobileFreProgress.WELCOME_SIGNIN_WITH_DEFAULT_ACCOUNT : MobileFreProgress.WELCOME_SIGNIN_WITH_NON_DEFAULT_ACCOUNT); - // If the user signs into an account on the FRE, goes to the sync consent page and presses - // back to come back to the FRE, then there will already be an account signed in. +- // If the user signs into an account on the FRE, goes to the sync consent page and presses +- // back to come back to the FRE, then there will already be an account signed in. - @Nullable - CoreAccountInfo signedInAccount = - IdentityServicesProvider.get() @@ -2615,7 +2701,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows - mDelegate.advanceToNextPage(); - return; - } -- mModel.set(SigninFirstRunProperties.IS_CONTINUE_OR_DISMISS_CLICKED, true); +- mModel.set(SigninFirstRunProperties.SHOW_SIGNIN_PROGRESS_SPINNER, true); - final SigninManager signinManager = IdentityServicesProvider.get().getSigninManager( - Profile.getLastUsedRegularProfile()); - signinManager.onFirstRunCheckDone(); @@ -2635,16 +2721,18 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows } /** -@@ -212,21 +182,6 @@ class SigninFirstRunMediator implements AccountsChangeObserver, ProfileDataCache - if (isContinueOrDismissClicked()) return; - assert mModel.get(SigninFirstRunProperties.ARE_NATIVE_AND_POLICY_LOADED) - : "The dismiss button shouldn't be visible before the native is not initialized!"; + * Callback for the PropertyKey {@link SigninFirstRunProperties#ON_DISMISS_CLICKED}. + */ + private void onDismissClicked() { +- if (isContinueOrDismissClicked()) return; +- assert mModel.get(SigninFirstRunProperties.ARE_NATIVE_AND_POLICY_LOADED) +- : "The dismiss button shouldn't be visible before the native is not initialized!"; - mDelegate.recordFreProgressHistogram(MobileFreProgress.WELCOME_DISMISS); - mDelegate.acceptTermsOfService(); - if (IdentityServicesProvider.get() - .getIdentityManager(Profile.getLastUsedRegularProfile()) - .hasPrimaryAccount(ConsentLevel.SIGNIN)) { -- mModel.set(SigninFirstRunProperties.IS_CONTINUE_OR_DISMISS_CLICKED, true); +- mModel.set(SigninFirstRunProperties.SHOW_SIGNIN_PROGRESS_SPINNER, true); - IdentityServicesProvider.get() - .getSigninManager(Profile.getLastUsedRegularProfile()) - .signOut(SignoutReason.ABORT_SIGNIN, @@ -2660,7 +2748,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -281,9 +281,6 @@ CHAR_LIMIT guidelines: +@@ -282,9 +282,6 @@ CHAR_LIMIT guidelines: Sign in to Chrome @@ -2670,7 +2758,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Sync and personalize across devices -@@ -393,21 +390,6 @@ CHAR_LIMIT guidelines: +@@ -394,21 +391,6 @@ CHAR_LIMIT guidelines: Because the preloaded pages are encrypted, Google will not learn anything about the preloaded page content. Google servers will learn which sites are privately preloaded. This information is only used to preload the pages, and is not linked to other information from your Google Account. @@ -2715,7 +2803,7 @@ diff --git a/components/password_manager/core/browser/password_form_manager.cc b #include "google_apis/gaia/core_account_id.h" #include "third_party/abseil-cpp/absl/types/variant.h" -@@ -270,27 +269,7 @@ bool PasswordFormManager::WasUnblocklisted() const { +@@ -263,27 +262,7 @@ bool PasswordFormManager::WasUnblocklisted() const { } bool PasswordFormManager::IsMovableToAccountStore() const { @@ -2744,7 +2832,7 @@ diff --git a/components/password_manager/core/browser/password_form_manager.cc b } void PasswordFormManager::Save() { -@@ -446,17 +425,6 @@ void PasswordFormManager::MoveCredentialsToAccountStore() { +@@ -440,17 +419,6 @@ void PasswordFormManager::MoveCredentialsToAccountStore() { void PasswordFormManager::BlockMovingCredentialsToAccountStore() { // Nothing to do if there is no signed in user or the credentials are already // blocked for moving. @@ -2765,7 +2853,7 @@ diff --git a/components/password_manager/core/browser/password_form_manager.cc b diff --git a/components/password_manager/core/browser/password_manager_client.h b/components/password_manager/core/browser/password_manager_client.h --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h -@@ -408,9 +408,6 @@ class PasswordManagerClient { +@@ -436,9 +436,6 @@ class PasswordManagerClient { // Returns the favicon service used to retrieve icons for an origin. virtual favicon::FaviconService* GetFaviconService(); @@ -2778,7 +2866,7 @@ diff --git a/components/password_manager/core/browser/password_manager_client.h diff --git a/components/password_manager/core/browser/password_manager_client_helper.cc b/components/password_manager/core/browser/password_manager_client_helper.cc --- a/components/password_manager/core/browser/password_manager_client_helper.cc +++ b/components/password_manager/core/browser/password_manager_client_helper.cc -@@ -12,29 +12,10 @@ +@@ -13,29 +13,10 @@ #include "components/password_manager/core/browser/password_sync_util.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" @@ -2808,7 +2896,7 @@ diff --git a/components/password_manager/core/browser/password_manager_client_he PasswordManagerClientHelper::PasswordManagerClientHelper( PasswordManagerClient* delegate) : delegate_(delegate) { -@@ -105,29 +86,7 @@ bool PasswordManagerClientHelper::ShouldPromptToEnableAutoSignIn() const { +@@ -106,29 +87,7 @@ bool PasswordManagerClientHelper::ShouldPromptToEnableAutoSignIn() const { bool PasswordManagerClientHelper::ShouldPromptToMovePasswordToAccount( const PasswordFormManagerForUI& submitted_manager) const { @@ -2934,7 +3022,7 @@ diff --git a/components/signin/features.gni b/components/signin/features.gni +enable_dice_support = false # Mirror is enabled and other account consistency mechanisms are not available. --enable_mirror = is_android || is_chromeos_ash || is_chromeos_lacros || is_ios +-enable_mirror = is_android || is_chromeos || is_ios +enable_mirror = false diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java --- a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java diff --git a/build/patches/Remove-weblayer-dependency-on-Play-Services.patch b/build/patches/Remove-weblayer-dependency-on-Play-Services.patch index fef8dcdf..637665be 100644 --- a/build/patches/Remove-weblayer-dependency-on-Play-Services.patch +++ b/build/patches/Remove-weblayer-dependency-on-Play-Services.patch @@ -32,6 +32,6 @@ diff --git a/weblayer/shell/android/BUILD.gn b/weblayer/shell/android/BUILD.gn - "$google_play_services_package:google_play_services_base_java", "//base:base_java", "//components/strictmode/android:java", - "//third_party/android_deps:android_support_v4_java", + "//third_party/android_deps:android_support_v7_appcompat_java", -- 2.25.1 diff --git a/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch b/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch index 54bc4813..665e1d6a 100644 --- a/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch +++ b/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch @@ -23,7 +23,7 @@ diff --git a/chrome/browser/net/dns_probe_runner.cc b/chrome/browser/net/dns_pro diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -887,7 +887,7 @@ class DnsTCPAttempt : public DnsAttempt { +@@ -897,7 +897,7 @@ class DnsTCPAttempt : public DnsAttempt { // ---------------------------------------------------------------------------- diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index fec55263..49bccdb5 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -7,7 +7,7 @@ This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2. Disable search-ready omnibox by default --- - chrome/browser/about_flags.cc | 5 ++++- + chrome/browser/about_flags.cc | 3 +++ chrome/browser/flag-metadata.json | 5 +++++ chrome/browser/flag_descriptions.cc | 5 +++++ chrome/browser/flag_descriptions.h | 3 +++ @@ -15,35 +15,25 @@ Disable search-ready omnibox by default chrome/browser/flags/android/chrome_feature_list.h | 1 + .../chrome/browser/flags/ChromeFeatureList.java | 1 + .../suggestions/DropdownItemViewInfoListBuilder.java | 10 ++++++++-- - 8 files changed, 31 insertions(+), 3 deletions(-) + 8 files changed, 30 insertions(+), 2 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3600,8 +3600,8 @@ const FeatureEntry kFeatureEntries[] = { - #if defined(USE_AURA) - {"overscroll-history-navigation", - flag_descriptions::kOverscrollHistoryNavigationName, -- flag_descriptions::kOverscrollHistoryNavigationDescription, kOsAura, - FEATURE_VALUE_TYPE(features::kOverscrollHistoryNavigation)}, -+ flag_descriptions::kOverscrollHistoryNavigationDescription, kOsAura, - {"pull-to-refresh", flag_descriptions::kPullToRefreshName, - flag_descriptions::kPullToRefreshDescription, kOsAura, - MULTI_VALUE_TYPE(kPullToRefreshChoices)}, -@@ -8050,6 +8050,9 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kDesksTrackpadSwipeImprovementsDescription, kOsCrOS, - FEATURE_VALUE_TYPE(ash::features::kEnableDesksTrackpadSwipeImprovements)}, +@@ -8201,6 +8201,9 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kPervasiveSystemAccentColorDescription, kOsWin, + SINGLE_VALUE_TYPE(switches::kPervasiveSystemAccentColor)}, #endif + {"enable-search-ready-omnibox", flag_descriptions::kSearchReadyOmniboxName, + flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid, + FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)}, - {"enable-cascade-layers", flag_descriptions::kCSSCascadeLayersName, - flag_descriptions::kCSSCascadeLayersDescription, kOsAll, + #if BUILDFLAG(IS_CHROMEOS_ASH) + {"use-multiple-overlays", flag_descriptions::kUseMultipleOverlaysName, 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 -@@ -2572,6 +2572,11 @@ +@@ -2470,6 +2470,11 @@ // with neural net palm detection. "expiry_milestone": 90 }, @@ -58,7 +48,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3616,6 +3616,11 @@ const char kSendTabToSelfV2Description[] = +@@ -3520,6 +3520,11 @@ const char kSendTabToSelfV2Description[] = "Enables new received tab " "UI shown next to the profile icon instead of using system notifications."; @@ -73,7 +63,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 -@@ -2068,6 +2068,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[]; +@@ -2001,6 +2001,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[]; extern const char kSendTabToSelfV2Name[]; extern const char kSendTabToSelfV2Description[]; @@ -86,7 +76,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 -@@ -259,6 +259,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -253,6 +253,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kImproveReaderModePrompt, &kReaderModeInCCT, &kReengagementNotification, @@ -94,7 +84,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kRelatedSearches, &kRelatedSearchesAlternateUx, &kRelatedSearchesInBar, -@@ -737,6 +738,9 @@ const base::Feature kRelatedSearchesSimplifiedUx{ +@@ -715,6 +716,9 @@ const base::Feature kRelatedSearchesSimplifiedUx{ const base::Feature kRelatedSearchesUi{"RelatedSearchesUi", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -107,7 +97,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 -@@ -132,6 +132,7 @@ extern const base::Feature kSearchEnginePromoExistingDeviceV2; +@@ -126,6 +126,7 @@ extern const base::Feature kSearchEnginePromoExistingDeviceV2; extern const base::Feature kSearchEnginePromoNewDevice; extern const base::Feature kSearchEnginePromoNewDeviceV2; extern const base::Feature kServiceManagerForBackgroundPrefetch; @@ -119,13 +109,13 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f --- 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 @@ -399,6 +399,7 @@ public abstract class ChromeFeatureList { - public static final String MESSAGES_FOR_ANDROID_REDUCE_LAYOUT_CHANGES = - "MessagesForAndroidReduceLayoutChanges"; - public static final String MESSAGES_FOR_ANDROID_SAVE_CARD = "MessagesForAndroidSaveCard"; -+ public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; + public static final String MESSAGES_FOR_ANDROID_STACKING_ANIMATION = + "MessagesForAndroidStackingAnimation"; public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError"; - public static final String MOBILE_IDENTITY_CONSISTENCY_PROMOS = - "MobileIdentityConsistencyPromos"; ++ public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; + public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; + public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid"; + public static final String NEW_WINDOW_APP_MENU = "NewWindowAppMenu"; diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index 918028fe..c321fcd1 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -28,7 +28,7 @@ This reverts commit 4d0e4483c5f77c66a8b6193e8a3bec5d0624d6ad. diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -590,6 +590,7 @@ chrome_java_resources = [ +@@ -577,6 +577,7 @@ chrome_java_resources = [ "java/res/layout/new_tab_page_incognito.xml", "java/res/layout/new_tab_page_layout.xml", "java/res/layout/new_tab_page_tile_grid_placeholder.xml", @@ -39,7 +39,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -533,6 +533,7 @@ chrome_java_sources = [ +@@ -536,6 +536,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/feedback/FeedFeedbackCollector.java", "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherImpl.java", "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java", @@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL import org.chromium.chrome.browser.lens.LensMetrics; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.logo.LogoBridge.Logo; -@@ -133,6 +134,8 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -135,6 +136,8 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer private UiConfig mUiConfig; private CallbackController mCallbackController = new CallbackController(); @@ -223,7 +223,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL /** * Whether the tiles shown in the layout have finished loading. * With {@link #mHasShownView}, it's one of the 2 flags used to track initialisation progress. -@@ -258,6 +261,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -261,6 +264,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer profile, searchProviderIsGoogle, contextMenuManager, tileGroupDelegate); } initializeSearchBoxBackground(); @@ -231,7 +231,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL initializeSearchBoxTextView(); initializeVoiceSearchButton(); initializeLensButton(); -@@ -628,10 +632,16 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -635,10 +639,16 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer * Updates the padding for the tile grid based on what is shown above it. */ private void updateTileGridPadding() { @@ -250,7 +250,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL if (mSiteSectionViewHolder != null) { mSiteSectionViewHolder.getItemView().setPadding( 0, paddingTop, 0, mSiteSectionViewHolder.getItemView().getPaddingBottom()); -@@ -1043,6 +1053,22 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -1052,6 +1062,22 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer return iphCommandBuilder; } @@ -310,7 +310,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug 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 -@@ -4283,6 +4283,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4410,6 +4410,9 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE_AND_VALUE( switches::kForceShowUpdateMenuItemCustomSummary, "Custom Summary")}, @@ -323,7 +323,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 -@@ -3646,6 +3646,9 @@ const char kStartSurfaceAndroidDescription[] = +@@ -3550,6 +3550,9 @@ const char kStartSurfaceAndroidDescription[] = "Enable showing the start surface when launching Chrome via the " "launcher."; @@ -336,7 +336,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 -@@ -2083,6 +2083,9 @@ extern const char kSiteIsolationForPasswordSitesDescription[]; +@@ -2016,6 +2016,9 @@ extern const char kSiteIsolationForPasswordSitesDescription[]; extern const char kSmartSuggestionForLargeDownloadsName[]; extern const char kSmartSuggestionForLargeDownloadsDescription[]; @@ -349,7 +349,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 -@@ -243,6 +243,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -238,6 +238,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kImmersiveUiMode, &kIncognitoReauthenticationForAndroid, &kIncognitoScreenshot, @@ -357,9 +357,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kInstanceSwitcher, &kInstantStart, &kKitKatSupported, -@@ -703,6 +704,9 @@ const base::Feature kInstanceSwitcher{"InstanceSwitcher", - const base::Feature kOfflineIndicatorV2{"OfflineIndicatorV2", - base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -684,6 +685,9 @@ const base::Feature kNotificationPermissionVariant{ + const base::Feature kInstanceSwitcher{"InstanceSwitcher", + base::FEATURE_ENABLED_BY_DEFAULT}; +const base::Feature kSimplifiedNTP{"SimplifiedNTP", + base::FEATURE_ENABLED_BY_DEFAULT}; @@ -370,9 +370,9 @@ 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 -@@ -116,6 +116,7 @@ extern const base::Feature kNewWindowAppMenu; +@@ -111,6 +111,7 @@ extern const base::Feature kLocationBarModelOptimizations; + extern const base::Feature kNewWindowAppMenu; extern const base::Feature kNotificationPermissionVariant; - extern const base::Feature kOfflineIndicatorV2; extern const base::Feature kPageAnnotationsService; +extern const base::Feature kSimplifiedNTP; extern const base::Feature kBookmarksImprovedSaveFlow; @@ -381,7 +381,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 -@@ -391,6 +391,7 @@ public abstract class ChromeFeatureList { +@@ -388,6 +388,7 @@ public abstract class ChromeFeatureList { public static final String MESSAGES_FOR_ANDROID_ADS_BLOCKED = "MessagesForAndroidAdsBlocked"; public static final String MESSAGES_FOR_ANDROID_CHROME_SURVEY = "MessagesForAndroidChromeSurvey"; @@ -414,7 +414,7 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json -@@ -3644,6 +3644,24 @@ +@@ -3708,6 +3708,24 @@ ] } ], diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index d7cdf16a..d4925df5 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -2,25 +2,258 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 4 Dec 2021 11:41:31 +0100 Subject: Restore offline-indicator-v2 flag +Reverts acc8b6f4542703211e5f3c5181914fd3374c9e84 --- - chrome/browser/flag-metadata.json | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + .../indicator/OfflineDetector.java | 38 ++++++++++++++++++- + .../indicator/OfflineIndicatorController.java | 3 +- + .../tabbed_mode/TabbedRootUiCoordinator.java | 16 +++++++- + chrome/browser/about_flags.cc | 3 ++ + chrome/browser/flag-metadata.json | 10 +++++ + chrome/browser/flag_descriptions.cc | 4 ++ + chrome/browser/flag_descriptions.h | 3 ++ + .../flags/android/chrome_feature_list.cc | 4 ++ + .../flags/android/chrome_feature_list.h | 1 + + .../browser/flags/ChromeFeatureList.java | 1 + + 10 files changed, 79 insertions(+), 4 deletions(-) +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java +@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.offlinepages.indicator; + + import android.os.Handler; + import android.os.SystemClock; ++import android.text.TextUtils; + + import androidx.annotation.VisibleForTesting; + +@@ -14,8 +15,10 @@ import org.chromium.base.ApplicationStatus; + import org.chromium.base.Callback; + import org.chromium.base.Log; + import org.chromium.base.supplier.Supplier; ++import org.chromium.chrome.browser.flags.ChromeFeatureList; + import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector; + import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState; ++import org.chromium.components.variations.VariationsAssociatedData; + import org.chromium.components.version_info.VersionInfo; + + /** +@@ -111,8 +114,9 @@ class OfflineDetector + mIsOfflineCallback = isOfflineCallback; + mIsForegroundCallback = isForegroundCallback; + mHandler = new Handler(); +- mStatusIndicatorWaitOnSwitchOnlineToOfflineDurationMs = +- STATUS_INDICATOR_WAIT_ON_SWITCH_ONLINE_TO_OFFLINE_DEFAULT_DURATION_MS; ++ mStatusIndicatorWaitOnSwitchOnlineToOfflineDurationMs = getIntParamValueOrDefault( ++ "STATUS_INDICATOR_WAIT_ON_SWITCH_ONLINE_TO_OFFLINE_DEFAULT_DURATION_MS", ++ STATUS_INDICATOR_WAIT_ON_SWITCH_ONLINE_TO_OFFLINE_DEFAULT_DURATION_MS); + + mUpdateOfflineStatusIndicatorDelayedRunnable = () -> { + if (sLoggingEnabled) { +@@ -312,4 +316,34 @@ class OfflineDetector + Math.max(Math.max(timeNeededForForeground, timeNeededForOffline), + timeNeededAfterConnectionChangeFromOnlineToOffline)); + } ++ ++ /** ++ * Returns the value for a Finch parameter, or the default value if no parameter ++ * exists in the current configuration. ++ * @param paramName The name of the Finch parameter (or command-line switch) to get a value ++ * for. ++ * @param defaultValue The default value to return when there's no param or switch. ++ * @return The value -- either the param or the default. ++ */ ++ private static long getIntParamValueOrDefault(String paramName, long defaultValue) { ++ String value; ++ ++ // May throw exception in tests. ++ try { ++ value = VariationsAssociatedData.getVariationParamValue( ++ ChromeFeatureList.OFFLINE_INDICATOR_V2, paramName); ++ } catch (java.lang.UnsupportedOperationException e) { ++ return defaultValue; ++ } ++ ++ if (!TextUtils.isEmpty(value)) { ++ try { ++ return Integer.parseInt(value); ++ } catch (NumberFormatException e) { ++ return defaultValue; ++ } ++ } ++ ++ return defaultValue; ++ } + } +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java +@@ -90,7 +90,8 @@ public class OfflineIndicatorController implements ConnectivityDetector.Observer + public static void initialize() { + // No need to create the singleton if the feature is not enabled. Also, if V2 is enabled, + // this version will be disabled. +- if (!ChromeFeatureList.isEnabled(ChromeFeatureList.OFFLINE_INDICATOR)) { ++ if (!ChromeFeatureList.isEnabled(ChromeFeatureList.OFFLINE_INDICATOR) ++ || ChromeFeatureList.isEnabled(ChromeFeatureList.OFFLINE_INDICATOR_V2)) { + return; + } + +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 +@@ -128,6 +128,8 @@ import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; + * A {@link RootUiCoordinator} variant that controls tabbed-mode specific UI. + */ + public class TabbedRootUiCoordinator extends RootUiCoordinator { ++ private static boolean sEnableStatusIndicatorForTests; ++ + private final ObservableSupplierImpl mEphemeralTabCoordinatorSupplier; + private final RootUiTabObserver mRootUiTabObserver; + private TabbedSystemUiCoordinator mSystemUiCoordinator; +@@ -731,7 +733,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { + private void initStatusIndicatorCoordinator(LayoutManagerImpl layoutManager) { + // TODO(crbug.com/1035584): Disable on tablets for now as we need to do one or two extra + // things for tablets. +- if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { ++ if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity) ++ || (!ChromeFeatureList.isEnabled(ChromeFeatureList.OFFLINE_INDICATOR_V2) ++ && !sEnableStatusIndicatorForTests)) { + return; + } + +@@ -751,6 +755,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { + mStatusIndicatorCoordinator.addObserver(mStatusIndicatorObserver); + mStatusIndicatorCoordinator.addObserver(mStatusBarColorController); + ++ // Don't initialize the offline indicator controller if the feature is disabled. ++ if (!ChromeFeatureList.isEnabled(ChromeFeatureList.OFFLINE_INDICATOR_V2)) { ++ return; ++ } ++ + ObservableSupplierImpl isUrlBarFocusedSupplier = new ObservableSupplierImpl<>(); + isUrlBarFocusedSupplier.set(mToolbarManager.isUrlBarFocused()); + mUrlFocusChangeListener = new UrlFocusChangeListener() { +@@ -837,6 +846,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { + return mStatusIndicatorCoordinator; + } + ++ @VisibleForTesting ++ public static void setEnableStatusIndicatorForTests(boolean disable) { ++ sEnableStatusIndicatorForTests = disable; ++ } ++ + @VisibleForTesting + public EphemeralTabCoordinator getEphemeralTabCoordinatorForTesting() { + return mEphemeralTabCoordinatorSupplier.get(); +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 +@@ -4338,6 +4338,9 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kOfflinePagesLivePageSharingName, + flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, + FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, ++ {"offline-indicator-v2", flag_descriptions::kOfflineIndicatorV2Name, ++ flag_descriptions::kOfflineIndicatorV2Description, kOsAndroid, ++ FEATURE_VALUE_TYPE(chrome::android::kOfflineIndicatorV2)}, + {"offline-pages-auto-save", + flag_descriptions::kOfflinePagesAutoSaveFeatureName, + flag_descriptions::kOfflinePagesAutoSaveFeatureDescription, kOsAndroid, 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 -@@ -4457,9 +4457,9 @@ +@@ -43,6 +43,11 @@ + "owners": [ "ogastorga", "ftirelo" ], + "expiry_milestone": 109 + }, ++ { ++ "name": "offline-indicator-v2", ++ "owners": [ "sinansahin@google.com", "twellington", "offline-dev" ], ++ "expiry_milestone": -1 ++ }, + { + "name": "adaptive-button-in-top-toolbar", + "owners": [ "bttk", "chrome-segmentation-platform@google.com" ], +@@ -4337,6 +4342,11 @@ + "owners": [ "adamta", "sczs" ], "expiry_milestone": 98 }, - { -- "name": "offline-indicator-v2", -- "owners": [ "sinansahin@google.com", "twellington", "offline-dev" ], -- "expiry_milestone": 90 -+ "name": "offline-indicator-v2", // Bromite: restore flag -+ "owners": [ "sinansahin@google.com", "twellington", "offline-dev" ], // offline-indicator-v2 -+ "expiry_milestone": -1 - }, ++ { ++ "name": "offline-indicator-v2", ++ "owners": [ "sinansahin@google.com", "twellington", "offline-dev" ], ++ "expiry_milestone": 90 ++ }, { "name": "offline-pages-live-page-sharing", + "owners": [ "sclittle", "srsudar", "offline-dev" ], +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 +@@ -3362,6 +3362,10 @@ const char kNotificationPermissionRationaleDescription[] = + "Configure the dialog shown before requesting notification permission. " + "Only works with builds targeting Android T."; + ++const char kOfflineIndicatorV2Name[] = "Offline indicator V2"; ++const char kOfflineIndicatorV2Description[] = ++ "Show a persistent offline indicator when offline."; ++ + const char kOfflinePagesLivePageSharingName[] = + "Enables live page sharing of offline pages"; + const char kOfflinePagesLivePageSharingDescription[] = +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 +@@ -1915,6 +1915,9 @@ extern const char kNewWindowAppMenuDescription[]; + extern const char kNotificationPermissionRationaleName[]; + extern const char kNotificationPermissionRationaleDescription[]; + ++extern const char kOfflineIndicatorV2Name[]; ++extern const char kOfflineIndicatorV2Description[]; ++ + extern const char kOfflinePagesLivePageSharingName[]; + extern const char kOfflinePagesLivePageSharingDescription[]; + +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 +@@ -248,6 +248,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &kLocationBarModelOptimizations, + &kNewWindowAppMenu, + &kNotificationPermissionVariant, ++ &kOfflineIndicatorV2, + &kPageAnnotationsService, + &kInlineUpdateFlow, + &kBookmarksImprovedSaveFlow, +@@ -700,6 +701,9 @@ const base::Feature kInstanceSwitcher{"InstanceSwitcher", + const base::Feature kSimplifiedNTP{"SimplifiedNTP", + base::FEATURE_ENABLED_BY_DEFAULT}; + ++const base::Feature kOfflineIndicatorV2{"OfflineIndicatorV2", ++ base::FEATURE_ENABLED_BY_DEFAULT}; ++ + const base::Feature kPageAnnotationsService{"PageAnnotationsService", + base::FEATURE_DISABLED_BY_DEFAULT}; + +diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h +--- a/chrome/browser/flags/android/chrome_feature_list.h ++++ b/chrome/browser/flags/android/chrome_feature_list.h +@@ -112,6 +112,7 @@ extern const base::Feature kLensOnQuickActionSearchWidget; + extern const base::Feature kLocationBarModelOptimizations; + extern const base::Feature kNewWindowAppMenu; + extern const base::Feature kNotificationPermissionVariant; ++extern const base::Feature kOfflineIndicatorV2; + extern const base::Feature kPageAnnotationsService; + extern const base::Feature kSimplifiedNTP; + extern const base::Feature kBookmarksImprovedSaveFlow; +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 +@@ -409,6 +409,7 @@ public abstract class ChromeFeatureList { + public static final String NEW_WINDOW_APP_MENU = "NewWindowAppMenu"; + public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; + public static final String OFFLINE_INDICATOR = "OfflineIndicator"; ++ public static final String OFFLINE_INDICATOR_V2 = "OfflineIndicatorV2"; + public static final String OFFLINE_PAGES_DESCRIPTIVE_FAIL_STATUS = + "OfflinePagesDescriptiveFailStatus"; + public static final String OFFLINE_PAGES_DESCRIPTIVE_PENDING_STATUS = -- 2.25.1 diff --git a/build/patches/Revert-Permit-blocking-of-view-source-with-URLBlocklist.patch b/build/patches/Revert-Permit-blocking-of-view-source.patch similarity index 83% rename from build/patches/Revert-Permit-blocking-of-view-source-with-URLBlocklist.patch rename to build/patches/Revert-Permit-blocking-of-view-source.patch index 649e9540..1795c901 100644 --- a/build/patches/Revert-Permit-blocking-of-view-source-with-URLBlocklist.patch +++ b/build/patches/Revert-Permit-blocking-of-view-source.patch @@ -1,15 +1,15 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 6 Mar 2022 11:29:27 +0100 -Subject: Revert "Permit blocking of view-source: with URLBlocklist" +Subject: Revert Permit blocking of view-source This reverts commit e72fc9b64116bf259e516096fcc60b58ae8ae1b3. --- .../test/url_blocklist_policy_browsertest.cc | 78 ------------------- .../policy/url_blocking_policy_test_utils.cc | 11 --- .../policy/url_blocking_policy_test_utils.h | 3 - - .../policy_blocklist_navigation_throttle.cc | 28 +------ + .../policy_blocklist_navigation_throttle.cc | 19 ----- .../policy_blocklist_navigation_throttle.h | 5 +- - 5 files changed, 3 insertions(+), 122 deletions(-) + 5 files changed, 1 insertion(+), 115 deletions(-) diff --git a/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc b/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc --- a/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc @@ -141,7 +141,7 @@ diff --git a/chrome/browser/policy/url_blocking_policy_test_utils.h b/chrome/bro diff --git a/components/policy/content/policy_blocklist_navigation_throttle.cc b/components/policy/content/policy_blocklist_navigation_throttle.cc --- a/components/policy/content/policy_blocklist_navigation_throttle.cc +++ b/components/policy/content/policy_blocklist_navigation_throttle.cc -@@ -17,7 +17,6 @@ +@@ -13,7 +13,6 @@ #include "components/prefs/pref_service.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" @@ -149,9 +149,9 @@ diff --git a/components/policy/content/policy_blocklist_navigation_throttle.cc b #include "content/public/browser/navigation_handle.h" #include "url/gurl.h" -@@ -54,19 +53,6 @@ PolicyBlocklistNavigationThrottle::~PolicyBlocklistNavigationThrottle() { - policy_service_->RemoveObserver(policy::POLICY_DOMAIN_CHROME, this); - } +@@ -41,19 +40,6 @@ PolicyBlocklistNavigationThrottle::PolicyBlocklistNavigationThrottle( + PolicyBlocklistNavigationThrottle::~PolicyBlocklistNavigationThrottle() = + default; -bool PolicyBlocklistNavigationThrottle::IsBlockedViewSourceNavigation() { - content::NavigationEntry* nav_entry = @@ -169,18 +169,7 @@ diff --git a/components/policy/content/policy_blocklist_navigation_throttle.cc b content::NavigationThrottle::ThrottleCheckResult PolicyBlocklistNavigationThrottle::WillStartRequest() { const GURL& url = navigation_handle()->GetURL(); -@@ -80,8 +66,8 @@ PolicyBlocklistNavigationThrottle::WillStartRequest() { - if (policy_service_) { - // Defer until policies are loaded if there are no pref defines neither - // UrlBlocklist nor UrlAllowlist and the policies from the Chrome domain -- // have not been loaded yet. Otherwise we assume that we have all the -- // necessary info. -+ // have not been loaded yet. Otherwise we assume that we all the necessary -+ // info. - if (!prefs_->HasPrefPath(policy::policy_prefs::kUrlBlocklist) && - !prefs_->HasPrefPath(policy::policy_prefs::kUrlAllowlist) && - !policy_service_->IsFirstPolicyLoadComplete( -@@ -111,11 +97,6 @@ PolicyBlocklistNavigationThrottle::WillStartRequest() { +@@ -70,11 +56,6 @@ PolicyBlocklistNavigationThrottle::WillStartRequest() { net::ERR_BLOCKED_BY_ADMINISTRATOR); } @@ -192,23 +181,11 @@ diff --git a/components/policy/content/policy_blocklist_navigation_throttle.cc b if (blocklist_state == URLBlocklistState::URL_IN_ALLOWLIST) return PROCEED; -@@ -177,11 +158,6 @@ void PolicyBlocklistNavigationThrottle::OnFirstPoliciesLoadedImpl( - ThrottleCheckResult(BLOCK_REQUEST, net::ERR_BLOCKED_BY_ADMINISTRATOR)); - } - -- if (IsBlockedViewSourceNavigation()) { -- return CancelDeferredNavigation( -- ThrottleCheckResult(BLOCK_REQUEST, net::ERR_BLOCKED_BY_ADMINISTRATOR)); -- } -- - if (CheckSafeSitesFilter(url).action() == PROCEED) - Resume(); - } diff --git a/components/policy/content/policy_blocklist_navigation_throttle.h b/components/policy/content/policy_blocklist_navigation_throttle.h --- a/components/policy/content/policy_blocklist_navigation_throttle.h +++ b/components/policy/content/policy_blocklist_navigation_throttle.h -@@ -50,10 +50,7 @@ class PolicyBlocklistNavigationThrottle - void OnFirstPoliciesLoadedImpl(bool timeout); +@@ -35,10 +35,7 @@ class PolicyBlocklistNavigationThrottle : public content::NavigationThrottle { + const char* GetNameForLogging() override; private: - // Returns TRUE if this navigation is to view-source: and view-source is on diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index e4ffabce..0680fab7 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -13,9 +13,9 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f. 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 -@@ -3643,6 +3643,10 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableVulkanDescription, - kOsWin | kOsLinux | kOsAndroid, FEATURE_VALUE_TYPE(features::kVulkan)}, +@@ -3794,6 +3794,10 @@ const FeatureEntry kFeatureEntries[] = { + kOsWin | kOsLinux | kOsLacros | kOsAndroid, + FEATURE_VALUE_TYPE(features::kVulkan)}, #if BUILDFLAG(IS_ANDROID) + {switches::kDisablePullToRefreshEffect, + flag_descriptions::kDisablePullToRefreshEffectName, @@ -27,7 +27,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -1277,6 +1277,11 @@ +@@ -1268,6 +1268,11 @@ // enable-javascript-harmony. "expiry_milestone": -1 }, @@ -42,7 +42,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3517,6 +3517,10 @@ const char kReadLaterDescription[] = +@@ -3421,6 +3421,10 @@ const char kReadLaterDescription[] = "Allow users to save tabs for later. Enables a new button and menu for " "accessing tabs saved for later."; @@ -56,7 +56,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 -@@ -2012,6 +2012,9 @@ extern const char kQueryTilesSegmentationDescription[]; +@@ -1945,6 +1945,9 @@ extern const char kQueryTilesSegmentationDescription[]; extern const char kQueryTilesSwapTrendingName[]; extern const char kQueryTilesSwapTrendingDescription[]; diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch index 19971749..75bd1cf4 100644 --- a/build/patches/Revert-flags-remove-num-raster-threads.patch +++ b/build/patches/Revert-flags-remove-num-raster-threads.patch @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, {flag_descriptions::kTouchSelectionStrategyCharacter, -@@ -3874,6 +3883,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4027,6 +4036,9 @@ const FeatureEntry kFeatureEntries[] = { {"restricted-api-origins", flag_descriptions::kRestrictedApiOriginsName, flag_descriptions::kRestrictedApiOriginsDescription, kOsAll, ORIGIN_LIST_VALUE_TYPE(switches::kRestrictedApiOrigins, "")}, @@ -42,7 +42,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -4296,6 +4296,11 @@ +@@ -4177,6 +4177,11 @@ "owners": [ "aaronhk", "fserb", "juanmihd", "yiyix" ], "expiry_milestone": 100 }, @@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1756,6 +1756,14 @@ const char kOmniboxActiveSearchEnginesDescription[] = +@@ -1696,6 +1696,14 @@ const char kOmniboxActiveSearchEnginesDescription[] = "Enables a 'Your Search Engines' section on " "chrome://settings/searchEngines."; @@ -75,7 +75,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1009,6 +1009,13 @@ extern const char kOmitCorsClientCertDescription[]; +@@ -970,6 +970,13 @@ extern const char kOmitCorsClientCertDescription[]; extern const char kOmniboxActiveSearchEnginesName[]; extern const char kOmniboxActiveSearchEnginesDescription[]; diff --git a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch index a8607fae..ffd350cf 100644 --- a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch +++ b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch @@ -365,7 +365,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -318,7 +318,7 @@ void ContentSettingsRegistry::Init() { +@@ -328,7 +328,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -389,19 +389,19 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -187,6 +187,7 @@ bool RendererContentSettingRules::IsRendererContentSetting( - ContentSettingsType content_type) { +@@ -198,6 +198,7 @@ bool RendererContentSettingRules::IsRendererContentSetting( return content_type == ContentSettingsType::IMAGES || content_type == ContentSettingsType::JAVASCRIPT || -+ content_type == ContentSettingsType::AUTOPLAY || - content_type == ContentSettingsType::CLIENT_HINTS || content_type == ContentSettingsType::POPUPS || ++ content_type == ContentSettingsType::AUTOPLAY || content_type == ContentSettingsType::MIXEDSCRIPT || + content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || + content_type == ContentSettingsType::TIMEZONE_OVERRIDE; diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h --- a/components/content_settings/core/common/content_settings.h +++ b/components/content_settings/core/common/content_settings.h -@@ -77,6 +77,7 @@ struct RendererContentSettingRules { - ~RendererContentSettingRules(); +@@ -89,6 +89,7 @@ struct RendererContentSettingRules { + ContentSettingsForOneType image_rules; ContentSettingsForOneType script_rules; + ContentSettingsForOneType autoplay_rules; @@ -448,7 +448,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -433,6 +433,17 @@ bool ContentSettingsAgentImpl::AllowRunningInsecureContent( +@@ -402,6 +402,17 @@ bool ContentSettingsAgentImpl::AllowRunningInsecureContent( return false; } @@ -458,7 +458,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc + + blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); + return GetContentSettingFromRules( -+ content_setting_rules_->autoplay_rules, frame, ++ content_setting_rules_->autoplay_rules, + url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL()) == + CONTENT_SETTING_ALLOW; +} @@ -469,7 +469,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h --- a/components/content_settings/renderer/content_settings_agent_impl.h +++ b/components/content_settings/renderer/content_settings_agent_impl.h -@@ -98,6 +98,7 @@ class ContentSettingsAgentImpl +@@ -91,6 +91,7 @@ class ContentSettingsAgentImpl void DidNotAllowScript() override; bool AllowRunningInsecureContent(bool allowed_per_settings, const blink::WebURL& url) override; @@ -491,7 +491,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -98,6 +98,7 @@ ContentSettingsType kPermissionType[] = { +@@ -100,6 +100,7 @@ ContentSettingsType kPermissionType[] = { ContentSettingsType::ADS, ContentSettingsType::BACKGROUND_SYNC, ContentSettingsType::SOUND, @@ -499,7 +499,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. ContentSettingsType::AUTOMATIC_DOWNLOADS, #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_WIN) ContentSettingsType::PROTECTED_MEDIA_IDENTIFIER, -@@ -140,6 +141,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, +@@ -142,6 +143,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, return is_subresource_filter_activated; } @@ -559,7 +559,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi #include "third_party/blink/public/platform/web_media_player.h" #include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_local_frame_client.h" -@@ -313,7 +314,7 @@ bool AutoplayPolicy::IsGestureNeededForPlayback() const { +@@ -315,7 +316,7 @@ bool AutoplayPolicy::IsGestureNeededForPlayback() const { // We want to allow muted video to autoplay if the element is allowed to // autoplay muted. @@ -568,7 +568,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi } String AutoplayPolicy::GetPlayErrorMessage() const { -@@ -405,6 +406,15 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() { +@@ -407,6 +408,15 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() { } } diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch index 8571773a..ae2eb850 100644 --- a/build/patches/Site-setting-for-images.patch +++ b/build/patches/Site-setting-for-images.patch @@ -416,7 +416,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -90,9 +90,7 @@ ContentSettingsType kPermissionType[] = { +@@ -92,9 +92,7 @@ ContentSettingsType kPermissionType[] = { ContentSettingsType::SENSORS, ContentSettingsType::NOTIFICATIONS, ContentSettingsType::JAVASCRIPT, @@ -426,7 +426,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. ContentSettingsType::POPUPS, ContentSettingsType::WINDOW_PLACEMENT, ContentSettingsType::ADS, -@@ -147,6 +145,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, +@@ -149,6 +147,11 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info, return true; } diff --git a/build/patches/Switch-to-fstack-protector-strong.patch b/build/patches/Switch-to-fstack-protector-strong.patch index 4f91edda..3a01cc15 100644 --- a/build/patches/Switch-to-fstack-protector-strong.patch +++ b/build/patches/Switch-to-fstack-protector-strong.patch @@ -16,10 +16,10 @@ higher memory/cache usage but not by the full 2-3%. diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -334,18 +334,12 @@ config("compiler") { +@@ -329,18 +329,12 @@ config("compiler") { cflags += [ "-fstack-protector" ] } - } else if ((is_posix && !is_chromeos_ash && !is_nacl) || is_fuchsia) { + } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) { - # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc supports it. - # See also https://crbug.com/533294 - if (current_os != "zos") { diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch index 0ca27161..5739e8b3 100644 --- a/build/patches/Timezone-customization.patch +++ b/build/patches/Timezone-customization.patch @@ -515,7 +515,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + getString(ContentSettingsResources.getSiteSummary(contentSettingsType, + ContentSettingValues.BLOCK)); - return new AlertDialog.Builder(getContext(), R.style.Theme_Chromium_AlertDialog) + return new AlertDialog.Builder(getContext(), R.style.ThemeOverlay_BrowserUI_AlertDialog) .setPositiveButton(R.string.cancel, null) diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java @@ -804,7 +804,7 @@ new file mode 100755 + }; + + AlertDialog.Builder alert = -+ new AlertDialog.Builder(getContext(), R.style.Theme_Chromium_AlertDialog); ++ new AlertDialog.Builder(getContext(), R.style.ThemeOverlay_BrowserUI_AlertDialog); + AlertDialog alertDialog = + alert.setTitle(R.string.website_settings_select_dialog_title) + .setView(view) @@ -969,7 +969,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc -@@ -84,6 +84,8 @@ void PrefProvider::RegisterProfilePrefs( +@@ -86,6 +86,8 @@ void PrefProvider::RegisterProfilePrefs( info->GetPrefRegistrationFlags()); } @@ -978,7 +978,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov // Obsolete prefs ---------------------------------------------------------- // These prefs have been removed, but need to be registered so they can -@@ -169,6 +171,10 @@ PrefProvider::PrefProvider(PrefService* prefs, +@@ -172,6 +174,10 @@ PrefProvider::PrefProvider(PrefService* prefs, event_args->set_number_of_exceptions( num_exceptions); // PrefProvider::PrefProvider. }); @@ -989,7 +989,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov } PrefProvider::~PrefProvider() { -@@ -299,4 +305,14 @@ void PrefProvider::SetClockForTesting(base::Clock* clock) { +@@ -303,4 +309,14 @@ void PrefProvider::SetClockForTesting(base::Clock* clock) { clock_ = clock; } @@ -1028,7 +1028,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -645,6 +645,18 @@ void ContentSettingsRegistry::Init() { +@@ -655,6 +655,18 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); @@ -1067,7 +1067,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc -@@ -599,6 +599,14 @@ void HostContentSettingsMap::SetClockForTesting(base::Clock* clock) { +@@ -600,6 +600,14 @@ void HostContentSettingsMap::SetClockForTesting(base::Clock* clock) { provider->SetClockForTesting(clock); } @@ -1098,8 +1098,8 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -190,7 +190,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( - content_type == ContentSettingsType::CLIENT_HINTS || +@@ -199,7 +199,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( + content_type == ContentSettingsType::JAVASCRIPT || content_type == ContentSettingsType::POPUPS || content_type == ContentSettingsType::MIXEDSCRIPT || - content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT; @@ -1107,11 +1107,11 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo + content_type == ContentSettingsType::TIMEZONE_OVERRIDE; } - RendererContentSettingRules::RendererContentSettingRules() {} + void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h --- a/components/content_settings/core/common/content_settings.h +++ b/components/content_settings/core/common/content_settings.h -@@ -80,6 +80,8 @@ struct RendererContentSettingRules { +@@ -92,6 +92,8 @@ struct RendererContentSettingRules { ContentSettingsForOneType popup_redirect_rules; ContentSettingsForOneType mixed_content_rules; ContentSettingsForOneType auto_dark_content_rules; @@ -1167,7 +1167,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -226,6 +226,9 @@ enum class ContentSettingsType : int32_t { +@@ -229,6 +229,9 @@ enum class ContentSettingsType : int32_t { // by the File System Access API. FILE_SYSTEM_LAST_PICKED_DIRECTORY, @@ -1180,7 +1180,7 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/ diff --git a/components/content_settings/core/common/pref_names.cc b/components/content_settings/core/common/pref_names.cc --- a/components/content_settings/core/common/pref_names.cc +++ b/components/content_settings/core/common/pref_names.cc -@@ -157,4 +157,7 @@ const char kQuietNotificationPermissionUiDisabledTime[] = +@@ -163,4 +163,7 @@ const char kQuietNotificationPermissionUiDisabledTime[] = const char kNotificationsVibrateEnabled[] = "notifications.vibrate_enabled"; #endif @@ -1191,7 +1191,7 @@ diff --git a/components/content_settings/core/common/pref_names.cc b/components/ diff --git a/components/content_settings/core/common/pref_names.h b/components/content_settings/core/common/pref_names.h --- a/components/content_settings/core/common/pref_names.h +++ b/components/content_settings/core/common/pref_names.h -@@ -83,6 +83,8 @@ extern const char kQuietNotificationPermissionUiDisabledTime[]; +@@ -86,6 +86,8 @@ extern const char kQuietNotificationPermissionUiDisabledTime[]; extern const char kNotificationsVibrateEnabled[]; #endif @@ -1233,8 +1233,8 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc + namespace content_settings { namespace { - -@@ -357,6 +365,10 @@ bool ContentSettingsAgentImpl::AllowScript(bool enabled_per_settings) { + bool IsFrameWithOpaqueOrigin(WebFrame* frame) { +@@ -329,6 +337,10 @@ bool ContentSettingsAgentImpl::AllowScript(bool enabled_per_settings) { allow = allow || IsAllowlistedForContentSettings(); cached_script_permissions_[frame] = allow; @@ -1245,7 +1245,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc return allow; } -@@ -487,4 +499,81 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const { +@@ -465,4 +477,81 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const { return false; } @@ -1257,7 +1257,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc + blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); + + setting = GetContentSettingFromRules( -+ content_setting_rules_->timezone_override_rules, frame, ++ content_setting_rules_->timezone_override_rules, + url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL()); + } + return UpdateTimeZoneOverride( @@ -1330,7 +1330,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h --- a/components/content_settings/renderer/content_settings_agent_impl.h +++ b/components/content_settings/renderer/content_settings_agent_impl.h -@@ -183,6 +183,10 @@ class ContentSettingsAgentImpl +@@ -167,6 +167,10 @@ class ContentSettingsAgentImpl std::unique_ptr delegate_; mojo::AssociatedReceiverSet receivers_; diff --git a/build/patches/Unexpire-tab-groups-flags.patch b/build/patches/Unexpire-tab-groups-flags.patch index 9950f428..d82da71e 100644 --- a/build/patches/Unexpire-tab-groups-flags.patch +++ b/build/patches/Unexpire-tab-groups-flags.patch @@ -12,7 +12,7 @@ Disable by default 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 -@@ -2888,7 +2888,7 @@ +@@ -2755,7 +2755,7 @@ { "name": "enable-tab-groups", "owners": [ "memex-team@google.com" ], @@ -21,7 +21,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js }, { "name": "enable-tab-groups-continuation", -@@ -2903,7 +2903,7 @@ +@@ -2770,7 +2770,7 @@ { "name": "enable-tab-groups-ui-improvements", "owners": [ "memex-team@google.com" ], @@ -33,7 +33,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js 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 -@@ -788,13 +788,13 @@ const base::Feature kTabEngagementReportingAndroid{ +@@ -766,13 +766,13 @@ const base::Feature kTabEngagementReportingAndroid{ "TabEngagementReportingAndroid", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kTabGroupsAndroid{"TabGroupsAndroid", @@ -52,7 +52,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -73,7 +73,7 @@ public class CachedFeatureFlags { +@@ -72,7 +72,7 @@ public class CachedFeatureFlags { .put(ChromeFeatureList.PREFETCH_NOTIFICATION_SCHEDULING_INTEGRATION, false) .put(ChromeFeatureList.STORE_HOURS, false) .put(ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID, true) diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch index 04eb69f3..22807eab 100644 --- a/build/patches/Update-i18n-zh_CN-support.patch +++ b/build/patches/Update-i18n-zh_CN-support.patch @@ -14,7 +14,7 @@ Subject: Update i18n zh_CN support diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb -@@ -8339,4 +8339,6 @@ +@@ -8407,4 +8407,6 @@ 查看与亲朋好友相聚时刻的回忆集锦 您需要开启 Chrome 同步才能使用 Wi-Fi 同步功能。了解详情 检查(&N) @@ -26,7 +26,7 @@ diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/res diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb --- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb +++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb -@@ -359,4 +359,5 @@ +@@ -369,4 +369,5 @@ 如需在您的所有设备上访问自己的 Chrome 信息，请登录您的帐号，然后开启同步功能。 Google Chrome 是您的默认浏览器 可用于切换 Chrome 个人资料 @@ -37,7 +37,7 @@ diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/r diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -@@ -1523,4 +1523,68 @@ Privacy Sandbox 试用版功能尚处于积极开发阶段，目前只能在部 +@@ -1526,4 +1526,68 @@ Privacy Sandbox 试用版功能尚处于积极开发阶段，目前只能在部 关闭所有标签页 常规 动态卡片上的菜单已关闭 @@ -141,7 +141,7 @@ diff --git a/components/browser_ui/strings/android/translations/browser_ui_strin diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb --- a/components/strings/components_strings_zh-CN.xtb +++ b/components/strings/components_strings_zh-CN.xtb -@@ -2968,4 +2968,31 @@ +@@ -2986,4 +2986,31 @@ </ul> JIS B1 来自 Google Pay diff --git a/build/patches/Use-4-tile-rows-never-show-logo.patch b/build/patches/Use-4-tile-rows-never-show-logo.patch index aba6044c..846676f3 100644 --- a/build/patches/Use-4-tile-rows-never-show-logo.patch +++ b/build/patches/Use-4-tile-rows-never-show-logo.patch @@ -12,7 +12,7 @@ Subject: Use 4 tile rows, never show logo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -@@ -145,7 +145,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -147,7 +147,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer */ private boolean mHasShownView; @@ -21,7 +21,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL private boolean mSearchProviderIsGoogle; private boolean mShowingNonStandardLogo; -@@ -371,7 +371,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -374,7 +374,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer mTileGroup = new TileGroup(tileRenderer, mManager, contextMenuManager, tileGroupDelegate, /* observer = */ this, offlinePageBridge); @@ -30,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL if (searchProviderIsGoogle && QueryTileUtils.isQueryTilesEnabledOnNTP()) { maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext()); } -@@ -608,7 +608,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -615,7 +615,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer && mInitialized) { return; } diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index fc0cf001..578f5d85 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -70,7 +70,7 @@ diff --git a/base/base_switches.h b/base/base_switches.h diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -698,4 +698,6 @@ chrome_java_resources = [ +@@ -685,4 +685,6 @@ chrome_java_resources = [ "java/res/xml/privacy_preferences.xml", "java/res/xml/search_widget_info.xml", "java/res/xml/tracing_preferences.xml", @@ -80,7 +80,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -886,6 +886,7 @@ chrome_java_sources = [ +@@ -892,6 +892,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java", "java/src/org/chromium/chrome/browser/payments/ui/LineItem.java", "java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java", @@ -629,7 +629,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java -@@ -28,6 +28,10 @@ import org.chromium.ui.base.WindowAndroid; +@@ -31,6 +31,10 @@ import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.display.DisplayAndroidManager; import org.chromium.url.GURL; @@ -640,7 +640,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.ja /** * Collection of utility methods that operates on Tab. */ -@@ -90,18 +94,15 @@ public class TabUtils { +@@ -93,18 +97,15 @@ public class TabUtils { * @param forcedByUser Whether this was triggered by users action. */ public static void switchUserAgent(Tab tab, boolean switchToDesktop, boolean forcedByUser) { @@ -739,8 +739,8 @@ diff --git a/chrome/browser/android/preferences/browser_prefs_android.cc b/chrom diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc --- a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc +++ b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc -@@ -12,6 +12,30 @@ - #include "components/metrics/metrics_pref_names.h" +@@ -14,6 +14,30 @@ + #include "components/policy/core/common/features.h" #include "components/prefs/pref_service.h" +#include "base/command_line.h" @@ -770,7 +770,7 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl static jboolean JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingEnabled( JNIEnv* env) { PrefService* local_state = g_browser_process->local_state(); -@@ -33,3 +57,100 @@ JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy( +@@ -41,3 +65,100 @@ JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy( metrics::prefs::kMetricsReportingEnabled) && !local_state->GetBoolean(metrics::prefs::kMetricsReportingEnabled); } @@ -874,7 +874,7 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl 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 -@@ -1006,6 +1006,9 @@ public final class ChromePreferenceKeys { +@@ -1004,6 +1004,9 @@ public final class ChromePreferenceKeys { public static final KeyPrefix KEY_ZERO_SUGGEST_HEADER_GROUP_COLLAPSED_BY_DEFAULT_PREFIX = new KeyPrefix("zero_suggest_header_group_collapsed_by_default*"); @@ -884,7 +884,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * These values are currently used as SharedPreferences keys, along with the keys in * {@link LegacyChromePreferenceKeys#getKeysInUse()}. Add new SharedPreferences keys -@@ -1130,6 +1133,8 @@ public final class ChromePreferenceKeys { +@@ -1128,6 +1131,8 @@ public final class ChromePreferenceKeys { TAP_FEED_CARDS_COUNT, TAP_MV_TILES_COUNT, TWA_DISCLOSURE_SEEN_PACKAGES, @@ -966,7 +966,7 @@ diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chro 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 -@@ -228,6 +228,41 @@ CHAR_LIMIT guidelines: +@@ -229,6 +229,41 @@ CHAR_LIMIT guidelines: Visit help page @@ -1011,7 +1011,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 -@@ -433,6 +433,19 @@ const char kAllowJavascriptAppleEvents[] = +@@ -437,6 +437,19 @@ const char kAllowJavascriptAppleEvents[] = #endif @@ -1034,7 +1034,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 -@@ -1198,6 +1198,14 @@ extern const char kDesktopSharingHubEnabled[]; +@@ -1209,6 +1209,14 @@ extern const char kDesktopSharingHubEnabled[]; #if !BUILDFLAG(IS_ANDROID) extern const char kLastWhatsNewVersion[]; #endif @@ -1073,7 +1073,7 @@ diff --git a/components/browser_ui/widget/android/java/src/org/chromium/componen diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -369,6 +369,13 @@ std::string GetUserAgent( +@@ -370,6 +370,13 @@ std::string GetUserAgent( std::string GetReducedUserAgent( ForceMajorVersionToMinorPosition force_major_to_minor) { @@ -1087,7 +1087,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd return content::GetReducedUserAgent( base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kUseMobileUserAgent), -@@ -534,6 +541,10 @@ blink::UserAgentMetadata GetUserAgentMetadata(PrefService* pref_service) { +@@ -535,6 +542,10 @@ blink::UserAgentMetadata GetUserAgentMetadata(PrefService* pref_service) { policy::policy_prefs::kUserAgentClientHintsGREASEUpdateEnabled); ua_options.force_major_to_minor = GetMajorToMinorFromPrefs(pref_service); } @@ -1101,7 +1101,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/content/browser/renderer_host/navigation_controller_android.cc --- a/content/browser/renderer_host/navigation_controller_android.cc +++ b/content/browser/renderer_host/navigation_controller_android.cc -@@ -247,6 +247,7 @@ void NavigationControllerAndroid::LoadUrl( +@@ -245,6 +245,7 @@ void NavigationControllerAndroid::LoadUrl( jboolean can_load_local_resources, jboolean is_renderer_initiated, jboolean should_replace_current_entry, @@ -1109,9 +1109,9 @@ diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/co const JavaParamRef& j_initiator_origin, jboolean has_user_gesture, jboolean should_clear_history_list, -@@ -334,6 +335,9 @@ void NavigationControllerAndroid::LoadUrl( - attribution_expiry); - } +@@ -311,6 +312,9 @@ void NavigationControllerAndroid::LoadUrl( + if (input_start != 0) + params.input_start = base::TimeTicks::FromUptimeMillis(input_start); + params.override_user_agent = static_cast( + user_agent_override_option); @@ -1133,7 +1133,7 @@ diff --git a/content/browser/renderer_host/navigation_controller_android.h b/con diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3432,6 +3432,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3427,6 +3427,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kLacrosUseChromeosProtectedMedia, switches::kLacrosUseChromeosProtectedAv1, #endif @@ -1152,7 +1152,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser #include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" -@@ -2769,6 +2770,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() { +@@ -2791,6 +2792,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() { !renderer_preferences_.user_agent_override.ua_metadata_override->mobile) #endif prefs.viewport_meta_enabled = false; @@ -1171,21 +1171,21 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/frameh params.getIsRendererInitiated(), params.getShouldReplaceCurrentEntry(), + params.getUserAgentOverrideOption(), params.getInitiatorOrigin(), params.getHasUserGesture(), - params.getShouldClearHistoryList(), inputStart, - params.getAttributionSourcePackageName(), params.getAttributionSourceEventId(), -@@ -359,7 +360,7 @@ import org.chromium.url.Origin; + params.getShouldClearHistoryList(), inputStart); + } +@@ -356,7 +357,7 @@ import org.chromium.url.Origin; int referrerPolicy, int uaOverrideOption, String extraHeaders, ResourceRequestBody postData, String baseUrlForDataUrl, String virtualUrlForDataUrl, String dataUrlAsString, boolean canLoadLocalResources, boolean isRendererInitiated, - boolean shouldReplaceCurrentEntry, Origin initiatorOrigin, boolean hasUserGesture, + boolean shouldReplaceCurrentEntry, int userAgentOverrideOption, Origin initiatorOrigin, boolean hasUserGesture, - boolean shouldClearHistoryList, long inputStart, String sourcePackageName, - String attributionSourceEventId, String attributionDestination, - String attributionReportTo, long attributionExpiry); + boolean shouldClearHistoryList, long inputStart); + void clearHistory(long nativeNavigationControllerAndroid, NavigationControllerImpl caller); + int getNavigationHistory(long nativeNavigationControllerAndroid, diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -976,7 +976,6 @@ void RenderThreadImpl::InitializeRenderer( +@@ -972,7 +972,6 @@ void RenderThreadImpl::InitializeRenderer( const std::string& reduced_user_agent, const blink::UserAgentMetadata& user_agent_metadata, const std::vector& cors_exempt_header_list) { diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch index 2ac3ae86..f7bec29c 100644 --- a/build/patches/Welcome-screen.patch +++ b/build/patches/Welcome-screen.patch @@ -5,12 +5,12 @@ Subject: Welcome screen Allow toggling automatic updates --- .../android/java/res/layout/fre_tosanduma.xml | 4 +- - .../browser/firstrun/FirstRunActivity.java | 58 +------ - .../firstrun/FirstRunFlowSequencer.java | 81 ++------- + .../browser/firstrun/FirstRunActivity.java | 43 +---- + .../firstrun/FirstRunFlowSequencer.java | 63 ++----- .../browser/firstrun/FirstRunUtils.java | 13 +- .../firstrun/ToSAndUMAFirstRunFragment.java | 163 +++++------------- .../strings/android_chrome_strings.grd | 27 ++- - 6 files changed, 96 insertions(+), 250 deletions(-) + 6 files changed, 86 insertions(+), 227 deletions(-) diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml --- a/chrome/android/java/res/layout/fre_tosanduma.xml @@ -32,7 +32,7 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java -@@ -31,8 +31,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity; +@@ -32,8 +32,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity; import org.chromium.chrome.browser.fonts.FontPreloader; import org.chromium.chrome.browser.metrics.UmaUtils; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; @@ -41,16 +41,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.modaldialog.ModalDialogManager; -@@ -96,8 +94,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa - @Nullable - private static FirstRunActivityObserver sObserver; - -- private String mResultSyncConsentAccountName; -- - private boolean mPostNativeAndPolicyPagesCreated; - // Use hasValue() to simplify access. Will be null before initialized. - private final OneshotSupplierImpl mNativeSideIsInitializedSupplier = -@@ -146,18 +142,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -147,18 +145,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa /** Creates first page and sets up adapter. Should result UI being shown on the screen. */ private void createFirstPage() { BooleanSupplier showWelcomePage = () -> !FirstRunStatus.shouldSkipWelcomePage(); @@ -70,7 +61,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR mFreProgressStates.add(MobileFreProgress.WELCOME_SHOWN); mPagerAdapter = new FirstRunPagerAdapter(FirstRunActivity.this, mPages); mPager.setAdapter(mPagerAdapter); -@@ -165,15 +150,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -166,15 +153,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa // native and policy service have been initialized. } @@ -86,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR /** * Create the page sequence which requires native initialized, and policies loaded if any * on-device policies may exists. -@@ -187,7 +163,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -188,7 +166,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa BooleanSupplier showSearchEnginePromo = () -> mFreProperties.getBoolean(SHOW_SEARCH_ENGINE_PAGE); @@ -94,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR // An optional page to select a default search engine. if (showSearchEnginePromo.getAsBoolean()) { -@@ -196,11 +171,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -197,11 +174,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa mFreProgressStates.add(MobileFreProgress.DEFAULT_SEARCH_ENGINE_SHOWN); } @@ -106,7 +97,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR if (mPagerAdapter != null) { mPagerAdapter.notifyDataSetChanged(); } -@@ -245,10 +215,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -246,10 +218,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa @Override public void triggerLayoutInflation() { @@ -117,52 +108,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR initializeStateFromLaunchData(); RecordHistogram.recordTimesHistogram("MobileFre.FromLaunch.TriggerLayoutInflation", SystemClock.elapsedRealtime() - mIntentCreationElapsedRealtimeMs); -@@ -256,8 +222,12 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -257,7 +225,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa setFinishOnTouchOutside(true); setContentView(createContentView()); -- ViewDrawBlocker.blockViewDrawUntilReady( +- if (FREMobileIdentityConsistencyFieldTrial.isEnabled() && mPagerAdapter == null) { + if (mPagerAdapter == null) { -+ createFirstPage(); -+ } else { -+ ViewDrawBlocker.blockViewDrawUntilReady( - findViewById(android.R.id.content), () -> mPages.size() > 0); -+ } + // SigninFirstRunFragment doesn't use getProperties() and can be shown right away, + // without waiting for FirstRunFlowSequencer. + createFirstPage(); +@@ -271,8 +239,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa + public void onFlowIsKnown(Bundle freProperties) { + assert freProperties != null; + mFreProperties = freProperties; +- mChildAccountStatusSupplier.set( +- mFreProperties.getBoolean(SyncConsentFirstRunFragment.IS_CHILD_ACCOUNT)); ++ mChildAccountStatusSupplier.set(false); - mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) { - @Override -@@ -462,12 +432,8 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa - public void completeFirstRunExperience() { - RecordHistogram.recordMediumTimesHistogram("MobileFre.FromLaunch.FreCompleted", - SystemClock.elapsedRealtime() - mIntentCreationElapsedRealtimeMs); -- if (mFreProperties.getBoolean(OPEN_ADVANCED_SYNC_SETTINGS)) { -- recordFreProgressHistogram(MobileFreProgress.SYNC_CONSENT_SETTINGS_LINK_CLICK); -- } + onInternalStateChanged(); -- FirstRunFlowSequencer.markFlowAsCompleted(mResultSyncConsentAccountName, -- mFreProperties.getBoolean(OPEN_ADVANCED_SYNC_SETTINGS)); -+ FirstRunFlowSequencer.markFlowAsCompleted(); - - if (sObserver != null) sObserver.onUpdateCachedEngineName(this); - -@@ -510,16 +476,10 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa - - @Override - public void refuseSync() { -- mResultSyncConsentAccountName = null; -- mFreProperties.putBoolean(OPEN_ADVANCED_SYNC_SETTINGS, false); -- recordFreProgressHistogram(MobileFreProgress.SYNC_CONSENT_DISMISSED); - } - - @Override - public void acceptSync(String accountName, boolean openSettings) { -- mResultSyncConsentAccountName = accountName; -- mFreProperties.putBoolean(OPEN_ADVANCED_SYNC_SETTINGS, openSettings); -- recordFreProgressHistogram(MobileFreProgress.SYNC_CONSENT_ACCEPTED); - } - - @Override -@@ -536,10 +496,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -527,10 +494,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa public void acceptTermsOfService(boolean allowCrashUpload) { assert mNativeSideIsInitializedSupplier.hasValue(); @@ -232,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR } /** @return true if first use hints should be skipped. */ -@@ -141,19 +111,8 @@ public abstract class FirstRunFlowSequencer { +@@ -141,19 +111,6 @@ public abstract class FirstRunFlowSequencer { * Once finished, calls onFlowIsKnown(). */ void start() { @@ -240,7 +205,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR - AccountManagerFacadeProvider.getInstance().getAccounts().then(accounts -> { - AccountUtils.checkChildAccountStatus( - AccountManagerFacadeProvider.getInstance(), accounts, (isChild, account) -> { -- RecordHistogram.recordCountHistogram( +- RecordHistogram.recordCount1MHistogram( - "Signin.AndroidDeviceAccountsNumberWhenEnteringFRE", - Math.min(accounts.size(), 2)); - RecordHistogram.recordTimesHistogram("MobileFre.ChildAccountStatusDuration", @@ -249,36 +214,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR - processFreEnvironmentPreNative(); - }); - }); -+ mIsChild = false; -+ processFreEnvironmentPreNative(); } @VisibleForTesting -@@ -162,22 +121,15 @@ public abstract class FirstRunFlowSequencer { - } - - private boolean shouldShowSyncConsentPage() { -- return mDelegate.shouldShowSyncConsentPage(mActivity, mGoogleAccounts, mIsChild); -+ return false; - } - - @VisibleForTesting - protected void setFirstRunFlowSignInComplete() { -- FirstRunSignInProcessor.setFirstRunFlowSignInComplete(true); -- } -- -- private void initializeSharedState(boolean isChild, List accounts) { -- mIsChild = isChild; -- mGoogleAccounts = accounts; - } +@@ -172,7 +129,6 @@ public abstract class FirstRunFlowSequencer { private void processFreEnvironmentPreNative() { Bundle freProperties = new Bundle(); - freProperties.putBoolean(SyncConsentFirstRunFragment.IS_CHILD_ACCOUNT, mIsChild); onFlowIsKnown(freProperties); - if (mIsChild) { -@@ -191,8 +143,8 @@ public abstract class FirstRunFlowSequencer { + } +@@ -183,8 +139,8 @@ public abstract class FirstRunFlowSequencer { * @param freProperties Resulting FRE properties bundle. */ public void updateFirstRunProperties(Bundle freProperties) { @@ -289,28 +236,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR freProperties.putBoolean( FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE, shouldShowSearchEnginePage()); } -@@ -202,17 +154,15 @@ public abstract class FirstRunFlowSequencer { - * @param syncConsentAccountName The account name for the pending sign-in request. (Or null) - * @param showAdvancedSyncSettings Whether the user selected to see the settings once signed in. - */ -- public static void markFlowAsCompleted( -- String syncConsentAccountName, boolean showAdvancedSyncSettings) { -+ public static void markFlowAsCompleted() { - // When the user accepts ToS in the Setup Wizard, we do not show the ToS page to the user - // because the user has already accepted one outside FRE. - if (!FirstRunUtils.isFirstRunEulaAccepted()) { - FirstRunUtils.setEulaAccepted(); - } - -- // Mark the FRE flow as complete and set the sign-in flow preferences if necessary. -- FirstRunSignInProcessor.finalizeFirstRunFlowState( -- syncConsentAccountName, showAdvancedSyncSettings); -+ // Mark the FRE flow as complete. -+ FirstRunStatus.setFirstRunFlowComplete(true); - } - - /** -@@ -257,6 +207,7 @@ public abstract class FirstRunFlowSequencer { +@@ -243,6 +199,7 @@ public abstract class FirstRunFlowSequencer { || FirstRunStatus.getLightweightFirstRunFlowComplete())) { return false; } @@ -318,7 +244,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR return true; } -@@ -304,15 +255,21 @@ public abstract class FirstRunFlowSequencer { +@@ -290,15 +247,21 @@ public abstract class FirstRunFlowSequencer { freIntent = VrModuleProvider.getIntentDelegate().setupVrFreIntent(caller, freIntent); // We cannot access Chrome right now, e.g. because the VR module is not installed. @@ -677,9 +603,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd 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 -@@ -2817,11 +2817,30 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

- %1$sGoogle Maps will open in Chrome. By continuing, you agree to the <LINK1>Google Terms of Service</LINK1>, and the <LINK2>Google Chrome and Chrome OS Additional Terms of Service</LINK2>. The <LINK3>Privacy Policy</LINK3> also applies. + %1$sGoogle Maps will open in Chrome. By continuing, you agree to the <LINK1>Google Terms of Service</LINK1>, and the <LINK2>Google Chrome and ChromeOS Additional Terms of Service</LINK2>. The <LINK3>Privacy Policy</LINK3> also applies. - - Help make Chrome better by sending usage statistics and crash reports to Google. diff --git a/build/patches/ask-permission-to-play-protected-media-by-default.patch b/build/patches/ask-permission-to-play-protected-media-by-default.patch index 2be74812..be7003b3 100644 --- a/build/patches/ask-permission-to-play-protected-media-by-default.patch +++ b/build/patches/ask-permission-to-play-protected-media-by-default.patch @@ -9,7 +9,7 @@ Subject: ask permission to play protected media by default diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -269,9 +269,7 @@ void ContentSettingsRegistry::Init() { +@@ -279,9 +279,7 @@ void ContentSettingsRegistry::Init() { // On ChromeOS and Windows the default value is always ALLOW. const auto protected_media_identifier_setting = #if BUILDFLAG(IS_ANDROID) diff --git a/build/patches/autofill-miscellaneous.patch b/build/patches/autofill-miscellaneous.patch index bcd7067c..3a255ad5 100644 --- a/build/patches/autofill-miscellaneous.patch +++ b/build/patches/autofill-miscellaneous.patch @@ -21,7 +21,7 @@ Do not skip google.com domains for password generation (csagan5) diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -512,35 +512,6 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload, +@@ -511,35 +511,6 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload, return upload_request.SerializeToString(payload); } @@ -57,7 +57,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com // Gets HTTP body payload for API POST request. bool GetAPIBodyPayload(const std::string& payload, AutofillDownloadManager::RequestType type, -@@ -778,6 +749,7 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( +@@ -777,6 +748,7 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( // ID of the resource to add to the API request URL. Nothing will be added if // |resource_id| is empty. std::string resource_id; @@ -65,7 +65,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com std::string method = "POST"; if (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY) { -@@ -798,7 +770,10 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( +@@ -797,7 +769,10 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( // Add the query parameter to set the response format to a serialized proto. url = net::AppendQueryParameter(url, "alt", "proto"); @@ -129,7 +129,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/components/autofill/core/browser/browser_autofill_manager.h --- a/components/autofill/core/browser/browser_autofill_manager.h +++ b/components/autofill/core/browser/browser_autofill_manager.h -@@ -705,9 +705,9 @@ class BrowserAutofillManager : public AutofillManager, +@@ -701,9 +701,9 @@ class BrowserAutofillManager : public AutofillManager, std::unique_ptr credit_card_form_event_logger_; // Have we logged whether Autofill is enabled for this page load? @@ -144,7 +144,7 @@ diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/compo diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc --- a/components/autofill/core/common/autofill_features.cc +++ b/components/autofill/core/common/autofill_features.cc -@@ -402,7 +402,7 @@ const base::Feature kAutofillSectionUponRedundantNameInfo{ +@@ -411,7 +411,7 @@ const base::Feature kAutofillSectionUponRedundantNameInfo{ // "upload" resources. // i.e., https://other.autofill.server:port/tbproxy/af/ const base::Feature kAutofillServerCommunication{ diff --git a/build/patches/build-remove-calling-untrusted-hooks.patch b/build/patches/build-remove-calling-untrusted-hooks.patch index f5bd9d60..f60aab89 100644 --- a/build/patches/build-remove-calling-untrusted-hooks.patch +++ b/build/patches/build-remove-calling-untrusted-hooks.patch @@ -31,7 +31,7 @@ diff --git a/DEPS b/DEPS # By default bot checkouts the WPR archive files only when this # flag is set True. -@@ -3718,49 +3718,6 @@ hooks = [ +@@ -3694,49 +3694,6 @@ hooks = [ 'sync', '--extract', ], }, @@ -81,10 +81,10 @@ diff --git a/DEPS b/DEPS { # Case-insensitivity for the Win SDK. Must run before win_toolchain below. 'name': 'ciopfs_linux', -@@ -3890,57 +3847,6 @@ hooks = [ - '-s', 'src/third_party/skia', - '--header', 'src/skia/ext/skia_commit_hash.h'], +@@ -3894,57 +3851,6 @@ hooks = [ + ], }, + - # Pull clang-format binaries using checked-in hashes. - { - 'name': 'clang_format_win', @@ -139,7 +139,7 @@ diff --git a/DEPS b/DEPS # Pull rc binaries using checked-in hashes. { 'name': 'rc_win', -@@ -3966,30 +3872,6 @@ hooks = [ +@@ -3970,30 +3876,6 @@ hooks = [ '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', ], }, diff --git a/build/patches/disable-AdsBlockedInfoBar.patch b/build/patches/disable-AdsBlockedInfoBar.patch index f75bb5f2..9c203b67 100644 --- a/build/patches/disable-AdsBlockedInfoBar.patch +++ b/build/patches/disable-AdsBlockedInfoBar.patch @@ -9,7 +9,7 @@ Subject: disable AdsBlockedInfoBar diff --git a/components/subresource_filter/content/browser/profile_interaction_manager.cc b/components/subresource_filter/content/browser/profile_interaction_manager.cc --- a/components/subresource_filter/content/browser/profile_interaction_manager.cc +++ b/components/subresource_filter/content/browser/profile_interaction_manager.cc -@@ -18,13 +18,6 @@ +@@ -19,13 +19,6 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" @@ -23,7 +23,7 @@ diff --git a/components/subresource_filter/content/browser/profile_interaction_m namespace subresource_filter { ProfileInteractionManager::ProfileInteractionManager( -@@ -134,47 +127,6 @@ void ProfileInteractionManager::MaybeShowNotification() { +@@ -135,47 +128,6 @@ void ProfileInteractionManager::MaybeShowNotification() { // currently primary. DCHECK(page_); DCHECK(page_->IsPrimary()); diff --git a/build/patches/disable-appending-variations-header.patch b/build/patches/disable-appending-variations-header.patch index 1988729d..72342e6d 100644 --- a/build/patches/disable-appending-variations-header.patch +++ b/build/patches/disable-appending-variations-header.patch @@ -9,7 +9,7 @@ Subject: disable appending variations header diff --git a/components/variations/net/variations_http_headers.cc b/components/variations/net/variations_http_headers.cc --- a/components/variations/net/variations_http_headers.cc +++ b/components/variations/net/variations_http_headers.cc -@@ -100,10 +100,7 @@ URLValidationResult GetUrlValidationResult(const GURL& url) { +@@ -118,10 +118,7 @@ URLValidationResult GetUrlValidationResult(const GURL& url) { // Also, logs the result of validating |url| in histograms, one of which ends in // |suffix|. bool ShouldAppendVariationsHeader(const GURL& url, const std::string& suffix) { diff --git a/build/patches/disable-background-sync-by-default.patch b/build/patches/disable-background-sync-by-default.patch index 559eca72..35053f33 100644 --- a/build/patches/disable-background-sync-by-default.patch +++ b/build/patches/disable-background-sync-by-default.patch @@ -9,7 +9,7 @@ Subject: disable background sync by default diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -308,7 +308,7 @@ void ContentSettingsRegistry::Init() { +@@ -318,7 +318,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync", diff --git a/build/patches/battery_status_service-disable-more-privacy-nightmares.patch b/build/patches/disable-battery-status-updater.patch similarity index 95% rename from build/patches/battery_status_service-disable-more-privacy-nightmares.patch rename to build/patches/disable-battery-status-updater.patch index 11283ba1..bf624244 100644 --- a/build/patches/battery_status_service-disable-more-privacy-nightmares.patch +++ b/build/patches/disable-battery-status-updater.patch @@ -1,6 +1,6 @@ From: Joachim Bauch Date: Tue, 4 Aug 2015 15:15:53 +0200 -Subject: battery_status_service: disable more privacy nightmares +Subject: disable battery status updater The W3C Battery Status API[1] has quite a laughable statement: diff --git a/build/patches/disable-browser-autologin-by-default.patch b/build/patches/disable-browser-autologin-by-default.patch index 5fdbba12..fd4953a3 100644 --- a/build/patches/disable-browser-autologin-by-default.patch +++ b/build/patches/disable-browser-autologin-by-default.patch @@ -9,7 +9,7 @@ Subject: disable browser autologin by default diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc --- a/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/components/signin/internal/identity_manager/primary_account_manager.cc -@@ -54,7 +54,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -50,7 +50,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { std::string()); registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string()); registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false); diff --git a/build/patches/disable-mobile-identity-consistency-by-default.patch b/build/patches/disable-mobile-identity-consistency-by-default.patch deleted file mode 100644 index 37a93c98..00000000 --- a/build/patches/disable-mobile-identity-consistency-by-default.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Daniel Micay -Date: Fri, 28 May 2021 09:08:01 -0400 -Subject: disable mobile identity consistency by default - ---- - components/signin/public/base/account_consistency_method.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/components/signin/public/base/account_consistency_method.cc b/components/signin/public/base/account_consistency_method.cc ---- a/components/signin/public/base/account_consistency_method.cc -+++ b/components/signin/public/base/account_consistency_method.cc -@@ -10,7 +10,7 @@ namespace signin { - - #if BUILDFLAG(IS_ANDROID) - const base::Feature kMobileIdentityConsistencyPromos{ -- "MobileIdentityConsistencyPromos", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "MobileIdentityConsistencyPromos", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif - - } // namespace signin --- -2.25.1 diff --git a/build/patches/disable-sensors-access-site-setting-by-default.patch b/build/patches/disable-sensors-access-site-setting-by-default.patch index 3b6e4240..b38a5372 100644 --- a/build/patches/disable-sensors-access-site-setting-by-default.patch +++ b/build/patches/disable-sensors-access-site-setting-by-default.patch @@ -9,7 +9,7 @@ Subject: disable sensors access site setting by default diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -408,7 +408,7 @@ void ContentSettingsRegistry::Init() { +@@ -418,7 +418,7 @@ void ContentSettingsRegistry::Init() { // TODO(crbug.com/904439): Update this to "SECURE_ONLY" once // DeviceOrientationEvents and DeviceMotionEvents are only fired in secure // contexts. diff --git a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch index f186c6d0..292c3e5b 100644 --- a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch +++ b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch @@ -13,7 +13,7 @@ Increase probe period from 1s to 15s 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 -@@ -150,12 +150,12 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; +@@ -151,12 +151,12 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; // Time between IPv6 probes, i.e. for how long results of each IPv6 probe are // cached. diff --git a/build/patches/enable-ftrivial-auto-var-init-zero.patch b/build/patches/enable-ftrivial-auto-var-init-zero.patch index 352831f3..3e7e5fcc 100644 --- a/build/patches/enable-ftrivial-auto-var-init-zero.patch +++ b/build/patches/enable-ftrivial-auto-var-init-zero.patch @@ -9,7 +9,7 @@ Subject: enable -ftrivial-auto-var-init=zero diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -354,6 +354,10 @@ config("compiler") { +@@ -349,6 +349,10 @@ config("compiler") { cflags += [ "-fwrapv" ] } diff --git a/build/patches/enable-process-isolated-sandboxed-iframes-by-default.patch b/build/patches/enable-process-isolated-sandboxed-iframes-by-default.patch index 3052ae78..cafee41a 100644 --- a/build/patches/enable-process-isolated-sandboxed-iframes-by-default.patch +++ b/build/patches/enable-process-isolated-sandboxed-iframes-by-default.patch @@ -10,7 +10,7 @@ Signed-off-by: June 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 -@@ -463,7 +463,7 @@ const char kIsolateOriginsFieldTrialParamName[] = "OriginsList"; +@@ -467,7 +467,7 @@ const char kIsolateOriginsFieldTrialParamName[] = "OriginsList"; // the attribute. Note: At present, only iframes with origin-restricted // sandboxes are isolated. const base::Feature kIsolateSandboxedIframes{"IsolateSandboxedIframes", diff --git a/build/patches/first_run-deactivate-autoupdate-globally.patch b/build/patches/first_run-deactivate-autoupdate-globally.patch index 2abe51ee..7c3b32f8 100644 --- a/build/patches/first_run-deactivate-autoupdate-globally.patch +++ b/build/patches/first_run-deactivate-autoupdate-globally.patch @@ -15,7 +15,7 @@ turn it back on. diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -202,8 +202,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { +@@ -203,8 +203,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { user_script_manager_ = std::make_unique(profile_); diff --git a/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch b/build/patches/net-cert-increase-default-key-length.patch similarity index 90% rename from build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch rename to build/patches/net-cert-increase-default-key-length.patch index 58bda770..25d0b97c 100644 --- a/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch +++ b/build/patches/net-cert-increase-default-key-length.patch @@ -1,6 +1,6 @@ From: Jan Engelhardt Date: Mon, 15 Sep 2014 10:52:32 +0200 -Subject: net/cert: increase default key length for newly-generated RSA keys +Subject: net/cert: increase default key length Should we add something for chrome://settings, or just leave it as hidden as it was before? diff --git a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch index 6c6228d1..131a3751 100644 --- a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch +++ b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch @@ -12,7 +12,7 @@ Limit threads auto-detect only for iOS diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc --- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc +++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -@@ -215,11 +215,11 @@ bool H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) { +@@ -217,11 +217,11 @@ bool H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) { init_params.iRCMode = RC_OFF_MODE; } diff --git a/build/patches/prefs-always-prompt-for-download-directory-by-default.patch b/build/patches/prefs-always-prompt-for-download-directory.patch similarity index 93% rename from build/patches/prefs-always-prompt-for-download-directory-by-default.patch rename to build/patches/prefs-always-prompt-for-download-directory.patch index 1b3a109f..cd9facc6 100644 --- a/build/patches/prefs-always-prompt-for-download-directory-by-default.patch +++ b/build/patches/prefs-always-prompt-for-download-directory.patch @@ -1,6 +1,6 @@ From: Jan Engelhardt Date: Fri, 13 Feb 2015 01:04:21 +0100 -Subject: prefs: always prompt for download directory by default +Subject: prefs: always prompt for download directory If the user opens a link, one of two things might happen. The URI resolves to a "web page" and will be displayed, then everything is @@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily. diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -266,7 +266,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -267,7 +267,7 @@ void DownloadPrefs::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, diff --git a/build/patches/prefs-disable-signinallowed-by-default.patch b/build/patches/prefs-disable-signinallowed-by-default.patch index 3a22484a..889bbafc 100644 --- a/build/patches/prefs-disable-signinallowed-by-default.patch +++ b/build/patches/prefs-disable-signinallowed-by-default.patch @@ -9,7 +9,7 @@ Subject: prefs: disable signinallowed by default diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc --- a/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/components/signin/internal/identity_manager/primary_account_manager.cc -@@ -56,7 +56,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -52,7 +52,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false); registry->RegisterBooleanPref(prefs::kAutologinEnabled, true); registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList); diff --git a/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch b/build/patches/profile-resetter-disable-send-settings.patch similarity index 94% rename from build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch rename to build/patches/profile-resetter-disable-send-settings.patch index 66b6b955..6a046b34 100644 --- a/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch +++ b/build/patches/profile-resetter-disable-send-settings.patch @@ -1,6 +1,6 @@ From: Jan Engelhardt Date: Tue, 28 Oct 2014 18:45:19 +0100 -Subject: profile-resetter: do not tick send-settings by default +Subject: profile-resetter: disable send-settings When the user wishes to reset his preferences, Chromium would suggest to send over the old settings to Google. I presume that this is for diff --git a/build/patches/ungoogled-chromium-Disable-intranet-redirect-detector.patch b/build/patches/ungoogled-chromium-Disable-intranet-detector.patch similarity index 94% rename from build/patches/ungoogled-chromium-Disable-intranet-redirect-detector.patch rename to build/patches/ungoogled-chromium-Disable-intranet-detector.patch index 9196e3ae..3dde65f1 100644 --- a/build/patches/ungoogled-chromium-Disable-intranet-redirect-detector.patch +++ b/build/patches/ungoogled-chromium-Disable-intranet-detector.patch @@ -1,6 +1,6 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Mon, 12 Feb 2018 21:30:30 +0100 -Subject: ungoogled-chromium: Disable intranet redirect detector +Subject: ungoogled-chromium: Disable intranet detector Disables the intranet redirect detector. It generates extra DNS requests and the functionality using this is disabled. diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch index b0de988b..22349cf3 100644 --- a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch +++ b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch @@ -11,7 +11,7 @@ Added some Bromite-specific further improvements diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1391,8 +1391,6 @@ static_library("browser") { +@@ -1397,8 +1397,6 @@ static_library("browser") { "profiles/profile_attributes_storage.cc", "profiles/profile_attributes_storage.h", "profiles/profile_attributes_storage_observer.h", diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index 105d5900..a781cb70 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -165,7 +165,7 @@ diff --git a/chrome/browser/language/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 -@@ -1533,9 +1533,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1537,9 +1537,6 @@ Your Google account may have other forms of browsing history like searches and a Websites will show text in your preferred language, when possible. diff --git a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch index d23287cf..4306d8c9 100644 --- a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch +++ b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch @@ -48,7 +48,7 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc -@@ -337,7 +337,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request, +@@ -336,7 +336,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request, // Open network connection. InternetHandle connection_handle = InternetConnectA(inet_handle, @@ -57,7 +57,7 @@ diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc INTERNET_FLAG_NO_CACHE_WRITE, 0); if (!connection_handle) return PING_FAILURE; -@@ -381,7 +381,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request, +@@ -380,7 +380,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request, return PING_SUCCESSFUL; #else std::string url = diff --git a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch index cfd519c2..37d46987 100644 --- a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch +++ b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch @@ -9,7 +9,7 @@ Subject: ungoogled-chromium: Disable webRTC log uploader diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -127,28 +127,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload( +@@ -126,28 +126,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload( DCHECK(meta_data.get()); DCHECK(!upload_done_data.paths.directory.empty()); @@ -39,7 +39,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser } void WebRtcLogUploader::PrepareMultipartPostData( -@@ -159,6 +138,11 @@ void WebRtcLogUploader::PrepareMultipartPostData( +@@ -158,6 +137,11 @@ void WebRtcLogUploader::PrepareMultipartPostData( DCHECK(!compressed_log.empty()); DCHECK(meta_data.get()); diff --git a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch index fba520a0..9db1abb0 100644 --- a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch +++ b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch @@ -27,7 +27,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc -@@ -103,7 +103,9 @@ WebRTCIPHandlingPolicy GetWebRTCIPHandlingPolicy(const String& preference) { +@@ -105,7 +105,9 @@ WebRTCIPHandlingPolicy GetWebRTCIPHandlingPolicy(const String& preference) { return kDefaultPublicInterfaceOnly; if (preference == kWebRTCIPHandlingDisableNonProxiedUdp) return kDisableNonProxiedUdp; @@ -38,7 +38,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d } bool IsValidPortRange(uint16_t min_port, uint16_t max_port) { -@@ -774,7 +776,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -780,7 +782,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( break; }