diff --git a/build/RELEASE b/build/RELEASE index 95485dae..a1133ae0 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -94.0.4606.109 +95.0.4638.67 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index c9f518e0..5948441d 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -48,7 +48,6 @@ Remove-help-menu-item.patch AudioBuffer-AnalyserNode-fp-mitigations.patch Multiple-fingerprinting-mitigations.patch Disable-metrics-on-all-I-O-threads.patch -Always-respect-async-dns-flag-regardless-of-SDK-version.patch Add-flag-to-configure-maximum-connections-per-host.patch Do-not-ignore-download-location-prompt-setting.patch Add-bookmark-import-export-actions.patch @@ -160,7 +159,8 @@ Add-custom-tab-intents-privacy-option.patch Enable-share-intent.patch Site-setting-for-images.patch Bromite-auto-updater.patch -Add-flag-to-disable-pull-to-refresh-effect.patch Experimental-user-scripts-support.patch Enable-native-Android-autofill.patch +Keep-empty-tabs-between-sessions.patch Automated-domain-substitution.patch +Disable-third-party-origin-trials.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index 943657a9..09432a15 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 -@@ -2017,7 +2017,7 @@ +@@ -2101,7 +2101,7 @@ { "name": "enable-image-reader", "owners": [ "vikassoni", "liberato" ], @@ -156,8 +156,8 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; -@@ -319,6 +322,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { - gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] = +@@ -344,6 +347,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { + gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] = kGpuFeatureStatusBlocklisted; } + @@ -225,7 +225,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -668,6 +668,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -653,6 +653,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", // Note: Has no effect if kMediaDrmPreprovisioning feature is disabled. const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -239,7 +239,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h -@@ -219,6 +219,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; +@@ -216,6 +216,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders; MEDIA_EXPORT extern const base::Feature kAllowNonSecureOverlays; MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index e133b123..10b5180f 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 -@@ -223,6 +223,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -226,6 +226,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; -@@ -976,6 +977,8 @@ public abstract class ChromeActivity +@@ -984,6 +985,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 -@@ -88,6 +88,7 @@ public class ChromeCachedFlags { +@@ -87,6 +87,7 @@ public class ChromeCachedFlags { add(ChromeFeatureList.EARLY_LIBRARY_LOAD); add(ChromeFeatureList.ELASTIC_OVERSCROLL); 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 -@@ -2781,6 +2781,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2910,6 +2910,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, #if defined(OS_ANDROID) @@ -91,15 +91,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -139,6 +139,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &feed::kFeedInteractiveRefresh, +@@ -142,6 +142,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &feed::kFeedSignInPromoDismiss, &feed::kInterestFeedContentSuggestions, &feed::kInterestFeedSpinnerAlwaysAnimate, + &kAllowUserCertificates, &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -373,6 +374,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ +@@ -377,6 +378,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -128,13 +128,13 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f private static Map sDefaults = ImmutableMap.builder() + .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false) - .put(ChromeFeatureList.ANDROID_PARTNER_CUSTOMIZATION_PHENOTYPE, true) .put(ChromeFeatureList.BOOKMARK_BOTTOM_SHEET, false) .put(ChromeFeatureList.CONDITIONAL_TAB_STRIP_ANDROID, false) + .put(ChromeFeatureList.LENS_CAMERA_ASSISTED_SEARCH, false) 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 -@@ -211,6 +211,7 @@ public abstract class ChromeFeatureList { +@@ -193,6 +193,7 @@ public abstract class ChromeFeatureList { } /* Alphabetical: */ diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index dbe6f3a3..24bab18a 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 -@@ -7617,6 +7617,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7852,6 +7852,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( chrome::android::kBookmarksExportUseSaf)}, @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1407,6 +1407,10 @@ const char kHttpsOnlyModeDescription[] = +@@ -1460,6 +1460,10 @@ const char kHttpsOnlyModeDescription[] = "Adds a setting under chrome://settings/security to opt-in to HTTPS-First " "Mode."; @@ -43,7 +43,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -814,6 +814,9 @@ extern const char kHostedAppShimCreationDescription[]; +@@ -845,6 +845,9 @@ extern const char kHostedAppShimCreationDescription[]; extern const char kHttpsOnlyModeName[]; extern const char kHttpsOnlyModeDescription[]; @@ -81,7 +81,7 @@ diff --git a/net/base/features.h b/net/base/features.h diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -214,6 +214,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -215,6 +215,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { } #if defined(OS_ANDROID) diff --git a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch index 8a669003..3b605368 100644 --- a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -17,7 +17,7 @@ See also: diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7518,6 +7518,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7709,6 +7709,12 @@ const FeatureEntry kFeatureEntries[] = { "AndroidDynamicColor")}, #endif // defined(OS_ANDROID) @@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -635,6 +635,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] = +@@ -658,6 +658,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] = "authenticator (if available) to verify card ownership when retrieving " "credit cards from Google Payments."; @@ -48,7 +48,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -404,6 +404,9 @@ extern const char kEnableAutofillSaveCardInfoBarAccountIndicationFooterName[]; +@@ -420,6 +420,9 @@ extern const char kEnableAutofillSaveCardInfoBarAccountIndicationFooterName[]; extern const char kEnableAutofillSaveCardInfoBarAccountIndicationFooterDescription[]; @@ -61,7 +61,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl --- a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl +++ b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl -@@ -129,10 +129,6 @@ public abstract class ChromeSwitches {{ +@@ -123,10 +123,6 @@ public abstract class ChromeSwitches {{ /** Switch for enabling the Chrome Survey. Only works when UMA is accepted. */ public static final String CHROME_FORCE_ENABLE_SURVEY = "force-enable-chrome-survey"; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 3748d9ed..40ea2794 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -23,17 +23,17 @@ for SimpleURLLoaders as well. chrome/browser/resources/proxy_config.js | 266 +++++++++++ chrome/browser/ui/BUILD.gn | 2 + .../webui/chrome_web_ui_controller_factory.cc | 3 + - chrome/browser/ui/webui/proxy_config_ui.cc | 416 ++++++++++++++++++ + chrome/browser/ui/webui/proxy_config_ui.cc | 419 ++++++++++++++++++ chrome/browser/ui/webui/proxy_config_ui.h | 33 ++ chrome/common/webui_url_constants.cc | 4 + chrome/common/webui_url_constants.h | 2 + - .../core/browser/proxy_policy_handler.cc | 2 +- .../pref_proxy_config_tracker_impl.cc | 1 + .../proxy_config/proxy_config_dictionary.cc | 30 +- .../proxy_config/proxy_config_dictionary.h | 7 +- + .../proxy_config/proxy_policy_handler.cc | 2 +- net/proxy_resolution/proxy_config.cc | 52 ++- net/proxy_resolution/proxy_config.h | 3 + - 24 files changed, 995 insertions(+), 14 deletions(-) + 24 files changed, 998 insertions(+), 14 deletions(-) create mode 100644 chrome/browser/resources/proxy_config.css create mode 100644 chrome/browser/resources/proxy_config.html create mode 100644 chrome/browser/resources/proxy_config.js @@ -70,7 +70,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -50,6 +50,7 @@ import org.chromium.ui.text.SpanApplier; +@@ -49,6 +49,7 @@ import org.chromium.ui.text.SpanApplier; public class PrivacySettings extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener, INeedSnackbarManager { @@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -365,6 +365,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -367,6 +367,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUISettingsURL)); #endif @@ -93,7 +93,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -88,6 +88,12 @@ +@@ -89,6 +89,12 @@ @@ -182,7 +182,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #if BUILDFLAG(ENABLE_BACKGROUND_MODE) #include "chrome/browser/background/background_mode_manager.h" #endif -@@ -914,6 +916,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -941,6 +943,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { PluginsResourceService::RegisterPrefs(registry); #endif @@ -647,7 +647,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h" #include "chrome/browser/ui/webui/signin_internals_ui.h" #include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h" -@@ -619,6 +620,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -638,6 +639,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -660,7 +660,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webu new file mode 100644 --- /dev/null +++ b/chrome/browser/ui/webui/proxy_config_ui.cc -@@ -0,0 +1,416 @@ +@@ -0,0 +1,419 @@ +/* + This file is part of Bromite. + @@ -747,9 +747,9 @@ new file mode 100644 + void RegisterMessages() override; + + // Messages -+ void OnEnableNotifyUIWithState(const base::ListValue* list); -+ void OnApply(const base::ListValue* config); -+ void OnClear(const base::ListValue* config); ++ void OnEnableNotifyUIWithState(base::Value::ConstListView list); ++ void OnApply(base::Value::ConstListView config); ++ void OnClear(base::Value::ConstListView config); + + // net::ProxyConfigService::Observer implementation: + // Calls ProxyConfigView.onProxyConfigChanged JavaScript function in the @@ -910,7 +910,7 @@ new file mode 100644 +// The proxy configuration UI is not notified of state changes until this function runs. +// After this function, OnProxyConfigChanged() will be called on all proxy state changes. +void ProxyConfigMessageHandler::OnEnableNotifyUIWithState( -+ const base::ListValue* list) { ++ base::Value::ConstListView list) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + + if (!is_observing_) { @@ -932,24 +932,24 @@ new file mode 100644 + OnProxyConfigChanged(config, availability); +} + -+void ProxyConfigMessageHandler::OnClear(const base::ListValue* list) { ++void ProxyConfigMessageHandler::OnClear(base::Value::ConstListView list) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + + const base::Value cfg = ProxyConfigDictionary::CreateSystem(); + pref_service_->Set(proxy_config::prefs::kProxy, cfg); + pref_service_->CommitPendingWrite(); -+ OnEnableNotifyUIWithState(nullptr); ++ OnEnableNotifyUIWithState(list); +} + -+void ProxyConfigMessageHandler::OnApply(const base::ListValue* list) { ++void ProxyConfigMessageHandler::OnApply(base::Value::ConstListView list) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + -+ if ((list->GetList().size() != 1) || !list->GetList()[0].is_dict()) { ++ if ((list.size() != 1) || !list[0].is_dict()) { + return; + } + + const base::DictionaryValue* config = nullptr; -+ if (!list->GetDictionary(0, &config)) ++ if (!list[0].GetAsDictionary(&config)) + return; + + const base::Value *autoDetect = config->FindKeyOfType("auto_detect", base::Value::Type::BOOLEAN); @@ -1019,7 +1019,8 @@ new file mode 100644 + } else if (t == "direct") { + proxyConfig.proxy_rules().type = net::ProxyConfig::ProxyRules::Type::EMPTY; + } else if (t == "none") { -+ OnClear(nullptr); ++ base::Value::ConstListView empty; ++ OnClear(empty); + return; + } else { + // invalid type @@ -1064,7 +1065,9 @@ new file mode 100644 + pref_service_->Set(proxy_config::prefs::kProxy, cfg); + } + pref_service_->CommitPendingWrite(); -+ OnEnableNotifyUIWithState(nullptr); ++ ++ base::Value::ConstListView empty; ++ OnEnableNotifyUIWithState(empty); +} + +} // namespace @@ -1118,7 +1121,7 @@ new file mode 100644 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -34,6 +34,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; +@@ -35,6 +35,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; const char kChromeUICertificateViewerURL[] = "chrome://view-cert/"; const char kChromeUIChromeSigninHost[] = "chrome-signin"; const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/"; @@ -1146,7 +1149,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -125,6 +125,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -126,6 +126,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; @@ -1155,18 +1158,6 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const extern const char kChromeUINetInternalsHost[]; extern const char kChromeUINetInternalsURL[]; extern const char kChromeUINewTabHost[]; -diff --git a/components/policy/core/browser/proxy_policy_handler.cc b/components/policy/core/browser/proxy_policy_handler.cc ---- a/components/policy/core/browser/proxy_policy_handler.cc -+++ b/components/policy/core/browser/proxy_policy_handler.cc -@@ -207,7 +207,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, - ProxyConfigDictionary::CreateFixedServers( - server->GetString(), bypass_list && bypass_list->is_string() - ? bypass_list->GetString() -- : std::string())); -+ : std::string(), false)); - } - break; - } diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc --- a/components/proxy_config/pref_proxy_config_tracker_impl.cc +++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc @@ -1303,6 +1294,18 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox base::Value dict_; +diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc +--- a/components/proxy_config/proxy_policy_handler.cc ++++ b/components/proxy_config/proxy_policy_handler.cc +@@ -259,7 +259,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, + ProxyConfigDictionary::CreateFixedServers( + server->GetString(), bypass_list && bypass_list->is_string() + ? bypass_list->GetString() +- : std::string())); ++ : std::string(), false)); + } + break; + } diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc --- a/net/proxy_resolution/proxy_config.cc +++ b/net/proxy_resolution/proxy_config.cc diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index d7ba4453..55bc3974 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -44,7 +44,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -28,6 +28,11 @@ +@@ -32,6 +32,11 @@ android:key="secure_dns" android:title="@string/settings_secure_dns_title" android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings"/> @@ -152,7 +152,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; -@@ -1756,8 +1757,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1884,6 +1885,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -212,7 +212,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,10 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -408,6 +409,10 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { boolean hasSaveImage = false; mShowEphemeralTabNewLabel = null; @@ -223,7 +223,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr List> groupedItems = new ArrayList<>(); if (mParams.isAnchor()) { -@@ -427,6 +432,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -426,6 +431,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP)); } } @@ -231,7 +231,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 +457,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -450,7 +456,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -278,7 +278,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java -@@ -50,6 +50,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable; +@@ -49,6 +49,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable; import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.device.mojom.ScreenOrientationLockType; @@ -288,7 +288,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; -@@ -727,7 +730,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -726,7 +729,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isIncognito() { @@ -339,7 +339,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -27,6 +27,10 @@ import org.chromium.chrome.browser.profiles.Profile; +@@ -26,6 +26,10 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; @@ -350,7 +350,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate; import org.chromium.components.browser_ui.settings.SettingsLauncher; -@@ -41,7 +45,12 @@ import org.chromium.ui.text.SpanApplier; +@@ -40,7 +44,12 @@ import org.chromium.ui.text.SpanApplier; * Fragment to keep track of the all the privacy related preferences. */ public class PrivacySettings @@ -364,7 +364,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_NETWORK_PREDICTIONS = "preload_pages"; private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; -@@ -84,6 +93,25 @@ public class PrivacySettings +@@ -83,6 +92,25 @@ public class PrivacySettings (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); canMakePaymentPref.setOnPreferenceChangeListener(this); @@ -390,7 +390,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting ChromeSwitchPreference networkPredictionPref = (ChromeSwitchPreference) findPreference(PREF_NETWORK_PREDICTIONS); networkPredictionPref.setChecked( -@@ -115,6 +143,9 @@ public class PrivacySettings +@@ -114,6 +142,9 @@ public class PrivacySettings } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { PrivacyPreferencesManagerImpl.getInstance().setNetworkPredictionEnabled( (boolean) newValue); @@ -400,7 +400,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); -@@ -192,4 +223,8 @@ public class PrivacySettings +@@ -191,4 +222,8 @@ public class PrivacySettings } return false; } @@ -518,7 +518,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; -@@ -687,6 +690,13 @@ public class TabPersistentStore { +@@ -654,6 +657,13 @@ public class TabPersistentStore { } } } @@ -580,7 +580,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI 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 -@@ -447,7 +447,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", +@@ -445,7 +445,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognitoAvailableToThirdParty{ @@ -592,7 +592,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -907,6 +907,19 @@ Your Google account may have other forms of browsing history like searches and a +@@ -922,6 +922,19 @@ Your Google account may have other forms of browsing history like searches and a Clears history from all synced devices. diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index df152c69..d4e74850 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -69,7 +69,7 @@ diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils. diff --git a/base/android/content_uri_utils.h b/base/android/content_uri_utils.h --- a/base/android/content_uri_utils.h +++ b/base/android/content_uri_utils.h -@@ -17,6 +17,10 @@ namespace base { +@@ -18,6 +18,10 @@ namespace base { // Returns -1 if the URI is invalid. BASE_EXPORT File OpenContentUriForRead(const FilePath& content_uri); @@ -146,7 +146,7 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/ @@ -21,6 +21,20 @@ android:visible="false" app:showAsAction="ifRoom" - app:iconTint="@color/default_icon_color_tint_list" /> + app:iconTint="@color/default_icon_color_secondary_tint_list" /> + +@@ -84,6 +84,12 @@ public class BookmarkActionBar extends SelectableListToolbar } else if (menuItem.getItemId() == R.id.search_menu_id) { mDelegate.openSearchUI(); return true; @@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } SelectionDelegate selectionDelegate = mDelegate.getSelectionDelegate(); -@@ -134,6 +140,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -135,6 +141,8 @@ public class BookmarkActionBar extends SelectableListToolbar void showLoadingUi() { setTitle(null); setNavigationButton(NAVIGATION_BUTTON_NONE); @@ -218,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false); } -@@ -143,6 +151,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -144,6 +152,8 @@ public class BookmarkActionBar extends SelectableListToolbar super.showNormalView(); if (mDelegate == null) { @@ -227,7 +227,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm getMenu().findItem(R.id.search_menu_id).setVisible(false); getMenu().findItem(R.id.edit_menu_id).setVisible(false); } -@@ -173,6 +183,8 @@ public class BookmarkActionBar extends SelectableListToolbar +@@ -174,6 +184,8 @@ public class BookmarkActionBar extends SelectableListToolbar public void onFolderStateSet(BookmarkId folder) { mCurrentFolder = mDelegate.getModel().getBookmarkById(folder); @@ -287,7 +287,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); -+ mWindowAndroid.getIntentRequestTracker().onActivityResult(requestCode, resultCode, data, mWindowAndroid); ++ mWindowAndroid.getIntentRequestTracker().onActivityResult(requestCode, resultCode, data); if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) { BookmarkId bookmarkId = BookmarkId.getBookmarkIdFromString(data.getStringExtra( INTENT_VISIT_BOOKMARK_ID)); @@ -417,7 +417,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + window.showIntent(fileSelector, + new WindowAndroid.IntentCallback() { + @Override -+ public void onIntentCompleted(WindowAndroid window, int resultCode, Intent data) { ++ public void onIntentCompleted(int resultCode, Intent data) { + if (data == null) return; + Uri filePath = data.getData(); + doExportBookmarksImpl(window, filePath); @@ -446,8 +446,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + // get real actual file name on disk + if (actualFilePath==null) actualFilePath = lastSelectedUri.toString(); + // set file name to last exported file name -+ fileSelector.putExtra(Intent.EXTRA_TITLE, -+ ContentUriUtils.getDisplayName(lastSelectedUri, context, ++ fileSelector.putExtra(Intent.EXTRA_TITLE, ++ ContentUriUtils.getDisplayName(lastSelectedUri, context, + DocumentsContract.Document.COLUMN_DISPLAY_NAME)); + } + return null; @@ -504,7 +504,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + DownloadLocationDialogController controller = new DownloadLocationDialogController() { + @Override + public void onDownloadLocationDialogComplete(String returnedPath) {} -+ ++ + @Override + public void onDownloadLocationDialogCanceled() {} + }; @@ -786,7 +786,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1817,6 +1817,13 @@ static_library("browser") { +@@ -1832,6 +1832,13 @@ static_library("browser") { "window_placement/window_placement_permission_context.h", ] @@ -800,7 +800,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -2938,6 +2945,8 @@ static_library("browser") { +@@ -2965,6 +2972,8 @@ static_library("browser") { "autofill/manual_filling_view_interface.h", "banners/android/chrome_app_banner_manager_android.cc", "banners/android/chrome_app_banner_manager_android.h", @@ -809,7 +809,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", -@@ -3483,8 +3492,6 @@ static_library("browser") { +@@ -3541,8 +3550,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -821,9 +821,9 @@ 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 -@@ -7567,6 +7567,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - password_manager::features::kPasswordsAccountStorageRevisedOptInFlow)}, +@@ -7802,6 +7802,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kCommerceDeveloperDescription, kOsAll, + FEATURE_VALUE_TYPE(commerce::kCommerceDeveloper)}, + {"export-bookmarks-use-saf", + flag_descriptions::kBookmarksExportUseSafName, @@ -1339,7 +1339,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -5306,6 +5306,11 @@ const char kWebKioskEnableLacrosDescription[] = +@@ -5415,6 +5415,11 @@ const char kWebKioskEnableLacrosDescription[] = "Chrome OS. When disabled, the Ash-chrome will be used"; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1354,7 +1354,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 -@@ -3091,6 +3091,9 @@ extern const char kWebKioskEnableLacrosName[]; +@@ -3162,6 +3162,9 @@ extern const char kWebKioskEnableLacrosName[]; extern const char kWebKioskEnableLacrosDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1367,7 +1367,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 -@@ -164,6 +164,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -165,6 +165,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kBackgroundThreadPool, &kBentoOffline, &kBookmarkBottomSheet, @@ -1375,7 +1375,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCastDeviceFilter, &kCloseTabSuggestions, &kCriticalPersistedTabData, -@@ -810,6 +811,10 @@ const base::Feature kWebApkInstallCompleteNotification{ +@@ -812,6 +813,10 @@ const base::Feature kWebApkInstallCompleteNotification{ const base::Feature kWebApkTrampolineOnInitialIntent{ "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1400,7 +1400,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 -@@ -560,6 +560,7 @@ public abstract class ChromeFeatureList { +@@ -546,6 +546,7 @@ public abstract class ChromeFeatureList { "WebApkTrampolineOnInitialIntent"; public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; public static final String WEB_OTP_CROSS_DEVICE_SIMPLE_STRING = "WebOtpCrossDeviceSimpleString"; @@ -1478,7 +1478,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** * Whether Chrome is set as the default browser. -@@ -1042,6 +1044,7 @@ public final class ChromePreferenceKeys { +@@ -1059,6 +1061,7 @@ public final class ChromePreferenceKeys { AUTOFILL_ASSISTANT_PROACTIVE_HELP, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1517,7 +1517,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 -@@ -416,6 +416,9 @@ static_library("common") { +@@ -412,6 +412,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1539,7 +1539,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/external_process_importer_bridge.cc", -@@ -184,6 +182,11 @@ static_library("utility") { +@@ -185,6 +183,11 @@ static_library("utility") { } } @@ -1717,7 +1717,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui return mimeTypes; } -@@ -812,6 +820,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -811,6 +819,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick return countAcceptTypesFor(superType) == mFileTypes.size(); } diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index 12f15017..9b55f274 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -20,7 +20,7 @@ See also: https://github.com/bromite/bromite/issues/1474 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -56,6 +56,16 @@ +@@ -60,6 +60,16 @@ android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" android:key="do_not_track" android:title="@string/do_not_track_title"/> @@ -133,7 +133,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -191,6 +194,9 @@ public class PrivacySettings +@@ -190,6 +193,9 @@ public class PrivacySettings updateSummaries(); } @@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); -@@ -222,6 +228,14 @@ public class PrivacySettings +@@ -221,6 +227,14 @@ public class PrivacySettings } else if (PREF_INCOGNITO_TAB_HISTORY_ENABLED.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED, (boolean) newValue); @@ -158,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; -@@ -257,6 +271,16 @@ public class PrivacySettings +@@ -256,6 +270,16 @@ public class PrivacySettings canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -194,7 +194,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4496,6 +4496,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 4ef86959..9f8da8c2 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -37,7 +37,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 -@@ -206,6 +206,8 @@ import java.util.HashSet; +@@ -208,6 +208,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -46,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct /** * This is the main activity for ChromeMobile when not running in document mode. All the tabs * are accessible via a chrome specific tab switching UI. -@@ -2008,6 +2010,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2309,6 +2310,11 @@ public abstract class ChromeActivity return true; } @@ -97,7 +97,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 -@@ -3144,6 +3144,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Turn on Request desktop site diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index f7f93277..d765260f 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -15,7 +15,7 @@ and internal chrome:// pages will be used for the autocomplete results. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -449,6 +449,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { +@@ -456,6 +456,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { base::size(kReaderModeOfferInSettings), nullptr}}; #endif // OS_ANDROID @@ -38,7 +38,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if defined(OS_ANDROID) const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = { {"mode", "always-none"}}; -@@ -4766,6 +4782,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4973,6 +4989,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) @@ -81,7 +81,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc -@@ -553,6 +553,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, +@@ -551,6 +551,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY) matches_.push_back(what_you_typed_match); diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 11eb4405..4f08a46d 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -14,7 +14,7 @@ Subject: Add flag for save-data-header diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4500,6 +4500,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4700,6 +4700,9 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if defined(OS_ANDROID) @@ -27,7 +27,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1035,6 +1035,10 @@ const char kDisableKeepaliveFetchDescription[] = +@@ -1058,6 +1058,10 @@ const char kDisableKeepaliveFetchDescription[] = "Disable fetch with keepalive set " "(https://fetch.spec.whatwg.org/#request-keepalive-flag)."; @@ -41,7 +41,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -564,6 +564,9 @@ extern const char kDiagnosticsAppNavigationDescription[]; +@@ -583,6 +583,9 @@ extern const char kDiagnosticsAppNavigationDescription[]; extern const char kDisableKeepaliveFetchName[]; extern const char kDisableKeepaliveFetchDescription[]; @@ -70,7 +70,7 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -156,6 +156,10 @@ const base::FeatureParam +@@ -140,6 +140,10 @@ const base::FeatureParam "DisabledProviders", ""}; // Disable special treatment on requests with keepalive set (see @@ -84,7 +84,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 -@@ -60,6 +60,8 @@ extern const base::FeatureParam +@@ -54,6 +54,8 @@ extern const base::FeatureParam COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kDisableKeepaliveFetch; 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 c88e46ce..7dc5ffc7 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -19,7 +19,7 @@ with limited CPU/memory resources and it is disabled by default. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -837,6 +837,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -868,6 +868,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { net::kEffectiveConnectionType4G}, }; @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // Ensure that all effective connection types returned by Network Quality // Estimator (NQE) are also exposed via flags. static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 == -@@ -3792,6 +3797,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3974,6 +3979,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 -@@ -1524,6 +1524,10 @@ const char kMediaHistoryDescription[] = +@@ -1572,6 +1572,10 @@ const char kMediaHistoryDescription[] = "Enables Media History which records data around media playbacks on " "websites."; @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -877,6 +877,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -905,6 +905,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kMediaHistoryName[]; extern const char kMediaHistoryDescription[]; diff --git a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch index f0f9d87e..e49e713a 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 -@@ -2708,6 +2708,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2837,6 +2837,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 -@@ -1120,6 +1120,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1143,6 +1143,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 -@@ -632,6 +632,9 @@ extern const char kEnablePortalsDescription[]; +@@ -648,6 +648,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index de12f754..97e83b19 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 -@@ -4742,6 +4742,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4949,6 +4949,11 @@ const FeatureEntry kFeatureEntries[] = { #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || // defined(OS_CHROMEOS) @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3015,6 +3015,10 @@ const char kContextualSearchRankerQueryDescription[] = +@@ -3070,6 +3070,10 @@ const char kContextualSearchRankerQueryDescription[] = const char kContextualSearchSecondTapName[] = "Contextual Search second tap triggering"; @@ -45,7 +45,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -689,6 +689,9 @@ extern const char kEnableWasmLazyCompilationName[]; +@@ -711,6 +711,9 @@ extern const char kEnableWasmLazyCompilationName[]; extern const char kEnableWasmLazyCompilationDescription[]; extern const char kEnableWasmTieringName[]; @@ -101,7 +101,7 @@ diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/compon diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -86,6 +86,7 @@ +@@ -88,6 +88,7 @@ #include "net/log/net_log_event_type.h" #include "net/log/net_log_source.h" #include "net/log/net_log_source_type.h" @@ -109,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc #include "net/log/net_log_with_source.h" #include "net/socket/client_socket_factory.h" #include "net/socket/datagram_client_socket.h" -@@ -3512,8 +3513,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3692,8 +3693,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { diff --git a/build/patches/Add-flag-to-disable-WebGL.patch b/build/patches/Add-flag-to-disable-WebGL.patch index 460fd636..17b919dc 100644 --- a/build/patches/Add-flag-to-disable-WebGL.patch +++ b/build/patches/Add-flag-to-disable-WebGL.patch @@ -11,7 +11,7 @@ Subject: Add flag to disable WebGL diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -2643,6 +2643,9 @@ const FeatureEntry::FeatureVariation kReadLaterVariations[] = { +@@ -2772,6 +2772,9 @@ const FeatureEntry::Choice kDocumentTransitionSlowdownFactorChoices[] = { // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and @@ -24,7 +24,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -613,6 +613,10 @@ const char kEnableAudioFocusEnforcementName[] = "Audio Focus Enforcement"; +@@ -636,6 +636,10 @@ const char kEnableAudioFocusEnforcementName[] = "Audio Focus Enforcement"; const char kEnableAudioFocusEnforcementDescription[] = "Enables enforcement of a single media session having audio focus at " "any one time. Requires #enable-media-session-service to be enabled too."; @@ -38,7 +38,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -341,6 +341,9 @@ extern const char kForceColorProfileSRGB[]; +@@ -354,6 +354,9 @@ extern const char kForceColorProfileSRGB[]; extern const char kForceColorProfileP3[]; extern const char kForceColorProfileColorSpin[]; extern const char kForceColorProfileSCRGBLinear[]; diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch index 1a66787a..e88cf7d7 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -11,7 +11,7 @@ Subject: Add flag to disable external intent requests diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -2697,6 +2697,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2826,6 +2826,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebrtcCaptureMultiChannelApmName, flag_descriptions::kWebrtcCaptureMultiChannelApmDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebRtcEnableCaptureMultiChannelApm)}, @@ -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 -@@ -3272,6 +3272,12 @@ const char kProcessSharingWithStrictSiteInstancesDescription[] = +@@ -3344,6 +3344,12 @@ const char kProcessSharingWithStrictSiteInstancesDescription[] = "separated like strict site isolation, but process selection puts multiple " "site instances in a single process."; @@ -40,7 +40,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1883,6 +1883,9 @@ extern const char kQueryTilesNTPDescription[]; +@@ -1930,6 +1930,9 @@ extern const char kQueryTilesNTPDescription[]; extern const char kQueryTilesOmniboxName[]; extern const char kQueryTilesOmniboxDescription[]; extern const char kQueryTilesSingleTierName[]; diff --git a/build/patches/Add-flag-to-disable-pull-to-refresh-effect.patch b/build/patches/Add-flag-to-disable-pull-to-refresh-effect.patch deleted file mode 100644 index 9f47230b..00000000 --- a/build/patches/Add-flag-to-disable-pull-to-refresh-effect.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Mon, 18 Oct 2021 20:50:48 +0200 -Subject: Add flag to disable pull to refresh effect - ---- - chrome/browser/about_flags.cc | 6 ++++++ - chrome/browser/flag_descriptions.cc | 6 ++++++ - chrome/browser/flag_descriptions.h | 3 +++ - 3 files changed, 15 insertions(+) - -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 -@@ -7477,6 +7477,12 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kPrivacyReviewDescription, kOsDesktop | kOsAndroid, - FEATURE_VALUE_TYPE(features::kPrivacyReview)}, - -+#if defined(OS_ANDROID) -+ {switches::kDisablePullToRefreshEffect, flag_descriptions::kDisablePullToRefreshEffectName, -+ flag_descriptions::kDisablePullToRefreshEffectDescription, kOsAndroid, -+ SINGLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, -+#endif -+ - #if defined(OS_ANDROID) - {"google-mobile-services-passwords", - flag_descriptions::kUnifiedPasswordManagerAndroidName, -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 -@@ -1451,6 +1451,12 @@ const char kIncognitoClearBrowsingDataDialogForDesktopDescription[] = - "When enabled, clear browsing data option would be enabled in Incognito " - "which upon clicking would show a dialog to close all Incognito windows."; - -+const char kDisablePullToRefreshEffectName[] = -+ "Disable the pull-to-refresh effect when vertically overscrolling content."; -+const char kDisablePullToRefreshEffectDescription[] = -+ "Disable the pull-to-refresh effect with the elastic overscroll feature " -+ "used to indicate that the user is scrolling beyond the range of the scrollable area."; -+ - const char kUpdateHistoryEntryPointsInIncognitoName[] = - "Update history entry points in Incognito."; - const char kUpdateHistoryEntryPointsInIncognitoDescription[] = -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 -@@ -564,6 +564,9 @@ extern const char kDiagnosticsAppDescription[]; - extern const char kDiagnosticsAppNavigationName[]; - extern const char kDiagnosticsAppNavigationDescription[]; - -+extern const char kDisablePullToRefreshEffectName[]; -+extern const char kDisablePullToRefreshEffectDescription[]; -+ - extern const char kDisableKeepaliveFetchName[]; - extern const char kDisableKeepaliveFetchDescription[]; - --- -2.17.1 - diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index c78e4ac7..72a7f94c 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 -@@ -6207,6 +6207,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6412,6 +6412,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 -@@ -5127,6 +5127,9 @@ const char kDefaultMeetWebAppDescription[] = +@@ -5242,6 +5242,9 @@ const char kDefaultMeetWebAppDescription[] = "Enables the Meet web app to be installed by default."; #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 -@@ -2968,6 +2968,9 @@ extern const char kDefaultMeetWebAppName[]; +@@ -3044,6 +3044,9 @@ extern const char kDefaultMeetWebAppName[]; extern const char kDefaultMeetWebAppDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -70,19 +70,19 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc @@ -103,6 +103,9 @@ const base::Feature kBackForwardCacheSameSiteForBots{ + // BackForwardCacheMemoryControls is enabled only on Android to disable // BackForwardCache for lower memory devices due to memory limiations. - #if defined(OS_ANDROID) +// Enables vibration; an user gesture will still be required if enabled. +const base::Feature kVibration{"Vibration", + base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kBackForwardCacheMemoryControls{ - "BackForwardCacheMemoryControls", base::FEATURE_ENABLED_BY_DEFAULT}; - #else + "BackForwardCacheMemoryControls", + 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 -@@ -266,6 +266,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; +@@ -273,6 +273,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; CONTENT_EXPORT extern const base::Feature kWebNfc; #endif // defined(OS_ANDROID) @@ -139,7 +139,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1537,6 +1537,10 @@ +@@ -1575,6 +1575,10 @@ name: "OrientationEvent", status: {"Android": "stable"}, }, diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index 87c92d3a..c919a5d8 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -68,7 +68,7 @@ diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/ diff --git a/chrome/android/chrome_test_java_sources.gni b/chrome/android/chrome_test_java_sources.gni --- a/chrome/android/chrome_test_java_sources.gni +++ b/chrome/android/chrome_test_java_sources.gni -@@ -645,3 +645,9 @@ chrome_test_java_sources = [ +@@ -649,3 +649,9 @@ chrome_test_java_sources = [ if (enable_feed_v2) { chrome_test_java_sources += [ "javatests/src/org/chromium/chrome/browser/ntp/NewTabPageColorWithFeedV2Test.java" ] } @@ -81,7 +81,7 @@ diff --git a/chrome/android/chrome_test_java_sources.gni b/chrome/android/chrome diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -42,6 +42,11 @@ +@@ -46,6 +46,11 @@ android:title="@string/close_tabs_on_exit_title" android:summary="@string/close_tabs_on_exit_summary" android:defaultValue="false" /> @@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java -@@ -66,6 +66,10 @@ import org.chromium.ui.widget.Toast; +@@ -71,6 +71,10 @@ import org.chromium.ui.widget.Toast; import java.io.File; @@ -187,7 +187,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo /** * A class containing some utility static methods. */ -@@ -306,7 +310,17 @@ public class DownloadUtils { +@@ -311,7 +315,17 @@ public class DownloadUtils { // Offline pages isn't supported in Incognito. This should be checked before calling // OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found // for incognito profile. @@ -222,7 +222,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History /** * Combines and manages the different UI components of browsing history. */ -@@ -217,7 +223,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve +@@ -216,7 +222,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve : mSelectableListLayout; } @@ -305,7 +305,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.R; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl; import org.chromium.chrome.browser.flags.ChromeFeatureList; -@@ -137,6 +138,11 @@ public class PrivacySettings +@@ -136,6 +137,11 @@ public class PrivacySettings Preference secureDnsPref = findPreference(PREF_SECURE_DNS); secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); @@ -317,7 +317,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting updateSummaries(); } -@@ -159,11 +165,16 @@ public class PrivacySettings +@@ -158,11 +164,16 @@ public class PrivacySettings } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); @@ -334,7 +334,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onResume() { super.onResume(); -@@ -204,6 +215,13 @@ public class PrivacySettings +@@ -203,6 +214,13 @@ public class PrivacySettings (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT); closeTabsOnExitPref.setOnPreferenceChangeListener(this); closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); @@ -1274,7 +1274,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo #else #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -299,6 +302,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -345,6 +348,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -1288,7 +1288,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo if (profile->IsOffTheRecord()) return NULL; -@@ -306,6 +316,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -352,6 +362,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -1325,9 +1325,9 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor private: explicit HistoryTabHelper(content::WebContents* web_contents); friend class content::WebContentsUserData; -@@ -53,9 +60,6 @@ class HistoryTabHelper : public content::WebContentsObserver, - void TitleWasSet(content::NavigationEntry* entry) override; - void WebContentsDestroyed() override; +@@ -65,9 +72,6 @@ class HistoryTabHelper : public content::WebContentsObserver, + bool started_from_context_menu, + bool renderer_initiated) override; - // Helper function to return the history service. May return null. - history::HistoryService* GetHistoryService(); @@ -1348,8 +1348,8 @@ diff --git a/chrome/browser/history/history_tab_helper_unittest.cc b/chrome/brow namespace { #if defined(OS_ANDROID) -@@ -271,4 +274,23 @@ TEST_F(HistoryTabHelperTest, FeedNavigationsDoNotContributeToMostVisited) { - +@@ -48,6 +51,25 @@ class TestFeedApi : public feed::StubFeedApi { + }; #endif +TEST_F(HistoryTabHelperTest, Bromite_CheckHistoryService_IncognitoTabHistoryEnabled) { @@ -1372,6 +1372,8 @@ diff --git a/chrome/browser/history/history_tab_helper_unittest.cc b/chrome/brow +} + } // namespace + + class HistoryTabHelperTest : public ChromeRenderViewHostTestHarness { 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 @@ -1577,7 +1579,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" -@@ -1210,6 +1212,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1239,6 +1241,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); @@ -1666,7 +1668,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 -@@ -938,6 +938,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -953,6 +953,12 @@ Your Google account may have other forms of browsing history like searches and a Your changes will take effect the next time you relaunch Bromite. @@ -1682,7 +1684,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 -@@ -3225,6 +3225,11 @@ const char kLacrosAllowed[] = "lacros_allowed"; +@@ -3238,6 +3238,11 @@ const char kShowCaretBrowsingDialog[] = const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; #endif @@ -1697,7 +1699,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 -@@ -1184,6 +1184,10 @@ extern const char kLastWhatsNewVersion[]; +@@ -1192,6 +1192,10 @@ extern const char kLastWhatsNewVersion[]; extern const char kLensRegionSearchEnabled[]; #endif @@ -1711,7 +1713,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -4669,6 +4669,11 @@ test("unit_tests") { +@@ -4837,6 +4837,11 @@ test("unit_tests") { ] } diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index 52b0a497..125aa8d5 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; -@@ -2020,6 +2022,8 @@ public class ChromeTabbedActivity extends ChromeActivity topLevelFolders = new ArrayList<>(); BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId(); BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId(); @@ -244,7 +244,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm BookmarkId othersNodeId = bookmarkModel.getOtherFolderId(); List specialFoldersIds = -@@ -541,6 +542,9 @@ public class BookmarkUtils { +@@ -540,6 +541,9 @@ public class BookmarkUtils { if (bookmarkModel.isFolderVisible(mobileNodeId)) { topLevelFolders.add(mobileNodeId); } @@ -377,7 +377,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 -@@ -3224,6 +3224,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Track prices diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index aefc55ad..f7b03d01 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 -@@ -2043,6 +2043,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2436,6 +2436,11 @@ public abstract class ChromeActivity return true; } diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index ddc0aa21..a3a13ba0 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -536,6 +536,7 @@ public final class ChromePreferenceKeys { +@@ -543,6 +543,7 @@ public final class ChromePreferenceKeys { public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom"; public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; @@ -101,7 +101,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1200,6 +1200,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1223,6 +1223,12 @@ Your Google account may have other forms of browsing history like searches and a Turn off @@ -129,7 +129,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 -@@ -542,7 +542,7 @@ test("components_unittests") { +@@ -549,7 +549,7 @@ test("components_unittests") { # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency. # On other platforms, no components should depend on Chrome. @@ -138,7 +138,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn assert_no_deps = [ "//chrome/*" ] } -@@ -789,7 +789,7 @@ if (!is_ios) { +@@ -798,7 +798,7 @@ if (!is_ios) { # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency. # On other platforms, no components should depend on Chrome. @@ -150,7 +150,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn -@@ -370,6 +370,8 @@ android_library("ui_no_recycler_view_java") { +@@ -369,6 +369,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 a0108185..0afadf75 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -12,7 +12,7 @@ Subject: Add option to not persist tabs across sessions diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -33,6 +33,11 @@ +@@ -37,6 +37,11 @@ android:title="@string/always_incognito_title" android:summary="@string/always_incognito_summary" android:defaultValue="false" /> @@ -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 -@@ -1188,8 +1188,10 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

