From 46985eced726e503b31c4edf96afc7c488779c4a Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 23 Aug 2020 22:09:50 +0200 Subject: [PATCH] Release 85.0.4183.82 --- CHANGELOG.md | 7 + README.md | 4 +- build/RELEASE | 2 +- build/bromite_patches_list.txt | 11 +- build/chromium_patches_list.txt | 1 + build/patches/AV1-codec-support.patch | 2 +- ...-allow-screenshots-in-Incognito-mode.patch | 8 +- .../Add-a-proxy-configuration-page.patch | 18 +- .../Add-an-always-incognito-mode.patch | 57 +- .../Add-bookmark-import-export-actions.patch | 18 +- ...dd-custom-tab-intents-privacy-option.patch | 20 +- build/patches/Add-exit-menu-item.patch | 23 +- ...nfigure-maximum-connections-per-host.patch | 8 +- ...ontrol-video-playback-resume-feature.patch | 8 +- .../Add-flag-to-disable-IPv6-probes.patch | 14 +- build/patches/Add-flag-to-disable-WebGL.patch | 6 +- ...sable-device-motion-orientation-APIs.patch | 20 +- ...dd-history-support-in-incognito-mode.patch | 61 +- .../Add-menu-item-to-view-source.patch | 12 +- ...configure-the-ad-blocker-filters-URL.patch | 42 +- ...-to-not-persist-tabs-across-sessions.patch | 32 +- ...ng-for-DNS-over-HTTPS-DoH-custom-URL.patch | 38 +- .../Allow-playing-audio-in-background.patch | 8 +- ...c-dns-flag-regardless-of-SDK-version.patch | 2 +- .../Automated-domain-substitution.patch | 2032 +++++++++-------- ...the-domain-name-or-with-a-trk-scheme.patch | 12 +- ...Block-gateway-attacks-via-websockets.patch | 18 +- .../Bromite-AdBlockUpdaterService.patch | 44 +- ...webRTC-policy-to-not-use-any-address.patch | 4 +- ...AImageReader-for-ARM64-P-and-ARM64-Q.patch | 2 +- ...DRM-media-origin-IDs-preprovisioning.patch | 2 +- ...le-NTP-remote-suggestions-by-default.patch | 2 +- .../patches/Disable-Omaha-update-checks.patch | 2 +- build/patches/Disable-all-promo-dialogs.patch | 6 +- .../Disable-feeds-support-by-default.patch | 6 +- ...media-router-and-remoting-by-default.patch | 4 +- .../Disable-metrics-on-all-I-O-threads.patch | 4 +- ...-omission-of-URL-elements-in-Omnibox.patch | 2 +- .../patches/Disable-plugins-enumeration.patch | 2 +- ...romos-displayed-in-bookmarks-manager.patch | 103 +- ...e-references-to-fonts.googleapis.com.patch | 18 +- build/patches/Disable-safe-browsing.patch | 535 +++-- .../Disable-scroll-to-text-fragment.patch | 36 + .../Disable-seed-based-field-trials.patch | 2 +- .../Disable-smart-selection-by-default.patch | 2 +- ...isable-some-signed-exchange-features.patch | 4 +- .../Disable-sync-services-menu-entry.patch | 2 +- build/patches/Disable-update-scheduler.patch | 11 +- .../Do-not-compile-QR-code-sharing.patch | 113 +- ...tifications-to-default-search-engine.patch | 15 +- ...ore-download-location-prompt-setting.patch | 117 +- .../Do-not-store-passwords-by-default.patch | 2 +- ...SPPI-for-devices-with-enough-memory.patch} | 16 +- ...ownloads-storage-location-by-default.patch | 23 - ...e-darken-websites-checkbox-in-themes.patch | 37 + ...fwrapv-in-Clang-for-non-UBSan-builds.patch | 2 +- ...-improved-cookie-controls-by-default.patch | 13 +- ...ble-legacy-TLS-interstitital-warning.patch | 4 +- ...-prefetch-privacy-changes-by-default.patch | 2 +- ...uced-referrer-granularity-by-default.patch | 2 +- .../Enable-user-agent-freeze-by-default.patch | 2 +- .../patches/Hide-passwords-manager-link.patch | 4 +- ...ripts-for-AMP-tracking-ads-and-video.patch | 14 +- .../patches/Modify-default-preferences.patch | 12 +- ...or-canvas-text-and-client-rectangles.patch | 54 +- .../Never-send-any-crash-upload-data.patch | 2 +- ...uiltin-autocomplete-for-chrome-flags.patch | 2 +- .../Open-YouTube-links-in-Bromite.patch | 4 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 14 +- build/patches/Remove-EV-certificates.patch | 83 +- ...cklisted-URLs-upon-bookmark-creation.patch | 57 + ...ncy-on-auth-signin-dynamic-and-tasks.patch | 68 +- ...dependency-on-com.google.android.gcm.patch | 7 +- ...dency-on-com.google.android.gms.auth.patch | 24 +- ...dency-on-com.google.android.gms.cast.patch | 36 +- ...ndency-on-com.google.android.gms.gcm.patch | 8 +- ...ependency-on-com.google.android.play.patch | 14 +- ...ncy-on-fido-iid-instantapps-location.patch | 98 +- ...dependency-on-flags-places-and-stats.patch | 2 +- ...ncy-on-vision-clearcut-and-phenotype.patch | 12 +- .../patches/Remove-google_services_gcm.patch | 6 +- build/patches/Remove-help-menu-item.patch | 4 +- ...e-signin-and-data-saver-integrations.patch | 161 +- ...ce-DoH-probe-domain-with-RIPE-domain.patch | 2 +- ...acklist-for-AImageReader-on-ARM-CPUs.patch | 2 +- .../Restore-Search-Ready-Omnibox-flag.patch | 92 +- .../Restore-classic-new-tab-page.patch | 8 +- build/patches/Restore-duet-flags.patch | 34 - ...-enable-horizontal-tab-switcher-flag.patch | 2 +- ...flags-to-enable-disable-AImageReader.patch | 4 +- ...vert-Remove-pre-unified-consent-code.patch | 326 +-- ...emove-disable-pull-to-refresh-effect.patch | 8 +- ...ove-setup-for-disabling-AImageReader.patch | 16 +- ...llback-dav1d-upgrades-that-break-x86.patch | 59 + .../Session-only-cookies-support.patch | 108 +- ...tings-for-cookies-javascript-and-ads.patch | 34 +- .../Switch-to-fstack-protector-strong.patch | 2 +- build/patches/Update-i18n-zh_CN-support.patch | 4 +- .../Use-4-tile-rows-never-show-logo.patch | 6 +- build/patches/Use-dummy-DFM-installer.patch | 2 +- ...ll-disable-autofill-download-manager.patch | 10 +- ...build-remove-calling-untrusted-hooks.patch | 14 +- build/patches/disable-AdsBlockedInfoBar.patch | 2 +- ...IPv6-connectivity-probes-to-RIPE-DNS.patch | 2 +- ...t_run-deactivate-autoupdate-globally.patch | 2 +- build/patches/fix-bug-681.patch | 29 - build/patches/kill-Auth.patch | 20 +- build/patches/kill-GCM.patch | 65 +- .../kill-TOS-and-metrics-opt-out.patch | 2 +- build/patches/kill-Vision.patch | 2 +- ...-length-for-newly-generated-RSA-keys.patch | 2 +- ...pt-for-download-directory-by-default.patch | 2 +- ...how-download-prompt-again-by-default.patch | 25 - .../ungoogled-chromium-Disable-Gaia.patch | 14 +- ...romium-Disable-Google-host-detection.patch | 21 +- ...gled-chromium-Disable-profile-avatar.patch | 4 +- ...romium-Disable-translate-integration.patch | 20 +- ...ed-chromium-Disable-untraceable-URLs.patch | 2 +- 118 files changed, 2656 insertions(+), 2602 deletions(-) create mode 100644 build/patches/Disable-scroll-to-text-fragment.patch rename build/patches/{Enable-site-per-process-isolation-for-devices-with-enough-memory.patch => Enable-SPPI-for-devices-with-enough-memory.patch} (63%) delete mode 100644 build/patches/Enable-changing-default-downloads-storage-location-by-default.patch create mode 100644 build/patches/Enable-darken-websites-checkbox-in-themes.patch create mode 100644 build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch delete mode 100644 build/patches/Restore-duet-flags.patch create mode 100644 build/patches/Rollback-dav1d-upgrades-that-break-x86.patch delete mode 100644 build/patches/fix-bug-681.patch delete mode 100644 build/patches/show-download-prompt-again-by-default.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 873c3a52..141123ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# 85.0.4183.82 +* disable scroll-to-text-fragment +* remove NTP blocklisted URLs when adding an URL as bookmark +* removed duet flags +* unexpire `#darken-websites-checkbox-in-themes-setting` flag +* rollback dav1d upgrade which breaks x86 + # 84.0.4147.132 * fix exit menu item not always working (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/673) * session-only cookies site settings option (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/142) diff --git a/README.md b/README.md index 1fc6fd22..45a4db38 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042` * use frozen User-Agent to conceal real model and browser version * privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects * security enhancement patches from [GrapheneOS](https://github.com/GrapheneOS) project +* disable scroll-to-text-fragment ## Features not related to privacy * import/export bookmarks @@ -64,6 +65,7 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042` * allow changing default download storage location * do not ignore save prompt for users without SD cards * disable articles and increase number of icons on new tab page +* adding an URL as bookmark will clear its blocked status for the NTP tiles You can inspect all functionality/privacy changes by reading the [patches](https://github.com/bromite/bromite/tree/master/build/patches) and/or the [CHANGELOG](./CHANGELOG.md). @@ -74,7 +76,7 @@ Flags which have been retired from upstream Chromium but are still available in * `#enable-horizontal-tab-switcher` * `#pull-to-refresh` * `#enable-search-ready-omnibox` -* `#enable-chrome-duet` and `#enable-duet-tabstrip-integration` +* `#darken-websites-checkbox-in-themes-setting` New flags: diff --git a/build/RELEASE b/build/RELEASE index 38c8a452..b82d099b 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -84.0.4147.132 +85.0.4183.82 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 758092a7..47487c97 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -98,11 +98,10 @@ Do-not-ignore-download-location-prompt-setting.patch Disable-previews-by-default.patch Use-4-tile-rows-never-show-logo.patch Disable-metrics-collection-for-NTP-tiles.patch -Enable-site-per-process-isolation-for-devices-with-enough-memory.patch +Enable-SPPI-for-devices-with-enough-memory.patch prefs-disable-signinallowed-by-default.patch prefs-always-prompt-for-download-directory-by-default.patch Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch -Enable-changing-default-downloads-storage-location-by-default.patch disable-payment-support-by-default.patch disable-background-sync-by-default.patch disable-sensors-access-site-setting-by-default.patch @@ -114,7 +113,6 @@ Add-option-to-configure-the-ad-blocker-filters-URL.patch Replace-DoH-probe-domain-with-RIPE-domain.patch Increase-number-of-autocomplete-matches-from-5-to-10.patch Disable-HEAD-requests-for-single-word-Omnibar-searches.patch -Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch Disable-some-signed-exchange-features.patch Add-flag-to-disable-WebGL.patch Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch @@ -129,7 +127,6 @@ Restore-enable-horizontal-tab-switcher-flag.patch Disable-DRM-media-origin-IDs-preprovisioning.patch Disable-smart-selection-by-default.patch Enable-user-agent-freeze-by-default.patch -show-download-prompt-again-by-default.patch disable-browser-autologin-by-default.patch Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch Revert-Remove-flags-to-enable-disable-AImageReader.patch @@ -142,9 +139,13 @@ Enable-legacy-TLS-interstitital-warning.patch Block-gateway-attacks-via-websockets.patch Enable-prefetch-privacy-changes-by-default.patch Enable-reduced-referrer-granularity-by-default.patch -Restore-duet-flags.patch Disable-support-for-RAR-files-inspection.patch Enable-improved-cookie-controls-by-default.patch Session-only-cookies-support.patch Add-history-support-in-incognito-mode.patch +Enable-darken-websites-checkbox-in-themes.patch +Remove-blocklisted-URLs-upon-bookmark-creation.patch +Disable-scroll-to-text-fragment.patch +Rollback-dav1d-upgrades-that-break-x86.patch +Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch Automated-domain-substitution.patch diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt index 0ab662a2..08b0c0d3 100644 --- a/build/chromium_patches_list.txt +++ b/build/chromium_patches_list.txt @@ -4,3 +4,4 @@ Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch Disable-password-reuse-detection-on-android.patch Disable-feeds-support-by-default.patch +Rollback-dav1d-upgrades-that-break-x86.patch diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index 06748c2c..b7842a75 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -73,7 +73,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni --- a/third_party/libaom/libaom_srcs.gni +++ b/third_party/libaom/libaom_srcs.gni -@@ -641,6 +641,11 @@ aom_mem_sources = [ +@@ -656,6 +656,11 @@ aom_mem_sources = [ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ] 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 84b05817..a6b674cb 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 -@@ -4441,6 +4441,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4499,6 +4499,12 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(features::kEnableAmbientAuthenticationInIncognito)}, @@ -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 -@@ -483,6 +483,11 @@ const char kEnableAmbientAuthenticationInIncognitoDescription[] = +@@ -515,6 +515,11 @@ const char kEnableAmbientAuthenticationInIncognitoDescription[] = "Enables ambient authentication in Incognito mode. This flag may be " "overriden by policies."; @@ -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 -@@ -301,6 +301,9 @@ extern const char kEnableAccessibilityObjectModelDescription[]; +@@ -316,6 +316,9 @@ extern const char kEnableAccessibilityObjectModelDescription[]; extern const char kEnableAmbientAuthenticationInIncognitoName[]; extern const char kEnableAmbientAuthenticationInIncognitoDescription[]; @@ -75,7 +75,7 @@ diff --git a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmp diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc -@@ -338,6 +338,9 @@ const char kHomePage[] = "homepage"; +@@ -339,6 +339,9 @@ const char kHomePage[] = "homepage"; // Causes the browser to launch directly in incognito mode. const char kIncognito[] = "incognito"; diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 845b683b..a566af8b 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -53,7 +53,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi -+ @@ -63,7 +63,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 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 -@@ -239,6 +239,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -245,6 +245,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { std::vector builtins_to_provide; builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUIFlagsURL)); @@ -76,7 +76,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -111,6 +111,12 @@ - + + @@ -509,7 +509,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -263,6 +263,8 @@ static_library("ui") { +@@ -253,6 +253,8 @@ static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -521,7 +521,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -60,6 +60,7 @@ +@@ -62,6 +62,7 @@ #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" #include "chrome/browser/ui/webui/policy_ui.h" #include "chrome/browser/ui/webui/predictors/predictors_ui.h" @@ -529,7 +529,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/settings/settings_ui.h" #include "chrome/browser/ui/webui/settings_utils.h" -@@ -452,6 +453,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -464,6 +465,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -979,7 +979,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 -@@ -33,6 +33,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; +@@ -32,6 +32,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert"; const char kChromeUICertificateViewerURL[] = "chrome://view-cert/"; const char kChromeUIChromeSigninHost[] = "chrome-signin"; const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/"; @@ -996,7 +996,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIOobeHost, kChromeUIOSCreditsHost, kChromeUIOSSettingsHost, -@@ -469,6 +472,7 @@ const char* const kChromeHostURLs[] = { +@@ -480,6 +483,7 @@ const char* const kChromeHostURLs[] = { #if !defined(OS_ANDROID) #if !defined(OS_CHROMEOS) kChromeUIAppLauncherPageHost, @@ -1007,7 +1007,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 -@@ -116,6 +116,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -108,6 +108,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 11cd9a17..aff3be6e 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -140,7 +140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; -@@ -1517,6 +1518,9 @@ public abstract class ChromeActivity +@@ -1509,6 +1510,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -161,7 +161,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; -@@ -1644,8 +1645,9 @@ public class ChromeTabbedActivity +@@ -1664,8 +1665,9 @@ public class ChromeTabbedActivity extends ChromeActivity Clears history and autocompletions in the address bar. @@ -416,3 +416,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. +-- +2.17.1 + diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 8533c663..53be3b7f 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -327,7 +327,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -176,6 +176,10 @@ static_library("browser") { +@@ -182,6 +182,10 @@ static_library("browser") { "bitmap_fetcher/bitmap_fetcher_service.h", "bitmap_fetcher/bitmap_fetcher_service_factory.cc", "bitmap_fetcher/bitmap_fetcher_service_factory.h", @@ -338,16 +338,16 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "bluetooth/bluetooth_chooser_context.cc", "bluetooth/bluetooth_chooser_context.h", "bluetooth/bluetooth_chooser_context_factory.cc", -@@ -3144,8 +3148,6 @@ static_library("browser") { +@@ -3048,8 +3052,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", - "bookmarks/bookmark_html_writer.cc", - "bookmarks/bookmark_html_writer.h", - "certificate_viewer.h", - "chrome_browser_field_trials_desktop.cc", - "chrome_browser_field_trials_desktop.h", -@@ -3282,8 +3284,6 @@ static_library("browser") { + "browsing_data/access_context_audit_database.cc", + "browsing_data/access_context_audit_database.h", + "browsing_data/access_context_audit_service.cc", +@@ -3189,8 +3191,6 @@ static_library("browser") { "importer/importer_uma.h", "importer/in_process_importer_bridge.cc", "importer/in_process_importer_bridge.h", @@ -457,7 +457,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef&) { -@@ -513,6 +583,153 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -520,6 +590,153 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -752,7 +752,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 -@@ -417,6 +417,9 @@ static_library("common") { +@@ -415,6 +415,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -774,7 +774,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/edge_database_reader_win.cc", -@@ -170,6 +168,11 @@ static_library("utility") { +@@ -172,6 +170,11 @@ static_library("utility") { } } diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index fceb8572..0bd6d96c 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -35,13 +35,13 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi + android:title="@string/allow_custom_tab_intents_title" + android:summary="@string/allow_custom_tab_intents_summary" + android:defaultValue="false" /> - <resetlink>reset sync

Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 694a6061..3ecd257e 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -4,11 +4,11 @@ Subject: Add exit menu item Corrected Exit functionality --- - chrome/android/java/res/menu/main_menu.xml | 4 ++++ - .../src/org/chromium/chrome/browser/ChromeActivity.java | 7 +++++++ - .../chrome/browser/init/ChromeLifetimeController.java | 6 +++++- - .../browser/ui/android/strings/android_chrome_strings.grd | 3 +++ - 4 files changed, 19 insertions(+), 1 deletion(-) + chrome/android/java/res/menu/main_menu.xml | 4 ++++ + .../src/org/chromium/chrome/browser/ChromeActivity.java | 5 +++++ + .../chrome/browser/init/ChromeLifetimeController.java | 6 +++++- + .../browser/ui/android/strings/android_chrome_strings.grd | 3 +++ + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml @@ -34,7 +34,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/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -1920,6 +1920,11 @@ public abstract class ChromeActivity +@@ -1896,6 +1896,11 @@ public abstract class ChromeActivity RecordUserAction.record("MobileMenuSettings"); } @@ -46,15 +46,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. if (id == R.id.update_menu_id) { UpdateMenuItemHelper.getInstance().onMenuItemClicked(this); return true; -@@ -1996,6 +2001,8 @@ public abstract class ChromeActivity - AddToHomescreenCoordinator.showForAppMenu( - this, getWindowAndroid(), getModalDialogManager(), currentTab.getWebContents()); - RecordUserAction.record("MobileMenuAddToHomescreen"); -+ } else if (id == R.id.exit_id) { -+ ApplicationLifetime.terminate(false); - } else if (id == R.id.open_webapk_id) { - Context context = ContextUtils.getApplicationContext(); - String packageName = diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java @@ -74,7 +65,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 -@@ -2413,6 +2413,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Settings 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 aaba00ae..8322e6b2 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 -@@ -740,6 +740,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -701,6 +701,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 == -@@ -2928,6 +2933,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2953,6 +2958,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 -@@ -1227,6 +1227,10 @@ const char kMediaHistoryDescription[] = +@@ -1298,6 +1298,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 -@@ -738,6 +738,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[]; +@@ -770,6 +770,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[]; 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 e9fc824c..af019499 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 -@@ -2143,6 +2143,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2146,6 +2146,10 @@ const FeatureEntry kFeatureEntries[] = { kOsAura, FEATURE_VALUE_TYPE(features::kOverlayScrollbarFlashWhenMouseEnter)}, #endif // USE_AURA @@ -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 -@@ -853,6 +853,11 @@ const char kMemlogStackModeNative[] = "Native"; +@@ -912,6 +912,11 @@ const char kMemlogStackModeNative[] = "Native"; const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names"; const char kMemlogStackModePseudo[] = "Trace events"; @@ -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 -@@ -495,6 +495,9 @@ extern const char kEnablePortalsDescription[]; +@@ -518,6 +518,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; @@ -67,7 +67,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc + base::FEATURE_DISABLED_BY_DEFAULT }; - // Enable Media Capabilities with finch-parameters. + // When enabled, MediaCapabilities will check with GPU Video Accelerator -- 2.17.1 diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index f6335527..e969c453 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 -@@ -3713,6 +3713,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3770,6 +3770,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) @@ -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 -@@ -2437,6 +2437,10 @@ const char kContextualSearchRankerQueryDescription[] = +@@ -2561,6 +2561,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 -@@ -561,6 +561,9 @@ extern const char kEnableWasmThreadsName[]; +@@ -584,6 +584,9 @@ extern const char kEnableWasmThreadsName[]; extern const char kEnableWasmThreadsDescription[]; 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 -@@ -92,6 +92,7 @@ +@@ -93,6 +93,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" -@@ -3585,8 +3586,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3583,8 +3584,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { @@ -128,7 +128,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -52,6 +52,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -47,6 +47,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kThrottleDelayable{"ThrottleDelayable", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -142,7 +142,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 -@@ -21,6 +21,8 @@ extern const base::Feature kNetworkErrorLogging; +@@ -19,6 +19,8 @@ extern const base::Feature kNetworkErrorLogging; COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kNetworkService; COMPONENT_EXPORT(NETWORK_CPP) diff --git a/build/patches/Add-flag-to-disable-WebGL.patch b/build/patches/Add-flag-to-disable-WebGL.patch index ad7a1653..6734a860 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 -@@ -1972,6 +1972,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1975,6 +1975,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAccelerated2dCanvasName, flag_descriptions::kAccelerated2dCanvasDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)}, @@ -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 -@@ -452,6 +452,10 @@ const char kDeviceDiscoveryNotificationsName[] = +@@ -484,6 +484,10 @@ const char kDeviceDiscoveryNotificationsName[] = const char kDeviceDiscoveryNotificationsDescription[] = "Device discovery notifications on local network."; @@ -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 -@@ -286,6 +286,9 @@ extern const char kDebugShortcutsDescription[]; +@@ -301,6 +301,9 @@ extern const char kDebugShortcutsDescription[]; extern const char kDeviceDiscoveryNotificationsName[]; extern const char kDeviceDiscoveryNotificationsDescription[]; diff --git a/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch b/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch index 57f8a114..1fbf83f6 100644 --- a/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch +++ b/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch @@ -20,7 +20,7 @@ legacy acceleration events. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -2196,6 +2196,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2199,6 +2199,12 @@ const FeatureEntry kFeatureEntries[] = { {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName, flag_descriptions::kGpuRasterizationDescription, kOsAll, MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)}, @@ -36,7 +36,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 -@@ -674,6 +674,14 @@ const char kWinrtSensorsImplementationDescription[] = +@@ -705,6 +705,14 @@ const char kWinrtSensorsImplementationDescription[] = "Enables usage of the Windows.Devices.Sensors WinRT APIs on Windows for " "sensors"; @@ -54,7 +54,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 -@@ -407,6 +407,12 @@ extern const char kWinrtGeolocationImplementationDescription[]; +@@ -422,6 +422,12 @@ extern const char kWinrtGeolocationImplementationDescription[]; extern const char kWinrtSensorsImplementationName[]; extern const char kWinrtSensorsImplementationDescription[]; @@ -70,9 +70,9 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -88,6 +88,9 @@ void SetRuntimeFeatureDefaultsForPlatform( +@@ -92,6 +92,9 @@ void SetRuntimeFeatureDefaultsForPlatform( command_line.HasSwitch( - switches::kEnableGpuMemoryBufferCompositorResources) && + blink::switches::kEnableGpuMemoryBufferCompositorResources) && !command_line.HasSwitch(switches::kDisableWebGLImageChromium) && + WebRuntimeFeatures::EnableDeviceMotion(base::FeatureList::IsEnabled(features::kDeviceMotion)); + WebRuntimeFeatures::EnableDeviceOrientation(base::FeatureList::IsEnabled(features::kDeviceOrientation)); @@ -83,7 +83,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -804,6 +804,16 @@ const base::Feature kWebOtpBackend{"kWebOtpBackend", +@@ -801,6 +801,16 @@ const base::Feature kWebOtpBackend{"kWebOtpBackend", // TODO(rouslan): Remove this. const base::Feature kWebPayments{"WebPayments", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -103,7 +103,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -176,6 +176,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrHitTest; +@@ -175,6 +175,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrHitTest; CONTENT_EXPORT extern const base::Feature kWebXrIncubations; CONTENT_EXPORT extern const base::Feature kWebXrPermissionsApi; @@ -115,7 +115,7 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -98,6 +98,8 @@ class WebRuntimeFeatures { +@@ -99,6 +99,8 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableCSSHexAlphaColor(bool); BLINK_PLATFORM_EXPORT static void EnableSameSiteByDefaultCookies(bool); BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool); @@ -147,7 +147,7 @@ diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_p diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -179,6 +179,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { +@@ -189,6 +189,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) { RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable); } @@ -165,7 +165,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 -@@ -1244,6 +1244,14 @@ +@@ -1256,6 +1256,14 @@ name: "OffscreenCanvasCommit", status: "experimental", }, diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index f0bc1584..78ba1d8e 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -5,7 +5,6 @@ Subject: Add history support in incognito mode --- .../java/res/xml/privacy_preferences.xml | 5 +++++ .../privacy/settings/PrivacySettings.java | 18 ++++++++++++++++++ - chrome/browser/android/preferences/prefs.h | 2 ++ chrome/browser/history/history_tab_helper.cc | 16 ++++++++++++++++ chrome/browser/history/history_tab_helper.h | 4 ++++ chrome/browser/prefs/browser_prefs.cc | 2 ++ @@ -13,10 +12,9 @@ Subject: Add history support in incognito mode .../translations/android_chrome_strings_it.xtb | 2 ++ chrome/common/pref_names.cc | 5 +++++ chrome/common/pref_names.h | 4 ++++ - 10 files changed, 64 insertions(+) + 9 files changed, 62 insertions(+) mode change 100644 => 100755 chrome/android/java/res/xml/privacy_preferences.xml mode change 100644 => 100755 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java - mode change 100644 => 100755 chrome/browser/android/preferences/prefs.h mode change 100644 => 100755 chrome/browser/history/history_tab_helper.cc mode change 100644 => 100755 chrome/browser/history/history_tab_helper.h mode change 100644 => 100755 chrome/browser/prefs/browser_prefs.cc @@ -30,9 +28,9 @@ old mode 100644 new mode 100755 --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -34,6 +34,11 @@ - android:title="@string/always_incognito_title" - android:summary="@string/always_incognito_summary" +@@ -39,6 +39,11 @@ + android:title="@string/close_tabs_on_exit_title" + android:summary="@string/close_tabs_on_exit_summary" android:defaultValue="false" /> + GetBrowserContext()); @@ -150,7 +127,7 @@ new mode 100755 if (profile->IsOffTheRecord()) return NULL; -@@ -247,6 +257,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -249,6 +259,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -191,7 +168,7 @@ old mode 100644 new mode 100755 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -232,6 +232,7 @@ +@@ -233,6 +233,7 @@ #include "components/ntp_tiles/popular_sites_impl.h" #include "components/permissions/contexts/geolocation_permission_context_android.h" #include "components/query_tiles/tile_service_prefs.h" @@ -199,7 +176,7 @@ new mode 100755 #if BUILDFLAG(ENABLE_FEED_IN_CHROME) #include "components/feed/core/common/pref_names.h" #endif // BUILDFLAG(ENABLE_FEED_IN_CHROME) -@@ -978,6 +979,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -999,6 +1000,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); feed::prefs::RegisterFeedSharedProfilePrefs(registry); @@ -212,7 +189,7 @@ old mode 100644 new mode 100755 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -745,6 +745,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -794,6 +794,12 @@ Your Google account may have other forms of browsing history like searches and a Opens links in incognito tabs when you click on new tab or on a link @@ -230,7 +207,7 @@ old mode 100644 new mode 100755 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb -@@ -1017,4 +1017,6 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun +@@ -1062,4 +1062,6 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun Utilizza un servizio di previsione per visualizzare query correlate e siti web popolari durante la digitazione nella barra degli indirizzi Sincronizzazione con Gestione attività di Google @@ -242,7 +219,7 @@ old mode 100644 new mode 100755 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -2996,4 +2996,9 @@ const char kMediaFeedsSafeSearchEnabled[] = "media_feeds_safe_search_enabled"; +@@ -3038,4 +3038,9 @@ const char kMediaFeedsSafeSearchEnabled[] = "media_feeds_safe_search_enabled"; // TODO(enne): Remove this once AppCache has been removed. const char kAppCacheForceEnabled[] = "app_cache_force_enabled"; @@ -257,7 +234,7 @@ old mode 100644 new mode 100755 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1064,6 +1064,10 @@ extern const char kMediaFeedsSafeSearchEnabled[]; +@@ -1074,6 +1074,10 @@ extern const char kMediaFeedsSafeSearchEnabled[]; extern const char kAppCacheForceEnabled[]; diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index cda21677..59703f8d 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -40,7 +40,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/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -2010,6 +2010,8 @@ public abstract class ChromeActivity +@@ -1984,6 +1984,8 @@ public abstract class ChromeActivity } catch (ActivityNotFoundException e) { Toast.makeText(context, R.string.open_webapk_failed, Toast.LENGTH_SHORT).show(); } @@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. 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 -@@ -1838,6 +1838,8 @@ public class ChromeTabbedActivity +@@ -1866,6 +1866,8 @@ public class ChromeTabbedActivity extends ChromeActivity Other Google services diff --git a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch index 2e32b483..94444a81 100644 --- a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch +++ b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch @@ -5,7 +5,7 @@ Subject: Add option to configure the ad blocker filters URL --- chrome/android/chrome_java_resources.gni | 2 + chrome/android/chrome_java_sources.gni | 2 + - .../java/res/layout/adblock_editor.xml | 65 +++++++++++++ + .../java/res/layout/adblock_editor.xml | 67 ++++++++++++++ chrome/android/java/res/values/values.xml | 2 + .../java/res/xml/adblock_preferences.xml | 25 +++++ .../android/java/res/xml/main_preferences.xml | 5 + @@ -21,7 +21,7 @@ Subject: Add option to configure the ad blocker filters URL chrome/common/pref_names.h | 1 + .../adblock_updater_service.cc | 6 +- .../adblock_updater_service.h | 3 +- - 18 files changed, 311 insertions(+), 5 deletions(-) + 18 files changed, 313 insertions(+), 5 deletions(-) create mode 100644 chrome/android/java/res/layout/adblock_editor.xml create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java @@ -30,7 +30,7 @@ Subject: Add option to configure the ad blocker filters URL diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -885,6 +885,7 @@ chrome_java_resources = [ +@@ -815,6 +815,7 @@ chrome_java_resources = [ "java/res/layout/account_picker_new_account_row_legacy.xml", "java/res/layout/account_picker_row.xml", "java/res/layout/account_picker_row_legacy.xml", @@ -38,7 +38,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/layout/add_languages_main.xml", "java/res/layout/add_to_homescreen_dialog.xml", "java/res/layout/auto_sign_in_first_run_dialog.xml", -@@ -1175,6 +1176,7 @@ chrome_java_resources = [ +@@ -1102,6 +1103,7 @@ chrome_java_resources = [ "java/res/xml/about_chrome_preferences.xml", "java/res/xml/accessibility_preferences.xml", "java/res/xml/account_management_preferences.xml", @@ -49,7 +49,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1321,6 +1321,8 @@ chrome_java_sources = [ +@@ -1318,6 +1318,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/photo_picker/DecodeVideoTask.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java", @@ -62,7 +62,7 @@ diff --git a/chrome/android/java/res/layout/adblock_editor.xml b/chrome/android/ new file mode 100644 --- /dev/null +++ b/chrome/android/java/res/layout/adblock_editor.xml -@@ -0,0 +1,65 @@ +@@ -0,0 +1,67 @@ + + @@ -159,7 +161,7 @@ new file mode 100644 + android:summaryOn="@string/text_on" + android:summaryOff="@string/text_off" /> + -+ @@ -173,9 +175,9 @@ new file mode 100644 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml --- a/chrome/android/java/res/xml/main_preferences.xml +++ b/chrome/android/java/res/xml/main_preferences.xml -@@ -55,6 +55,11 @@ +@@ -61,6 +61,11 @@ android:key="privacy" - android:order="12" + android:order="14" android:title="@string/prefs_privacy"/> + @@ -371,7 +373,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1066,7 +1066,8 @@ BrowserProcessImpl::adblock_updater() { +@@ -1075,7 +1075,8 @@ BrowserProcessImpl::adblock_updater() { adblock_updater_ = std::make_unique( g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(), std::move(scheduler), @@ -402,8 +404,8 @@ diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/brows diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -250,6 +250,14 @@ public class CachedFeatureFlags { - ChromeFeatureList.isEnabled(ChromeFeatureList.REACHED_CODE_PROFILER)); +@@ -253,6 +253,14 @@ public class CachedFeatureFlags { + ChromeFeatureList.REACHED_CODE_PROFILER, "sampling_interval_us", 0)); } + public static void setAdBlockFiltersURL(String url) { @@ -417,7 +419,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /** * Caches flags that must take effect on startup but are set via native code. */ -@@ -402,5 +410,7 @@ public class CachedFeatureFlags { +@@ -405,5 +413,7 @@ public class CachedFeatureFlags { @NativeMethods interface Natives { boolean isNetworkServiceWarmUpEnabled(); @@ -428,7 +430,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -328,6 +328,8 @@ SystemNetworkContextManager::SystemNetworkContextManager( +@@ -331,6 +331,8 @@ SystemNetworkContextManager::SystemNetworkContextManager( SSLConfigServiceManager::CreateDefaultManager(local_state_)), proxy_config_monitor_(local_state_), stub_resolver_config_reader_(local_state_) { @@ -437,7 +439,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows #if !defined(OS_ANDROID) // QuicAllowed was not part of Android policy. const base::Value* value = -@@ -389,6 +391,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { +@@ -392,6 +394,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { StubResolverConfigReader::RegisterPrefs(registry); @@ -449,7 +451,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1825,6 +1825,20 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -473,7 +475,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 -@@ -2043,6 +2043,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; +@@ -2069,6 +2069,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; // capture devices without prompt. const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; @@ -486,7 +488,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -31,6 +31,7 @@ extern const char kDownloadRestrictions[]; +@@ -30,6 +30,7 @@ extern const char kDownloadRestrictions[]; extern const char kForceEphemeralProfiles[]; extern const char kHomePageIsNewTabPage[]; extern const char kHomePage[]; 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 10c1b1c1..53d04df6 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 @@ -26,9 +26,9 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res 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 -@@ -34,6 +34,11 @@ - android:title="@string/allow_custom_tab_intents_title" - android:summary="@string/allow_custom_tab_intents_summary" +@@ -25,6 +25,11 @@ + android:title="@string/always_incognito_title" + android:summary="@string/always_incognito_summary" android:defaultValue="false" /> + <resetlink>reset sync

IMAGE diff --git a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch index f775f014..669425e3 100644 --- a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch +++ b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch @@ -5,7 +5,7 @@ Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL --- chrome/android/chrome_java_resources.gni | 2 + chrome/android/chrome_java_sources.gni | 2 + - chrome/android/java/res/layout/doh_editor.xml | 65 +++++++++++++ + chrome/android/java/res/layout/doh_editor.xml | 67 ++++++++++++++ chrome/android/java/res/values/values.xml | 2 + .../android/java/res/xml/doh_preferences.xml | 25 +++++ .../java/res/xml/privacy_preferences.xml | 5 + @@ -17,7 +17,7 @@ Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL .../net/stub_resolver_config_reader.cc | 36 ++------ .../strings/android_chrome_strings.grd | 11 +++ chrome/common/chrome_features.cc | 4 +- - 14 files changed, 322 insertions(+), 31 deletions(-) + 14 files changed, 324 insertions(+), 31 deletions(-) create mode 100644 chrome/android/java/res/layout/doh_editor.xml create mode 100644 chrome/android/java/res/xml/doh_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java @@ -26,15 +26,15 @@ Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -954,6 +954,7 @@ chrome_java_resources = [ +@@ -881,6 +881,7 @@ chrome_java_resources = [ + "java/res/layout/date_view.xml", + "java/res/layout/default_search_engine_first_run_fragment.xml", "java/res/layout/device_item_list.xml", ++ "java/res/layout/doh_editor.xml", "java/res/layout/distilled_page_font_family_spinner.xml", "java/res/layout/distilled_page_prefs_view.xml", -+ "java/res/layout/doh_editor.xml", - "java/res/layout/edit_url_suggestion_layout.xml", "java/res/layout/editable_option_editor_footer.xml", - "java/res/layout/editable_option_editor_icons.xml", -@@ -1185,6 +1186,7 @@ chrome_java_resources = [ +@@ -1112,6 +1113,7 @@ chrome_java_resources = [ "java/res/xml/data_reduction_preferences.xml", "java/res/xml/data_reduction_preferences_off_lite_mode.xml", "java/res/xml/developer_preferences.xml", @@ -45,7 +45,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1374,6 +1374,8 @@ chrome_java_sources = [ +@@ -1373,6 +1373,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java", "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetAdapter.java", "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java", @@ -58,7 +58,7 @@ diff --git a/chrome/android/java/res/layout/doh_editor.xml b/chrome/android/java new file mode 100644 --- /dev/null +++ b/chrome/android/java/res/layout/doh_editor.xml -@@ -0,0 +1,65 @@ +@@ -0,0 +1,67 @@ + + @@ -155,7 +157,7 @@ new file mode 100644 + android:summaryOn="@string/text_on" + android:summaryOff="@string/text_off" /> + -+ @@ -340,7 +342,7 @@ new file mode 100644 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -6912,6 +6912,12 @@ the Bookmarks menu."> +@@ -6977,6 +6977,12 @@ the Bookmarks menu."> @@ -395,7 +397,7 @@ diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/brows diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java -@@ -127,6 +127,26 @@ public class CachedFeatureFlags { +@@ -128,6 +128,26 @@ public class CachedFeatureFlags { private static Map sOverridesTestFeatures; private static String sReachedCodeProfilerTrialGroup; @@ -422,7 +424,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /** * Checks if a cached feature flag is enabled. * -@@ -409,6 +429,10 @@ public class CachedFeatureFlags { +@@ -412,6 +432,10 @@ public class CachedFeatureFlags { @NativeMethods interface Natives { @@ -436,7 +438,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc --- a/chrome/browser/net/stub_resolver_config_reader.cc +++ b/chrome/browser/net/stub_resolver_config_reader.cc -@@ -140,28 +140,6 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state, +@@ -141,28 +141,6 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state, base::Value(SecureDnsConfig::ModeToString(default_secure_dns_mode))); local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsTemplates, base::Value(default_doh_templates)); @@ -465,7 +467,7 @@ diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/ } pref_change_registrar_.Add(prefs::kBuiltInDnsClientEnabled, pref_callback); -@@ -323,21 +301,21 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( +@@ -346,21 +324,21 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( parental_controls_checked_ = true; } @@ -497,7 +499,7 @@ diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -580,6 +580,17 @@ CHAR-LIMIT guidelines: +@@ -590,6 +590,17 @@ CHAR-LIMIT guidelines: Chrome Passwords @@ -518,7 +520,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -281,12 +281,12 @@ const base::Feature kDefaultWebAppInstallation{ +@@ -281,12 +281,12 @@ const base::Feature kDesktopPWAsRunOnOsLogin{"DesktopPWAsRunOnOsLogin", // Enable DNS over HTTPS (DoH). const base::Feature kDnsOverHttps{"DnsOverHttps", diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 7ed3c0f8..b3f28080 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -10,7 +10,7 @@ Subject: Allow playing audio in background diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc -@@ -1031,6 +1031,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1053,6 +1053,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -23,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp void WebMediaPlayerImpl::EnabledAudioTracksChanged( const blink::WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3458,7 +3464,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3469,7 +3475,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. @@ -35,11 +35,11 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp + if (!HasVideoNonEmptySize()) return false; - if (!is_background_video_playback_enabled_) + if (using_media_player_renderer_ && diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h --- a/media/blink/webmediaplayer_impl.h +++ b/media/blink/webmediaplayer_impl.h -@@ -151,6 +151,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl +@@ -153,6 +153,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl // True if the loaded media has a playable video/audio track. bool HasVideo() const override; bool HasAudio() const override; 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 index 372bc818..633700de 100644 --- 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 @@ -11,7 +11,7 @@ Do not read experiment value for cronet async DNS configuration 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 -@@ -148,7 +148,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams( +@@ -150,7 +150,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams( local_state->GetBoolean(prefs::kNtlmV2Enabled); #endif // defined(OS_POSIX) diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 94487ffc..8de1075d 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -1,10 +1,10 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Mon, 13 Jul 2020 01:13:42 +0200 +Date: Fri, 21 Aug 2020 13:41:07 +0200 Subject: Automated domain substitution --- .gn | 2 +- - PRESUBMIT.py | 52 +- + PRESUBMIT.py | 54 +- .../devui/WebViewPackageError.java | 2 +- build/android/pylib/constants/__init__.py | 2 +- .../android/commands/unzip/Unzip.java | 2 +- @@ -15,21 +15,20 @@ Subject: Automated domain substitution .../feedactionparser/FeedActionParser.java | 2 +- .../chrome/browser/ChromeStringConstants.java | 6 +- .../chrome/browser/ChromeTabbedActivity.java | 2 +- - .../chrome/browser/IntentHandler.java | 6 +- + .../chrome/browser/IntentHandler.java | 10 +- .../customtabs/CustomButtonParams.java | 2 +- .../browser/feedback/ConnectivityChecker.java | 4 +- .../indicator/ConnectivityDetector.java | 4 +- .../browser/omaha/RequestGenerator.java | 2 +- .../suggestions/SuggestionsConfig.java | 2 +- .../SuggestionsNavigationDelegate.java | 2 +- - .../webapk/lib/client/WebApkValidator.java | 2 +- chrome/app/PRESUBMIT.py | 8 +- chrome/browser/about_flags.cc | 12 +- .../apps/platform_apps/install_chrome_app.cc | 2 +- .../browser/chrome_browser_application_mac.mm | 2 +- - .../browser/chrome_content_browser_client.cc | 2 +- chrome/browser/chromeos/app_mode/fake_cws.cc | 2 +- .../backdrop_wallpaper_handlers.cc | 6 +- + .../chromeos/crostini/crostini_util.cc | 2 +- .../customization/customization_document.cc | 2 +- .../chromeos/drive/drivefs_test_support.cc | 2 +- .../file_manager/private_api_drive.cc | 2 +- @@ -37,7 +36,7 @@ Subject: Automated domain substitution chrome/browser/chromeos/hats/hats_dialog.cc | 2 +- .../recommend_apps_fetcher_impl.cc | 2 +- .../login/session/user_session_manager.cc | 2 +- - .../chromeos/plugin_vm/plugin_vm_util.cc | 2 +- + .../chromeos/plugin_vm/plugin_vm_util.cc | 6 +- .../chromeos/policy/heartbeat_scheduler.cc | 4 +- .../remote_commands/crd_host_delegate.cc | 10 +- .../protocol_handler_registry.cc | 4 +- @@ -53,12 +52,13 @@ Subject: Automated domain substitution .../updater/chrome_update_client_config.cc | 2 +- .../importer/edge_importer_browsertest_win.cc | 8 +- .../importer/ie_importer_browsertest_win.cc | 30 +- - .../cast/cast_media_route_provider.cc | 2 +- + .../cast/cast_media_route_provider.cc | 4 +- .../dial/dial_media_route_provider.cc | 12 +- .../media/webrtc/webrtc_browsertest_common.cc | 2 +- .../notification_platform_bridge_mac.mm | 2 +- .../ads_page_load_metrics_observer.cc | 2 +- chrome/browser/policy/policy_test_utils.cc | 2 +- + .../isolated/isolated_prerender_params.cc | 2 +- chrome/browser/profiles/profile_window.cc | 2 +- .../push_messaging_service_impl.cc | 2 +- .../resources/chromeos/emulator/icons.html | 2 +- @@ -80,11 +80,11 @@ Subject: Automated domain substitution .../browser/ssl/connection_help_tab_helper.cc | 2 +- .../permission_request_creator_apiary.cc | 2 +- .../supervised_user_service.cc | 2 +- - .../supervised_user_url_filter.cc | 10 +- + .../supervised_user_url_filter.cc | 12 +- ...r_content_setting_bubble_model_delegate.cc | 4 +- .../browser_navigator_browsertest_chromeos.cc | 2 +- .../browser/ui/cocoa/share_menu_controller.mm | 2 +- - chrome/browser/ui/signin_view_controller.cc | 4 +- + chrome/browser/ui/signin_view_controller.cc | 2 +- .../toolbar/media_router_contextual_menu.cc | 6 +- .../views/accessibility/invert_bubble_view.cc | 6 +- .../ui/views/network_profile_bubble_view.cc | 2 +- @@ -93,7 +93,6 @@ Subject: Automated domain substitution .../chromeos/login/gaia_screen_handler.cc | 2 +- .../ui/webui/interstitials/interstitial_ui.cc | 2 +- .../browser/ui/webui/management_ui_handler.cc | 2 +- - .../ui/webui/new_tab_page/new_tab_page_ui.cc | 2 +- chrome/browser/ui/webui/ntp/new_tab_ui.cc | 2 +- .../ui/webui/ntp/ntp_resource_cache.cc | 8 +- .../webui/settings/reset_settings_handler.cc | 2 +- @@ -333,21 +332,17 @@ Subject: Automated domain substitution .../docs/templates/public/owners.html | 2 +- chrome/common/google_url_loader_throttle.cc | 4 +- chrome/common/service_process.mojom | 2 +- - chrome/common/url_constants.cc | 224 ++--- + chrome/common/url_constants.cc | 226 ++--- .../gaiacp/gaia_credential_base.cc | 8 +- .../setup/google_chrome_behaviors.cc | 2 +- .../subresource_redirect_params.cc | 2 +- - .../public/mojom/app_service.mojom | 2 +- - .../app_service/public/mojom/types.mojom | 4 +- chrome/utility/importer/ie_importer_win.cc | 2 +- .../chromecast/shell/CastCrashUploader.java | 6 +- chromeos/components/drivefs/drivefs_auth.cc | 2 +- .../multidevice/remote_device_test_util.cc | 2 +- - .../quick_answers/search_result_loader.cc | 2 +- - .../assistant/public/mojom/assistant.mojom | 4 +- .../device_sync/cryptauth_client_impl.cc | 8 +- .../win/port_monitor/port_monitor.cc | 2 +- - .../arc/mojom/accessibility_helper.mojom | 12 +- + .../arc/mojom/accessibility_helper.mojom | 14 +- components/arc/mojom/app_permissions.mojom | 2 +- components/arc/mojom/bluetooth.mojom | 10 +- components/arc/mojom/file_system.mojom | 6 +- @@ -358,12 +353,11 @@ Subject: Automated domain substitution .../domain_reliability/bake_in_configs.py | 286 +++--- components/feed/core/feed_networking_host.cc | 2 +- .../minidump_uploader/MinidumpUploader.java | 2 +- - .../policy/resources/policy_templates.json | 898 +++++++++--------- + .../policy/resources/policy_templates.json | 930 +++++++++--------- .../CaptivePortalHelper.java | 2 +- .../components/sync/SyncConstants.java | 2 +- .../firstrun/VariationsSeedFetcher.java | 2 +- .../browser/webauth/authenticator_common.cc | 6 +- - content/common/input/input_handler.mojom | 2 +- content/common/renderer.mojom | 2 +- .../pepper/pepper_media_device_manager.cc | 2 +- .../chromium/content_shell/ShellManager.java | 2 +- @@ -377,7 +371,6 @@ Subject: Automated domain substitution ios/chrome/browser/autofill/BUILD.gn | 4 +- ios/chrome/browser/omaha/omaha_service.mm | 2 +- ios/chrome/browser/u2f/u2f_controller.mm | 4 +- - .../signed_in_accounts_view_controller.mm | 2 +- .../content_suggestions/ntp_home_mediator.mm | 2 +- ios/chrome/browser/ui/ntp/incognito_view.mm | 2 +- .../ui/ntp/notification_promo_whats_new.mm | 2 +- @@ -389,7 +382,7 @@ Subject: Automated domain substitution .../chromeos/mojom/camera_metadata.mojom | 4 +- media/mojo/mojom/provision_fetcher.mojom | 2 +- native_client_sdk/src/doc/_book.yaml | 2 +- - net/http/transport_security_state_static.json | 506 +++++----- + net/http/transport_security_state_static.json | 510 +++++----- .../org/chromium/chromoting/Chromoting.java | 4 +- .../chromoting/PrivacyPolicyActivity.java | 2 +- .../chromoting/TermsOfServiceActivity.java | 2 +- @@ -438,13 +431,13 @@ Subject: Automated domain substitution .../tools/blinkpy/w3c/chromium_commit.py | 2 +- .../tools/blinkpy/w3c/chromium_commit_mock.py | 2 +- third_party/blink/tools/blinkpy/w3c/common.py | 4 +- - .../tools/blinkpy/w3c/export_notifier.py | 2 +- + .../tools/blinkpy/w3c/export_notifier.py | 4 +- third_party/blink/tools/blinkpy/w3c/gerrit.py | 6 +- .../tools/blinkpy/w3c/import_notifier.py | 2 +- .../blink/tools/blinkpy/w3c/monorail.py | 2 +- .../tools/blinkpy/w3c/pr_cleanup_tool.py | 2 +- .../blink/tools/blinkpy/w3c/test_exporter.py | 4 +- - .../blink/tools/blinkpy/w3c/test_importer.py | 10 +- + .../blink/tools/blinkpy/w3c/test_importer.py | 12 +- third_party/blink/tools/move_blink_source.py | 2 +- .../print_stale_test_expectations_entries.py | 2 +- .../channel/AndroidChannelConstants.java | 2 +- @@ -507,12 +500,12 @@ Subject: Automated domain substitution .../account_picker/user_pod_template.html | 2 +- ui/webui/resources/cr_elements/icons.html | 4 +- .../weblayer/shell/WebLayerShellActivity.java | 2 +- - 504 files changed, 2467 insertions(+), 2467 deletions(-) + 497 files changed, 2486 insertions(+), 2486 deletions(-) diff --git a/.gn b/.gn --- a/.gn +++ b/.gn -@@ -566,7 +566,7 @@ check_targets = [ +@@ -568,7 +568,7 @@ check_targets = [ "//ui/*", "//url/*", @@ -533,7 +526,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for more details about the presubmit API built into depot_tools. """ -@@ -132,7 +132,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -133,7 +133,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView addTrackingRect:owner:userData:assumeInside:] is' 'prohibited. Please use CrTrackingArea instead.', @@ -542,7 +535,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -141,7 +141,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -142,7 +142,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of NSTrackingAreas is prohibited. Please use CrTrackingArea', 'instead.', @@ -551,7 +544,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ), -@@ -150,7 +150,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -151,7 +151,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertPointFromBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) fromView:nil| instead.', @@ -560,7 +553,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -159,7 +159,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -160,7 +160,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertPointToBase:] is almost certainly wrong.', 'Please use |convertPoint:(point) toView:nil| instead.', @@ -569,7 +562,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -168,7 +168,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -169,7 +169,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertRectFromBase:] is almost certainly wrong.', 'Please use |convertRect:(point) fromView:nil| instead.', @@ -578,7 +571,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -177,7 +177,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -178,7 +178,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertRectToBase:] is almost certainly wrong.', 'Please use |convertRect:(point) toView:nil| instead.', @@ -587,7 +580,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -186,7 +186,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -187,7 +187,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertSizeFromBase:] is almost certainly wrong.', 'Please use |convertSize:(point) fromView:nil| instead.', @@ -596,7 +589,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -195,7 +195,7 @@ _BANNED_OBJC_FUNCTIONS = ( +@@ -196,7 +196,7 @@ _BANNED_OBJC_FUNCTIONS = ( ( 'The use of -[NSView convertSizeToBase:] is almost certainly wrong.', 'Please use |convertSize:(point) toView:nil| instead.', @@ -605,7 +598,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), True, ), -@@ -600,7 +600,7 @@ _BANNED_CPP_FUNCTIONS = ( +@@ -610,7 +610,7 @@ _BANNED_CPP_FUNCTIONS = ( ( "Don't use CallJavascriptFunctionUnsafe() in new code. Instead, use", 'AllowJavascript(), OnJavascriptAllowed()/OnJavascriptDisallowed(),', @@ -614,7 +607,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ), False, ( -@@ -1239,7 +1239,7 @@ _DEPRECATED_MOJO_TYPES = ( +@@ -1249,7 +1249,7 @@ _DEPRECATED_MOJO_TYPES = ( _IPC_ENUM_TRAITS_DEPRECATED = ( 'You are using IPC_ENUM_TRAITS() in your code. It has been deprecated.\n' @@ -623,7 +616,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'security-tips-for-ipc') _LONG_PATH_ERROR = ( -@@ -1378,7 +1378,7 @@ _KNOWN_ROBOTS = set( +@@ -1395,7 +1395,7 @@ _KNOWN_ROBOTS = set( 'wpt-autoroller',) ) | set('%s@skia-public.iam.gserviceaccount.com' % s for s in ('chromium-autoroll', 'chromium-release-autoroll') @@ -632,7 +625,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py for s in ('chromium-internal-autoroll',)) -@@ -1785,7 +1785,7 @@ def _CheckNoDEPSGIT(input_api, output_api): +@@ -1802,7 +1802,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' @@ -641,7 +634,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'get-the-code#Rolling_DEPS\n' 'for more information')] return [] -@@ -1990,7 +1990,7 @@ def _CheckNoPragmaOnce(input_api, output_api): +@@ -2011,7 +2011,7 @@ def _CheckNoPragmaOnce(input_api, output_api): if files: return [output_api.PresubmitError( 'Do not use #pragma once in header files.\n' @@ -650,7 +643,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py files)] return [] -@@ -2196,7 +2196,7 @@ def _CheckForVersionControlConflicts(input_api, output_api): +@@ -2217,7 +2217,7 @@ def _CheckForVersionControlConflicts(input_api, output_api): def _CheckGoogleSupportAnswerUrl(input_api, output_api): @@ -659,7 +652,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors = [] for f in input_api.AffectedFiles(): for line_num, line in f.ChangedContents(): -@@ -2305,7 +2305,7 @@ def _CheckNoAbbreviationInPngFileName(input_api, output_api): +@@ -2326,7 +2326,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' @@ -668,7 +661,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3038,7 +3038,7 @@ def _CheckSecurityOwners(input_api, output_api): +@@ -3061,7 +3061,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. @@ -677,7 +670,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. -@@ -3336,7 +3336,7 @@ def _CheckAndroidToastUsage(input_api, output_api): +@@ -3359,7 +3359,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' @@ -686,7 +679,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py errors)) return results -@@ -3469,7 +3469,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): +@@ -3492,7 +3492,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): if errors: results.append(output_api.PresubmitError( 'APIs from junit.framework.* are deprecated, please use JUnit4 framework' @@ -695,7 +688,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' if you have any question.', errors)) return results -@@ -3500,7 +3500,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): +@@ -3523,7 +3523,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' @@ -704,7 +697,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py ' questions.', errors)) return results -@@ -3524,7 +3524,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): +@@ -3547,7 +3547,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.' @@ -713,7 +706,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -3544,7 +3544,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api): +@@ -3567,7 +3567,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' @@ -722,7 +715,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py return results -@@ -4221,7 +4221,7 @@ def _CheckFuzzTargets(input_api, output_api): +@@ -4258,7 +4258,7 @@ def _CheckFuzzTargets(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 ' @@ -731,7 +724,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py 'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % ( ', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER) ) -@@ -4256,7 +4256,7 @@ def _CheckNewImagesWarning(input_api, output_api): +@@ -4293,7 +4293,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 ' @@ -740,7 +733,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 -@@ -4573,7 +4573,7 @@ def _CheckForInvalidIfDefinedMacros(input_api, output_api): +@@ -4619,7 +4619,7 @@ def _CheckForInvalidIfDefinedMacros(input_api, output_api): def _CheckForIPCRules(input_api, output_api): """Check for same IPC rules described in @@ -749,7 +742,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) -@@ -4819,7 +4819,7 @@ def CheckChangeOnCommit(input_api, output_api): +@@ -4865,7 +4865,7 @@ def CheckChangeOnCommit(input_api, output_api): results.extend(input_api.canned_checks.CheckTreeIsOpen( input_api, output_api, @@ -758,6 +751,15 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py results.extend( input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) +@@ -5184,7 +5184,7 @@ def _CheckStrings(input_api, output_api): + if icu_syntax_errors: + results.append(output_api.PresubmitError( + 'ICU syntax errors were found in the following strings (problems or ' +- 'feedback? Contact rainhard@chromium.org):', items=icu_syntax_errors)) ++ 'feedback? Contact rainhard@ch40m1um.qjz9zk):', items=icu_syntax_errors)) + + return results + diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/WebViewPackageError.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/WebViewPackageError.java --- a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/WebViewPackageError.java +++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/WebViewPackageError.java @@ -797,7 +799,7 @@ diff --git a/build/android/pylib/device/commands/java/src/org/chromium/android/c diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -1695,7 +1695,7 @@ if (enable_java_templates) { +@@ -1715,7 +1715,7 @@ if (enable_java_templates) { # * public.txt # * annotations.zip # * assets/ @@ -821,7 +823,7 @@ diff --git a/build/toolchain/cros_toolchain.gni b/build/toolchain/cros_toolchain diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java --- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java +++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java -@@ -36,7 +36,7 @@ import java.util.Map; +@@ -38,7 +38,7 @@ import java.util.Map; class AutofillAssistantClient { /** OAuth2 scope that RPCs require. */ private static final String AUTH_TOKEN_TYPE = @@ -881,8 +883,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStringCon 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 -@@ -190,7 +190,7 @@ public class ChromeTabbedActivity - extends ChromeActivity implements AccessibilityUtil.Observer { +@@ -194,7 +194,7 @@ public class ChromeTabbedActivity extends ChromeActivityGetPrimaryAccountId(signin::ConsentLevel::kNotRequired); std::vector scopes; @@ -1180,7 +1174,7 @@ diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.c 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 -@@ -84,7 +84,7 @@ namespace { +@@ -86,7 +86,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -1216,7 +1210,7 @@ diff --git a/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc --- a/chrome/browser/chromeos/login/session/user_session_manager.cc +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc -@@ -1203,7 +1203,7 @@ void ShowSupervisedUserDeprecationNotification(Profile* profile, +@@ -1208,7 +1208,7 @@ void ShowSupervisedUserDeprecationNotification(Profile* profile, NavigateParams params( profile, @@ -1228,15 +1222,27 @@ diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chr diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc --- a/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc +++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc -@@ -186,7 +186,7 @@ void RemoveDriveDownloadDirectoryIfExists() { - - // TODO(muhamedp): Update if a different url format is ultimately chosen. - bool IsDriveUrl(const GURL& url) { -- const std::string url_base = "https://drive.google.com/open"; -+ const std::string url_base = "https://drive.9oo91e.qjz9zk/open"; +@@ -193,7 +193,7 @@ void RemoveDriveDownloadDirectoryIfExists() { + base::Optional GetIdFromDriveUrl(const GURL& url) { const std::string& spec = url.spec(); - return spec.find(url_base) == 0 && spec.find("id=") < (spec.length() - 3); - } + +- const std::string kOpenUrlBase = "https://drive.google.com/open?"; ++ const std::string kOpenUrlBase = "https://drive.9oo91e.qjz9zk/open?"; + if (base::StartsWith(spec, kOpenUrlBase, + base::CompareCase::INSENSITIVE_ASCII)) { + // e.g. https://drive.google.com/open?id=[ID] +@@ -205,9 +205,9 @@ base::Optional GetIdFromDriveUrl(const GURL& url) { + + // These will match some invalid URLs, which is fine. + const std::string kViewUrlPatternWithDomain = +- "https://drive.google.com/a/*/file/d/*/view*"; ++ "https://drive.9oo91e.qjz9zk/a/*/file/d/*/view*"; + const std::string kViewUrlPatternWithoutDomain = +- "https://drive.google.com/file/d/*/view*"; ++ "https://drive.9oo91e.qjz9zk/file/d/*/view*"; + if (base::MatchPattern(spec, kViewUrlPatternWithDomain) || + base::MatchPattern(spec, kViewUrlPatternWithoutDomain)) { + // e.g. https://drive.google.com/a/example.org/file/d/[ID]/view?usp=sharing diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc --- a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc +++ b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc @@ -1257,7 +1263,7 @@ diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc b/chrome/brow diff --git a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc b/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc --- a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc +++ b/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc -@@ -58,8 +58,8 @@ constexpr char kCRDConnectSuppressNotifications[] = "suppressNotifications"; +@@ -57,8 +57,8 @@ constexpr char kCRDConnectSuppressNotifications[] = "suppressNotifications"; constexpr char kCRDTerminateUponInput[] = "terminateUponInput"; // Connect message parameter values: @@ -1268,7 +1274,7 @@ diff --git a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc // CRD host states we care about: constexpr char kCRDStateKey[] = "state"; -@@ -79,11 +79,11 @@ constexpr char kCRDConnectClientKey[] = "client"; +@@ -78,11 +78,11 @@ constexpr char kCRDConnectClientKey[] = "client"; // OAuth2 Token scopes constexpr char kCloudDevicesOAuth2Scope[] = @@ -1303,7 +1309,7 @@ diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrom diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc b/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc --- a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc +++ b/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.cc -@@ -56,7 +56,7 @@ +@@ -59,7 +59,7 @@ namespace { // Assume that any proxy host ending with this suffix is a Data Reduction Proxy. @@ -1312,7 +1318,7 @@ diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_set // Searches |proxy_list| for any Data Reduction Proxies, even if they don't // match a currently configured Data Reduction Proxy. -@@ -173,7 +173,7 @@ DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefsHelper( +@@ -176,7 +176,7 @@ DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefsHelper( // could be implied, so searching for ".googlezip.net:" in the PAC script // indicates whether there's a proxy in that PAC script with a host of the // form "*.googlezip.net". @@ -1353,7 +1359,7 @@ diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_priva diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc -@@ -136,7 +136,7 @@ void ImportPrivateKeyPKCS8ToSlot(const unsigned char* pkcs8_der, +@@ -137,7 +137,7 @@ void ImportPrivateKeyPKCS8ToSlot(const unsigned char* pkcs8_der, const char kTestExtensionID[] = "aecpbnckhoppanpmefllkdkohionpmig"; const char kTestExtensionUpdateManifest[] = R"( @@ -1401,7 +1407,7 @@ diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performance_t diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc -@@ -282,7 +282,7 @@ void ExternalPrefLoader::LoadOnFileThread() { +@@ -330,7 +330,7 @@ void ExternalPrefLoader::LoadOnFileThread() { if (!prefs->empty()) LOG(WARNING) << "You are using an old-style extension deployment method " "(external_extensions.json), which will soon be " @@ -1554,19 +1560,21 @@ diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/bro diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc --- a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc +++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc -@@ -35,7 +35,7 @@ std::vector GetOrigins(const MediaSource::Id& source_id) { - return base::StartsWith(source_id, kMirroringAppPrefix, - base::CompareCase::SENSITIVE) - ? std::vector( -- {url::Origin::Create(GURL("https://docs.google.com"))}) -+ {url::Origin::Create(GURL("https://docs.9oo91e.qjz9zk"))}) - : std::vector(); - } +@@ -31,8 +31,8 @@ constexpr char kLoggerComponent[] = "CastMediaRouteProvider"; + // Whitelist of origins allowed to use a PresentationRequest to initiate + // mirroring. + constexpr std::array kPresentationApiWhitelist = { +- "https://docs.google.com", +- "https://meet.google.com", ++ "https://docs.9oo91e.qjz9zk", ++ "https://meet.9oo91e.qjz9zk", + }; + // Returns a list of origins that are valid for |source_id|. An empty list diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc --- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc +++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc -@@ -557,12 +557,12 @@ std::vector DialMediaRouteProvider::GetOrigins( +@@ -530,12 +530,12 @@ std::vector DialMediaRouteProvider::GetOrigins( base::flat_map>> origin_white_list( {{"YouTube", @@ -1600,7 +1608,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc b/chrome/b diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm -@@ -510,7 +510,7 @@ bool NotificationPlatformBridgeMac::SupportsAlerts() { +@@ -519,7 +519,7 @@ bool NotificationPlatformBridgeMac::SupportsAlerts() { // Overriden from _NSUserNotificationCenterDelegatePrivate. // Emitted when a user closes a notification from the notification center. // This is an undocumented method introduced in 10.8 according to @@ -1612,7 +1620,7 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/ diff --git a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.cc --- a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.cc +++ b/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.cc -@@ -103,7 +103,7 @@ void RecordFeatureUsage(content::RenderFrameHost* rfh, +@@ -104,7 +104,7 @@ void RecordFeatureUsage(content::RenderFrameHost* rfh, std::string GetHeavyAdReportMessage(const FrameData& frame_data, bool will_unload_adframe) { const char kChromeStatusMessage[] = @@ -1624,7 +1632,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load diff --git a/chrome/browser/policy/policy_test_utils.cc b/chrome/browser/policy/policy_test_utils.cc --- a/chrome/browser/policy/policy_test_utils.cc +++ b/chrome/browser/policy/policy_test_utils.cc -@@ -216,7 +216,7 @@ void PolicyTest::ClearEnableFlag(const keyboard::KeyboardEnableFlag& flag) { +@@ -248,7 +248,7 @@ void PolicyTest::ClearEnableFlag(const keyboard::KeyboardEnableFlag& flag) { // static GURL PolicyTest::GetExpectedSearchURL(bool expect_safe_search) { @@ -1633,6 +1641,18 @@ diff --git a/chrome/browser/policy/policy_test_utils.cc b/chrome/browser/policy/ if (expect_safe_search) { expected_url += "?" + std::string(safe_search_util::kSafeSearchSafeParameter) + +diff --git a/chrome/browser/prerender/isolated/isolated_prerender_params.cc b/chrome/browser/prerender/isolated/isolated_prerender_params.cc +--- a/chrome/browser/prerender/isolated/isolated_prerender_params.cc ++++ b/chrome/browser/prerender/isolated/isolated_prerender_params.cc +@@ -105,7 +105,7 @@ GURL IsolatedPrerenderCanaryCheckURL() { + if (url.is_valid()) { + return url; + } +- return GURL("http://check.googlezip.net/connect"); ++ return GURL("http://check.9oo91e21p.qjz9zk/connect"); + } + + base::TimeDelta IsolatedPrerenderCanaryCheckCacheLifetime() { diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc @@ -1754,7 +1774,7 @@ diff --git a/chrome/browser/resources/settings/chromeos/os_icons.html b/chrome/b diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resources/settings/icons.html --- a/chrome/browser/resources/settings/icons.html +++ b/chrome/browser/resources/settings/icons.html -@@ -71,7 +71,7 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. +@@ -83,7 +83,7 @@ NOTE: Chrome OS icons go in ./chromeos/os_icons.html. +@@ -1908,15 +1908,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); @@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java -@@ -459,7 +459,7 @@ public abstract class BaseCustomTabActivity @@ -99,7 +99,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1013,16 +995,6 @@ by a child template that "extends" this file. +@@ -987,16 +969,6 @@ by a child template that "extends" this file. @@ -135,14 +135,14 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j - +@@ -868,28 +863,6 @@ public abstract class ChromeActivity private void createContextReporterIfNeeded() { if (!mStarted) return; // Sync state reporting should work only in started state. if (mContextReporter != null || getActivityTab() == null) return; @@ -198,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. } @Override -@@ -962,13 +935,6 @@ public abstract class ChromeActivity +@@ -955,13 +928,6 @@ public abstract class ChromeActivity if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) { GSAAccountChangeListener.getInstance().disconnect(); } @@ -215,7 +215,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java -@@ -54,10 +54,10 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat { +@@ -56,10 +56,10 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat { public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { SettingsUtils.addPreferencesFromResource(this, R.xml.data_reduction_preferences); getActivity().setTitle(R.string.data_reduction_title_lite_mode); @@ -230,7 +230,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/s setHasOptionsMenu(true); -@@ -161,21 +161,7 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat { +@@ -175,21 +175,7 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat { * Returns summary string. */ public static String generateSummary(Resources resources) { @@ -256,19 +256,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/s 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 -@@ -42,9 +42,6 @@ public class PrivacySettings - private static final String PREF_NETWORK_PREDICTIONS = "preload_pages"; +@@ -47,9 +47,6 @@ public class PrivacySettings + private static final String PREF_SECURE_DNS = "secure_dns"; private static final String PREF_DO_NOT_TRACK = "do_not_track"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; - private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER = - "sync_and_services_link_divider"; - private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; + private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; private ManagedPreferenceDelegate mManagedPreferenceDelegate; - -@@ -67,9 +64,6 @@ public class PrivacySettings - networkPredictionPref.setOnPreferenceChangeListener(this); - networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); +@@ -78,9 +75,6 @@ public class PrivacySettings + Preference secureDnsPref = findPreference(PREF_SECURE_DNS); + secureDnsPref.setVisible(privacyPrefManager.isDnsOverHttpsUiEnabled()); - getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER)); - getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK)); @@ -299,7 +299,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils; import org.chromium.chrome.browser.tracing.settings.DeveloperSettings; import org.chromium.components.browser_ui.settings.ChromeBasePreference; -@@ -45,23 +39,17 @@ import java.util.Map; +@@ -45,18 +39,13 @@ import java.util.Map; * The main settings screen, shown when the user first opens Settings. */ public class MainSettings extends PreferenceFragmentCompat @@ -313,10 +313,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe public static final String PREF_PASSWORDS = "passwords"; public static final String PREF_HOMEPAGE = "homepage"; public static final String PREF_UI_THEME = "ui_theme"; + public static final String PREF_PRIVACY = "privacy"; + public static final String PREF_SAFETY_CHECK = "safety_check"; - public static final String PREF_DATA_REDUCTION = "data_reduction"; public static final String PREF_NOTIFICATIONS = "notifications"; public static final String PREF_DOWNLOADS = "downloads"; public static final String PREF_DEVELOPER = "developer"; +@@ -67,7 +56,6 @@ public class MainSettings extends PreferenceFragmentCompat private final ManagedPreferenceDelegate mManagedPreferenceDelegate; private final Map mAllPreferences = new HashMap<>(); @@ -324,7 +327,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe public MainSettings() { setHasOptionsMenu(true); -@@ -84,35 +72,16 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -90,35 +78,16 @@ public class MainSettings extends PreferenceFragmentCompat @Override public void onDestroy() { super.onDestroy(); @@ -360,8 +363,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe } @Override -@@ -125,12 +94,9 @@ public class MainSettings extends PreferenceFragmentCompat - SettingsUtils.addPreferencesFromResource(this, R.xml.main_preferences); +@@ -146,12 +115,9 @@ public class MainSettings extends PreferenceFragmentCompat + cachePreferences(); - mSignInPreference.setOnStateChangedCallback(this::onSignInPreferenceStateChanged); @@ -373,7 +376,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { // If we are on Android O+ the Notifications preference should lead to the Android -@@ -176,7 +142,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -202,7 +168,6 @@ public class MainSettings extends PreferenceFragmentCompat Preference preference = getPreferenceScreen().getPreference(index); mAllPreferences.put(preference.getKey(), preference); } @@ -381,7 +384,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe } private void setManagedPreferenceDelegateForPreference(String key) { -@@ -185,13 +150,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -211,13 +176,6 @@ public class MainSettings extends PreferenceFragmentCompat } private void updatePreferences() { @@ -395,7 +398,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe updateSearchEnginePreference(); Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE); -@@ -208,10 +166,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -234,10 +192,6 @@ public class MainSettings extends PreferenceFragmentCompat } else { removePreferenceIfPresent(PREF_DEVELOPER); } @@ -406,7 +409,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe } private Preference addPreferenceIfAbsent(String key) { -@@ -225,13 +179,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -251,13 +205,6 @@ public class MainSettings extends PreferenceFragmentCompat if (preference != null) getPreferenceScreen().removePreference(preference); } @@ -420,7 +423,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe private void updateSearchEnginePreference() { if (!TemplateUrlServiceFactory.get().isLoaded()) { ChromeBasePreference searchEnginePref = -@@ -263,28 +210,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -289,28 +236,6 @@ public class MainSettings extends PreferenceFragmentCompat pref.setSummary(isOn ? R.string.text_on : R.string.text_off); } @@ -449,7 +452,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe // TemplateUrlService.LoadListener implementation. @Override public void onTemplateUrlServiceLoaded() { -@@ -292,11 +217,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -318,11 +243,6 @@ public class MainSettings extends PreferenceFragmentCompat updateSearchEnginePreference(); } @@ -461,7 +464,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe @VisibleForTesting public ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() { return mManagedPreferenceDelegate; -@@ -306,9 +226,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -332,9 +252,6 @@ public class MainSettings extends PreferenceFragmentCompat return new ChromeManagedPreferenceDelegate() { @Override public boolean isPreferenceControlledByPolicy(Preference preference) { @@ -471,7 +474,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe if (PREF_SEARCH_ENGINE.equals(preference.getKey())) { return TemplateUrlServiceFactory.get().isDefaultSearchManaged(); } -@@ -317,11 +234,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -343,11 +260,6 @@ public class MainSettings extends PreferenceFragmentCompat @Override public boolean isPreferenceClickDisabledByPolicy(Preference preference) { @@ -486,10 +489,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java -@@ -22,9 +22,7 @@ import org.chromium.base.metrics.RecordHistogram; - import org.chromium.base.metrics.RecordUserAction; +@@ -23,9 +23,7 @@ import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.task.PostTask; import org.chromium.chrome.browser.externalauth.ExternalAuthUtils; + import org.chromium.chrome.browser.sync.AndroidSyncSettings; -import org.chromium.components.signin.AccountTrackerService; import org.chromium.components.signin.AccountUtils; -import org.chromium.components.signin.ChromeSigninController; @@ -645,6 +648,47 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa private void disableSyncAndWipeData( boolean shouldWipeUserData, final Runnable wipeDataCallback) { mAndroidSyncSettings.updateAccount(null); +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java +@@ -215,13 +215,7 @@ public class AndroidSyncSettings { + + private void setChromeSyncEnabled(boolean value) { + synchronized (mLock) { +- updateSyncability(null); +- if (value == mChromeSyncEnabled || mAccount == null) return; +- mChromeSyncEnabled = value; +- +- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); +- mSyncContentResolverDelegate.setSyncAutomatically(mAccount, mContractAuthority, value); +- StrictMode.setThreadPolicy(oldPolicy); ++ mChromeSyncEnabled = false; + } + notifyObservers(); + } +@@ -302,19 +296,9 @@ public class AndroidSyncSettings { + boolean oldChromeSyncEnabled = mChromeSyncEnabled; + boolean oldMasterSyncEnabled = mMasterSyncEnabled; + +- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); +- if (mAccount != null) { +- mIsSyncable = +- mSyncContentResolverDelegate.getIsSyncable(mAccount, mContractAuthority) +- == 1; +- mChromeSyncEnabled = mSyncContentResolverDelegate.getSyncAutomatically( +- mAccount, mContractAuthority); +- } else { +- mIsSyncable = false; +- mChromeSyncEnabled = false; +- } +- mMasterSyncEnabled = mSyncContentResolverDelegate.getMasterSyncAutomatically(); +- StrictMode.setThreadPolicy(oldPolicy); ++ mIsSyncable = false; ++ mChromeSyncEnabled = false; ++ mMasterSyncEnabled = false; + + return oldChromeSyncEnabled != mChromeSyncEnabled + || oldMasterSyncEnabled != mMasterSyncEnabled; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java @@ -678,7 +722,7 @@ diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/br 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 -@@ -263,18 +263,9 @@ CHAR-LIMIT guidelines: +@@ -261,18 +261,9 @@ CHAR-LIMIT guidelines: @@ -697,7 +741,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Sync and personalize across devices -@@ -333,9 +324,6 @@ CHAR-LIMIT guidelines: +@@ -331,9 +322,6 @@ CHAR-LIMIT guidelines: Sends URLs of pages you visit to Google @@ -707,7 +751,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Cancel sync? -@@ -871,9 +859,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -964,9 +952,6 @@ Your Google account may have other forms of browsing history like searches and a When Lite mode is on, Chrome uses Google servers to make pages load faster. Lite mode rewrites very slow pages to load only essential content. Lite mode does not apply to Incognito tabs. @@ -720,7 +764,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java --- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java +++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java -@@ -170,16 +170,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -171,16 +171,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @Override public boolean hasFeatures(Account account, String[] features) { @@ -737,17 +781,17 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon return false; } -@@ -219,32 +209,10 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -220,32 +210,10 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { public void updateCredentials( Account account, Activity activity, final Callback callback) { ThreadUtils.assertOnUiThread(); - if (!hasManageAccountsPermission()) { - if (callback != null) { -- ThreadUtils.postOnUiThread(() -> callback.onResult(false)); +- ThreadUtils.postOnUiThread(callback.bind(false)); - } - return; + if (callback != null) { -+ ThreadUtils.postOnUiThread(() -> callback.onResult(false)); ++ ThreadUtils.postOnUiThread(callback.bind(false)); } - - AccountManagerCallback realCallback = future -> { @@ -773,47 +817,6 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon } @Nullable -diff --git a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java ---- a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java -+++ b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java -@@ -213,13 +213,7 @@ public class AndroidSyncSettings { - - private void setChromeSyncEnabled(boolean value) { - synchronized (mLock) { -- updateSyncability(null); -- if (value == mChromeSyncEnabled || mAccount == null) return; -- mChromeSyncEnabled = value; -- -- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); -- mSyncContentResolverDelegate.setSyncAutomatically(mAccount, mContractAuthority, value); -- StrictMode.setThreadPolicy(oldPolicy); -+ mChromeSyncEnabled = false; - } - notifyObservers(); - } -@@ -300,19 +294,9 @@ public class AndroidSyncSettings { - boolean oldChromeSyncEnabled = mChromeSyncEnabled; - boolean oldMasterSyncEnabled = mMasterSyncEnabled; - -- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); -- if (mAccount != null) { -- mIsSyncable = -- mSyncContentResolverDelegate.getIsSyncable(mAccount, mContractAuthority) -- == 1; -- mChromeSyncEnabled = mSyncContentResolverDelegate.getSyncAutomatically( -- mAccount, mContractAuthority); -- } else { -- mIsSyncable = false; -- mChromeSyncEnabled = false; -- } -- mMasterSyncEnabled = mSyncContentResolverDelegate.getMasterSyncAutomatically(); -- StrictMode.setThreadPolicy(oldPolicy); -+ mIsSyncable = false; -+ mChromeSyncEnabled = false; -+ mMasterSyncEnabled = false; - - return oldChromeSyncEnabled != mChromeSyncEnabled - || oldMasterSyncEnabled != mMasterSyncEnabled; diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java --- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java +++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java diff --git a/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch b/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch index 332e9197..88fe72de 100644 --- a/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch +++ b/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch @@ -9,7 +9,7 @@ Subject: Replace DoH probe domain with RIPE domain diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -841,7 +841,7 @@ class DnsTCPAttempt : public DnsAttempt { +@@ -838,7 +838,7 @@ class DnsTCPAttempt : public DnsAttempt { // ---------------------------------------------------------------------------- diff --git a/build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch b/build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch index 58288cd5..fe3c1e53 100644 --- a/build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch +++ b/build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch @@ -13,7 +13,7 @@ See discussion at https://github.com/bromite/bromite/issues/445 diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json --- a/gpu/config/gpu_driver_bug_list.json +++ b/gpu/config/gpu_driver_bug_list.json -@@ -3531,6 +3531,22 @@ +@@ -3537,6 +3537,22 @@ "dont_delete_source_texture_for_egl_image" ] }, diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 072858e5..92d9126a 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -7,36 +7,46 @@ This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2. Disable search-ready omnibox by default --- - .../browser/omnibox/suggestions/AutocompleteMediator.java | 6 ++++++ - chrome/browser/about_flags.cc | 3 +++ - chrome/browser/flag-metadata.json | 5 +++++ - chrome/browser/flag_descriptions.cc | 5 +++++ - chrome/browser/flag_descriptions.h | 3 +++ - chrome/browser/flags/android/chrome_feature_list.cc | 4 ++++ - chrome/browser/flags/android/chrome_feature_list.h | 1 + - .../chromium/chrome/browser/flags/ChromeFeatureList.java | 1 + - 8 files changed, 28 insertions(+) + .../DropdownItemViewInfoListBuilder.java | 14 ++++++++------ + chrome/browser/about_flags.cc | 3 +++ + chrome/browser/flag-metadata.json | 5 +++++ + chrome/browser/flag_descriptions.cc | 5 +++++ + chrome/browser/flag_descriptions.h | 3 +++ + .../browser/flags/android/chrome_feature_list.cc | 4 ++++ + chrome/browser/flags/android/chrome_feature_list.h | 1 + + .../chrome/browser/flags/ChromeFeatureList.java | 1 + + 8 files changed, 30 insertions(+), 6 deletions(-) -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java -@@ -497,6 +497,12 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, StartStopWi - void onNativeInitialized() { - mNativeInitialized = true; +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java +@@ -83,14 +83,16 @@ class DropdownItemViewInfoListBuilder { -+ // Destroy coordinator if the feature is disabled. -+ if (!ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX)) { -+ mEditUrlProcessor.destroy(); -+ mEditUrlProcessor = null; -+ } + final Supplier imageFetcherSupplier = () -> mImageFetcher; + final Supplier iconBridgeSupplier = () -> mIconBridge; +- final Supplier tabSupplier = +- () -> mActivityTabProvider == null ? null : mActivityTabProvider.get(); +- final Supplier shareSupplier = +- () -> mShareDelegateSupplier == null ? null : mShareDelegateSupplier.get(); +- + mHeaderProcessor = new HeaderProcessor(context, host, delegate); +- registerSuggestionProcessor(new EditUrlSuggestionProcessor( + - mEnableAdaptiveSuggestionsCount = - ChromeFeatureList.isEnabled(ChromeFeatureList.OMNIBOX_ADAPTIVE_SUGGESTIONS_COUNT); - mEnableDeferredKeyboardPopup = ++ if (ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX)) { ++ final Supplier tabSupplier = ++ () -> mActivityTabProvider == null ? null : mActivityTabProvider.get(); ++ final Supplier shareSupplier = ++ () -> mShareDelegateSupplier == null ? null : mShareDelegateSupplier.get(); ++ registerSuggestionProcessor(new EditUrlSuggestionProcessor( + context, host, delegate, iconBridgeSupplier, tabSupplier, shareSupplier)); ++ } + registerSuggestionProcessor( + new AnswerSuggestionProcessor(context, host, textProvider, imageFetcherSupplier)); + registerSuggestionProcessor( 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 -@@ -2529,6 +2529,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2539,6 +2539,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAndroidAutofillAccessibilityName, flag_descriptions::kAndroidAutofillAccessibilityDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kAndroidAutofillAccessibility)}, @@ -49,9 +59,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -1883,6 +1883,11 @@ - // settings. - "expiry_milestone" : 79 +@@ -1884,6 +1884,11 @@ + "owners": [ "peter", "finnur" ], + "expiry_milestone": 84 }, + { + "name": "enable-search-ready-omnibox", @@ -59,12 +69,12 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js + "expiry_milestone": -1 + }, { - "name": "enable-persistent-downloads", - "owners": [ "ewannpv", "gambard" ], + "name": "enable-navigation-predictor", + "owners": [ "tbansal", "ryansturm", "instant-nav" ], 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 -@@ -2758,6 +2758,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] = +@@ -2890,6 +2890,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] = "process to check the Safe Browsing reputation of URLs without calling " "into GmsCore for every URL."; @@ -79,7 +89,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 -@@ -1607,6 +1607,9 @@ extern const char kReportFeedUserActionsDescription[]; +@@ -1673,6 +1673,9 @@ extern const char kReportFeedUserActionsDescription[]; extern const char kSafeBrowsingUseLocalBlacklistsV2Name[]; extern const char kSafeBrowsingUseLocalBlacklistsV2Description[]; @@ -93,16 +103,16 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -183,6 +183,7 @@ const base::Feature* kFeaturesExposedToJava[] = { + &kReachedCodeProfiler, + &kReaderModeInCCT, + &kReengagementNotification, ++ &kSearchReadyOmniboxFeature, &kRelatedSearches, &kRevampedContextMenu, - &kScrollToExpandPaymentHandler, -+ &kSearchReadyOmniboxFeature, &kSearchEnginePromoExistingDevice, - &kSearchEnginePromoNewDevice, - &kServiceManagerForBackgroundPrefetch, -@@ -555,6 +556,9 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu", - const base::Feature kScrollToExpandPaymentHandler{ - "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -552,6 +553,9 @@ const base::Feature kRelatedSearches{"RelatedSearches", + const base::Feature kRevampedContextMenu{"RevampedContextMenu", + base::FEATURE_ENABLED_BY_DEFAULT}; +const base::Feature kSearchReadyOmniboxFeature{ + "SearchReadyOmnibox", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -113,8 +123,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -104,6 +104,7 @@ extern const base::Feature kRevampedContextMenu; - extern const base::Feature kScrollToExpandPaymentHandler; +@@ -104,6 +104,7 @@ extern const base::Feature kRelatedSearches; + extern const base::Feature kRevampedContextMenu; extern const base::Feature kSearchEnginePromoExistingDevice; extern const base::Feature kSearchEnginePromoNewDevice; +extern const base::Feature kSearchReadyOmniboxFeature; @@ -124,7 +134,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 -@@ -316,6 +316,7 @@ public abstract class ChromeFeatureList { +@@ -324,6 +324,7 @@ public abstract class ChromeFeatureList { public static final String OMNIBOX_ADAPTIVE_SUGGESTIONS_COUNT = "OmniboxAdaptiveSuggestionsCount"; public static final String OMNIBOX_ASSISTANT_VOICE_SEARCH = "OmniboxAssistantVoiceSearch"; diff --git a/build/patches/Restore-classic-new-tab-page.patch b/build/patches/Restore-classic-new-tab-page.patch index 029f7522..f590dba9 100644 --- a/build/patches/Restore-classic-new-tab-page.patch +++ b/build/patches/Restore-classic-new-tab-page.patch @@ -9,7 +9,7 @@ Subject: Restore classic new tab page diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc -@@ -90,16 +90,6 @@ enum NewTabURLState { +@@ -91,16 +91,6 @@ enum NewTabURLState { NEW_TAB_URL_MAX }; @@ -26,7 +26,7 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc bool IsMatchingServiceWorker(const GURL& my_url, const GURL& document_url) { // The origin should match. if (!MatchesOrigin(my_url, document_url)) -@@ -139,31 +129,6 @@ GURL RemoveQueryParam(const GURL& url) { +@@ -140,31 +130,6 @@ GURL RemoveQueryParam(const GURL& url) { return url.ReplaceComponents(replacements); } @@ -58,7 +58,7 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc // Used to look up the URL to use for the New Tab page. Also tracks how we // arrived at that URL so it can be logged with UMA. struct NewTabURLDetails { -@@ -184,10 +149,9 @@ struct NewTabURLDetails { +@@ -185,10 +150,9 @@ struct NewTabURLDetails { : chrome::kChromeSearchLocalNtpUrl); #endif @@ -71,7 +71,7 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc GetDefaultSearchProviderTemplateURL(profile); if (!profile || !template_url) return NewTabURLDetails(local_url, NEW_TAB_URL_BAD); -@@ -203,7 +167,7 @@ struct NewTabURLDetails { +@@ -204,7 +168,7 @@ struct NewTabURLDetails { if (!IsURLAllowedForSupervisedUser(search_provider_url, profile)) return NewTabURLDetails(local_url, NEW_TAB_URL_BLOCKED); diff --git a/build/patches/Restore-duet-flags.patch b/build/patches/Restore-duet-flags.patch deleted file mode 100644 index 86c7ddfe..00000000 --- a/build/patches/Restore-duet-flags.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Tue, 4 Aug 2020 07:58:21 +0200 -Subject: Restore duet flags - ---- - chrome/browser/flag-metadata.json | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json ---- a/chrome/browser/flag-metadata.json -+++ b/chrome/browser/flag-metadata.json -@@ -1273,7 +1273,7 @@ - { - "name": "enable-chrome-duet", - "owners": [ "mdjones" ], -- "expiry_milestone": 82 -+ "expiry_milestone": -1 - }, - { - "name": "enable-chrome-duet-labels", -@@ -1455,8 +1455,8 @@ - }, - { - "name": "enable-duet-tabstrip-integration", -- "owners": [ "memex-team@google.com" ], -- "expiry_milestone": 84 -+ "owners": [ "memex-team@9oo91e.qjz9zk" ], -+ "expiry_milestone": -1 - }, - { - "name": "enable-edu-coexistence", --- -2.17.1 - diff --git a/build/patches/Restore-enable-horizontal-tab-switcher-flag.patch b/build/patches/Restore-enable-horizontal-tab-switcher-flag.patch index 4a2171b0..89748422 100644 --- a/build/patches/Restore-enable-horizontal-tab-switcher-flag.patch +++ b/build/patches/Restore-enable-horizontal-tab-switcher-flag.patch @@ -9,7 +9,7 @@ Subject: Restore enable-horizontal-tab-switcher flag 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 -@@ -1661,7 +1661,7 @@ +@@ -1746,7 +1746,7 @@ { "name": "enable-horizontal-tab-switcher", "owners": [ "memex-team@google.com" ], diff --git a/build/patches/Revert-Remove-flags-to-enable-disable-AImageReader.patch b/build/patches/Revert-Remove-flags-to-enable-disable-AImageReader.patch index f6bf73be..9ed07414 100644 --- a/build/patches/Revert-Remove-flags-to-enable-disable-AImageReader.patch +++ b/build/patches/Revert-Remove-flags-to-enable-disable-AImageReader.patch @@ -94,7 +94,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 -@@ -525,6 +525,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -542,6 +542,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -108,7 +108,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 -@@ -182,6 +182,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; +@@ -186,6 +186,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup; diff --git a/build/patches/Revert-Remove-pre-unified-consent-code.patch b/build/patches/Revert-Remove-pre-unified-consent-code.patch index 0b75d6d0..d7e85a36 100644 --- a/build/patches/Revert-Remove-pre-unified-consent-code.patch +++ b/build/patches/Revert-Remove-pre-unified-consent-code.patch @@ -9,10 +9,9 @@ Disable unified consent on Android Unified consent miscellanous backport fixes --- .../java/res/xml/privacy_preferences.xml | 25 +++++ - .../privacy/settings/PrivacySettings.java | 97 ++++++++++++++++--- + .../privacy/settings/PrivacySettings.java | 95 +++++++++++++++++-- .../sync/SyncNotificationController.java | 6 +- .../chrome/browser/sync/SyncTestRule.java | 10 +- - .../chromium/chrome/browser/sync/UkmTest.java | 50 +++++++++- .../strings/android_chrome_strings.grd | 15 +++ .../android_chrome_strings_am.xtb | 19 +++- .../android_chrome_strings_ar.xtb | 19 +++- @@ -67,7 +66,7 @@ Unified consent miscellanous backport fixes .../android_chrome_strings_zh-CN.xtb | 19 +++- .../android_chrome_strings_zh-TW.xtb | 19 +++- .../unified_consent_service_factory.cc | 5 +- - 59 files changed, 1121 insertions(+), 75 deletions(-) + 58 files changed, 1073 insertions(+), 71 deletions(-) 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 @@ -107,7 +106,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi @@ -121,7 +120,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 -@@ -16,10 +16,12 @@ import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; +@@ -16,11 +16,13 @@ import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; import org.chromium.base.BuildInfo; import org.chromium.chrome.R; @@ -129,12 +128,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.browser.help.HelpAndFeedback; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.preferences.PrefServiceBridge; + import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager.DohEntry; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge; import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; import org.chromium.chrome.browser.settings.SettingsLauncher; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; -@@ -36,18 +38,24 @@ import org.chromium.ui.text.SpanApplier; +@@ -40,11 +42,19 @@ import java.util.List; */ public class PrivacySettings extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener { @@ -145,26 +145,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting + private static final String PREF_SAFE_BROWSING = "safe_browsing"; 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_SECURE_DNS = "secure_dns"; - private static final String PREF_USAGE_STATS = "usage_stats_reporting"; private static final String PREF_DO_NOT_TRACK = "do_not_track"; + private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; + private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER = + "sync_and_services_link_divider"; - private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; + private static final String PREF_USAGE_STATS = "usage_stats_reporting"; + private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; private ManagedPreferenceDelegate mManagedPreferenceDelegate; - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { -- PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance(); -- privacyPrefManager.migrateNetworkPredictionPreferences(); - SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences); - getActivity().setTitle(R.string.prefs_privacy); - setHasOptionsMenu(true); -@@ -65,15 +73,30 @@ public class PrivacySettings - networkPredictionPref.setOnPreferenceChangeListener(this); - networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); +@@ -73,15 +83,30 @@ public class PrivacySettings + Preference secureDnsPref = findPreference(PREF_SECURE_DNS); + secureDnsPref.setVisible(privacyPrefManager.isDnsOverHttpsUiEnabled()); - Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK); - NoUnderlineClickableSpan linkSpan = new NoUnderlineClickableSpan(getResources(), view -> { @@ -202,7 +195,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting updateSummaries(); } -@@ -86,6 +109,15 @@ public class PrivacySettings +@@ -94,6 +119,15 @@ public class PrivacySettings Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue); @@ -218,7 +211,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; -@@ -103,6 +135,35 @@ public class PrivacySettings +@@ -111,6 +145,35 @@ public class PrivacySettings public void updateSummaries() { PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance(); @@ -254,7 +247,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting CheckBoxPreference canMakePaymentPref = (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT); if (canMakePaymentPref != null) { -@@ -140,6 +201,18 @@ public class PrivacySettings +@@ -173,6 +236,18 @@ public class PrivacySettings private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() { return preference -> { String key = preference.getKey(); @@ -302,7 +295,7 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncT import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator; import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory; import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator; -@@ -428,9 +429,12 @@ public class SyncTestRule extends ChromeActivityTestRule { +@@ -430,9 +431,12 @@ public class SyncTestRule extends ChromeActivityTestRule { Assert.fail("Sign-in was aborted"); } }); @@ -318,87 +311,10 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncT }); if (setFirstSetupComplete) { SyncTestUtil.waitForSyncActive(); -diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTest.java ---- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTest.java -+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTest.java -@@ -15,10 +15,13 @@ import org.junit.Test; - import org.junit.runner.RunWith; - - import org.chromium.base.test.util.CommandLineFlags; -+import org.chromium.chrome.browser.ChromeFeatureList; - import org.chromium.chrome.browser.flags.ChromeSwitches; - import org.chromium.chrome.browser.metrics.UmaSessionStats; - import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.test.ChromeJUnit4ClassRunner; -+import org.chromium.chrome.test.util.browser.Features.DisableFeatures; -+import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; - import org.chromium.components.sync.ModelType; - import org.chromium.content_public.browser.test.util.JavaScriptUtils; - import org.chromium.content_public.browser.test.util.TestThreadUtils; -@@ -132,6 +135,33 @@ public class UkmTest { - Assert.assertTrue("UKM Enabled:", isUkmEnabled(normalTab)); - } - -+ @Test -+ @SmallTest -+ @DisableFeatures(ChromeFeatureList.UNIFIED_CONSENT) -+ public void secondaryPassphraseCheck() throws Exception { -+ // Keep in sync with UkmBrowserTest.SecondaryPassphraseCheck in -+ // chrome/browser/metrics/ukm_browsertest.cc. -+ // Make sure that UKM is disabled when an secondary passphrase is set. -+ -+ TestThreadUtils.runOnUiThreadBlocking( -+ () -> UmaSessionStats.updateMetricsAndCrashReportingForTesting(true)); -+ -+ // Enable a Syncing account. -+ Account account = mSyncTestRule.setUpTestAccountAndSignIn(); -+ Tab normalTab = mSyncTestRule.getActivity().getActivityTab(); -+ Assert.assertTrue("UKM Enabled:", isUkmEnabled(normalTab)); -+ -+ String clientId = getUkmClientId(normalTab); -+ -+ // Add a passphrase. This should disable UKM. -+ SyncTestUtil.encryptWithPassphrase("passphrase"); -+ -+ Assert.assertFalse("UKM Enabled:", isUkmEnabled(normalTab)); -+ -+ // Client ID should have been reset. -+ Assert.assertNotEquals("Client id:", clientId, getUkmClientId(normalTab)); -+ } -+ - @Test - @SmallTest - public void singleSyncSignoutCheck() throws Exception { -@@ -178,7 +208,23 @@ public class UkmTest { - // Disable Sync for history. - mSyncTestRule.disableDataType(ModelType.TYPED_URLS); - -- // Disable history sync does not disable UKM -- Assert.assertTrue("UKM Enabled:", isUkmEnabled(normalTab)); -+ if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) { -+ // Disable history sync does not disable UKM when unified consent is -+ // enabled. -+ Assert.assertTrue("UKM Enabled:", isUkmEnabled(normalTab)); -+ } else { -+ Assert.assertFalse("UKM Enabled:", isUkmEnabled(normalTab)); -+ -+ // Client ID should have been reset. -+ Assert.assertNotEquals("Client id:", originalClientId, getUkmClientId(normalTab)); -+ -+ // Re-enable Sync for history. -+ mSyncTestRule.enableDataType(ModelType.TYPED_URLS); -+ -+ Assert.assertTrue("UKM Enabled:", isUkmEnabled(normalTab)); -+ -+ // Client ID should still be different. -+ Assert.assertNotEquals("Client id:", originalClientId, getUkmClientId(normalTab)); -+ } - } - } 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 -@@ -671,6 +671,18 @@ CHAR-LIMIT guidelines: +@@ -681,6 +681,18 @@ CHAR-LIMIT guidelines: Privacy @@ -417,7 +333,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Help improve Chrome security -@@ -1098,6 +1110,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1217,6 +1229,9 @@ Your Google account may have other forms of browsing history like searches and a Signed in to Google as @@ -430,10 +346,10 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_am.xtb -@@ -1000,4 +1000,21 @@ - ከመስመር ውጪ +@@ -1045,4 +1045,21 @@ ሁሉንም ትሮች ይዝጉ አጠቃላይ + የምግብ ካርድ ምናሌ ተዘግቷል - \ No newline at end of file +ትሮችዎን ከሌሎች መሣሪያዎችዎ ለማግኘት ወደ Chrome ይግቡ። @@ -457,10 +373,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ar.xtb -@@ -1000,4 +1000,21 @@ - بلا اتصال +@@ -1045,4 +1045,21 @@ إغلاق جميع علامات التبويب عام + قائمة بطاقات الخلاصة مغلقة - \ No newline at end of file +‏للحصول على علامات التبويب من أجهزتك الأخرى، سجّل الدخول إلى Chrome. @@ -484,10 +400,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bg.xtb -@@ -1000,4 +1000,21 @@ - Офлайн +@@ -1045,4 +1045,21 @@ Затваряне на всички раздели Общи + Менюто на картата за емисията е затворено - \ No newline at end of file +Влезте в Chrome, за да получите разделите си от другите си устройства. @@ -511,10 +427,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb -@@ -1002,4 +1002,21 @@ - অফলাইন +@@ -1047,4 +1047,21 @@ সমস্ত ট্যাবগুলি বন্ধ করুন সাধারণ + ফিড কার্ডের মেনু বন্ধ করা আছে - \ No newline at end of file +আপনার অন্য ডিভাইসগুলি থেকে আপনার ট্যাবগুলি পেতে, Chrome-এ সাইন-ইন করুন। @@ -538,10 +454,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ca.xtb -@@ -1000,4 +1000,21 @@ Per exemple, és possible que alguns llocs web responguin a aquesta sol·licitud - Sense connexió +@@ -1045,4 +1045,21 @@ Per exemple, és possible que alguns llocs web responguin a aquesta sol·licitud Tanca totes les pestanyes General + El menú de la targeta del tauler està tancat - \ No newline at end of file +Inicia la sessió a Chrome per accedir a les pestanyes dels altres dispositius que tinguis. @@ -565,10 +481,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_cs.xtb -@@ -1000,4 +1000,21 @@ Některé weby mohou například na tento požadavek reagovat tak, že vám zobr - Offline +@@ -1045,4 +1045,21 @@ Některé weby mohou například na tento požadavek reagovat tak, že vám zobr Zavřít všechny karty Všeobecné + Nabídka karty informačních kanálů je zavřená - \ No newline at end of file +Chcete-li získat přístup ke kartám ze svých ostatních zařízení, přihlaste se do Chromu. @@ -592,10 +508,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_da.xtb -@@ -1000,4 +1000,21 @@ Nogle websites kan f.eks. reagere på denne anmodning ved at vise dig annoncer, - Offline +@@ -1045,4 +1045,21 @@ Nogle websites kan f.eks. reagere på denne anmodning ved at vise dig annoncer, Luk alle faner Generelt + Feedkortmenuen er lukket - \ No newline at end of file +Log ind på Chrome for at få adgang til dine faner på dine andre enheder. @@ -619,10 +535,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb -@@ -1000,4 +1000,21 @@ Einige Websites schalten möglicherweise Werbeanzeigen, deren Auswahl nicht dara - Offline +@@ -1045,4 +1045,21 @@ Einige Websites schalten möglicherweise Werbeanzeigen, deren Auswahl nicht dara Alle Tabs schließen Allgemein + Feedkartenmenü ist geschlossen - \ No newline at end of file +Melden Sie sich in Chrome an, um Tabs von Ihren anderen Geräten abzurufen. @@ -646,10 +562,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb -@@ -1000,4 +1000,21 @@ - Εκτός σύνδεσης +@@ -1045,4 +1045,21 @@ Κλείσιμο όλων των καρτελών Γενικά + Το μενού της κάρτας ροής είναι κλειστό - \ No newline at end of file +Για να εμφανίζονται οι καρτέλες από τις άλλες συσκευές σας, συνδεθείτε στο Chrome. @@ -673,10 +589,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_en-GB.xtb -@@ -1000,4 +1000,21 @@ For example, some websites may respond to this request by showing you ads that a - Offline +@@ -1045,4 +1045,21 @@ For example, some websites may respond to this request by showing you ads that a Close all tabs General + Feed card menu is closed - \ No newline at end of file +To get your tabs from your other devices, sign in to Chrome. @@ -700,10 +616,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es-419.xtb -@@ -1000,4 +1000,21 @@ Por ejemplo, algunos sitios web pueden responder a la solicitud mediante anuncio - Sin conexión +@@ -1045,4 +1045,21 @@ Por ejemplo, algunos sitios web pueden responder a la solicitud mediante anuncio Cerrar todas las pestañas General + Se cerró el menú de la tarjeta de feed - \ No newline at end of file +Accede a Chrome para obtener las pestañas de tus otros dispositivos. @@ -727,10 +643,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_es.xtb -@@ -1000,4 +1000,21 @@ Por ejemplo, algunos sitios web pueden responder a la solicitud mostrándote anu - Sin conexión +@@ -1045,4 +1045,21 @@ Por ejemplo, algunos sitios web pueden responder a la solicitud mostrándote anu Cerrar todas las pestañas General + El menú de la tarjeta del feed está cerrado - \ No newline at end of file +Inicia sesión en Chrome para ver las pestañas de tus otros dispositivos. @@ -754,10 +670,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_et.xtb -@@ -1000,4 +1000,21 @@ Näiteks võivad mõned veebisaidid taotlusele reageerida nii, et näitavad teil - Võrguühenduseta +@@ -1045,4 +1045,21 @@ Näiteks võivad mõned veebisaidid taotlusele reageerida nii, et näitavad teil Sule kõik vahelehed Üldine + Voo kaardimenüü on suletud - \ No newline at end of file +Vahelehtede hankimiseks oma teistest seadmetest logige Chrome'i sisse. @@ -781,10 +697,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb -@@ -1000,4 +1000,21 @@ - آفلاین +@@ -1045,4 +1045,21 @@ بستن همه برگه‌ها موارد کلی + منوی کارت فید بسته شد - \ No newline at end of file +‏برای دسترسی به برگه‌هایتان در دستگاه‌های دیگر، به سیستم Chrome وارد شوید. @@ -808,10 +724,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fi.xtb -@@ -1000,4 +1000,21 @@ Jotkin verkkosivustot voivat vastata tähän pyyntöön esimerkiksi näyttämäl - Offline +@@ -1045,4 +1045,21 @@ Jotkin verkkosivustot voivat vastata tähän pyyntöön esimerkiksi näyttämäl Sulje kaikki välilehdet Yleistä + Fiidikorttien valikko on suljettu - \ No newline at end of file +Käytä välilehtiä muilta laitteiltasi kirjautumalla Chromeen. @@ -835,10 +751,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fil.xtb -@@ -1000,4 +1000,21 @@ Halimbawa, puwedeng tumugon ang ilang website sa kahilingang ito sa pamamagitan - Offline +@@ -1045,4 +1045,21 @@ Halimbawa, puwedeng tumugon ang ilang website sa kahilingang ito sa pamamagitan Isara ang lahat ng tab Pangkalahatan + Nakasara ang menu ng feed card - \ No newline at end of file +Upang makuha ang iyong mga tab mula sa iba mo pang mga device, mag-sign in sa Chrome. @@ -862,10 +778,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb -@@ -1000,4 +1000,21 @@ Par exemple, certains sites Web peuvent répondre à cette demande en diffusant - Hors connexion +@@ -1045,4 +1045,21 @@ Par exemple, certains sites Web peuvent répondre à cette demande en diffusant Fermer tous les onglets Général + Le menu de la carte de flux est fermé - \ No newline at end of file +Connectez-vous à Chrome pour accéder à vos onglets sur vos autres appareils. @@ -889,10 +805,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_gu.xtb -@@ -1000,4 +1000,21 @@ - ઑફલાઇન +@@ -1045,4 +1045,21 @@ બધા ટેબ્સ બંધ કરો સામાન્ય + ફીડ કાર્ડ મેનૂ બંધ છે - \ No newline at end of file +તમારા અન્ય ઉપકરણો પરથી તમારા ટૅબ્સ મેળવવા માટે, Chrome માં સાઇન ઇન કરો. @@ -916,10 +832,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hi.xtb -@@ -1000,4 +1000,21 @@ - ऑफ़लाइन +@@ -1045,4 +1045,21 @@ सभी टैब बंद करें सामान्य + फ़ीड कार्ड मेन्यू बंद हो गया है - \ No newline at end of file +अपने दूसरे डिवाइस से अपने टैब पाने के लिए, Chrome में साइन इन करें. @@ -943,10 +859,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hr.xtb -@@ -1000,4 +1000,21 @@ Na primjer, neke web-lokacije na taj zahtjev mogu odgovoriti tako da vam prikaž - Izvanmrežno +@@ -1045,4 +1045,21 @@ Na primjer, neke web-lokacije na taj zahtjev mogu odgovoriti tako da vam prikaž Zatvori sve kartice Općenito + Izbornik kartice feeda je zatvoren - \ No newline at end of file +Da bi se prikazale kartice s vaših ostalih uređaja, prijavite se na Chrome. @@ -970,10 +886,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hu.xtb -@@ -1000,4 +1000,21 @@ Egyes webhelyek például válaszolhatnak rá úgy, hogy olyan hirdetéseket jel - Offline +@@ -1045,4 +1045,21 @@ Egyes webhelyek például válaszolhatnak rá úgy, hogy olyan hirdetéseket jel Az összes lap bezárása Általános + A hírcsatornakártya menüje be van csukva - \ No newline at end of file +Ha a többi eszközéről is szeretné elérni a lapjait, jelentkezzen be a Chrome-ba. @@ -997,10 +913,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_id.xtb -@@ -1000,4 +1000,21 @@ Misalnya, beberapa situs web mungkin menanggapi permintaan ini dengan menayangka - Offline +@@ -1045,4 +1045,21 @@ Misalnya, beberapa situs web mungkin menanggapi permintaan ini dengan menayangka Tutup semua tab Umum + Menu kartu feed ditutup - \ No newline at end of file +Untuk mengakses tab Anda dari perangkat lainnya, login ke Chrome. @@ -1024,10 +940,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb -@@ -1000,4 +1000,21 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun - Offline +@@ -1045,4 +1045,21 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun Chiudi tutte le schede Generali + Menu scheda feed chiuso - \ No newline at end of file +Accedi a Chrome per trovare le tue schede degli altri dispositivi. @@ -1051,10 +967,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_iw.xtb -@@ -1000,4 +1000,21 @@ - לא מקוון +@@ -1045,4 +1045,21 @@ סגירת כל הכרטיסיות כללי + תפריט כרטיס הפיד סגור - \ No newline at end of file +‏כדי לקבל את הכרטיסיות מהמכשירים האחרים שלך, יש להיכנס ל-Chrome. @@ -1078,10 +994,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb -@@ -1000,4 +1000,21 @@ - オフライン +@@ -1045,4 +1045,21 @@ すべてのタブを閉じる 全般 + フィードカード メニューは閉じています - \ No newline at end of file +他のデバイスと同じタブを使用するには、Chrome にログインします。 @@ -1105,10 +1021,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb -@@ -1000,4 +1000,21 @@ - ಆಫ್‌ಲೈನ್ +@@ -1045,4 +1045,21 @@ ಎಲ್ಲ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಮುಚ್ಚಿ ಸಾಮಾನ್ಯ + ಫೀಡ್ ಕಾರ್ಡ್ ಮೆನು ಅನ್ನು ಮುಚ್ಚಲಾಗಿದೆ - \ No newline at end of file +ನಿಮ್ಮ ಇತರ ಸಾಧನಗಳಿಂದ ನಿಮ್ಮ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಲು, Chrome ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ. @@ -1132,10 +1048,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ko.xtb -@@ -1000,4 +1000,21 @@ - 오프라인 +@@ -1045,4 +1045,21 @@ 탭 모두 닫기 일반 + 피드 카드 메뉴가 닫힘 - \ No newline at end of file +다른 기기에서 탭을 가져오려면 Chrome에 로그인하세요. @@ -1159,10 +1075,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lt.xtb -@@ -1000,4 +1000,21 @@ Pavyzdžiui, kai kurios svetainės gali atsakyti į šią užklausą rodydamos j - Neprisijungus +@@ -1045,4 +1045,21 @@ Pavyzdžiui, kai kurios svetainės gali atsakyti į šią užklausą rodydamos j Uždar. visų skirtukų lapus Bendra + Sklaidos kanalo kortelės meniu uždarytas - \ No newline at end of file +Prisijunkite prie „Chrome“, kad pasiektumėte skirtukus iš kitų įrenginių. @@ -1186,10 +1102,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_lv.xtb -@@ -1000,4 +1000,21 @@ Piemēram, dažas vietnes, reaģējot uz šo pieprasījumu, var rādīt jums rek - Bezsaistē +@@ -1045,4 +1045,21 @@ Piemēram, dažas vietnes, reaģējot uz šo pieprasījumu, var rādīt jums rek Aizvērt visas cilnes Vispārīgi + Plūsmas kartītes izvēlne ir aizvērta - \ No newline at end of file +Pierakstieties pārlūkā Chrome, lai būtu pieejamas cilnes no citām jūsu ierīcēm. @@ -1213,10 +1129,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ml.xtb -@@ -1000,4 +1000,21 @@ - ഓഫ്‌ലൈൻ +@@ -1045,4 +1045,21 @@ ടാബെല്ലാം അടയ്‌ക്കൂ പൊതുവായ + ഫീഡ് കാർഡ് മെനു അടച്ചു - \ No newline at end of file +നിങ്ങളുടെ മറ്റ് ഉപകരണങ്ങളിൽ നിന്നുള്ള ടാബുകൾ ലഭിക്കാൻ, Chrome-ൽ സൈൻ ഇൻ ചെയ്യുക. @@ -1240,10 +1156,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_mr.xtb -@@ -1000,4 +1000,21 @@ - ऑफलाइन +@@ -1045,4 +1045,21 @@ सर्व टॅब बंद करा सामान्य + फीड कार्ड मेनू बंद केला गेला आहे - \ No newline at end of file +आपल्या इतर डिव्हाइसेसवरील तुमचे टॅब प्राप्त करण्यासाठी, Chrome मध्ये साइन इन करा. @@ -1267,10 +1183,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ms.xtb -@@ -1000,4 +1000,21 @@ Sebagai contoh, sesetengah tapak web mungkin memberi respons kepada permintaan i - Luar talian +@@ -1045,4 +1045,21 @@ Sebagai contoh, sesetengah tapak web mungkin memberi respons kepada permintaan i Tutup semua tab Umum + Menu kad suapan ditutup - \ No newline at end of file +Log masuk ke Chrome untuk mendapatkan tab daripada peranti anda yang lain. @@ -1294,10 +1210,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_nl.xtb -@@ -1000,4 +1000,21 @@ Zo kunnen sommige websites op dit verzoek reageren door advertenties weer te gev - Offline +@@ -1045,4 +1045,21 @@ Zo kunnen sommige websites op dit verzoek reageren door advertenties weer te gev Alle tabbladen sluiten Algemeen + Feedkaartmenu is gesloten - \ No newline at end of file +Log in bij Chrome om de tabbladen van je andere apparaten te bekijken. @@ -1321,10 +1237,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb -@@ -1000,4 +1000,21 @@ Noen nettsteder kan for eksempel svare på denne forespørselen ved å vise deg - Uten nett +@@ -1045,4 +1045,21 @@ Noen nettsteder kan for eksempel svare på denne forespørselen ved å vise deg Lukk alle faner Generelt + Feedkortmenyen er lukket - \ No newline at end of file +For å få fanene dine fra de andre enhetene du bruker, logg på Chrome. @@ -1348,10 +1264,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pl.xtb -@@ -1000,4 +1000,21 @@ Na przykład niektóre strony mogą na nie zareagować, wyświetlając reklamy b - Offline +@@ -1045,4 +1045,21 @@ Na przykład niektóre strony mogą na nie zareagować, wyświetlając reklamy b Zamknij wszystkie karty Ogólne + Menu karty kanału jest zamknięte - \ No newline at end of file +Aby korzystać z kart ze swoich innych urządzeń, zaloguj się w Chrome. @@ -1375,10 +1291,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb -@@ -1001,4 +1001,21 @@ Por exemplo, alguns sites podem responder a esse pedido mostrando anúncios que - Off-line +@@ -1046,4 +1046,21 @@ Por exemplo, alguns sites podem responder a esse pedido mostrando anúncios que Fechar todas as guias Geral + O menu do card do feed está fechado - \ No newline at end of file +Para ver as guias dos seus outros dispositivos, faça login no Chrome. @@ -1402,10 +1318,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-PT.xtb -@@ -1000,4 +1000,21 @@ Por exemplo, alguns Sites podem responder a este pedido ao mostrar-lhe anúncios - Offline +@@ -1045,4 +1045,21 @@ Por exemplo, alguns Sites podem responder a este pedido ao mostrar-lhe anúncios Fechar todos os separadores Geral + O menu do cartão do feed está fechado. - \ No newline at end of file +Para obter os separadores dos seus outros dispositivos, inicie sessão no Chrome. @@ -1429,10 +1345,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ro.xtb -@@ -1000,4 +1000,21 @@ De exemplu, unele site-uri pot răspunde la această solicitare afișând anunț - Offline +@@ -1045,4 +1045,21 @@ De exemplu, unele site-uri pot răspunde la această solicitare afișând anunț Închide toate filele General + Meniul cardului din feed este închis - \ No newline at end of file +Pentru a accesa filele de pe alte dispozitive, conectează-te la Chrome. @@ -1456,10 +1372,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ru.xtb -@@ -1000,4 +1000,21 @@ - Офлайн +@@ -1045,4 +1045,21 @@ Закрыть все вкладки Общие + Меню карточки из ленты закрыто - \ No newline at end of file +Чтобы получить доступ к вкладкам на всех ваших устройствах, войдите в Chrome. @@ -1483,10 +1399,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb -@@ -1000,4 +1000,21 @@ Niektoré weby môžu napríklad na túto žiadosť reagovať tak, že vám zobr - Offline +@@ -1045,4 +1045,21 @@ Niektoré weby môžu napríklad na túto žiadosť reagovať tak, že vám zobr Zavrieť všetky karty Všeobecné + Ponuka karty feedu je zatvorená - \ No newline at end of file +Ak chcete získať karty z ďalších svojich zariadení, prihláste sa do Chromu. @@ -1510,10 +1426,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sl.xtb -@@ -1000,4 +1000,21 @@ Nekatera spletna mesta se lahko na primer na zahtevo odzovejo tako, da prikažej - Brez povezave +@@ -1045,4 +1045,21 @@ Nekatera spletna mesta se lahko na primer na zahtevo odzovejo tako, da prikažej Zapri vse zavihke Splošno + Meni kartice vira je zaprt - \ No newline at end of file +Če želite dostopati do zavihkov v drugih napravah, se prijavite v Chrome. @@ -1537,10 +1453,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sr.xtb -@@ -1000,4 +1000,21 @@ Google налог можда има друге облике историје п - Офлајн +@@ -1045,4 +1045,21 @@ Google налог можда има друге облике историје п Затвори све картице Опште + Мени картице фида је затворен - \ No newline at end of file +Да би вам картице биле доступне на другим уређајима, пријавите се у Chrome. @@ -1564,10 +1480,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sv.xtb -@@ -1000,4 +1000,21 @@ Vissa webbplatser kan till exempel svara på begäran genom att visa annonser so - Offline +@@ -1045,4 +1045,21 @@ Vissa webbplatser kan till exempel svara på begäran genom att visa annonser so Stäng alla flikar Allmänt + Menyn med flödeskort är stängd - \ No newline at end of file +Logga in i Chrome om du vill ha samma flikar tillgängliga på alla enheter. @@ -1591,10 +1507,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sw.xtb -@@ -1000,4 +1000,21 @@ Kwa mfano, baadhi ya tovuti zinaweza kujibu ombi hili kwa kukuonyesha matangazo - Nje ya mtandao +@@ -1045,4 +1045,21 @@ Kwa mfano, baadhi ya tovuti zinaweza kujibu ombi hili kwa kukuonyesha matangazo Funga vichupo vyote Jumla + Menyu ya kadi ya mipasho imefungwa - \ No newline at end of file +Ili upate vichupo kutoka kwenye vifaa vyako vingine, ingia katika Chrome. @@ -1618,10 +1534,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ta.xtb -@@ -1000,4 +1000,21 @@ - ஆஃப்லைன் +@@ -1045,4 +1045,21 @@ எல்லா தாவல்களையும் மூடு பொது + ஃபீட் கார்டு மெனு மூடப்பட்டுள்ளது - \ No newline at end of file +உங்கள் பிற சாதனங்களிலிருந்து தாவல்களைப் பெற, Chrome இல் உள்நுழையவும். @@ -1645,10 +1561,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb -@@ -1000,4 +1000,21 @@ - ఆఫ్‌లైన్ +@@ -1045,4 +1045,21 @@ అన్ని ట్యాబ్‌లను మూసివేయి సాధారణం + ఫీడ్ కార్డ్ మెనూ మూసివేయబడింది - \ No newline at end of file +మీ ఇతర పరికరాల నుండి మీ ట్యాబ్‌లను పొందడానికి, Chromeకు సైన్ ఇన్ చేయండి. @@ -1672,10 +1588,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb -@@ -1000,4 +1000,21 @@ - ออฟไลน์ +@@ -1045,4 +1045,21 @@ ปิดแท็บทั้งหมด ทั่วไป + เมนูของการ์ดฟีดปิดอยู่ - \ No newline at end of file +ลงชื่อเข้าใช้ Chrome เพื่อรับแท็บจากอุปกรณ์เครื่องอื่นๆ ของคุณ @@ -1699,10 +1615,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_tr.xtb -@@ -1000,4 +1000,21 @@ Bu ayarı değiştirmek için senkronizasyonu sıfırlay - Çevrimdışı +@@ -1045,4 +1045,21 @@ Bu ayarı değiştirmek için senkronizasyonu sıfırlay Tüm sekmeleri kapat Genel + Akış kartı menüsü kapalı - \ No newline at end of file +Diğer cihazlarınızdaki sekmelerinize ulaşmak için Chrome'da oturum açın. @@ -1726,10 +1642,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_uk.xtb -@@ -1000,4 +1000,21 @@ - Офлайн +@@ -1045,4 +1045,21 @@ Закрити всі вкладки Загальне + Меню картки зі стрічки закрито - \ No newline at end of file +Щоб мати доступ до вкладок з інших пристроїв, увійдіть в обліковий запис Chrome. @@ -1753,10 +1669,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_vi.xtb -@@ -1000,4 +1000,21 @@ Ví dụ: một số trang web có thể phản hồi yêu cầu này bằng cá - Ngoại tuyến +@@ -1045,4 +1045,21 @@ Ví dụ: một số trang web có thể phản hồi yêu cầu này bằng cá Đóng tất cả các thẻ Chung + Trình đơn thẻ nguồn cấp dữ liệu đang đóng - \ No newline at end of file +Để có các tab từ các thiết bị khác của bạn, hãy đăng nhập vào Chrome. @@ -1780,10 +1696,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -@@ -1000,4 +1000,21 @@ - 离线 +@@ -1045,4 +1045,21 @@ 关闭所有标签页 常规 + 动态卡片上的菜单已关闭 - \ No newline at end of file +要访问您在其他设备上的标签页，请登录 Chrome。 @@ -1807,10 +1723,10 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb -@@ -1000,4 +1000,21 @@ - 離線 +@@ -1045,4 +1045,21 @@ 關閉所有分頁 一般 + 已關閉動態消息資訊卡選單 - \ No newline at end of file +如要存取您在其他裝置上開啟的分頁，請登入 Chrome。 diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 152716b7..516a1b94 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -13,7 +13,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -2554,6 +2554,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2564,6 +2564,10 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, #endif // OS_MACOSX #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-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -894,6 +894,11 @@ +@@ -945,6 +945,11 @@ // enable-javascript-harmony. "expiry_milestone": -1 }, @@ -42,7 +42,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2716,6 +2716,10 @@ const char kQueryTilesInstantFetchName[] = "Query tile instant fetch"; +@@ -2848,6 +2848,10 @@ const char kQueryTilesInstantFetchName[] = "Query tile instant fetch"; const char kQueryTilesInstantFetchDescription[] = "Immediately schedule background task to fetch query tiles"; @@ -56,7 +56,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1584,6 +1584,9 @@ extern const char kQueryTilesCountryCodeIndonesia[]; +@@ -1650,6 +1650,9 @@ extern const char kQueryTilesCountryCodeIndonesia[]; extern const char kQueryTilesInstantFetchName[]; extern const char kQueryTilesInstantFetchDescription[]; diff --git a/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch b/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch index 31f51cdb..039fb6ac 100644 --- a/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch +++ b/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch @@ -61,7 +61,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc --- a/gpu/config/gpu_util.cc +++ b/gpu/config/gpu_util.cc -@@ -110,6 +110,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( +@@ -111,6 +111,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( #if !defined(OS_ANDROID) return kGpuFeatureStatusDisabled; #else @@ -71,7 +71,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; -@@ -358,6 +361,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { +@@ -371,6 +374,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) { gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] = kGpuFeatureStatusBlacklisted; } @@ -89,15 +89,15 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list @@ -13,6 +13,7 @@ decode_encode_srgb_for_generatemipmap depth_stencil_renderbuffer_resize_emulation disable_2d_canvas_auto_flush - disable_accelerated_vpx_decode + disable_accelerated_av1_decode +disable_aimagereader + disable_accelerated_vp8_decode + disable_accelerated_vp9_decode disable_async_readpixels - disable_av_sample_buffer_display_layer - disable_blend_equation_advanced diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc -@@ -522,6 +522,12 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -561,6 +561,12 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, ui::OzonePlatform::GetInstance()->AfterSandboxEntry(); #endif @@ -110,8 +110,8 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc #if defined(USE_OZONE) gpu_feature_info_.supported_buffer_formats_for_allocation_and_texturing = std::move(supported_buffer_formats_for_texturing); -@@ -548,6 +554,11 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, - +@@ -587,6 +593,11 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, + DisableInProcessGpuVulkan(&gpu_feature_info_, &gpu_preferences_); default_offscreen_surface_ = gl::init::CreateOffscreenGLSurface(gfx::Size()); + // Disable AImageReader if the workaround is enabled. diff --git a/build/patches/Rollback-dav1d-upgrades-that-break-x86.patch b/build/patches/Rollback-dav1d-upgrades-that-break-x86.patch new file mode 100644 index 00000000..ece1adba --- /dev/null +++ b/build/patches/Rollback-dav1d-upgrades-that-break-x86.patch @@ -0,0 +1,59 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Sat, 22 Aug 2020 14:31:59 +0200 +Subject: Rollback dav1d upgrades that break x86 + +Revert "Roll src/third_party/dav1d/libdav1d/ 54f92068c..47daa4df3 (1 commit)" + +This reverts commit e6447f7294588dcab826736c267cdab094a1643e. + +Revert "Roll src/third_party/dav1d/libdav1d/ 07261e8c3..54f92068c (15 commits)" + +This reverts commit b47516cde6a4d570b4c29b761d31c26009f9611f. + +Revert "Roll src/third_party/dav1d/libdav1d/ b585f051c..07261e8c3 (39 commits)" + +This reverts commit d723c1391cd7f73dedfd97805f1503010edf06ad. +--- + DEPS | 2 +- + third_party/dav1d/dav1d_generated.gni | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/DEPS b/DEPS +--- a/DEPS ++++ b/DEPS +@@ -774,7 +774,7 @@ deps = { + Var('chromium_git') + '/angle/angle.git' + '@' + Var('angle_revision'), + + 'src/third_party/dav1d/libdav1d': +- Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + '47daa4df3387c1529536243db80b81f3878cbf76', ++ Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + 'b585f051c365bbada36bd066dd0a8a237fbf9dca', + + 'src/third_party/dawn': + Var('dawn_git') + '/dawn.git' + '@' + Var('dawn_revision'), +diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni +--- a/third_party/dav1d/dav1d_generated.gni ++++ b/third_party/dav1d/dav1d_generated.gni +@@ -20,7 +20,7 @@ x86_asm_sources = [ + "libdav1d/src/x86/looprestoration.asm", + "libdav1d/src/x86/looprestoration_ssse3.asm", + "libdav1d/src/x86/mc.asm", +- "libdav1d/src/x86/mc_sse.asm", ++ "libdav1d/src/x86/mc_ssse3.asm", + "libdav1d/src/x86/msac.asm", + ] + +@@ -37,11 +37,9 @@ x86_template_sources = [ + arm32_asm_sources = [ + "libdav1d/src/arm/32/cdef.S", + "libdav1d/src/arm/32/ipred.S", +- "libdav1d/src/arm/32/itx.S", + "libdav1d/src/arm/32/loopfilter.S", + "libdav1d/src/arm/32/looprestoration.S", + "libdav1d/src/arm/32/mc.S", +- "libdav1d/src/arm/32/msac.S", + "libdav1d/src/arm/32/util.S", + ] + +-- +2.17.1 + diff --git a/build/patches/Session-only-cookies-support.patch b/build/patches/Session-only-cookies-support.patch index 821fad67..ac53d1ed 100644 --- a/build/patches/Session-only-cookies-support.patch +++ b/build/patches/Session-only-cookies-support.patch @@ -11,12 +11,13 @@ Subject: Session-only cookies support .../four_state_cookie_settings_preference.xml | 7 ++++ .../ContentSettingsResources.java | 9 +++++ .../FourStateCookieSettingsPreference.java | 17 +++++++- - .../site_settings/SingleCategorySettings.java | 30 ++++++++++++++ - .../site_settings/SingleWebsiteSettings.java | 40 ++++++++++++++----- + .../site_settings/SingleCategorySettings.java | 29 ++++++++++++++ + .../site_settings/SingleWebsiteSettings.java | 38 ++++++++++++------ .../site_settings/SiteSettings.java | 9 +++++ .../strings/android/site_settings.grdp | 8 +++- .../translations/browser_ui_strings_it.xtb | 2 + .../core/browser/content_settings_registry.cc | 0 + .../core/data_use_measurement.cc | 1 + .../scheduler/responsiveness/calculator.cc | 1 + .../base/application_state_mojom_traits.cc | 7 +++- .../public/mojom/base/application_state.mojom | 1 + @@ -24,9 +25,9 @@ Subject: Session-only cookies support services/network/cookie_manager.h | 3 ++ services/network/network_context.cc | 17 ++++++++ .../network/public/mojom/cookie_manager.mojom | 3 ++ - .../network/session_cleanup_cookie_store.cc | 39 ++++++++++++++++++ + .../network/session_cleanup_cookie_store.cc | 39 +++++++++++++++++++ .../network/session_cleanup_cookie_store.h | 9 +++++ - 23 files changed, 212 insertions(+), 16 deletions(-) + 24 files changed, 210 insertions(+), 16 deletions(-) mode change 100644 => 100755 base/android/application_status_listener.cc mode change 100644 => 100755 base/android/application_status_listener.h mode change 100644 => 100755 base/android/java/src/org/chromium/base/ApplicationStatus.java @@ -56,7 +57,7 @@ old mode 100644 new mode 100755 --- a/base/android/application_status_listener.cc +++ b/base/android/application_status_listener.cc -@@ -84,6 +84,7 @@ void ApplicationStatusListener::NotifyApplicationStateChange( +@@ -85,6 +85,7 @@ void ApplicationStatusListener::NotifyApplicationStateChange( switch (state) { case APPLICATION_STATE_UNKNOWN: case APPLICATION_STATE_HAS_DESTROYED_ACTIVITIES: @@ -122,7 +123,7 @@ old mode 100644 new mode 100755 --- a/chrome/browser/availability/availability_prober.cc +++ b/chrome/browser/availability/availability_prober.cc -@@ -205,6 +205,7 @@ bool IsInForeground(base::android::ApplicationState state) { +@@ -206,6 +206,7 @@ bool IsInForeground(base::android::ApplicationState state) { case base::android::APPLICATION_STATE_HAS_PAUSED_ACTIVITIES: case base::android::APPLICATION_STATE_HAS_STOPPED_ACTIVITIES: case base::android::APPLICATION_STATE_HAS_DESTROYED_ACTIVITIES: @@ -154,7 +155,7 @@ old mode 100644 new mode 100755 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java -@@ -325,6 +325,8 @@ public class ContentSettingsResources { +@@ -335,6 +335,8 @@ public class ContentSettingsResources { return R.string.website_settings_permissions_allow; case ContentSettingValues.BLOCK: return R.string.website_settings_permissions_block; @@ -163,7 +164,7 @@ new mode 100755 default: return 0; // We never show Ask as an option on individual permissions. } -@@ -412,4 +414,11 @@ public class ContentSettingsResources { +@@ -422,4 +424,11 @@ public class ContentSettingsResources { assert false; return null; } @@ -258,7 +259,7 @@ old mode 100644 new mode 100755 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -@@ -568,6 +568,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -573,6 +573,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment private void setCookieSettingsPreference(CookieSettingsState state) { boolean allowCookies; @@ -266,7 +267,7 @@ new mode 100755 @CookieControlsMode int mode; -@@ -575,28 +576,50 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -580,23 +581,37 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case ALLOW: allowCookies = true; mode = CookieControlsMode.OFF; @@ -296,31 +297,32 @@ new mode 100755 return; } -+ // reset default ++ // reset cookies content setting to default + WebsitePreferenceBridge.setContentSetting( -+ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES, ++ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES, + ContentSettingValues.DEFAULT); + WebsitePreferenceBridge.setCategoryEnabled( getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES, allowCookies); - getPrefs().setCookieControlsMode(mode); - getPrefs().setBlockThirdPartyCookies(mode == CookieControlsMode.BLOCK_THIRD_PARTY); +@@ -604,6 +619,13 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment + prefService.setInteger(COOKIE_CONTROLS_MODE, mode); + prefService.setBoolean( + BLOCK_THIRD_PARTY_COOKIES, mode == CookieControlsMode.BLOCK_THIRD_PARTY); + -+ // set sessiononly content setting for cookies -+ if(sessionOnly) -+ { ++ // set session-only content setting for cookies ++ if (sessionOnly) { + WebsitePreferenceBridge.setContentSetting( -+ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES, ++ getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES, + ContentSettingValues.SESSION_ONLY); -+ } ++ } } private boolean cookieSettingsExceptionShouldBlock() { -@@ -1079,6 +1102,13 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment - params.cookieControlsMode = getPrefs().getCookieControlsMode(); - params.cookiesContentSettingEnforced = mCategory.isManaged(); - params.thirdPartyBlockingEnforced = getPrefs().isBlockThirdPartyCookiesManaged(); +@@ -1084,6 +1106,13 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment + params.allowCookies = WebsitePreferenceBridge.isCategoryEnabled( + getSiteSettingsClient().getBrowserContextHandle(), ContentSettingsType.COOKIES); + PrefService prefService = UserPrefs.get(getSiteSettingsClient().getBrowserContextHandle()); + + if (WebsitePreferenceBridge.getContentSetting( + getSiteSettingsClient().getBrowserContextHandle(), @@ -328,23 +330,15 @@ new mode 100755 + params.sessionOnlyCookies = true; + } + - fourStateCookieToggle.setState(params); - } - + params.blockThirdPartyCookies = prefService.getBoolean(BLOCK_THIRD_PARTY_COOKIES); + params.cookieControlsMode = prefService.getInteger(COOKIE_CONTROLS_MODE); + params.cookiesContentSettingEnforced = mCategory.isManaged(); diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java old mode 100644 new mode 100755 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java -@@ -69,6 +69,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment - public static final String PREF_RESET_SITE = "reset_site_button"; - - public static final String TAG = "SingleWebsitePreferences"; -+ - // Website permissions (if adding new, see hasPermissionsPreferences and resetSite below) - // All permissions from the permissions preference category must be listed here. - private static final String[] PERMISSION_PREFERENCE_KEYS = { -@@ -746,19 +747,36 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -750,21 +750,37 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setUpPreferenceCommon(preference); ListPreference listPreference = (ListPreference) preference; @@ -358,7 +352,7 @@ new mode 100755 - getString(ContentSettingsResources.getSiteSummary(ContentSettingValues.BLOCK)); - listPreference.setEntryValues(keys); - listPreference.setEntries(descriptions); -+ if(getContentSettingsTypeFromPreferenceKey(preference.getKey()) == ContentSettingsType.COOKIES) { ++ if (getContentSettingsTypeFromPreferenceKey(preference.getKey()) == ContentSettingsType.COOKIES) { + CharSequence[] keys = new String[3]; + CharSequence[] descriptions = new String[3]; + keys[0] = ContentSetting.toString(ContentSettingValues.ALLOW); @@ -383,21 +377,22 @@ new mode 100755 + getString(ContentSettingsResources.getSiteSummary(ContentSettingValues.BLOCK)); + listPreference.setEntryValues(keys); + listPreference.setEntries(descriptions); -+ } -+ ++ } + listPreference.setOnPreferenceChangeListener(this); + listPreference.setSummary(isEmbargoed ? getString(R.string.automatically_blocked) : "%s"); // TODO(crbug.com/735110): Figure out if this is the correct thing to do - here we are // effectively treating non-ALLOW values as BLOCK. - int index = (value == ContentSettingValues.ALLOW ? 0 : 1); + int index = (value == ContentSettingValues.SESSION_ONLY ? 2 : (value == ContentSettingValues.ALLOW ? 0 : 1)); listPreference.setValueIndex(index); - listPreference.setOnPreferenceChangeListener(this); - listPreference.setSummary("%s"); + } + diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java old mode 100644 new mode 100755 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java -@@ -67,6 +67,8 @@ public class SiteSettings +@@ -70,6 +70,8 @@ public class SiteSettings } boolean requiresTriStateSetting = WebsitePreferenceBridge.requiresTriStateContentSetting(contentType); @@ -406,7 +401,7 @@ new mode 100755 boolean checked = false; @ContentSettingValues -@@ -78,6 +80,11 @@ public class SiteSettings +@@ -81,6 +83,11 @@ public class SiteSettings } else if (requiresTriStateSetting) { setting = WebsitePreferenceBridge.getContentSetting( browserContextHandle, contentType); @@ -418,21 +413,21 @@ new mode 100755 } else { checked = WebsitePreferenceBridge.isCategoryEnabled( browserContextHandle, contentType); -@@ -95,6 +102,8 @@ public class SiteSettings +@@ -98,6 +105,8 @@ public class SiteSettings .showPermissionBlockedMessage(getActivity())) { // Show 'disabled' message when permission is not granted in Android. p.setSummary(ContentSettingsResources.getCategorySummary(contentType, false)); + } else if (Type.COOKIES == prefCategory && requiresFourStateContentSetting && setting == ContentSettingValues.SESSION_ONLY) { + p.setSummary(ContentSettingsResources.getCookieSessionOnlySummary()); } else if (Type.COOKIES == prefCategory && checked - && getSiteSettingsClient() - .getSiteSettingsPrefClient() + && UserPrefs.get(browserContextHandle).getBoolean(BLOCK_THIRD_PARTY_COOKIES)) { + p.setSummary(ContentSettingsResources.getCookieAllowedExceptThirdPartySummary()); diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp old mode 100644 new mode 100755 --- a/components/browser_ui/strings/android/site_settings.grdp +++ b/components/browser_ui/strings/android/site_settings.grdp -@@ -333,8 +333,14 @@ +@@ -345,8 +345,14 @@ Cookies are files created by websites you visit. Sites use them to remember your preferences. Third-party cookies are created by other sites. These sites own some of the content, like ads or images, that you see on the webpage you visit. @@ -453,8 +448,8 @@ old mode 100644 new mode 100755 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_it.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_it.xtb -@@ -238,4 +238,6 @@ - Gestito dai genitori +@@ -253,4 +253,6 @@ + Bluetooth Accesso al microfono Blocca se il sito mostra annunci invasivi o fuorvianti (consigliato) +Solo cookies di sessione @@ -464,6 +459,17 @@ new mode 100755 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc old mode 100644 new mode 100755 +diff --git a/components/data_use_measurement/core/data_use_measurement.cc b/components/data_use_measurement/core/data_use_measurement.cc +--- a/components/data_use_measurement/core/data_use_measurement.cc ++++ b/components/data_use_measurement/core/data_use_measurement.cc +@@ -33,6 +33,7 @@ bool IsInForeground(base::android::ApplicationState state) { + case base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES: + return true; + case base::android::APPLICATION_STATE_UNKNOWN: ++ case base::android::APPLICATION_STATE_EXITING: + case base::android::APPLICATION_STATE_HAS_PAUSED_ACTIVITIES: + case base::android::APPLICATION_STATE_HAS_STOPPED_ACTIVITIES: + case base::android::APPLICATION_STATE_HAS_DESTROYED_ACTIVITIES: diff --git a/content/browser/scheduler/responsiveness/calculator.cc b/content/browser/scheduler/responsiveness/calculator.cc old mode 100644 new mode 100755 @@ -567,7 +573,7 @@ old mode 100644 new mode 100755 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -289,12 +289,23 @@ class NetworkContextApplicationStatusListener +@@ -291,12 +291,23 @@ class NetworkContextApplicationStatusListener } void Notify(base::android::ApplicationState state) override { @@ -591,7 +597,7 @@ new mode 100755 }; #endif -@@ -2106,6 +2117,12 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() { +@@ -2169,6 +2180,12 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( std::move(session_cleanup_cookie_store), std::move(params_->cookie_manager_params)); @@ -609,7 +615,7 @@ old mode 100644 new mode 100755 --- a/services/network/public/mojom/cookie_manager.mojom +++ b/services/network/public/mojom/cookie_manager.mojom -@@ -361,4 +361,7 @@ interface CookieManager { +@@ -378,4 +378,7 @@ interface CookieManager { // the caller with a callback when settings have been updated. SetStorageAccessGrantSettings( array settings) => (); diff --git a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch index a9633592..71969d21 100644 --- a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch +++ b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch @@ -4,31 +4,23 @@ Subject: Show site settings for cookies, javascript and ads Avoid displaying info about intrusive ads --- - .../site_settings/SingleWebsiteSettings.java | 60 +++++++++---------- + .../site_settings/SingleWebsiteSettings.java | 59 +++++++++---------- .../browser_ui/site_settings/Website.java | 20 +++++++ - 2 files changed, 48 insertions(+), 32 deletions(-) + 2 files changed, 47 insertions(+), 32 deletions(-) diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java -@@ -68,6 +68,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment - // Buttons: - public static final String PREF_RESET_SITE = "reset_site_button"; - -+ public static final String TAG = "SingleWebsitePreferences"; - // Website permissions (if adding new, see hasPermissionsPreferences and resetSite below) - // All permissions from the permissions preference category must be listed here. - private static final String[] PERMISSION_PREFERENCE_KEYS = { -@@ -349,6 +350,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -349,6 +349,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setUpSoundPreference(preference); } else if (i == ContentSettingException.Type.JAVASCRIPT) { setUpJavascriptPreference(preference); + } else if (i == ContentSettingException.Type.COOKIE) { + setUpCookiePreference(preference); } else { - setUpListPreference(preference, mSite.getContentSettingPermission(i)); - } -@@ -666,19 +669,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment + // ContentSettingException can not be embargoed. + setUpListPreference(preference, mSite.getContentSettingPermission(i), +@@ -671,19 +673,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment } private void setUpAdsInformationalBanner() { @@ -50,7 +42,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } private SiteSettingsCategory getWarningCategory() { -@@ -831,13 +823,29 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -838,13 +829,29 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment @Nullable Integer currentValue = mSite.getContentSettingPermission(ContentSettingException.Type.JAVASCRIPT); @@ -69,7 +61,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + ? ContentSettingValues.ALLOW + : ContentSettingValues.BLOCK; + } -+ setUpListPreference(preference, currentValue); ++ setUpListPreference(preference, currentValue, false); + } + + private void setUpCookiePreference(Preference preference) { @@ -85,10 +77,10 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + ? ContentSettingValues.ALLOW + : ContentSettingValues.BLOCK; } - setUpListPreference(preference, currentValue); - } -@@ -855,22 +863,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment - setUpListPreference(preference, null); + // Not possible to embargo JAVASCRIPT. + setUpListPreference(preference, currentValue, false /* isEmbargoed */); +@@ -863,22 +870,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment + setUpListPreference(preference, null, false); return; } - // If the ad blocker is activated, then this site will have ads blocked unless there is an @@ -103,7 +95,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c - // If the site is not considered a candidate for blocking, do the standard thing and remove - // the preference. - if (permission == null && !activated) { -- setUpListPreference(preference, null); +- setUpListPreference(preference, null, false); - return; - } - diff --git a/build/patches/Switch-to-fstack-protector-strong.patch b/build/patches/Switch-to-fstack-protector-strong.patch index 2b665d3d..1613c60d 100644 --- a/build/patches/Switch-to-fstack-protector-strong.patch +++ b/build/patches/Switch-to-fstack-protector-strong.patch @@ -16,7 +16,7 @@ higher memory/cache usage but not by the full 2-3%. diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -273,16 +273,12 @@ config("compiler") { +@@ -279,16 +279,12 @@ config("compiler") { cflags += [ "-fstack-protector" ] } } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) { diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch index b63e8e32..c40316fb 100644 --- a/build/patches/Update-i18n-zh_CN-support.patch +++ b/build/patches/Update-i18n-zh_CN-support.patch @@ -10,7 +10,7 @@ Subject: Update i18n zh_CN support diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb -@@ -6464,4 +6464,8 @@ +@@ -6599,4 +6599,8 @@ YouTube 正在建立安全连接... 检查(&N) @@ -24,7 +24,7 @@ diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/res diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -@@ -1017,4 +1017,23 @@ +@@ -1062,4 +1062,23 @@ 当您在地址栏中输入查询内容时，使用联想查询服务显示相关查询和热门网站 正在同步到 Google 活动控件 diff --git a/build/patches/Use-4-tile-rows-never-show-logo.patch b/build/patches/Use-4-tile-rows-never-show-logo.patch index e75de0f9..aa058950 100644 --- a/build/patches/Use-4-tile-rows-never-show-logo.patch +++ b/build/patches/Use-4-tile-rows-never-show-logo.patch @@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL private boolean mSearchProviderIsGoogle; private boolean mInitialized; -@@ -526,7 +526,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -528,7 +528,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer && mInitialized) { return; } @@ -31,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL mSearchProviderIsGoogle = isGoogle; updateTileGridPadding(); -@@ -797,7 +797,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -799,7 +799,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer Integer maxRows = mQueryTileSection == null ? null : mQueryTileSection.getMaxRowsForMostVisitedTiles(); @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/engagement/important_sites_util.cc --- a/chrome/browser/engagement/important_sites_util.cc +++ b/chrome/browser/engagement/important_sites_util.cc -@@ -62,7 +62,7 @@ static const int kTimesIgnoredForBlacklist = 3; +@@ -63,7 +63,7 @@ static const int kTimesIgnoredForBlacklist = 3; // These are the maximum # of bookmarks we can use as signals. If the user has // <= kMaxBookmarks, then we just use those bookmarks. Otherwise we filter all // bookmarks on site engagement > 0, sort, and trim to kMaxBookmarks. diff --git a/build/patches/Use-dummy-DFM-installer.patch b/build/patches/Use-dummy-DFM-installer.patch index 21fd3b19..ee82751d 100644 --- a/build/patches/Use-dummy-DFM-installer.patch +++ b/build/patches/Use-dummy-DFM-installer.patch @@ -60,7 +60,7 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component import org.chromium.base.BuildInfo; import org.chromium.base.ContextUtils; import org.chromium.base.Log; -@@ -124,18 +121,7 @@ class FakeEngine extends SplitCompatEngine { +@@ -129,18 +126,7 @@ class FakeEngine extends SplitCompatEngine { return false; } diff --git a/build/patches/autofill-disable-autofill-download-manager.patch b/build/patches/autofill-disable-autofill-download-manager.patch index fb12587d..94f69fa9 100644 --- a/build/patches/autofill-disable-autofill-download-manager.patch +++ b/build/patches/autofill-disable-autofill-download-manager.patch @@ -11,7 +11,7 @@ Disables the autofill download manager (trk:158). diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -67,7 +67,6 @@ constexpr std::pair kAutofillExperimentRanges[] = { +@@ -66,7 +66,6 @@ constexpr std::pair kAutofillExperimentRanges[] = { {3314445, 3314448}, {3314854, 3314883}, }; @@ -19,7 +19,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com const size_t kAutofillDownloadManagerMaxFormCacheSize = 16; const size_t kMaxFieldsPerQueryRequest = 100; -@@ -524,35 +523,6 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload, +@@ -523,35 +522,6 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload, return upload_request.SerializeToString(payload); } @@ -55,7 +55,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com // Gets HTTP body payload for API POST request. bool GetAPIBodyPayload(const std::string& payload, AutofillDownloadManager::RequestType type, -@@ -776,6 +746,7 @@ size_t AutofillDownloadManager::GetPayloadLength( +@@ -785,6 +755,7 @@ size_t AutofillDownloadManager::GetPayloadLength( std::tuple AutofillDownloadManager::GetRequestURLAndMethod( const FormRequestData& request_data) const { @@ -63,7 +63,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com std::string method("POST"); std::string query_str; -@@ -798,36 +769,18 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( +@@ -807,36 +778,18 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( GURL url = autofill_server_url_ .Resolve(RequestTypeToString(request_data.request_type)) .ReplaceComponents(replacements); @@ -129,7 +129,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a ValuePatternsMetric GetValuePattern(const base::string16& value) { if (IsUPIVirtualPaymentAddress(value)) return ValuePatternsMetric::kUpiVpa; -@@ -1624,11 +1611,6 @@ AutofillManager::AutofillManager( +@@ -1642,11 +1629,6 @@ AutofillManager::AutofillManager( : std::make_unique( driver, client_, personal_data_, credit_card_form_event_logger_.get()); diff --git a/build/patches/build-remove-calling-untrusted-hooks.patch b/build/patches/build-remove-calling-untrusted-hooks.patch index 19dca815..3e0f4a09 100644 --- a/build/patches/build-remove-calling-untrusted-hooks.patch +++ b/build/patches/build-remove-calling-untrusted-hooks.patch @@ -11,7 +11,7 @@ sysroot. diff --git a/DEPS b/DEPS --- a/DEPS +++ b/DEPS -@@ -85,7 +85,7 @@ vars = { +@@ -86,7 +86,7 @@ vars = { # Check out and download nacl by default. This can be disabled e.g. with # custom_vars. @@ -20,7 +20,7 @@ diff --git a/DEPS b/DEPS # By default, do not check out src-internal. This can be overridden e.g. with # custom_vars. -@@ -115,8 +115,8 @@ vars = { +@@ -116,8 +116,8 @@ vars = { # support for other platforms may be added in the future. 'checkout_openxr' : 'checkout_win', @@ -29,9 +29,9 @@ diff --git a/DEPS b/DEPS + 'checkout_traffic_annotation_tools': False, + 'checkout_instrumented_libraries': False, - # By default, do not check out WebKit for iOS, as it is not needed unless - # running against ToT WebKit rather than system WebKit. This can be overridden -@@ -4044,49 +4044,6 @@ hooks = [ + # By default bot checkouts the WPR archive files only when this + # flag is set True. +@@ -4170,49 +4170,6 @@ hooks = [ 'sync', '--extract', ], }, @@ -81,7 +81,7 @@ diff --git a/DEPS b/DEPS { # Case-insensitivity for the Win SDK. Must run before win_toolchain below. 'name': 'ciopfs_linux', -@@ -4209,18 +4166,6 @@ hooks = [ +@@ -4336,18 +4293,6 @@ hooks = [ '-s', 'src/buildtools/mac/clang-format.sha1', ], }, @@ -100,7 +100,7 @@ diff --git a/DEPS b/DEPS # Pull rc binaries using checked-in hashes. { 'name': 'rc_win', -@@ -4246,29 +4191,6 @@ hooks = [ +@@ -4373,29 +4318,6 @@ hooks = [ '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', ], }, diff --git a/build/patches/disable-AdsBlockedInfoBar.patch b/build/patches/disable-AdsBlockedInfoBar.patch index 0c5098be..0e9e9d0e 100644 --- a/build/patches/disable-AdsBlockedInfoBar.patch +++ b/build/patches/disable-AdsBlockedInfoBar.patch @@ -9,7 +9,7 @@ Subject: disable AdsBlockedInfoBar diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc --- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc +++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc -@@ -148,11 +148,6 @@ void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) { +@@ -158,11 +158,6 @@ void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) { } void ChromeSubresourceFilterClient::ShowUI(const GURL& url) { diff --git a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch index d43fe1da..8596a08e 100644 --- a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch +++ b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch @@ -13,7 +13,7 @@ Increase probe period from 1s to 15s diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -128,12 +128,12 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; +@@ -129,12 +129,12 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; // Time between IPv6 probes, i.e. for how long results of each IPv6 probe are // cached. diff --git a/build/patches/first_run-deactivate-autoupdate-globally.patch b/build/patches/first_run-deactivate-autoupdate-globally.patch index 37f07d1b..25599055 100644 --- a/build/patches/first_run-deactivate-autoupdate-globally.patch +++ b/build/patches/first_run-deactivate-autoupdate-globally.patch @@ -15,7 +15,7 @@ turn it back on. diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -205,8 +205,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { +@@ -203,8 +203,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { // ExtensionService depends on RuntimeData. runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_))); diff --git a/build/patches/fix-bug-681.patch b/build/patches/fix-bug-681.patch deleted file mode 100644 index 2e190ccd..00000000 --- a/build/patches/fix-bug-681.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Sun, 23 Aug 2020 09:34:21 +0000 -Subject: bug 681 - ---- - chrome/browser/sessions/session_restore_android.cc | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - mode change 100644 => 100755 chrome/browser/sessions/session_restore_android.cc - -diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc -old mode 100644 -new mode 100755 -index 3ea43e77a973849c9fd7a196d07c13415f3d615d..487c4b1c6544601830dc61f0d74872a9ac5b95e3 ---- a/chrome/browser/sessions/session_restore_android.cc -+++ b/chrome/browser/sessions/session_restore_android.cc -@@ -43,7 +43,12 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab( - TabAndroid* current_tab = TabAndroid::FromWebContents(web_contents); - DCHECK(current_tab); - if (disposition == WindowOpenDisposition::CURRENT_TAB) { -- current_tab->SwapWebContents(std::move(new_web_contents), false, false); -+ // START: bromite #681 -+ //current_tab->SwapWebContents(std::move(new_web_contents), false, false); -+ int active_tab_index = tab_model->GetActiveIndex(); -+ tab_model->CreateTab(current_tab, new_web_contents.release()); -+ tab_model->CloseTabAt(active_tab_index); -+ // END: bromite #681 - } else { - DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB || - disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB); diff --git a/build/patches/kill-Auth.patch b/build/patches/kill-Auth.patch index 907ca542..652d9240 100644 --- a/build/patches/kill-Auth.patch +++ b/build/patches/kill-Auth.patch @@ -3,9 +3,9 @@ Date: Fri, 22 Jun 2018 17:06:15 +0200 Subject: kill Auth --- - .../chrome/browser/signin/SigninHelper.java | 22 +------ - .../signin/SystemAccountManagerDelegate.java | 57 ++----------------- - 2 files changed, 6 insertions(+), 73 deletions(-) + .../chrome/browser/signin/SigninHelper.java | 22 +------- + .../signin/SystemAccountManagerDelegate.java | 56 ++----------------- + 2 files changed, 5 insertions(+), 73 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java @@ -59,7 +59,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -@@ -119,48 +116,20 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -119,18 +116,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { // so don't report any accounts if Google Play Services are out of date. checkCanUseGooglePlayServices(); @@ -79,12 +79,13 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon } @Override - public String getAuthToken(Account account, String authTokenScope) throws AuthException { +@@ -138,30 +124,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { + throws AuthException { assert !ThreadUtils.runningOnUiThread(); assert AccountUtils.GOOGLE_ACCOUNT_TYPE.equals(account.type); - try { -- return GoogleAuthUtil.getTokenWithNotification( -- ContextUtils.getApplicationContext(), account, authTokenScope, null); +- return new AccessTokenData(GoogleAuthUtil.getTokenWithNotification( +- ContextUtils.getApplicationContext(), account, authTokenScope, null)); - } catch (GoogleAuthException ex) { - // This case includes a UserRecoverableNotifiedException, but most clients will have - // their own retry mechanism anyway. @@ -93,7 +94,6 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon - } catch (IOException ex) { - throw new AuthException(AuthException.TRANSIENT, ex); - } -+ + throw new AuthException(AuthException.NONTRANSIENT, + "Error while getting token for scope '" + authTokenScope + "'"); } @@ -112,7 +112,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon } @Override -@@ -190,17 +159,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -191,17 +159,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @SuppressLint("MissingPermission") @Override public void createAddAccountIntent(Callback callback) { @@ -130,7 +130,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon } // No permission is needed on 23+ and Chrome always has MANAGE_ACCOUNTS permission on lower APIs -@@ -218,12 +176,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -219,12 +176,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @Nullable @Override public String getAccountGaiaId(String accountEmail) { diff --git a/build/patches/kill-GCM.patch b/build/patches/kill-GCM.patch index 407c835a..8a893f29 100644 --- a/build/patches/kill-GCM.patch +++ b/build/patches/kill-GCM.patch @@ -3,14 +3,13 @@ Date: Fri, 22 Jun 2018 17:11:38 +0200 Subject: kill GCM --- - ...ystem_webview_apk.AndroidManifest.expected | 7 - + ...em_webview_bundle.AndroidManifest.expected | 7 - chrome/android/BUILD.gn | 1 - chrome/android/chrome_java_sources.gni | 6 - chrome/android/java/AndroidManifest.xml | 62 ------ .../ChromeBackgroundTaskFactory.java | 3 - .../ntp/snippets/SnippetsLauncher.java | 43 ---- .../services/gcm/GCMBackgroundTask.java | 2 +- - .../gcm/InvalidationGcmUpstreamSender.java | 18 -- components/background_task_scheduler/BUILD.gn | 1 - .../internal/BUILD.gn | 1 - ...kgroundTaskSchedulerGcmNetworkManager.java | 206 +----------------- @@ -21,11 +20,11 @@ Subject: kill GCM third_party/cacheinvalidation/BUILD.gn | 6 - .../contrib/MultiplexingGcmListener.java | 91 +------- .../channel/AndroidNetworkChannel.java | 6 +- - 18 files changed, 9 insertions(+), 496 deletions(-) + 17 files changed, 9 insertions(+), 478 deletions(-) -diff --git a/android_webview/java/system_webview_apk.AndroidManifest.expected b/android_webview/java/system_webview_apk.AndroidManifest.expected ---- a/android_webview/java/system_webview_apk.AndroidManifest.expected -+++ b/android_webview/java/system_webview_apk.AndroidManifest.expected +diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected +--- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected ++++ b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected @@ -21,10 +21,6 @@ android:multiArch="true" android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication" @@ -50,7 +49,7 @@ diff --git a/android_webview/java/system_webview_apk.AndroidManifest.expected b/ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -447,7 +447,6 @@ android_library("chrome_java") { +@@ -464,7 +464,6 @@ android_library("chrome_java") { "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java", "//third_party/android_deps:javax_inject_javax_inject_java", "//third_party/android_media:android_media_java", @@ -61,7 +60,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -17,7 +17,6 @@ chrome_java_sources = [ +@@ -18,7 +18,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ChromeActivity.java", "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java", "java/src/org/chromium/chrome/browser/ChromeApplication.java", @@ -69,7 +68,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java", "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java", "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java", -@@ -1387,11 +1386,6 @@ chrome_java_sources = [ +@@ -1386,11 +1385,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/services/AndroidChildAccountHelper.java", "java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java", "java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java", @@ -78,9 +77,9 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java - "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java", - "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java", - "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java", - "java/src/org/chromium/chrome/browser/settings/HyperlinkPreference.java", "java/src/org/chromium/chrome/browser/settings/MainSettings.java", "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java", + "java/src/org/chromium/chrome/browser/settings/SettingsLauncherImpl.java", diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -107,7 +106,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} -@@ -955,45 +950,6 @@ by a child template that "extends" this file. +@@ -929,45 +924,6 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" android:hardwareAccelerated="false" /> @@ -153,7 +152,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1015,28 +971,10 @@ by a child template that "extends" this file. +@@ -989,28 +945,10 @@ by a child template that "extends" this file. android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE"/> @@ -306,48 +305,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GC return false; } -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java -@@ -14,7 +14,6 @@ import android.util.Log; - import androidx.annotation.MainThread; - import androidx.annotation.Nullable; - --import com.google.android.gms.gcm.GoogleCloudMessaging; - import com.google.ipc.invalidation.ticl.android2.channel.GcmUpstreamSenderService; - - import org.chromium.base.ContextUtils; -@@ -28,9 +27,6 @@ import org.chromium.components.signin.identitymanager.IdentityManager; - import org.chromium.components.sync.SyncConstants; - import org.chromium.content_public.browser.UiThreadTaskTraits; - --import java.io.IOException; --import java.util.UUID; -- - /** - * Sends Upstream messages for Invalidations using GCM. - */ -@@ -92,20 +88,6 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService { - * This function runs on a thread pool executor thread. - */ - private void sendUpstreamMessage(String to, Bundle data, String token, Context context) { -- // Add the OAuth2 token to the bundle. The token should have the prefix Bearer added to it. -- data.putString("Authorization", "Bearer " + token); -- if (!isMessageWithinLimit(data)) { -- GcmUma.recordGcmUpstreamHistogram(context, GcmUma.UMA_UPSTREAM_SIZE_LIMIT_EXCEEDED); -- return; -- } -- String msgId = UUID.randomUUID().toString(); -- try { -- GoogleCloudMessaging.getInstance(ContextUtils.getApplicationContext()) -- .send(to, msgId, 1, data); -- } catch (IOException | IllegalArgumentException exception) { -- Log.w(TAG, "Send message failed"); -- GcmUma.recordGcmUpstreamHistogram(context, GcmUma.UMA_UPSTREAM_SEND_FAILED); -- } - } - - private boolean isMessageWithinLimit(Bundle data) { diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn --- a/components/background_task_scheduler/BUILD.gn +++ b/components/background_task_scheduler/BUILD.gn diff --git a/build/patches/kill-TOS-and-metrics-opt-out.patch b/build/patches/kill-TOS-and-metrics-opt-out.patch index 83aff1f9..d346a20b 100644 --- a/build/patches/kill-TOS-and-metrics-opt-out.patch +++ b/build/patches/kill-TOS-and-metrics-opt-out.patch @@ -23,7 +23,7 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml -@@ -161,7 +161,6 @@ +@@ -153,7 +153,6 @@ 12dp 24dp 120dp diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch index 1ee2fa8a..37fcea0e 100644 --- a/build/patches/kill-Vision.patch +++ b/build/patches/kill-Vision.patch @@ -14,7 +14,7 @@ Barcode, face and text detection APIs diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -284,8 +284,6 @@ android_library("chrome_java") { +@@ -281,8 +281,6 @@ android_library("chrome_java") { "$google_play_services_package:google_play_services_gcm_java", "$google_play_services_package:google_play_services_iid_java", "$google_play_services_package:google_play_services_tasks_java", diff --git a/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch b/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch index fcbe3eb0..d1e1b944 100644 --- a/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch +++ b/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch @@ -11,7 +11,7 @@ it as hidden as it was before? diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc --- a/net/cert/x509_util.cc +++ b/net/cert/x509_util.cc -@@ -239,7 +239,7 @@ bool GetTLSServerEndPointChannelBinding(const X509Certificate& certificate, +@@ -240,7 +240,7 @@ bool GetTLSServerEndPointChannelBinding(const X509Certificate& certificate, } // RSA keys created by CreateKeyAndSelfSignedCert will be of this length. diff --git a/build/patches/prefs-always-prompt-for-download-directory-by-default.patch b/build/patches/prefs-always-prompt-for-download-directory-by-default.patch index ac23e370..fd5d9a14 100644 --- a/build/patches/prefs-always-prompt-for-download-directory-by-default.patch +++ b/build/patches/prefs-always-prompt-for-download-directory-by-default.patch @@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily. diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -271,7 +271,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -279,7 +279,7 @@ void DownloadPrefs::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, diff --git a/build/patches/show-download-prompt-again-by-default.patch b/build/patches/show-download-prompt-again-by-default.patch deleted file mode 100644 index 601d08a2..00000000 --- a/build/patches/show-download-prompt-again-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Daniel Micay -Date: Fri, 28 Jun 2019 17:48:49 -0400 -Subject: show download prompt again by default - ---- - .../chrome/browser/download/DownloadLocationCustomView.java | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadLocationCustomView.java ---- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadLocationCustomView.java -+++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadLocationCustomView.java -@@ -54,10 +54,6 @@ public class DownloadLocationCustomView - void initialize(@DownloadLocationDialogType int dialogType, File suggestedPath) { - mDialogType = dialogType; - -- // Automatically check "don't show again" the first time the user is seeing the dialog. -- boolean isInitial = DownloadLocationDialogBridge.getPromptForDownloadAndroid() -- == DownloadPromptStatus.SHOW_INITIAL; -- mDontShowAgain.setChecked(isInitial); - mDontShowAgain.setOnCheckedChangeListener(this); - - mFileName.setText(suggestedPath.getName()); --- -2.17.1 - diff --git a/build/patches/ungoogled-chromium-Disable-Gaia.patch b/build/patches/ungoogled-chromium-Disable-Gaia.patch index e83fbbd2..e2a17e01 100644 --- a/build/patches/ungoogled-chromium-Disable-Gaia.patch +++ b/build/patches/ungoogled-chromium-Disable-Gaia.patch @@ -16,17 +16,17 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -141,7 +141,6 @@ - - - -- + + + +- - - + + diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc -@@ -116,7 +116,6 @@ content::WebUIDataSource* CreateWebUIDataSource() { +@@ -112,7 +112,6 @@ content::WebUIDataSource* CreateWebUIDataSource() { static constexpr webui::ResourcePath kResources[] = { {"inline_login.css", IDR_INLINE_LOGIN_CSS}, {"inline_login.js", IDR_INLINE_LOGIN_JS}, diff --git a/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch b/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch index 160bff0b..d3e77c29 100644 --- a/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch +++ b/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch @@ -4,19 +4,19 @@ Subject: ungoogled-chromium: Disable Google host detection Disables various detections of Google hosts and functionality specific to them --- - components/google/core/common/google_util.cc | 238 +----------------- + components/google/core/common/google_util.cc | 241 +----------------- .../browser/page_load_metrics_util.cc | 4 +- .../common/page_load_metrics_util.cc | 33 +-- components/search_engines/template_url.cc | 6 +- net/base/url_util.cc | 21 -- - 5 files changed, 14 insertions(+), 288 deletions(-) + 5 files changed, 14 insertions(+), 291 deletions(-) diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -47,106 +47,6 @@ bool gUseMockLinkDoctorBaseURLForTesting = false; +@@ -45,109 +45,6 @@ namespace { - bool g_ignore_port_numbers = false; + bool gUseMockLinkDoctorBaseURLForTesting = false; -bool IsPathHomePageBase(base::StringPiece path) { - return (path == "/") || (path == "/webhp"); @@ -75,6 +75,9 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co -// is DISALLOW_NON_STANDARD_PORTS, this also requires |url| to use the standard -// port for its scheme (80 for HTTP, 443 for HTTPS). -bool IsValidURL(const GURL& url, PortPermission port_permission) { +- static bool g_ignore_port_numbers = +- base::CommandLine::ForCurrentProcess()->HasSwitch( +- switches::kIgnoreGooglePortNumbers); - return url.is_valid() && url.SchemeIsHTTPOrHTTPS() && - (url.port().empty() || g_ignore_port_numbers || - (port_permission == ALLOW_NON_STANDARD_PORTS)); @@ -121,7 +124,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co } // namespace // Global functions ----------------------------------------------------------- -@@ -154,19 +54,11 @@ bool IsGoogleSearchSubdomainUrl(const GURL& url) { +@@ -155,19 +52,11 @@ bool IsGoogleSearchSubdomainUrl(const GURL& url) { const char kGoogleHomepageURL[] = "https://www.google.com/"; bool HasGoogleSearchQueryParam(base::StringPiece str) { @@ -142,7 +145,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co } void SetMockLinkDoctorBaseURLForTesting() { -@@ -180,161 +72,53 @@ std::string GetGoogleLocale(const std::string& application_locale) { +@@ -181,161 +70,53 @@ std::string GetGoogleLocale(const std::string& application_locale) { GURL AppendGoogleLocaleParam(const GURL& url, const std::string& application_locale) { @@ -171,7 +174,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co - if (country_code == "cat") - return "es"; - return country_code.as_string(); -+ return "nolocale"; ++ return std::string(); } GURL GetGoogleSearchURL(const GURL& google_homepage_url) { @@ -317,7 +320,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co diff --git a/components/page_load_metrics/browser/page_load_metrics_util.cc b/components/page_load_metrics/browser/page_load_metrics_util.cc --- a/components/page_load_metrics/browser/page_load_metrics_util.cc +++ b/components/page_load_metrics/browser/page_load_metrics_util.cc -@@ -171,9 +171,7 @@ bool DidObserveLoadingBehaviorInAnyFrame( +@@ -184,9 +184,7 @@ bool DidObserveLoadingBehaviorInAnyFrame( } bool IsGoogleSearchHostname(const GURL& url) { @@ -374,7 +377,7 @@ diff --git a/components/page_load_metrics/common/page_load_metrics_util.cc b/com diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -508,11 +508,7 @@ base::string16 TemplateURLRef::SearchTermToString16( +@@ -510,11 +510,7 @@ base::string16 TemplateURLRef::SearchTermToString16( bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch index cea751de..bd772972 100644 --- a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch +++ b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch @@ -12,7 +12,7 @@ Added some Bromite-specific further improvements diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1423,8 +1423,6 @@ static_library("browser") { +@@ -1362,8 +1362,6 @@ static_library("browser") { "profiles/profile_attributes_entry.h", "profiles/profile_attributes_storage.cc", "profiles/profile_attributes_storage.h", @@ -24,7 +24,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -260,20 +260,6 @@ base::string16 ProfileAttributesEntry::GetUserName() const { +@@ -261,20 +261,6 @@ base::string16 ProfileAttributesEntry::GetUserName() const { } const gfx::Image& ProfileAttributesEntry::GetAvatarIcon() const { diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index 4e3d34ba..b194ba39 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -5,11 +5,11 @@ Subject: ungoogled-chromium: Disable translate integration Remove translate offer --- .../java/res/xml/languages_preferences.xml | 5 ---- - .../language/settings/LanguageSettings.java | 25 ------------------- + .../language/settings/LanguageSettings.java | 23 ------------------- .../strings/android_chrome_strings.grd | 3 --- .../core/browser/translate_manager.cc | 5 ++-- - .../core/browser/translate_script.cc | 16 ++---------- - 5 files changed, 5 insertions(+), 49 deletions(-) + .../core/browser/translate_script.cc | 16 ++----------- + 5 files changed, 5 insertions(+), 47 deletions(-) diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/android/java/res/xml/languages_preferences.xml --- a/chrome/android/java/res/xml/languages_preferences.xml @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/andr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -@@ -30,7 +30,6 @@ public class LanguageSettings +@@ -32,7 +32,6 @@ public class LanguageSettings // The keys for each preference shown on the languages page. static final String PREFERRED_LANGUAGES_KEY = "preferred_languages"; @@ -35,22 +35,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settin @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { -@@ -40,30 +39,6 @@ public class LanguageSettings +@@ -42,28 +41,6 @@ public class LanguageSettings LanguageListPreference mLanguageListPref = (LanguageListPreference) findPreference(PREFERRED_LANGUAGES_KEY); mLanguageListPref.registerActivityLauncher(this); - - ChromeSwitchPreference translateSwitch = - (ChromeSwitchPreference) findPreference(TRANSLATE_SWITCH_KEY); -- boolean isTranslateEnabled = -- PrefServiceBridge.getInstance().getBoolean(Pref.OFFER_TRANSLATE_ENABLED); +- boolean isTranslateEnabled = getPrefService().getBoolean(Pref.OFFER_TRANSLATE_ENABLED); - translateSwitch.setChecked(isTranslateEnabled); - - translateSwitch.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - boolean enabled = (boolean) newValue; -- PrefServiceBridge.getInstance().setBoolean(Pref.OFFER_TRANSLATE_ENABLED, enabled); +- getPrefService().setBoolean(Pref.OFFER_TRANSLATE_ENABLED, enabled); - mLanguageListPref.notifyPrefChanged(); - LanguagesManager.recordAction(enabled ? LanguagesManager.LanguageSettingsActionType - .ENABLE_TRANSLATE_GLOBALLY @@ -60,8 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settin - } - }); - translateSwitch.setManagedPreferenceDelegate((ChromeManagedPreferenceDelegate) preference -- -> PrefServiceBridge.getInstance().isManagedPreference( -- Pref.OFFER_TRANSLATE_ENABLED)); +- -> getPrefService().isManagedPreference(Pref.OFFER_TRANSLATE_ENABLED)); - LanguagesManager.recordImpression(LanguagesManager.LanguageSettingsPageType.PAGE_MAIN); } @@ -69,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settin 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 -@@ -875,9 +875,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -968,9 +968,6 @@ Your Google account may have other forms of browsing history like searches and a Websites will show text in your preferred language, when possible. diff --git a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch index a15e5653..c291b649 100644 --- a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch +++ b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch @@ -68,7 +68,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/b update_renderers_callback_(update_renderers_callback), url_loader_factory_(url_loader_factory), last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) { -@@ -128,7 +126,7 @@ ModelLoader::ModelLoader( +@@ -129,7 +127,7 @@ ModelLoader::ModelLoader( scoped_refptr url_loader_factory, const std::string& model_name) : name_(model_name),