IMAGE diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index 0cb5e81d..420159fe 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -38,9 +38,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java --- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java +++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java -@@ -126,4 +126,8 @@ public class SettingsUtils { - ImageView imageButton = (ImageView) button; - return imageButton.getDrawable() == parentMenu.getOverflowIcon(); +@@ -97,4 +97,8 @@ public class SettingsUtils { + ToolbarUtils.setOverflowMenuVisibility(toolbar, visibility); + return true; } + + public interface ISupportHelpAndFeedback { diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 59d38ac7..133fc1bc 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -4,17 +4,21 @@ Subject: Allow building without enable_reporting --- content/browser/BUILD.gn | 8 ++++---- + content/browser/devtools/protocol/network_handler.cc | 2 ++ + content/browser/devtools/protocol/network_handler.h | 2 ++ .../common/content_switch_dependent_feature_overrides.cc | 3 +++ + services/network/network_context.cc | 2 +- + services/network/public/mojom/BUILD.gn | 3 +++ third_party/blink/renderer/core/frame/local_frame.cc | 3 +++ third_party/blink/renderer/core/frame/local_frame.h | 6 +++--- .../blink/renderer/core/frame/reporting_context.cc | 9 +++++++++ .../blink/renderer/core/frame/reporting_context.h | 7 +++++-- - 6 files changed, 27 insertions(+), 9 deletions(-) + 10 files changed, 35 insertions(+), 10 deletions(-) diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -1240,6 +1240,10 @@ source_set("browser") { +@@ -1251,6 +1251,10 @@ source_set("browser") { "net/browser_online_state_observer.cc", "net/browser_online_state_observer.h", "net/cookie_store_factory.cc", @@ -25,7 +29,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn "net/network_errors_listing_ui.cc", "net/network_errors_listing_ui.h", "net/network_quality_observer_impl.cc", -@@ -2989,10 +2993,6 @@ source_set("browser") { +@@ -3009,10 +3013,6 @@ source_set("browser") { if (enable_reporting) { sources += [ @@ -36,6 +40,39 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn "net/reporting_service_proxy.cc", "net/reporting_service_proxy.h", ] +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 +@@ -451,6 +451,7 @@ std::vector ComputeCookieURLs(RenderFrameHostImpl* frame_host, + return urls; + } + ++#if BUILDFLAG(ENABLE_REPORTING) + std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { + std::vector urls; + base::queue queue; +@@ -468,6 +469,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { + } + return urls; + } ++#endif // BUILDFLAG(ENABLE_REPORTING) + + String resourcePriority(net::RequestPriority priority) { + switch (priority) { +diff --git a/content/browser/devtools/protocol/network_handler.h b/content/browser/devtools/protocol/network_handler.h +--- a/content/browser/devtools/protocol/network_handler.h ++++ b/content/browser/devtools/protocol/network_handler.h +@@ -304,8 +304,10 @@ class NetworkHandler : public DevToolsDomainHandler, + Response response, + mojo::ScopedDataPipeConsumerHandle pipe, + const std::string& mime_type); ++#if BUILDFLAG(ENABLE_REPORTING) + std::unique_ptr BuildProtocolReport( + const net::ReportingReport& report); ++#endif // BUILDFLAG(ENABLE_REPORTING) + + // TODO(dgozman): Remove this. + const std::string host_id_; diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc b/content/public/common/content_switch_dependent_feature_overrides.cc --- a/content/public/common/content_switch_dependent_feature_overrides.cc +++ b/content/public/common/content_switch_dependent_feature_overrides.cc @@ -47,7 +84,7 @@ diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" #include "third_party/blink/public/common/features.h" -@@ -46,9 +47,11 @@ GetSwitchDependentFeatureOverrides(const base::CommandLine& command_line) { +@@ -40,9 +41,11 @@ GetSwitchDependentFeatureOverrides(const base::CommandLine& command_line) { {switches::kEnableExperimentalWebPlatformFeatures, std::cref(features::kDocumentPolicyNegotiation), base::FeatureList::OVERRIDE_ENABLE_FEATURE}, @@ -59,6 +96,31 @@ diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc {switches::kEnableExperimentalWebPlatformFeatures, std::cref(features::kExperimentalContentSecurityPolicyFeatures), base::FeatureList::OVERRIDE_ENABLE_FEATURE}, +diff --git a/services/network/network_context.cc b/services/network/network_context.cc +--- a/services/network/network_context.cc ++++ b/services/network/network_context.cc +@@ -1118,7 +1118,7 @@ void NetworkContext::SetDocumentReportingEndpoints( + + void NetworkContext::SendReportsAndRemoveSource( + const base::UnguessableToken& reporting_source) { +- NOTREACHED(); ++ // NOTREACHED(); removed for build in debug + } + + void NetworkContext::QueueReport( +diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn +--- a/services/network/public/mojom/BUILD.gn ++++ b/services/network/public/mojom/BUILD.gn +@@ -888,6 +888,9 @@ mojom("mojom") { + export_class_attribute_blink = "BLINK_PLATFORM_EXPORT" + export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" + export_header_blink = "third_party/blink/public/platform/web_common.h" ++ } ++ ++ if (enable_reporting) { + enabled_features += [ "enable_reporting" ] + } + 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 @@ -85,8 +147,8 @@ 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 -@@ -33,9 +33,9 @@ - +@@ -34,9 +34,9 @@ + #include "base/gtest_prod_util.h" #include "base/time/default_tick_clock.h" #include "base/unguessable_token.h" -#include "build/build_config.h" @@ -96,7 +158,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" -@@ -543,9 +543,9 @@ class CORE_EXPORT LocalFrame final : public Frame, +@@ -544,9 +544,9 @@ class CORE_EXPORT LocalFrame final : public Frame, } SmoothScrollSequencer& GetSmoothScrollSequencer(); diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 80bdf586..833b1b03 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -23,7 +23,7 @@ diff --git a/third_party/blink/public/platform/media/web_media_player_impl.h b/t diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc -@@ -1118,6 +1118,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1120,6 +1120,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -36,7 +36,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc void WebMediaPlayerImpl::EnabledAudioTracksChanged( const WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3490,7 +3496,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3492,7 +3498,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { // Audio only stream is allowed to play when in background. // TODO: We should check IsBackgroundOptimizationCandidate here. But we need // to move the logic of checking video frames out of that function. diff --git a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch b/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch deleted file mode 100644 index bfffc837..00000000 --- a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Tue, 5 Jun 2018 13:46:40 +0200 -Subject: Always respect async dns flag (regardless of SDK version) - -Do not read experiment value for cronet async DNS configuration ---- - chrome/browser/net/system_network_context_manager.cc | 2 +- - components/cronet/url_request_context_config.cc | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -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 -@@ -157,7 +157,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams( - local_state->GetBoolean(prefs::kNtlmV2Enabled); - #endif // defined(OS_POSIX) - --#if defined(OS_ANDROID) -+#if 0 - auth_dynamic_params->android_negotiate_account_type = - local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); - #endif // defined(OS_ANDROID) -diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc ---- a/components/cronet/url_request_context_config.cc -+++ b/components/cronet/url_request_context_config.cc -@@ -592,7 +592,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( - effective_experimental_options->RemoveKey(it.key()); - continue; - } -- async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable); -+ bool ignored; -+ async_dns_args->GetBoolean(kAsyncDnsEnable, &ignored); - } else if (it.key() == kStaleDnsFieldTrialName) { - const base::DictionaryValue* stale_dns_args = nullptr; - if (!it.value().GetAsDictionary(&stale_dns_args)) { --- -2.17.1 - diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index b858f041..b1bd1c8a 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -14,6 +14,8 @@ Subject: Automated domain substitution ash/ash_strings.grd | 10 +- ash/assistant/assistant_setup_controller.cc | 2 +- ash/assistant/util/deep_link_util.cc | 16 +- + ash/components/drivefs/drivefs_auth.cc | 2 +- + .../translation_result_loader.cc | 2 +- .../quick_answers_controller_impl.cc | 2 +- .../quick_answers_ui_controller.cc | 2 +- .../fast_pair/device_metadata_fetcher.cc | 2 +- @@ -22,6 +24,8 @@ Subject: Automated domain substitution .../diagnostics_ui/resources/network_card.js | 2 +- .../resources/network_troubleshooting.js | 2 +- .../resources/routine_section.js | 2 +- + .../help_app_kids_magazine_untrusted_ui.cc | 2 +- + ash/webui/media_app_ui/media_app_guest_ui.cc | 2 +- .../scanning/resources/scanning_app.html | 2 +- ash/webui/scanning/resources/scanning_app.js | 2 +- .../backend/shimless_rma_service.cc | 2 +- @@ -72,6 +76,7 @@ Subject: Automated domain substitution build/nocompile.gni | 2 +- build/skia_gold_common/PRESUBMIT.py | 2 +- build/toolchain/cros_toolchain.gni | 2 +- + build/toolchain/gcc_toolchain.gni | 2 +- .../lib/common/perf_tests_results_helper.py | 2 +- build/util/lib/results/result_sink.py | 2 +- build/whitespace_file.txt | 2 +- @@ -86,7 +91,7 @@ Subject: Automated domain substitution .../manifest/maps_go_manifest_config.json | 10 +- chrome/app/PRESUBMIT.py | 8 +- chrome/app/chromium_strings.grd | 14 +- - chrome/app/generated_resources.grd | 250 +- + chrome/app/generated_resources.grd | 252 +- chrome/app/google_chrome_strings.grd | 14 +- chrome/app/resources/locale_settings.grd | 10 +- chrome/app/theme/PRESUBMIT.py | 4 +- @@ -135,6 +140,7 @@ Subject: Automated domain substitution .../resources/cart_domain_name_mapping.json | 2 +- .../browser/chrome_browser_application_mac.mm | 2 +- .../chromeos/android_sms/android_sms_urls.cc | 16 +- + .../eche_app_notification_controller.cc | 2 +- .../file_manager/private_api_misc.cc | 2 +- .../arc_dns_resolution_routine.cc | 6 +- .../dns_latency_routine.cc | 2 +- @@ -151,7 +157,7 @@ Subject: Automated domain substitution .../extension_request_notification.cc | 4 +- .../signals/context_info_fetcher.cc | 4 +- ...e_js_error_report_processor_nonchromeos.cc | 4 +- - .../cryptotoken_private_api.cc | 6 +- + .../cryptotoken_private_api.cc | 8 +- .../enterprise_platform_keys_api.cc | 2 +- .../identity_launch_web_auth_flow_function.cc | 2 +- .../chrome_management_api_delegate.cc | 2 +- @@ -162,13 +168,13 @@ Subject: Automated domain substitution .../chrome_extension_downloader_factory.cc | 2 +- .../updater/chrome_update_client_config.cc | 2 +- .../floc_remote_permission_service.cc | 2 +- - chrome/browser/flag_descriptions.cc | 6 +- + chrome/browser/flag_descriptions.cc | 8 +- .../importer/edge_importer_browsertest_win.cc | 8 +- .../importer/ie_importer_browsertest_win.cc | 30 +- .../lacros/lacros_startup_infobar_delegate.cc | 4 +- .../service_discovery_client_mac.mm | 4 +- .../cast/cast_media_route_provider.cc | 6 +- - .../dial/dial_media_route_provider.cc | 12 +- + .../dial/dial_media_route_provider.cc | 18 +- .../media/webrtc/webrtc_browsertest_common.cc | 2 +- .../media/webrtc/webrtc_event_log_uploader.cc | 2 +- .../media/webrtc/webrtc_log_uploader.cc | 2 +- @@ -188,6 +194,7 @@ Subject: Automated domain substitution chrome/browser/policy/policy_test_utils.h | 2 +- .../prefetch_proxy/prefetch_proxy_params.cc | 6 +- .../profiles/profile_avatar_downloader.cc | 2 +- + ...rofile_shortcut_manager_browsertest_win.cc | 2 +- .../push_messaging_constants.cc | 2 +- .../push_messaging_service_impl.cc | 2 +- chrome/browser/resources/PRESUBMIT.py | 2 +- @@ -198,6 +205,7 @@ Subject: Automated domain substitution .../chromevox/options/options.css | 2 +- .../tools/webstore_extension_util.py | 10 +- .../chromevox_manifest.json.jinja2 | 8 +- + .../common/testing/e2e_test_base.js | 2 +- .../common/tutorial/chromevox_tutorial.js | 6 +- .../accessibility/select_to_speak/options.css | 2 +- .../select_to_speak/options.html | 2 +- @@ -223,8 +231,6 @@ Subject: Automated domain substitution .../login/screens/login/offline_login.js | 2 +- .../browser_tabs_metadata_form.js | 2 +- .../chromeos/wallpaper_manager/manifest.json | 2 +- - .../zip_archiver/unpacker-test/README.txt | 2 +- - .../zip_archiver/unpacker-test/cpp/Makefile | 2 +- .../browser/resources/cryptotoken/enroller.js | 2 +- .../default_apps/external_extensions.json | 14 +- .../discards/graph_doc_template.html | 2 +- @@ -262,7 +268,6 @@ Subject: Automated domain substitution chrome/browser/resources/proxy_config.html | 10 +- .../resources/settings/a11y_page/a11y_page.js | 2 +- .../settings/about_page/about_page.html | 4 +- - .../autofill_page/passwords_list_handler.js | 2 +- .../resources/settings/chromeos/PRESUBMIT.py | 4 +- .../crostini_disk_resize_dialog.html | 2 +- .../settings/chromeos/device_page/stylus.js | 2 +- @@ -271,7 +276,6 @@ Subject: Automated domain substitution .../chromeos/os_about_page/os_about_page.html | 2 +- .../borealis_page/borealis_detail_view.html | 2 +- .../app_management_page/icons.html | 2 +- - .../supported_links_item.html | 2 +- .../resources/settings/chromeos/os_icons.html | 2 +- .../os_people_page/users_add_user_dialog.js | 2 +- chrome/browser/resources/settings/icons.html | 2 +- @@ -304,13 +308,12 @@ Subject: Automated domain substitution .../supervised_user_service.cc | 2 +- .../supervised_user_url_filter.cc | 12 +- .../browser/tracing/crash_service_uploader.cc | 2 +- - .../strings/android_chrome_strings.grd | 36 +- + .../strings/android_chrome_strings.grd | 38 +- .../arc/arc_app_reinstall_app_result.cc | 2 +- .../search/arc/recommend_apps_fetcher_impl.cc | 2 +- .../search/files/item_suggest_cache.h | 2 +- .../ui/app_list/search/omnibox_provider.cc | 2 +- .../ui/ash/ambient/ambient_client_impl.cc | 8 +- - .../conversation_starters_client_impl.cc | 2 +- .../ui/ash/calendar/calendar_keyed_service.cc | 2 +- .../browser/ui/ash/chrome_shell_delegate.cc | 2 +- .../ui/ash/in_session_auth_dialog_client.cc | 2 +- @@ -336,7 +339,6 @@ Subject: Automated domain substitution chrome/browser/ui/webui/PRESUBMIT.py | 2 +- .../internals_ui_handler.cc | 2 +- .../add_supervision/add_supervision_ui.cc | 4 +- - .../assistant_optin/assistant_optin_utils.cc | 2 +- .../edu_coexistence_login_handler_chromeos.cc | 2 +- .../ui/webui/interstitials/interstitial_ui.cc | 2 +- .../ui/webui/media_router/cast_feedback_ui.cc | 4 +- @@ -387,7 +389,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 | 240 +- + chrome/common/url_constants.cc | 242 +- .../gaiacp/associated_user_validator.cc | 2 +- .../gaiacp/gaia_credential_base.cc | 8 +- .../credential_provider/gaiacp/gcp_utils.cc | 4 +- @@ -457,6 +459,7 @@ Subject: Automated domain substitution .../shell_devtools_discovery_page.html | 2 +- .../browser/service/cast_service_simple.cc | 2 +- chromecast/browser/webui/cast_webui.cc | 4 +- + chromecast/cast_core/grpc_webui_controller.cc | 2 +- chromecast/chromecast.gni | 2 +- chromecast/common/extensions_api/i18n.json | 2 +- chromecast/common/extensions_api/tabs.json | 4 +- @@ -467,13 +470,10 @@ Subject: Automated domain substitution .../resources/js/lib/analytics.js | 14 +- .../camera_app_ui/resources/js/util.js | 2 +- .../resources/strings/camera_strings.grd | 2 +- - chromeos/components/drivefs/drivefs_auth.cc | 2 +- - .../help_app_kids_magazine_untrusted_ui.cc | 2 +- - .../media_app_ui/media_app_guest_ui.cc | 2 +- .../multidevice/stub_multidevice_util.cc | 2 +- ...untrusted_personalization_app_ui_config.cc | 2 +- chromeos/components/phonehub/url_constants.cc | 2 +- - .../translation_result_loader.cc | 2 +- + .../untrusted_projector_ui_config.cc | 2 +- .../trial_group/trial_group_checker.cc | 2 +- .../simple_geolocation_provider.cc | 2 +- chromeos/printing/ppd_provider.h | 2 +- @@ -569,11 +569,11 @@ Subject: Automated domain substitution .../omnibox/browser/document_provider.cc | 10 +- .../browser/document_suggestions_service.cc | 4 +- .../omnibox/browser/zero_suggest_provider.cc | 2 +- - .../resources/omnibox_pedal_concepts.json | 22 +- + .../resources/omnibox_pedal_concepts.json | 28 +- .../resources/omnibox_pedal_concepts_ar.json | 20 +- .../resources/omnibox_pedal_concepts_de.json | 20 +- .../omnibox_pedal_concepts_en-GB.json | 20 +- - .../resources/omnibox_pedal_concepts_en.json | 20 +- + .../resources/omnibox_pedal_concepts_en.json | 26 +- .../omnibox_pedal_concepts_es-419.json | 20 +- .../resources/omnibox_pedal_concepts_fr.json | 20 +- .../resources/omnibox_pedal_concepts_ja.json | 20 +- @@ -611,7 +611,7 @@ Subject: Automated domain substitution .../core/browser/browser_policy_connector.cc | 10 +- components/policy/core/browser/url_util.cc | 4 +- .../core/common/policy_loader_common.cc | 2 +- - .../policy/resources/policy_templates.json | 2076 ++++++++--------- + .../policy/resources/policy_templates.json | 2090 ++++++++--------- .../policy/test_support/policy_testserver.py | 14 +- .../request_handler_for_policy.cc | 2 +- .../policy/test_support/signature_provider.h | 4 +- @@ -762,7 +762,7 @@ Subject: Automated domain substitution google_apis/drive/drive_api_url_generator.cc | 2 +- google_apis/gaia/gaia_auth_fetcher.cc | 4 +- google_apis/gaia/gaia_auth_util.cc | 6 +- - google_apis/gaia/gaia_constants.cc | 70 +- + google_apis/gaia/gaia_constants.cc | 72 +- google_apis/gaia/gaia_oauth_client.cc | 6 +- google_apis/gaia/gaia_urls.cc | 10 +- google_apis/gcm/base/mcs_util.cc | 2 +- @@ -789,7 +789,7 @@ Subject: Automated domain substitution ios/README.txt | 2 +- ios/build/bots/scripts/PRESUBMIT.py | 2 +- ios/build/bots/scripts/result_sink_util.py | 4 +- - ios/build/bots/scripts/standard_json_util.py | 2 +- + 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 | 8 +- @@ -798,7 +798,7 @@ Subject: Automated domain substitution ios/chrome/browser/autofill/BUILD.gn | 4 +- .../autofill/automation/automation_action.mm | 2 +- ...chrome_browser_state_removal_controller.mm | 2 +- - ios/chrome/browser/chrome_url_constants.cc | 30 +- + ios/chrome/browser/chrome_url_constants.cc | 32 +- .../breadcrumb_manager_tab_helper.mm | 4 +- ios/chrome/browser/flags/about_flags.mm | 4 +- ios/chrome/browser/omaha/omaha_service.mm | 2 +- @@ -812,15 +812,17 @@ Subject: Automated domain substitution .../browser/ui/ntp/discover_feed_constants.mm | 2 +- ios/chrome/browser/ui/ntp/incognito_view.mm | 2 +- .../ui/ntp/notification_promo_whats_new.mm | 2 +- + .../browser/ui/ntp/revamped_incognito_view.mm | 2 +- .../ui/qr_scanner/qr_scanner_app_interface.mm | 2 +- .../ui/settings/settings_app_interface.mm | 2 +- .../table_cell_catalog_view_controller.mm | 8 +- .../translate_table_view_controller.mm | 2 +- .../interstitials/interstitial_ui_util.mm | 2 +- + .../password_spec_fetcher.mm | 2 +- ..._credential_provider_extension_strings.grd | 4 +- ios/net/cookies/cookie_store_ios_test_util.mm | 2 +- ios/net/crn_http_protocol_handler.mm | 2 +- - .../omaha/test_omaha_service_provider.mm | 2 +- + .../chrome/browser/omaha/test_omaha.cc | 2 +- .../browser/signin/chrome_identity_service.mm | 4 +- .../signin/fake_chrome_identity_service.mm | 2 +- .../fake_chrome_identity_service_constants.mm | 2 +- @@ -954,14 +956,15 @@ Subject: Automated domain substitution testing/scripts/PRESUBMIT.py | 2 +- testing/scripts/common.py | 2 +- testing/scripts/run_chromedriver_tests.py | 2 +- + .../scripts/run_finch_smoke_tests_android.py | 2 +- testing/scripts/run_performance_tests.py | 4 +- testing/scripts/run_variations_smoke_tests.py | 2 +- testing/test_env.py | 8 +- testing/trigger_scripts/PRESUBMIT.py | 2 +- - .../trigger_scripts/base_test_triggerer.py | 6 +- + .../trigger_scripts/base_test_triggerer.py | 8 +- .../unexpected_passes_common/data_types.py | 2 +- testing/variations/PRESUBMIT.py | 2 +- - .../variations/fieldtrial_testing_config.json | 22 +- + .../variations/fieldtrial_testing_config.json | 24 +- .../markdown/extensions/smarty.py | 2 +- .../abseil-cpp/absl/abseil.podspec.gen.py | 2 +- third_party/abseil-cpp/conanfile.py | 2 +- @@ -984,7 +987,7 @@ Subject: Automated domain substitution third_party/afl/src/libtokencap/Makefile | 2 +- third_party/afl/src/llvm_mode/Makefile | 6 +- .../afl/src/llvm_mode/afl-clang-fast.c | 4 +- - .../android_build_tools/aapt2/3pp/fetch.py | 2 +- + .../android_build_tools/aapt2/3pp/fetch.py | 4 +- .../android_arch_core_common/3pp/fetch.py | 2 +- .../android_arch_core_runtime/3pp/fetch.py | 2 +- .../3pp/fetch.py | 2 +- @@ -1082,7 +1085,7 @@ Subject: Automated domain substitution .../renderer/core/dom/events/event_target.cc | 4 +- .../blink/renderer/core/events/touch_event.cc | 2 +- .../blink/renderer/core/events/wheel_event.cc | 2 +- - .../blink/renderer/core/frame/deprecation.cc | 48 +- + .../blink/renderer/core/frame/deprecation.cc | 50 +- .../blink/renderer/core/frame/local_frame.cc | 4 +- .../renderer/core/html/html_iframe_element.cc | 2 +- .../core/html/media/autoplay_policy.cc | 4 +- @@ -1352,7 +1355,6 @@ Subject: Automated domain substitution .../tensorflow_text/core/ops/rouge_l_op.cc | 2 +- .../metrics/text_similarity_metric_ops.py | 2 +- third_party/wpt_tools/wpt/tools/lint/rules.py | 4 +- - .../tools/third_party/pywebsocket3/setup.py | 2 +- .../wpt/tools/webdriver/webdriver/client.py | 2 +- .../wpt_tools/wpt/tools/wpt/android.py | 2 +- .../wpt_tools/wpt/tools/wpt/browser.py | 28 +- @@ -1363,7 +1365,7 @@ Subject: Automated domain substitution .../wptrunner/formatters/chromium.py | 2 +- tools/accessibility/nvda/README.txt | 2 +- tools/android/checkxmlstyle/PRESUBMIT.py | 2 +- - tools/android/checkxmlstyle/checkxmlstyle.py | 6 +- + tools/android/checkxmlstyle/checkxmlstyle.py | 8 +- .../customtabs_benchmark/scripts/PRESUBMIT.py | 2 +- .../scripts/customtabs_benchmark.py | 2 +- .../scripts/run_benchmark.py | 2 +- @@ -1530,7 +1532,7 @@ Subject: Automated domain substitution weblayer/browser/default_search_engine.cc | 2 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1527 files changed, 4758 insertions(+), 4758 deletions(-) + 1529 files changed, 4790 insertions(+), 4790 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -1544,7 +1546,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ PRESUBMIT_VERSION = '2.0.0' -@@ -195,7 +195,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -197,7 +197,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView addTrackingRect:owner:userData:assumeInside:] is' 'prohibited. Please use CrTrackingArea instead.', @@ -1553,7 +1555,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -204,7 +204,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -206,7 +206,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of NSTrackingAreas is prohibited. Please use CrTrackingArea', 'instead.', @@ -1562,7 +1564,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -213,7 +213,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -215,7 +215,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertPointFromBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) fromView:nil| instead.', @@ -1571,7 +1573,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -222,7 +222,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -224,7 +224,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertPointToBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) toView:nil| instead.', @@ -1580,7 +1582,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -231,7 +231,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -233,7 +233,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertRectFromBase:] is almost certainly wrong.', 'Please use |convertRect:(point) fromView:nil| instead.', @@ -1589,7 +1591,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -240,7 +240,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -242,7 +242,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertRectToBase:] is almost certainly wrong.', 'Please use |convertRect:(point) toView:nil| instead.', @@ -1598,7 +1600,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -249,7 +249,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -251,7 +251,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertSizeFromBase:] is almost certainly wrong.', 'Please use |convertSize:(point) fromView:nil| instead.', @@ -1607,7 +1609,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -258,7 +258,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -260,7 +260,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertSizeToBase:] is almost certainly wrong.', 'Please use |convertSize:(point) toView:nil| instead.', @@ -1616,7 +1618,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -487,7 +487,7 @@ _BANNED_CPP_FUNCTIONS = ( +@@ -489,7 +489,7 @@ _BANNED_CPP_FUNCTIONS = ( ( "Don't use CallJavascriptFunctionUnsafe() in new code. Instead, use", 'AllowJavascript(), OnJavascriptAllowed()/OnJavascriptDisallowed(),', @@ -1625,7 +1627,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1029,7 +1029,7 @@ _DEPRECATED_MOJO_TYPES = ( +@@ -1033,7 +1033,7 @@ _DEPRECATED_MOJO_TYPES = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -1634,7 +1636,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1189,9 +1189,9 @@ _KNOWN_ROBOTS = set( +@@ -1193,9 +1193,9 @@ _KNOWN_ROBOTS = set( 'lacros-version-skew-roller', 'skylab-test-cros-roller') ) | set('%s@skia-public.iam.gserviceaccount.com' % s for s in ('chromium-autoroll', 'chromium-release-autoroll') @@ -1646,7 +1648,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('swarming-tasks',)) _INVALID_GRD_FILE_LINE = [ -@@ -1521,7 +1521,7 @@ def CheckNoDEPSGIT(input_api, output_api): +@@ -1525,7 +1525,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' @@ -1655,7 +1657,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information')] return [] -@@ -1732,7 +1732,7 @@ def CheckNoPragmaOnce(input_api, output_api): +@@ -1736,7 +1736,7 @@ def CheckNoPragmaOnce(input_api, output_api): if files: return [output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -1664,7 +1666,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files)] return [] -@@ -1947,7 +1947,7 @@ def CheckForVersionControlConflicts(input_api, output_api): +@@ -1951,7 +1951,7 @@ def CheckForVersionControlConflicts(input_api, output_api): def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api): @@ -1673,7 +1675,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2056,7 +2056,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2060,7 +2060,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api): results.append(output_api.PresubmitError( 'The name of PNG files should not have abbreviations. \n' 'Use _hover.png, _center.png, instead of _h.png, _c.png.\n' @@ -1682,7 +1684,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -2827,7 +2827,7 @@ def CheckSecurityOwners(input_api, output_api): +@@ -2830,7 +2830,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. @@ -1691,7 +1693,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py # Go through the OWNERS files to check, filtering out rules that are already # present in that OWNERS file. -@@ -3128,7 +3128,7 @@ def _CheckAndroidToastUsage(input_api, output_api): +@@ -3131,7 +3131,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' @@ -1700,7 +1702,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3262,7 +3262,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3265,7 +3265,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): if errors: results.append(output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -1709,7 +1711,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3293,7 +3293,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3296,7 +3296,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): results.append(output_api.PresubmitPromptWarning( 'The newly created files include Test classes that inherits from base' ' class. Please do not use inheritance in JUnit4 tests or add new' @@ -1718,7 +1720,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3317,7 +3317,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3320,7 +3320,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.' @@ -1727,7 +1729,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3337,7 +3337,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3340,7 +3340,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' @@ -1736,7 +1738,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3872,7 +3872,7 @@ def CheckGnGlobForward(input_api, output_api): +@@ -3875,7 +3875,7 @@ def CheckGnGlobForward(input_api, output_api): long_text=('The variables "visibilty" and "test_only" should be ' 'explicitly listed in forward_variables_from(). For more ' 'details, see:\n' @@ -1745,7 +1747,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'build/docs/writing_gn_templates.md' '#Using-forward_variables_from'))] return [] -@@ -4034,7 +4034,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api): +@@ -4037,7 +4037,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 ' @@ -1754,7 +1756,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % ( ', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER) ) -@@ -4069,7 +4069,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4072,7 +4072,7 @@ def _CheckNewImagesWarning(input_api, output_api): errors.append(output_api.PresubmitPromptWarning( 'It looks like you are trying to commit some images. If these are ' 'non-test-only images, please make sure to read and apply the tips in ' @@ -1763,7 +1765,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'binary_size/optimization_advice.md#optimizing-images\nThis check is ' 'FYI only and will not block your CL on the CQ.', image_paths)) return errors -@@ -4163,7 +4163,7 @@ _NON_INCLUSIVE_TERMS = ( +@@ -4166,7 +4166,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', @@ -1772,7 +1774,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py True),) def ChecksCommon(input_api, output_api): -@@ -4432,7 +4432,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4435,7 +4435,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api): def CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -1781,7 +1783,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py """ base_pattern = r'IPC_ENUM_TRAITS\(' inclusion_pattern = input_api.re.compile(r'(%s)' % base_pattern) -@@ -4685,9 +4685,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): +@@ -4688,9 +4688,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api): return [output_api.PresubmitPromptWarning('You are adding/modifying code' 'related to technologies which will soon be deprecated (Chrome Apps, NaCl,' ' PNaCl, PPAPI). See this blog post for more details:\n' @@ -1793,7 +1795,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py '\n'.join(problems))] return [] -@@ -4730,7 +4730,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -4733,7 +4733,7 @@ def CheckChangeOnCommit(input_api, output_api): results.extend(input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -1802,7 +1804,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) -@@ -5062,7 +5062,7 @@ def CheckStrings(input_api, output_api): +@@ -5065,7 +5065,7 @@ def CheckStrings(input_api, output_api): if icu_syntax_errors: results.append(output_api.PresubmitPromptWarning( 'ICU syntax errors were found in the following strings (problems or ' @@ -1829,7 +1831,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/L/5.1_r28/" } }, -@@ -92,12 +92,12 @@ +@@ -96,12 +96,12 @@ "arch": { "arm64": { "filename": "arm64/M/android-cts-arm64-6.0_r32.zip", @@ -1844,7 +1846,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/M/6.0_r32/" } }, -@@ -181,12 +181,12 @@ +@@ -189,12 +189,12 @@ "arch": { "arm64": { "filename": "arm64/N/android-cts-arm64-7.0_r33.zip", @@ -1859,7 +1861,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/N/7.0_r33/" } }, -@@ -214,12 +214,12 @@ +@@ -226,12 +226,12 @@ "arch": { "arm64": { "filename": "arm64/O/android-cts-arm64-8.0_r24.zip", @@ -1874,7 +1876,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/O/8.0_r24/" } }, -@@ -236,12 +236,12 @@ +@@ -248,12 +248,12 @@ "arch": { "arm64": { "filename": "arm64/P/android-cts-arm64-9.0_r13.zip", @@ -1889,7 +1891,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi "unzip_dir": "x86/P/9.0_r13/" } }, -@@ -264,12 +264,12 @@ +@@ -276,12 +276,12 @@ "arch": { "arm64": { "filename": "arm64/Q/android-cts-arm64-10_r5.zip", @@ -2006,7 +2008,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 -@@ -656,7 +656,7 @@ This file contains the strings for ash. +@@ -677,7 +677,7 @@ This file contains the strings for ash. @@ -2015,7 +2017,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd -@@ -1030,7 +1030,7 @@ This file contains the strings for ash. +@@ -1051,7 +1051,7 @@ This file contains the strings for ash. Supervised user @@ -2024,7 +2026,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Account managed by $1user@example.com -@@ -1278,7 +1278,7 @@ This file contains the strings for ash. +@@ -1299,7 +1299,7 @@ This file contains the strings for ash. Tap to configure @@ -2033,7 +2035,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Connected devices settings -@@ -2805,7 +2805,7 @@ This file contains the strings for ash. +@@ -2829,7 +2829,7 @@ This file contains the strings for ash. Multiple sign-in has been disabled @@ -2042,7 +2044,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd Sign out -@@ -3153,7 +3153,7 @@ Here are some things you can try to get started. +@@ -3189,7 +3189,7 @@ Here are some things you can try to get started. Unlock device to perform the notification action @@ -2104,10 +2106,34 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link if (!IsWebDeepLinkType(type, params)) return absl::nullopt; +diff --git a/ash/components/drivefs/drivefs_auth.cc b/ash/components/drivefs/drivefs_auth.cc +--- a/ash/components/drivefs/drivefs_auth.cc ++++ b/ash/components/drivefs/drivefs_auth.cc +@@ -63,7 +63,7 @@ void DriveFsAuth::GetAccessToken( + timer_->Start( + FROM_HERE, base::TimeDelta::FromSeconds(30), + base::BindOnce(&DriveFsAuth::AuthTimeout, base::Unretained(this))); +- std::set scopes({"https://www.googleapis.com/auth/drive"}); ++ std::set scopes({"https://www.9oo91eapis.qjz9zk/auth/drive"}); + access_token_fetcher_ = + std::make_unique( + kIdentityConsumerId, identity_manager, scopes, +diff --git a/ash/components/quick_answers/translation_result_loader.cc b/ash/components/quick_answers/translation_result_loader.cc +--- a/ash/components/quick_answers/translation_result_loader.cc ++++ b/ash/components/quick_answers/translation_result_loader.cc +@@ -35,7 +35,7 @@ using network::mojom::URLLoaderFactory; + // } + + constexpr char kTranslationAPIUrl[] = +- "https://translation.googleapis.com/language/translate/v2"; ++ "https://translation.9oo91eapis.qjz9zk/language/translate/v2"; + constexpr char kAuthorizationHeaderFormat[] = "Bearer "; + + constexpr base::StringPiece kQueryKey = "q"; diff --git a/ash/quick_answers/quick_answers_controller_impl.cc b/ash/quick_answers/quick_answers_controller_impl.cc --- a/ash/quick_answers/quick_answers_controller_impl.cc +++ b/ash/quick_answers/quick_answers_controller_impl.cc -@@ -32,7 +32,7 @@ constexpr char kAssistantRelatedInfoUrl[] = +@@ -33,7 +33,7 @@ constexpr char kAssistantRelatedInfoUrl[] = constexpr char kQuickAnswersSettingsUrl[] = "chrome://os-settings/osSearch/search"; constexpr char kDogfoodUrl[] = @@ -2119,9 +2145,9 @@ diff --git a/ash/quick_answers/quick_answers_controller_impl.cc b/ash/quick_answ diff --git a/ash/quick_answers/quick_answers_ui_controller.cc b/ash/quick_answers/quick_answers_ui_controller.cc --- a/ash/quick_answers/quick_answers_ui_controller.cc +++ b/ash/quick_answers/quick_answers_ui_controller.cc -@@ -31,7 +31,7 @@ namespace ash { - - namespace { +@@ -31,7 +31,7 @@ namespace { + using quick_answers::QuickAnswer; + using quick_answers::QuickAnswersExitPoint; -constexpr char kGoogleSearchUrlPrefix[] = "https://www.google.com/search?q="; +constexpr char kGoogleSearchUrlPrefix[] = "https://www.9oo91e.qjz9zk/search?q="; @@ -2131,13 +2157,13 @@ diff --git a/ash/quick_answers/quick_answers_ui_controller.cc b/ash/quick_answer diff --git a/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc b/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc --- a/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc +++ b/ash/quick_pair/repository/fast_pair/device_metadata_fetcher.cc -@@ -19,7 +19,7 @@ namespace { - // TODO(crbug/1234546): Switch to requesting a binary proto once the server - // supports it. +@@ -16,7 +16,7 @@ + namespace { + const char kGetObservedDeviceUrl[] = - "https://nearbydevices-pa.googleapis.com/v1/device/" + "https://nearbydevices-pa.9oo91eapis.qjz9zk/v1/device/" - "%d?key=%s&mode=MODE_RELEASE"; + "%d?key=%s&mode=MODE_RELEASE&alt=proto"; // TODO(crbug/1226117): Update annotation with policy details when available. diff --git a/ash/resources/PRESUBMIT.py b/ash/resources/PRESUBMIT.py @@ -2178,7 +2204,7 @@ diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diag + window.open('https://support.9oo91e.qjz9zk/chromebook?p=diagnostics_'); }, - /** @protected */ + /** diff --git a/ash/webui/diagnostics_ui/resources/network_troubleshooting.js b/ash/webui/diagnostics_ui/resources/network_troubleshooting.js --- a/ash/webui/diagnostics_ui/resources/network_troubleshooting.js +++ b/ash/webui/diagnostics_ui/resources/network_troubleshooting.js @@ -2194,7 +2220,7 @@ diff --git a/ash/webui/diagnostics_ui/resources/network_troubleshooting.js b/ash diff --git a/ash/webui/diagnostics_ui/resources/routine_section.js b/ash/webui/diagnostics_ui/resources/routine_section.js --- a/ash/webui/diagnostics_ui/resources/routine_section.js +++ b/ash/webui/diagnostics_ui/resources/routine_section.js -@@ -334,7 +334,7 @@ Polymer({ +@@ -329,7 +329,7 @@ Polymer({ /** @protected */ onLearnMoreClicked_() { const baseSupportUrl = @@ -2203,10 +2229,34 @@ diff --git a/ash/webui/diagnostics_ui/resources/routine_section.js b/ash/webui/d assert(this.learnMoreLinkSection); window.open(baseSupportUrl + this.learnMoreLinkSection); +diff --git a/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc b/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc +--- a/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc ++++ b/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc +@@ -53,7 +53,7 @@ content::WebUIDataSource* CreateHelpAppKidsMagazineUntrustedDataSource() { + network::mojom::CSPDirectiveName::DefaultSrc, ""); + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::ScriptSrc, +- "script-src 'self' https://www.gstatic.com;"); ++ "script-src 'self' https://www.95tat1c.qjz9zk;"); + return source; + } + +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 +@@ -80,7 +80,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource( + // Allow calls to Maps reverse geocoding API for loading metadata. + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::ConnectSrc, +- "connect-src 'self' https://maps.googleapis.com/maps/api/geocode/json;"); ++ "connect-src 'self' https://maps.9oo91eapis.qjz9zk/maps/api/geocode/json;"); + + // Allow use of SharedArrayBuffer (required by the wasm). + source->OverrideCrossOriginOpenerPolicy("same-origin"); diff --git a/ash/webui/scanning/resources/scanning_app.html b/ash/webui/scanning/resources/scanning_app.html --- a/ash/webui/scanning/resources/scanning_app.html +++ b/ash/webui/scanning/resources/scanning_app.html -@@ -252,7 +252,7 @@ +@@ -255,7 +255,7 @@ [[i18n(toastMessageKey_)]]

dex.txt + base_has_imported_lib = False +@@ -518,7 +518,7 @@ out/Release/apks/YourApk.apk > dex.txt stderr += """ You may need to update build configs to run FragmentActivityReplacer for additional targets. See @@ -2639,7 +2689,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 -@@ -1058,7 +1058,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): +@@ -1055,7 +1055,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None): result_html_string, _, _ = test_results_presentation.result_details( json_path=json_file.name, test_name=args.command, @@ -2699,7 +2749,7 @@ diff --git a/build/chromeos/PRESUBMIT.py b/build/chromeos/PRESUBMIT.py diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py --- a/build/chromeos/test_runner.py +++ b/build/chromeos/test_runner.py -@@ -952,7 +952,7 @@ def main(): +@@ -949,7 +949,7 @@ def main(): tast_test_parser = subparsers.add_parser( 'tast', help='Runs a device-side set of Tast tests. For more details, see: ' @@ -2767,7 +2817,7 @@ diff --git a/build/config/chromeos/rules.gni b/build/config/chromeos/rules.gni 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 -@@ -109,7 +109,7 @@ declare_args() { +@@ -113,7 +113,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). @@ -2776,7 +2826,7 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler enable_cet_shadow_stack = target_cpu == "x64" } -@@ -219,7 +219,7 @@ declare_args() { +@@ -232,7 +232,7 @@ declare_args() { # results independent of the checkout and build directory names, which # in turn is important for goma compile hit rate. # Setting this to true may make it harder to debug binaries on Linux, see @@ -2800,7 +2850,7 @@ diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni diff --git a/build/config/ozone.gni b/build/config/ozone.gni --- a/build/config/ozone.gni +++ b/build/config/ozone.gni -@@ -22,7 +22,7 @@ declare_args() { +@@ -28,7 +28,7 @@ declare_args() { # Enable explicit apitrace (https://apitrace.github.io) loading. # This requires apitrace library with additional bindings. # See ChromeOS package for details: @@ -2929,6 +2979,18 @@ diff --git a/build/toolchain/cros_toolchain.gni b/build/toolchain/cros_toolchain # by setting appropriate cross-compilation variables. # # For example, to compile a Chrome source tree in /g/src for an +diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni +--- a/build/toolchain/gcc_toolchain.gni ++++ b/build/toolchain/gcc_toolchain.gni +@@ -673,7 +673,7 @@ template("gcc_toolchain") { + rustc += rust_prefix + rustc += "rustc" + +- # RSP files not used due to https://bugs.chromium.org/p/gn/issues/detail?id=249 ++ # RSP files not used due to https://bugs.ch40m1um.qjz9zk/p/gn/issues/detail?id=249 + tool("rust_staticlib") { + rust_outfile = "{{target_out_dir}}/{{crate_name}}.a" + depfile = "{{output}}.d" diff --git a/build/util/lib/common/perf_tests_results_helper.py b/build/util/lib/common/perf_tests_results_helper.py --- a/build/util/lib/common/perf_tests_results_helper.py +++ b/build/util/lib/common/perf_tests_results_helper.py @@ -2944,15 +3006,15 @@ diff --git a/build/util/lib/common/perf_tests_results_helper.py b/build/util/lib diff --git a/build/util/lib/results/result_sink.py b/build/util/lib/results/result_sink.py --- a/build/util/lib/results/result_sink.py +++ b/build/util/lib/results/result_sink.py -@@ -132,7 +132,7 @@ class ResultSinkClient(object): - 'name': test_id, - 'location': { - 'file_name': test_file, -- 'repo': 'https://chromium.googlesource.com/chromium/src', -+ 'repo': 'https://chromium.9oo91esource.qjz9zk/chromium/src', - } +@@ -133,7 +133,7 @@ class ResultSinkClient(object): + if test_file and str(test_file).startswith('//'): + tr['testMetadata']['location'] = { + 'file_name': test_file, +- 'repo': 'https://chromium.googlesource.com/chromium/src', ++ 'repo': 'https://chromium.9oo91esource.qjz9zk/chromium/src', } + res = requests.post(url=self.test_results_url, diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt --- a/build/whitespace_file.txt +++ b/build/whitespace_file.txt @@ -3183,9 +3245,9 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd - Also clear data from Chromium ($1www.google.com) + Also clear data from Chromium ($1www.9oo91e.qjz9zk) - -@@ -686,10 +686,10 @@ Chromium is unable to recover your settings. + +@@ -694,10 +694,10 @@ Chromium is unable to recover your settings. You're signed in to Chromium! @@ -3198,7 +3260,7 @@ 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. -@@ -739,7 +739,7 @@ Chromium is unable to recover your settings. +@@ -747,7 +747,7 @@ Chromium is unable to recover your settings. @@ -3207,7 +3269,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd -@@ -758,10 +758,10 @@ Chromium is unable to recover your settings. +@@ -766,10 +766,10 @@ Chromium is unable to recover your settings. $1Elisa is already signed in to this Chromium profile. To keep your browsing separate, Chromium can create your own profile for you. @@ -3244,7 +3306,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This file -@@ -596,7 +596,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -603,7 +603,7 @@ are declared in tools/grit/grit_rule.gni. Open link as @@ -3253,8 +3315,8 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open link in $1Gmail App -@@ -762,7 +762,7 @@ are declared in tools/grit/grit_rule.gni. - Search your screen with Google Lens +@@ -772,7 +772,7 @@ are declared in tools/grit/grit_rule.gni. + Search images with $1Google Lens - &Go to $1http://www.google.com/ @@ -3262,7 +3324,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest password... -@@ -837,7 +837,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -847,7 +847,7 @@ are declared in tools/grit/grit_rule.gni. Open Link as @@ -3271,8 +3333,8 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open Link in $1Gmail App -@@ -1015,7 +1015,7 @@ are declared in tools/grit/grit_rule.gni. - Search Your Screen with Google Lens +@@ -1028,7 +1028,7 @@ are declared in tools/grit/grit_rule.gni. + Search Images with $1Google Lens - &Go to $1http://www.google.com/ @@ -3280,7 +3342,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Suggest Password... -@@ -1235,7 +1235,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1248,7 +1248,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3289,7 +3351,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -1372,7 +1372,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -1385,7 +1385,7 @@ are declared in tools/grit/grit_rule.gni. Review @@ -3298,7 +3360,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -2809,10 +2809,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -2822,10 +2822,10 @@ are declared in tools/grit/grit_rule.gni. Images were blocked on this page. @@ -3311,7 +3373,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking cookies -@@ -2821,7 +2821,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2834,7 +2834,7 @@ are declared in tools/grit/grit_rule.gni. Continue allowing cookies @@ -3320,7 +3382,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking images -@@ -2833,28 +2833,28 @@ are declared in tools/grit/grit_rule.gni. +@@ -2846,28 +2846,28 @@ are declared in tools/grit/grit_rule.gni. Pop-ups blocked: @@ -3356,7 +3418,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Always block camera and microphone access -@@ -2875,19 +2875,19 @@ are declared in tools/grit/grit_rule.gni. +@@ -2888,19 +2888,19 @@ are declared in tools/grit/grit_rule.gni. Continue blocking camera access @@ -3381,7 +3443,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pop-up blocked -@@ -2899,7 +2899,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2912,7 +2912,7 @@ are declared in tools/grit/grit_rule.gni. JavaScript was blocked on this page. @@ -3390,7 +3452,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking JavaScript -@@ -2908,7 +2908,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2921,7 +2921,7 @@ are declared in tools/grit/grit_rule.gni. Sound was muted on this page @@ -3399,7 +3461,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue muting sound -@@ -3032,7 +3032,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3045,7 +3045,7 @@ are declared in tools/grit/grit_rule.gni. @@ -3408,7 +3470,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources &General -@@ -3557,13 +3557,13 @@ are declared in tools/grit/grit_rule.gni. +@@ -3570,13 +3570,13 @@ are declared in tools/grit/grit_rule.gni. @@ -3425,7 +3487,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share this tab instead -@@ -3572,7 +3572,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3585,7 +3585,7 @@ are declared in tools/grit/grit_rule.gni. Stop sharing @@ -3434,7 +3496,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Switch to capturing tab -@@ -3778,16 +3778,16 @@ are declared in tools/grit/grit_rule.gni. +@@ -3791,16 +3791,16 @@ are declared in tools/grit/grit_rule.gni. Incognito Tab: $1Google @@ -3455,7 +3517,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Plugin: $1Unknown Plugin -@@ -3796,7 +3796,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3809,7 +3809,7 @@ are declared in tools/grit/grit_rule.gni. Plugin Broker: $1Unknown Plugin @@ -3464,7 +3526,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Spare Renderer -@@ -3832,22 +3832,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -3845,22 +3845,22 @@ are declared in tools/grit/grit_rule.gni. Print: $1Google Maps @@ -3493,23 +3555,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources App: $1com.android.systemui -@@ -4048,13 +4048,13 @@ are declared in tools/grit/grit_rule.gni. - - These items may be dangerous +@@ -4075,7 +4075,7 @@ are declared in tools/grit/grit_rule.gni. + + "$1Gmail Checker" -- -+ - The extension "$1Gmail Checker" was automatically disabled. - - - "$1Gmail Checker" has been disabled because it contains malware - -- -+ - The app "$1Gmail" was automatically removed. +- ++ + The extension "$1Gmail Checker" was blocked by your administrator -@@ -4066,10 +4066,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4087,10 +4087,10 @@ are declared in tools/grit/grit_rule.gni. @@ -3522,7 +3577,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources It can: -@@ -4208,22 +4208,22 @@ are declared in tools/grit/grit_rule.gni. +@@ -4229,22 +4229,22 @@ are declared in tools/grit/grit_rule.gni. Change your home page to: $1home.page.com/home.html @@ -3551,7 +3606,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change your data on a number of websites -@@ -4232,10 +4232,10 @@ are declared in tools/grit/grit_rule.gni. +@@ -4253,10 +4253,10 @@ are declared in tools/grit/grit_rule.gni. Read your data on a number of websites @@ -3564,7 +3619,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Read and change anything you type -@@ -4600,7 +4600,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4621,7 +4621,7 @@ are declared in tools/grit/grit_rule.gni. When you click the extension @@ -3573,7 +3628,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On all sites -@@ -4644,7 +4644,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4665,7 +4665,7 @@ are declared in tools/grit/grit_rule.gni. When You Click the Extension @@ -3582,7 +3637,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources On All Sites -@@ -4937,7 +4937,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -4958,7 +4958,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Change back to $1DuckDuckGo? @@ -3591,7 +3646,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -5183,10 +5183,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5204,10 +5204,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Update password for $1example.com? @@ -3604,7 +3659,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Passwords are saved in your Google Account so you can use them on any device -@@ -5513,7 +5513,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5534,7 +5534,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3613,7 +3668,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and search for “$1flowers” -@@ -5524,7 +5524,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5545,7 +5545,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3622,7 +3677,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pa&ste and Search for “$1flowers” -@@ -5534,7 +5534,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5555,7 +5555,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3631,7 +3686,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Press $1Tab to send commands to $2Google Talk -@@ -5543,16 +5543,16 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5564,16 +5564,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Tab @@ -3651,7 +3706,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Clear input -@@ -5937,7 +5937,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5958,7 +5958,7 @@ Keep your key file in a safe place. You will need it to create new versions of y You’re seeing your recent and suggested documents based on your previous activity using Google Drive. <br> <br> @@ -3660,7 +3715,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Top picks for you -@@ -5946,10 +5946,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5967,10 +5967,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Why am I seeing this? @@ -3673,7 +3728,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6224,7 +6224,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6250,7 +6250,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Stay in Chrome @@ -3682,7 +3737,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6331,7 +6331,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6357,7 +6357,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 @@ -3691,7 +3746,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from seeing the clipboard -@@ -6437,7 +6437,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6469,7 +6469,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. @@ -3700,7 +3755,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -6474,7 +6474,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6506,7 +6506,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. @@ -3709,7 +3764,14 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6644,7 +6644,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6673,13 +6673,13 @@ 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. + + Confirm your username @@ -3718,7 +3780,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -6828,7 +6828,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6863,7 +6863,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Clear browsing data @@ -3727,7 +3789,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cleared Chrome data -@@ -6838,7 +6838,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -6873,7 +6873,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3736,7 +3798,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Some passwords were not deleted -@@ -7062,7 +7062,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7097,7 +7097,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Uploading ($127%)... @@ -3745,7 +3807,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7402,31 +7402,31 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7443,31 +7443,31 @@ Keep your key file in a safe place. You will need it to create new versions of y $1html5rocks.com is sharing your screen. @@ -3782,7 +3844,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Hide -@@ -7454,7 +7454,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7495,7 +7495,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -3791,7 +3853,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -7462,10 +7462,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7503,10 +7503,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Sign in to Security Device @@ -3804,7 +3866,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Please sign in to $1Software Security Device. -@@ -8561,7 +8561,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -7846,7 +7846,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 + + +- $1Your devices$2 · $3foo@gmail.com ++ $1Your devices$2 · $3foo@9ma1l.qjz9zk + + + +@@ -8609,7 +8609,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Work @@ -3813,7 +3884,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8570,10 +8570,10 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8618,10 +8618,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Can't sign in @@ -3826,7 +3897,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Close -@@ -8598,13 +8598,13 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8646,13 +8646,13 @@ Keep your key file in a safe place. You will need it to create new versions of y This wasn't me. @@ -3842,7 +3913,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Cancel -@@ -8653,7 +8653,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8701,7 +8701,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Open $1Adobe Acrobat? @@ -3851,7 +3922,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources A website wants to open this application. -@@ -8664,8 +8664,8 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8712,8 +8712,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Cancel @@ -3862,7 +3933,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -8690,7 +8690,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -8738,7 +8738,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Date Modified @@ -3871,7 +3942,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9272,7 +9272,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9320,7 +9320,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Wrong index. @@ -3880,7 +3951,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9686,7 +9686,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9734,7 +9734,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from accessing your location. @@ -3889,7 +3960,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking this site from accessing your location -@@ -9729,7 +9729,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9777,7 +9777,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. @@ -3898,7 +3969,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 -@@ -9818,7 +9818,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9866,7 +9866,7 @@ Please help our engineers fix this problem. Tell us what happened right before y View and manage saved passwords in your $1Google Account @@ -3907,7 +3978,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9850,10 +9850,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9898,10 +9898,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Undo @@ -3920,7 +3991,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -9964,19 +9964,19 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10012,19 +10012,19 @@ Please help our engineers fix this problem. Tell us what happened right before y An extension triggered full screen. @@ -3943,7 +4014,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources This page has disabled your mouse cursor. -@@ -9997,10 +9997,10 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10045,10 +10045,10 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3956,7 +4027,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Open $1search links -@@ -10037,7 +10037,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10085,7 +10085,7 @@ Please help our engineers fix this problem. Tell us what happened right before y This site has been blocked from using motion sensors. @@ -3965,7 +4036,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Continue blocking sensor access -@@ -10064,7 +10064,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10112,7 +10112,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue allowing sensor access @@ -3974,7 +4045,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10256,7 +10256,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 $1Google Hangouts wants to share the contents of your screen. @@ -3983,7 +4054,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Share system audio -@@ -10300,7 +10300,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10348,7 +10348,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -3992,7 +4063,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -10372,8 +10372,8 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10420,8 +10420,8 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Photos - Serial port connected @@ -4003,7 +4074,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Google Search - Crashed -@@ -10581,7 +10581,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10629,7 +10629,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4012,7 +4083,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources $1Nexus 5 detected -@@ -10687,7 +10687,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10735,7 +10735,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4021,7 +4092,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a serial port -@@ -10727,7 +10727,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10775,7 +10775,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4030,7 +4101,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources "$1Chrome Extension Name" wants to connect to a HID device -@@ -10775,7 +10775,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10823,7 +10823,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4039,7 +4110,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources No matching font found. -@@ -10896,7 +10896,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10944,7 +10944,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4048,7 +4119,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources wants to see the make and model of your Security Key -@@ -11083,13 +11083,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11131,13 +11131,13 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4064,7 +4135,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Pick an option -@@ -11183,7 +11183,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11231,7 +11231,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4073,7 +4144,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Didn't get it? -@@ -11198,7 +11198,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11246,7 +11246,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Security key request @@ -4082,7 +4153,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources -@@ -11297,7 +11297,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11345,7 +11345,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4091,7 +4162,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Select an account to sign in -@@ -11313,7 +11313,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11361,7 +11361,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 @@ -4100,7 +4171,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. -@@ -11322,13 +11322,13 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11370,13 +11370,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow this site to see your security key? @@ -4116,7 +4187,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources Allow -@@ -11608,7 +11608,7 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -11656,7 +11656,7 @@ Please help our engineers fix this problem. Tell us what happened right before y @@ -4144,9 +4215,9 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str - Also clear data from Chrome ($1www.google.com) + Also clear data from Chrome ($1www.9oo91e.qjz9zk) - -@@ -694,10 +694,10 @@ Google Chrome is unable to recover your settings. + +@@ -702,10 +702,10 @@ Google Chrome is unable to recover your settings. You're signed in to Chrome! @@ -4159,7 +4230,7 @@ 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. -@@ -747,7 +747,7 @@ Google Chrome is unable to recover your settings. +@@ -755,7 +755,7 @@ Google Chrome is unable to recover your settings. @@ -4168,7 +4239,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str -@@ -766,10 +766,10 @@ Google Chrome is unable to recover your settings. +@@ -774,10 +774,10 @@ Google Chrome is unable to recover your settings. $1Elisa is already signed in to this Chrome profile. To keep your browsing separate, Chrome can create your own profile for you. @@ -4239,7 +4310,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 -@@ -324,14 +324,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -331,14 +331,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -4258,7 +4329,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -3713,7 +3713,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3875,7 +3875,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -4267,7 +4338,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !defined(OS_ANDROID) {"media-router-cast-allow-all-ips", flag_descriptions::kMediaRouterCastAllowAllIPsName, -@@ -3921,7 +3921,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4107,7 +4107,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -4448,7 +4519,7 @@ diff --git a/chrome/browser/ash/backdrop_wallpaper_handlers/backdrop_wallpaper_h 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 -@@ -22,7 +22,7 @@ const char kBorealisAppIdRegex[] = "([^/]+\\d+)"; +@@ -24,7 +24,7 @@ const char kBorealisAppIdRegex[] = "([^/]+\\d+)"; // Base feedback form URL, without query parameters for prefilling. static constexpr char kFeedbackUrl[] = @@ -4771,7 +4842,7 @@ diff --git a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.c diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc --- a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc -@@ -34,11 +34,11 @@ namespace { +@@ -33,11 +33,11 @@ namespace { // OAuth2 Token scopes constexpr char kCloudDevicesOAuth2Scope[] = @@ -4806,13 +4877,13 @@ diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc b/chrome diff --git a/chrome/browser/autofill/autofill_gstatic_reader.cc b/chrome/browser/autofill/autofill_gstatic_reader.cc --- a/chrome/browser/autofill/autofill_gstatic_reader.cc +++ b/chrome/browser/autofill/autofill_gstatic_reader.cc -@@ -27,9 +27,9 @@ static const char kTokenizationBinRangeWhitelistKey[] = - static const char kTokenizationMerchantWhitelistKey[] = +@@ -27,9 +27,9 @@ static const char kTokenizationBinRangeAllowlistKey[] = + static const char kTokenizationMerchantAllowlistKey[] = "cpan_eligible_merchant_wl"; - static const char kTokenizationBinRangeWhitelistURL[] = + static const char kTokenizationBinRangeAllowlistURL[] = - "https://www.gstatic.com/autofill/hourly/bins.json"; + "https://www.95tat1c.qjz9zk/autofill/hourly/bins.json"; - static const char kTokenizationMerchantWhitelistURL[] = + static const char kTokenizationMerchantAllowlistURL[] = - "https://www.gstatic.com/autofill/weekly/merchants.json"; + "https://www.95tat1c.qjz9zk/autofill/weekly/merchants.json"; static const size_t kMaxDownloadSize = 30 * 1024; @@ -4845,15 +4916,15 @@ diff --git a/chrome/browser/buildflags.gni b/chrome/browser/buildflags.gni diff --git a/chrome/browser/cart/cart_discount_fetcher.cc b/chrome/browser/cart/cart_discount_fetcher.cc --- a/chrome/browser/cart/cart_discount_fetcher.cc +++ b/chrome/browser/cart/cart_discount_fetcher.cc -@@ -26,7 +26,7 @@ const char kPostMethod[] = "POST"; - const char kContentType[] = "application/json; charset=UTF-8"; +@@ -30,7 +30,7 @@ const char kAcceptLanguageKey[] = "Accept-Language"; + const char kClientDataHeader[] = "X-Client-Data"; const char kFetchDiscountsEndpoint[] = - "https://memex-pa.googleapis.com/v1/shopping/cart/discounts"; + "https://memex-pa.9oo91eapis.qjz9zk/v1/shopping/cart/discounts"; const int64_t kTimeoutMs = 30000; - struct DiscountInfo { + const char kCartDiscountFetcherEndpointParam[] = diff --git a/chrome/browser/cart/cart_discount_link_fetcher.cc b/chrome/browser/cart/cart_discount_link_fetcher.cc --- a/chrome/browser/cart/cart_discount_link_fetcher.cc +++ b/chrome/browser/cart/cart_discount_link_fetcher.cc @@ -4869,7 +4940,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 -@@ -474,7 +474,7 @@ void CartService::AddCartsWithFakeData() { +@@ -462,7 +462,7 @@ void CartService::AddCartsWithFakeData() { // Polulate and add some carts with fake data. double time_now = base::Time::Now().ToDoubleT(); cart_db::ChromeCartContentProto dummy_proto1; @@ -4878,7 +4949,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv dummy_proto1.set_key(std::string(kFakeDataPrefix) + eTLDPlusOne(dummy_url1)); dummy_proto1.set_merchant("Cart Foo"); dummy_proto1.set_merchant_cart_url(dummy_url1.spec()); -@@ -483,17 +483,17 @@ void CartService::AddCartsWithFakeData() { +@@ -471,17 +471,17 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, u"15%")); dummy_proto1.add_product_image_urls( @@ -4899,7 +4970,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"); -@@ -511,12 +511,12 @@ void CartService::AddCartsWithFakeData() { +@@ -499,12 +499,12 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT, u"20%")); dummy_proto2.add_product_image_urls( @@ -4914,7 +4985,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"); -@@ -534,7 +534,7 @@ void CartService::AddCartsWithFakeData() { +@@ -522,7 +522,7 @@ void CartService::AddCartsWithFakeData() { l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT, u"$50")); dummy_proto3.add_product_image_urls( @@ -4923,7 +4994,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"); -@@ -549,12 +549,12 @@ void CartService::AddCartsWithFakeData() { +@@ -537,12 +537,12 @@ void CartService::AddCartsWithFakeData() { dummy_proto4.set_merchant_cart_url(dummy_url4.spec()); dummy_proto4.set_timestamp(time_now + 3); dummy_proto4.add_product_image_urls( @@ -4938,7 +5009,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"); -@@ -569,7 +569,7 @@ void CartService::AddCartsWithFakeData() { +@@ -557,7 +557,7 @@ void CartService::AddCartsWithFakeData() { dummy_proto5.set_merchant_cart_url(dummy_url5.spec()); dummy_proto5.set_timestamp(time_now + 2); dummy_proto5.add_product_image_urls( @@ -4947,7 +5018,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"); -@@ -584,17 +584,17 @@ void CartService::AddCartsWithFakeData() { +@@ -572,17 +572,17 @@ void CartService::AddCartsWithFakeData() { dummy_proto6.set_merchant_cart_url(dummy_url6.spec()); dummy_proto6.set_timestamp(time_now + 1); dummy_proto6.add_product_image_urls( @@ -4971,9 +5042,9 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv diff --git a/chrome/browser/cart/fetch_discount_worker.cc b/chrome/browser/cart/fetch_discount_worker.cc --- a/chrome/browser/cart/fetch_discount_worker.cc +++ b/chrome/browser/cart/fetch_discount_worker.cc -@@ -24,7 +24,7 @@ constexpr base::FeatureParam kDelayFetchParam( - base::TimeDelta::FromHours(6)); +@@ -26,7 +26,7 @@ + namespace { const char kOauthName[] = "rbd"; -const char kOauthScopes[] = "https://www.googleapis.com/auth/chromememex"; +const char kOauthScopes[] = "https://www.9oo91eapis.qjz9zk/auth/chromememex"; @@ -5057,10 +5128,22 @@ diff --git a/chrome/browser/chromeos/android_sms/android_sms_urls.cc b/chrome/br break; } return stream; +diff --git a/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc b/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc +--- a/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc ++++ b/chrome/browser/chromeos/eche_app/eche_app_notification_controller.cc +@@ -29,7 +29,7 @@ const char kEcheAppFromWebWithoudButtonNotifierId[] = + + // TODO(crbug.com/1241352): This should probably have a ?p= at + // some point. +-const char kEcheAppLearnMoreUrl[] = "https://support.google.com/chromebook"; ++const char kEcheAppLearnMoreUrl[] = "https://support.9oo91e.qjz9zk/chromebook"; + + namespace { + diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -@@ -85,7 +85,7 @@ namespace { +@@ -87,7 +87,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -5241,7 +5324,7 @@ diff --git a/chrome/browser/download/mixed_content_download_blocking.cc b/chrome diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome/browser/enterprise/connectors/connectors_service.cc --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -140,7 +140,7 @@ const char kServiceProviderConfig[] = R"({ +@@ -113,7 +113,7 @@ const char kServiceProviderConfig[] = R"({ "version": { "1": { "analysis": { @@ -5250,7 +5333,7 @@ diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome "supported_tags": [ { "name": "malware", -@@ -193,7 +193,7 @@ const char kServiceProviderConfig[] = R"({ +@@ -166,7 +166,7 @@ const char kServiceProviderConfig[] = R"({ ] }, "reporting": { @@ -5295,7 +5378,7 @@ diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_req diff --git a/chrome/browser/enterprise/signals/context_info_fetcher.cc b/chrome/browser/enterprise/signals/context_info_fetcher.cc --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc -@@ -287,9 +287,9 @@ absl::optional ContextInfoFetcher::GetChromeCleanupEnabled() { +@@ -292,9 +292,9 @@ absl::optional ContextInfoFetcher::GetChromeCleanupEnabled() { } bool ContextInfoFetcher::GetChromeRemoteDesktopAppBlocked() { @@ -5325,7 +5408,7 @@ diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor_non diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc --- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc -@@ -40,10 +40,10 @@ namespace api { +@@ -44,10 +44,10 @@ namespace api { namespace { @@ -5339,6 +5422,15 @@ diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_priva // ContainsAppIdByHash returns true iff the SHA-256 hash of one of the // elements of |list| equals |hash|. +@@ -290,7 +290,7 @@ CryptotokenPrivateCanMakeU2fApiRequestFunction::Run() { + } + frame->AddMessageToConsole( + blink::mojom::ConsoleMessageLevel::kWarning, +- R"(The U2F Security Key API is deprecated and will be removed soon. If you own this website, please migrate to the Web Authentication API. For more information see https://groups.google.com/a/chromium.org/g/blink-dev/c/xHC3AtU_65A/m/yg20tsVFBAAJ)"); ++ R"(The U2F Security Key API is deprecated and will be removed soon. If you own this website, please migrate to the Web Authentication API. For more information see https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/g/blink-dev/c/xHC3AtU_65A/m/yg20tsVFBAAJ)"); + + blink::TrialTokenValidator validator; + const net::HttpResponseHeaders* response_headers = diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc @@ -5366,7 +5458,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 -@@ -80,7 +80,7 @@ namespace { +@@ -81,7 +81,7 @@ namespace { #if BUILDFLAG(IS_CHROMEOS_ASH) const char kPlayIntentPrefix[] = @@ -5461,7 +5553,16 @@ diff --git a/chrome/browser/federated_learning/floc_remote_permission_service.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 -@@ -596,7 +596,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = +@@ -193,7 +193,7 @@ const char kU2FSecurityKeyAPIDescription[] = + "Enable the legacy U2F Security Key API (CryptoToken). The U2F Security " + "Key API has been deprecated and will be removed soon. For more " + "information, refer to the deprecation announcement at " +- "https://groups.google.com/a/chromium.org/g/blink-dev/c/xHC3AtU_65A"; ++ "https://groups.9oo91e.qjz9zk/a/ch40m1um.qjz9zk/g/blink-dev/c/xHC3AtU_65A"; + + const char kUseLookalikesForNavigationSuggestionsName[] = + "Use lookalike URL suggestions for navigation suggestions"; +@@ -613,7 +613,7 @@ const char kDetectTargetEmbeddingLookalikesName[] = "Detect target embedding domains as lookalikes."; const char kDetectTargetEmbeddingLookalikesDescription[] = "Shows a lookalike interstitial when navigating to target embedding domains" @@ -5470,7 +5571,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDisableProcessReuse[] = "Disable subframe process reuse"; const char kDisableProcessReuseDescription[] = -@@ -2181,7 +2181,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; +@@ -2215,7 +2215,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. " @@ -5479,7 +5580,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = -@@ -2198,7 +2198,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2232,7 +2232,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 " @@ -5660,17 +5761,23 @@ diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provide diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc --- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc +++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc -@@ -695,12 +695,12 @@ std::vector DialMediaRouteProvider::GetOrigins( +@@ -695,15 +695,15 @@ std::vector DialMediaRouteProvider::GetOrigins( base::flat_map>> origin_allowlist( {{"YouTube", -- {CreateOrigin("https://tv.youtube.com"), +- {CreateOrigin("https://music.youtube.com/"), +- CreateOrigin("https://music-green-qa.youtube.com/"), +- CreateOrigin("https://music-release-qa.youtube.com/"), +- CreateOrigin("https://tv.youtube.com"), - CreateOrigin("https://tv-green-qa.youtube.com"), - CreateOrigin("https://tv-release-qa.youtube.com"), - CreateOrigin("https://web-green-qa.youtube.com"), - CreateOrigin("https://web-release-qa.youtube.com"), - CreateOrigin("https://www.youtube.com")}}, -+ {CreateOrigin("https://tv.y0u1ub3.qjz9zk"), ++ {CreateOrigin("https://music.y0u1ub3.qjz9zk/"), ++ CreateOrigin("https://music-green-qa.y0u1ub3.qjz9zk/"), ++ CreateOrigin("https://music-release-qa.y0u1ub3.qjz9zk/"), ++ CreateOrigin("https://tv.y0u1ub3.qjz9zk"), + CreateOrigin("https://tv-green-qa.y0u1ub3.qjz9zk"), + CreateOrigin("https://tv-release-qa.y0u1ub3.qjz9zk"), + CreateOrigin("https://web-green-qa.y0u1ub3.qjz9zk"), @@ -5873,7 +5980,7 @@ diff --git a/chrome/browser/new_tab_page/modules/photos/photos_service.cc b/chro constexpr char kPhotosImgScope[] = - "https://www.googleapis.com/auth/photos.image.readonly"; + "https://www.9oo91eapis.qjz9zk/auth/photos.image.readonly"; - // Maximum accepted size of an ItemSuggest response. 1MB. + // Maximum accepted size of an API response. 1MB. constexpr int kMaxResponseSize = 1024 * 1024; const char server_url[] = - "https://photosfirstparty-pa.googleapis.com/chrome_ntp/" @@ -6007,6 +6114,18 @@ diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/brows } ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index, +diff --git a/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc +--- a/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc ++++ b/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc +@@ -63,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(ProfileShortcutManagerBrowserTest, + auto* identity_manager = + IdentityManagerFactory::GetForProfile(browser()->profile()); + ASSERT_TRUE(identity_manager); +- signin::MakePrimaryAccountAvailable(identity_manager, "foo@gmail.com", ++ signin::MakePrimaryAccountAvailable(identity_manager, "foo@9ma1l.qjz9zk", + signin::ConsentLevel::kSync); + // Standard size of a Gaia account picture. + const int kGaiaPictureSize = 256; diff --git a/chrome/browser/push_messaging/push_messaging_constants.cc b/chrome/browser/push_messaging/push_messaging_constants.cc --- a/chrome/browser/push_messaging/push_messaging_constants.cc +++ b/chrome/browser/push_messaging/push_messaging_constants.cc @@ -6076,7 +6195,7 @@ diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/br diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js --- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js +++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier.js -@@ -79,7 +79,7 @@ export class Magnifier { +@@ -88,7 +88,7 @@ export class Magnifier { this.isInitializing_ = false; }, Magnifier.IGNORE_FOCUS_UPDATES_INITIALIZATION_MS); @@ -6097,7 +6216,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/backgroun 'labels=Type-Bug,Pri-2,OS-Chrome&' + 'components=OS>Accessibility>ChromeVox&' + 'description='; -@@ -1535,13 +1535,13 @@ CommandHandler.init = function() { +@@ -1551,13 +1551,13 @@ CommandHandler.init = function() { } }); @@ -6183,6 +6302,18 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox_manifest. ], "all_frames": true, "js": [ +diff --git a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js +--- a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js ++++ b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js +@@ -162,7 +162,7 @@ E2ETestBase = class extends testing.Test { + chrome.automation.getDesktop((desktop) => { + 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 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 @@ -6241,7 +6372,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/sel // Settings key for system speech rate setting. const SPEECH_RATE_KEY = 'settings.tts.speech_rate'; -@@ -177,7 +177,7 @@ export class SelectToSpeak { +@@ -178,7 +178,7 @@ export class SelectToSpeak { this.enableLanguageDetectionIntegration_ = false; // TODO(chrishall): do we want to (also?) expose this in preferences? @@ -6250,7 +6381,7 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/sel 'enable-experimental-accessibility-language-detection', (result) => { this.enableLanguageDetectionIntegration_ = result; }); -@@ -699,8 +699,8 @@ export class SelectToSpeak { +@@ -700,8 +700,8 @@ export class SelectToSpeak { chrome.tabs.query( { url: [ @@ -6450,7 +6581,7 @@ 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 -@@ -88,7 +88,7 @@ Polymer({ +@@ -76,7 +76,7 @@ Polymer({ * @private {string} */ urlTemplate_: @@ -6825,7 +6956,7 @@ diff --git a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js b/c 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 -@@ -597,7 +597,7 @@ cr.define('cr.ui.login.debug', function() { +@@ -602,7 +602,7 @@ cr.define('cr.ui.login.debug', function() { // Password and email mismatch error message. id: 'offline-login-password-mismatch', trigger: (screen) => { @@ -6837,7 +6968,7 @@ diff --git a/chrome/browser/resources/chromeos/login/debug/debug.js b/chrome/bro diff --git a/chrome/browser/resources/chromeos/login/marketing_opt_in.html b/chrome/browser/resources/chromeos/login/marketing_opt_in.html --- a/chrome/browser/resources/chromeos/login/marketing_opt_in.html +++ b/chrome/browser/resources/chromeos/login/marketing_opt_in.html -@@ -152,7 +152,7 @@ +@@ -132,7 +132,7 @@
Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA
@@ -6894,28 +7025,6 @@ diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json b "syncFileSystem" ], "app": { -diff --git a/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/README.txt b/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/README.txt ---- a/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/README.txt -+++ b/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/README.txt -@@ -5,5 +5,5 @@ Once the equivalend tests are added under zip_archiver/tests/, which runs as a - part of browser_tests, files under this directory should be removed. - - If you want to run tests under this diretory, see: --https://chromium.googlesource.com/apps/unpacker/+/main/README.md -+https://chromium.9oo91esource.qjz9zk/apps/unpacker/+/main/README.md - -diff --git a/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/cpp/Makefile b/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/cpp/Makefile ---- a/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/cpp/Makefile -+++ b/chrome/browser/resources/chromeos/zip_archiver/unpacker-test/cpp/Makefile -@@ -71,7 +71,7 @@ $(eval $(call NMF_RULE,$(TARGET),)) - # manually. - # -disable-setuid-sandbox is optional, but otherwise it is necessary to set up - # the sandbox for development. See --# https://chromium.googlesource.com/chromium/src/+/main/docs/linux/suid_sandbox_development.md -+# https://chromium.9oo91esource.qjz9zk/chromium/src/+/main/docs/linux/suid_sandbox_development.md - .PHONY: tests_run - tests_run: check_for_chrome all $(TEST_PAGE) - $(RUN_PY) -C $(CURDIR) -P $(TEST_PAGE_CONFIG) \ diff --git a/chrome/browser/resources/cryptotoken/enroller.js b/chrome/browser/resources/cryptotoken/enroller.js --- a/chrome/browser/resources/cryptotoken/enroller.js +++ b/chrome/browser/resources/cryptotoken/enroller.js @@ -7205,11 +7314,11 @@ diff --git a/chrome/browser/resources/media/mei_preload/manifest.json b/chrome/b +++ b/chrome/browser/resources/media/mei_preload/manifest.json @@ -3,6 +3,6 @@ "icons": {}, - "version": "1.0.5.0", + "version": "1.0.6.0", "manifest_version": 2, - "update_url": "https://clients2.google.com/service/update2/crx", + "update_url": "https://clients2.9oo91e.qjz9zk/service/update2/crx", - "name": "MEI Preload" + "description": "Contains preloaded data for Media Engagement" } \ No newline at end of file diff --git a/chrome/browser/resources/media/webrtc_logs.js b/chrome/browser/resources/media/webrtc_logs.js @@ -7534,18 +7643,6 @@ diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chro target="_blank" id="updaterLearnMore" on-click="onLearnMoreTap_"> $i18n{learnMore} -diff --git a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.js b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.js ---- a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.js -+++ b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.js -@@ -390,7 +390,7 @@ class PasswordsListHandlerElement extends PasswordsListHandlerElementBase { - shouldShowMoveToAccountOption_() { - const isFirstSignedInAccountPassword = !!this.activePassword_ && - this.activePassword_.entry.urls.origin.includes( -- 'accounts.google.com') && -+ 'accounts.9oo91e.qjz9zk') && - this.activePassword_.entry.username === this.firstSignedInAccountEmail_; - // It's not useful to move a password for an account into that same account. - return this.allowMoveToAccountOption && !isFirstSignedInAccountPassword; diff --git a/chrome/browser/resources/settings/chromeos/PRESUBMIT.py b/chrome/browser/resources/settings/chromeos/PRESUBMIT.py --- a/chrome/browser/resources/settings/chromeos/PRESUBMIT.py +++ b/chrome/browser/resources/settings/chromeos/PRESUBMIT.py @@ -7563,15 +7660,15 @@ diff --git a/chrome/browser/resources/settings/chromeos/PRESUBMIT.py b/chrome/br diff --git a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html --- a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html +++ b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html -@@ -44,7 +44,7 @@ - - -
$i18n{crostiniDiskResizeTitle}
-
+@@ -31,7 +31,7 @@ + + +
$i18n{crostiniDiskResizeTitle}
+
diff --git a/chrome/browser/resources/settings/chromeos/device_page/stylus.js b/chrome/browser/resources/settings/chromeos/device_page/stylus.js --- a/chrome/browser/resources/settings/chromeos/device_page/stylus.js +++ b/chrome/browser/resources/settings/chromeos/device_page/stylus.js @@ -7587,7 +7684,7 @@ diff --git a/chrome/browser/resources/settings/chromeos/device_page/stylus.js b/ diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html --- a/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html +++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html -@@ -422,7 +422,7 @@ +@@ -425,7 +425,7 @@ if="[[shouldShowAdditionalFeaturesLink_(isGuest_, isKioskModeActive_)]]"> -+ link-url=https://www.y0u1ub3.qjz9zk/watch?v=dQw4w9WgXcQ> - - - +