From d092391c34cce2f8adda3ffbc5ff71015d7b9a88 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sat, 4 Mar 2023 12:00:32 +0100 Subject: [PATCH] v111 no changes --- ...-ADDNEW-Add-an-always-incognito-mode.patch | 2 +- .../00109-ADDNEW-Client-hints-overrides.patch | 2 +- ...Disable-fetching-of-all-field-trials.patch | 4 +- .../00109-ADDNEW-Enable-share-intent.patch | 6 +- ...DDNEW-Guard-for-user-agent-reduction.patch | 4 +- ...-HTTP-referrals-in-cross-origin-navi.patch | 12 +- .../00109-ADDTO-Add-webGL-site-setting.patch | 2 +- ...00109-ADDTO-Add-webRTC-site-settings.patch | 2 +- ...O-Disable-conversion-measurement-api.patch | 14 +-- .../00109-ADDTO-Timezone-customization.patch | 2 +- ...dd-custom-tab-intents-privacy-option.patch | 4 +- ...Add-lifetime-options-for-permissions.patch | 6 +- ...DDTO-Content-settings-infrastructure.patch | 4 +- ...10-ADDTO-Disable-all-predictors-code.patch | 2 +- ...ADDTO-Enable-native-Android-autofill.patch | 2 +- .../00110-ADDTO-JIT-site-settings.patch | 4 +- ...-Multiple-fingerprinting-mitigations.patch | 4 +- ...-Remove-signin-and-sync-integrations.patch | 2 +- ...rt-removal-of-execution-context-addr.patch | 2 +- ...rt-the-removal-of-an-option-to-block.patch | 4 +- .../00110-ADDTO-Site-setting-for-images.patch | 4 +- .../00110-ADDTO-Timezone-customization.patch | 14 +-- .../00Add-setting-to-clear-data-on-exit.patch | 26 ++--- .../patches/00Disable-BackForwardCache.patch | 14 ++- .../patches/00Disable-Component-Updates.patch | 4 +- build/patches/00Disable-FedCm.patch | 10 +- build/patches/00Disable-csp-reports.patch | 4 +- ...ct-the-entire-FrameTree-like-desktop.patch | 12 +- .../00Fonts-fingerprinting-mitigation.patch | 38 +++--- ...xperimental-relative-c---abi-vtables.patch | 2 +- .../00Viewport-Protection-Site-Setting.patch | 40 +++---- .../patches/00Viewport-Protection-flag.patch | 48 ++++---- ...O-AImageReader-CFI-crash-mitigations.patch | 2 +- ...ADDTO-Add-AllowUserCertificates-flag.patch | 2 +- ...ADDTO-Add-a-proxy-configuration-page.patch | 2 +- ...N-ADDTO-Add-an-always-incognito-mode.patch | 2 +- ...O-Add-bookmark-import-export-actions.patch | 10 +- ...d-flag-to-configure-maximum-connecti.patch | 2 +- ...DDTO-Add-flag-to-disable-IPv6-probes.patch | 8 +- ...d-flag-to-disable-external-intent-re.patch | 2 +- .../00WIN-ADDTO-Add-webGL-site-setting.patch | 59 +++------- ...00WIN-ADDTO-Add-webRTC-site-settings.patch | 57 ++------- ...DDTO-Content-settings-infrastructure.patch | 2 +- ...-ADDTO-Do-not-build-API-keys-infobar.patch | 6 +- ...TO-Experimental-user-scripts-support.patch | 38 +++--- .../00WIN-ADDTO-JIT-site-settings.patch | 28 ++--- .../00WIN-ADDTO-Logcat-crash-reports-UI.patch | 12 +- ...-Remove-signin-and-sync-integrations.patch | 38 +++--- ...TO-Restore-Search-Ready-Omnibox-flag.patch | 6 +- ...Revert-flags--remove-num-raster-thre.patch | 4 +- ...Revert-the-removal-to-block-autoplay.patch | 26 ++--- .../00WIN-ADDTO-Timezone-customization.patch | 24 ++-- ...penH264--enable-ARM-ARM64-optimizati.patch | 2 +- ...ngoogled-chr--Disable-profile-avatar.patch | 2 +- build/patches/00WIN-Disable-sharing-hub.patch | 2 +- ...able-Network-Service-Sandbox-and-CIG.patch | 2 +- ...enable-HighEfficiencyMode-by-default.patch | 4 +- ...-enable-file-system-access-blocklist.patch | 2 +- build/patches/00WIN-enable-pdf-plugin.patch | 2 +- build/patches/00add-browser-policy.patch | 24 ++-- .../AImageReader-CFI-crash-mitigations.patch | 12 +- .../Add-IsCleartextPermitted-flag.patch | 12 +- .../Add-a-proxy-configuration-page.patch | 20 ++-- .../Add-an-always-incognito-mode.patch | 110 +++++++++--------- .../Add-bookmark-import-export-actions.patch | 106 ++++++++--------- ...dd-custom-tab-intents-privacy-option.patch | 22 ++-- build/patches/Add-exit-menu-item.patch | 10 +- ...g-for-omnibox-autocomplete-filtering.patch | 20 ++-- .../Add-flag-for-save-data-header.patch | 14 +-- ...nfigure-maximum-connections-per-host.patch | 8 +- ...ontrol-video-playback-resume-feature.patch | 8 +- .../Add-flag-to-disable-IPv6-probes.patch | 10 +- ...-to-disable-external-intent-requests.patch | 10 +- .../Add-flag-to-disable-vibration.patch | 20 ++-- ...-switch-for-unsupported-clangd-flags.patch | 2 +- ...Add-lifetime-options-for-permissions.patch | 68 +++++------ .../Add-menu-item-to-view-source.patch | 24 ++-- ...-to-not-persist-tabs-across-sessions.patch | 4 +- .../Add-option-to-use-home-page-as-NTP.patch | 14 +-- build/patches/Add-site-engagement-flag.patch | 12 +- ...-support-for-ISupportHelpAndFeedback.patch | 8 +- build/patches/Add-webGL-site-setting.patch | 24 ++-- build/patches/Add-webRTC-site-settings.patch | 16 +-- ...ow-building-without-enable_reporting.patch | 18 +-- .../Allow-playing-audio-in-background.patch | 6 +- ...ioBuffer-AnalyserNode-fp-mitigations.patch | 14 +-- ...Block-gateway-attacks-via-websockets.patch | 14 +-- .../Block-qjz9zk-or-trk-requests.patch | 16 +-- .../Bookmarks-select-all-menu-entry.patch | 10 +- build/patches/Bromite-auto-updater.patch | 34 +++--- build/patches/Bromite-package-name.patch | 2 +- .../Bromite-subresource-adblocker.patch | 34 +++--- build/patches/Client-hints-overrides.patch | 14 +-- .../Content-settings-infrastructure.patch | 78 ++++++------- build/patches/Disable-AGSA-by-default.patch | 36 +++--- ...ble-Accessibility-service-by-default.patch | 8 +- .../patches/Disable-AsyncDNS-by-default.patch | 2 +- ...DRM-media-origin-IDs-preprovisioning.patch | 2 +- .../Disable-StartSurface-feature.patch | 2 +- build/patches/Disable-TLS-resumption.patch | 28 ++--- build/patches/Disable-all-promo-dialogs.patch | 4 +- .../Disable-conversion-measurement-api.patch | 22 ++-- build/patches/Disable-crash-reporting.patch | 2 +- ...Disable-fetching-of-all-field-trials.patch | 12 +- build/patches/Disable-idle-detection.patch | 2 +- ...-lock-icon-in-address-bar-by-default.patch | 2 +- ...media-router-and-remoting-by-default.patch | 10 +- .../Disable-offline-pages-in-CCT.patch | 4 +- .../patches/Disable-plugins-enumeration.patch | 2 +- build/patches/Disable-safety-check.patch | 10 +- .../Disable-smart-selection-by-default.patch | 16 +-- ...isable-some-signed-exchange-features.patch | 2 +- .../Disable-text-fragments-by-default.patch | 18 +-- ...Disable-the-DIAL-repeating-discovery.patch | 4 +- .../Disable-third-party-origin-trials.patch | 16 +-- build/patches/Disable-update-scheduler.patch | 8 +- build/patches/Disable-various-metrics.patch | 12 +- .../Do-not-build-API-keys-infobar.patch | 2 +- .../Do-not-compile-QR-code-sharing.patch | 10 +- .../Do-not-hide-component-extensions.patch | 2 +- .../patches/Do-not-link-with-libatomic.patch | 2 +- build/patches/DoH-improvements.patch | 6 +- .../Enable-Certificate-Transparency.patch | 16 +-- build/patches/Enable-HEVC-by-default.patch | 2 +- ...able-PermuteTLSExtensions-by-default.patch | 6 +- ...-SPPI-for-devices-with-enough-memory.patch | 2 +- ...ctOriginIsolation-and-SitePerProcess.patch | 8 +- ...e-darken-websites-checkbox-in-themes.patch | 4 +- ...fwrapv-in-Clang-for-non-UBSan-builds.patch | 2 +- .../Enable-native-Android-autofill.patch | 66 +++++------ ...-prefetch-privacy-changes-by-default.patch | 2 +- build/patches/Enable-share-intent.patch | 42 +++---- ...ble-third-party-storage-partitioning.patch | 2 +- .../Experimental-user-scripts-support.patch | 68 +++++------ .../Guard-for-user-agent-reduction.patch | 2 +- ...story-number-of-days-privacy-setting.patch | 18 +-- ...number-of-autocomplete-matches-to-10.patch | 20 ++-- ...ripts-for-AMP-tracking-ads-and-video.patch | 12 +- build/patches/JIT-site-settings.patch | 36 +++--- .../Keep-empty-tabs-between-sessions.patch | 4 +- ...-allow-screenshots-in-Incognito-mode.patch | 2 +- .../patches/Modify-default-preferences.patch | 24 ++-- ...nt-settings-back-to-privacy-settings.patch | 2 +- .../Multiple-fingerprinting-mitigations.patch | 59 +++++----- ...uiltin-autocomplete-for-chrome-flags.patch | 2 +- build/patches/OpenSearch-miscellaneous.patch | 8 +- .../patches/Override-Navigator-Language.patch | 2 +- .../Partition-Blink-memory-cache.patch | 22 ++-- .../Partition-blobs-by-top-frame-URL.patch | 8 +- .../patches/Re-introduce-kWebAuthCable.patch | 34 +++--- ...-modal-dialog-flag-to-close-all-tabs.patch | 30 ++--- ...e-introduce-override_build_timestamp.patch | 2 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 6 +- ...referrals-in-cross-origin-navigation.patch | 6 +- ...cklisted-URLs-upon-bookmark-creation.patch | 2 +- build/patches/Remove-help-menu-item.patch | 12 +- ...-mremap-from-seccomp-baseline-policy.patch | 2 +- .../Remove-navigator.connection-info.patch | 4 +- .../Remove-segmentation-platform.patch | 2 +- ...weblayer-dependency-on-Play-Services.patch | 2 +- ...ndow-name-on-cross-origin-navigation.patch | 4 +- .../Restore-Search-Ready-Omnibox-flag.patch | 34 +++--- .../Restore-Simplified-NTP-launch.patch | 34 +++--- ...-button-in-top-toolbar-customization.patch | 10 +- ...Delete-block-external-form-redirects.patch | 47 ++++---- ...emove-disable-pull-to-refresh-effect.patch | 8 +- ...vert-flags-remove-num-raster-threads.patch | 10 +- ...l-of-execution-context-address-space.patch | 52 ++++----- ...moval-of-an-option-to-block-autoplay.patch | 34 +++--- ...tings-for-cookies-javascript-and-ads.patch | 8 +- build/patches/Site-setting-for-images.patch | 44 +++---- .../Switch-to-fstack-protector-strong.patch | 2 +- build/patches/Timezone-customization.patch | 84 ++++++------- build/patches/Unexpire-tab-groups-flags.patch | 6 +- build/patches/Update-i18n-zh_CN-support.patch | 55 +-------- .../Use-4-tile-rows-never-show-logo.patch | 6 +- build/patches/User-agent-customization.patch | 50 ++++---- build/patches/Welcome-screen.patch | 70 +++++------ build/patches/autofill-miscellaneous.patch | 30 ++--- ...build-remove-calling-untrusted-hooks.patch | 6 +- .../disable-WebView-variations-support.patch | 4 +- ...IPv6-connectivity-probes-to-RIPE-DNS.patch | 2 +- .../do-not-add-suffix-to-package-name.patch | 2 +- build/patches/do-not-hide-.orig-files.patch | 2 +- .../enable-ftrivial-auto-var-init-zero.patch | 2 +- build/patches/kill-Vision.patch | 2 +- ...nH264-enable-ARM-ARM64-optimizations.patch | 2 +- ...hromium-Disable-Network-Time-Tracker.patch | 2 +- ...gled-chromium-Disable-profile-avatar.patch | 2 +- ...romium-Disable-translate-integration.patch | 2 +- ...ed-chromium-no-special-hosts-domains.patch | 31 +++-- ...RTC-do-not-expose-local-IP-addresses.patch | 6 +- 192 files changed, 1397 insertions(+), 1509 deletions(-) diff --git a/build/patches/00109-ADDNEW-Add-an-always-incognito-mode.patch b/build/patches/00109-ADDNEW-Add-an-always-incognito-mode.patch index 484c869b..23f61076 100644 --- a/build/patches/00109-ADDNEW-Add-an-always-incognito-mode.patch +++ b/build/patches/00109-ADDNEW-Add-an-always-incognito-mode.patch @@ -19,7 +19,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; -@@ -583,9 +586,13 @@ public class ChromeTabbedActivity extends ChromeActivityRegisterIntegerPref( prefs::kUserAgentReduction, static_cast( @@ -53,7 +53,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc 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 -@@ -2902,7 +2902,8 @@ +@@ -2959,7 +2959,8 @@ base_feature: "UserAgentClientHint", }, { diff --git a/build/patches/00109-ADDNEW-Remove-HTTP-referrals-in-cross-origin-navi.patch b/build/patches/00109-ADDNEW-Remove-HTTP-referrals-in-cross-origin-navi.patch index 01211bab..229f7281 100644 --- a/build/patches/00109-ADDNEW-Remove-HTTP-referrals-in-cross-origin-navi.patch +++ b/build/patches/00109-ADDNEW-Remove-HTTP-referrals-in-cross-origin-navi.patch @@ -29,7 +29,7 @@ Subject: 109 ADDNEW Remove HTTP referrals in cross origin 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 -@@ -661,6 +661,8 @@ chrome_java_resources = [ +@@ -643,6 +643,8 @@ chrome_java_resources = [ "java/res/xml/incognito_preferences.xml", "java/res/xml/privacy_preferences.xml", "java/res/xml/privacy_preferences_v2.xml", @@ -41,7 +41,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 -@@ -908,6 +908,8 @@ chrome_java_sources = [ +@@ -895,6 +895,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java", @@ -412,7 +412,7 @@ diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/render 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 -@@ -894,8 +894,29 @@ CHAR_LIMIT guidelines: +@@ -888,8 +888,29 @@ CHAR_LIMIT guidelines: For example, some websites may respond to this request by showing you ads that aren’t based on other websites you’ve visited. Many websites will still collect and use your browsing data — for example to improve security, to provide content, ads and recommendations, and to generate reporting statistics. @@ -471,7 +471,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre 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 -@@ -1433,6 +1433,9 @@ const char kEnableHyperlinkAuditing[] = "enable_a_ping"; +@@ -1392,6 +1392,9 @@ const char kEnableHyperlinkAuditing[] = "enable_a_ping"; // Whether to enable sending referrers. const char kEnableReferrers[] = "enable_referrers"; @@ -484,7 +484,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 -@@ -443,6 +443,7 @@ extern const char kPinnedTabs[]; +@@ -435,6 +435,7 @@ extern const char kPinnedTabs[]; extern const char kDisable3DAPIs[]; extern const char kEnableHyperlinkAuditing[]; extern const char kEnableReferrers[]; @@ -495,7 +495,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -444,8 +444,9 @@ void AddAdditionalRequestHeaders( +@@ -448,8 +448,9 @@ void AddAdditionalRequestHeaders( blink::mojom::Referrer(GURL(), network::mojom::ReferrerPolicy::kNever); } diff --git a/build/patches/00109-ADDTO-Add-webGL-site-setting.patch b/build/patches/00109-ADDTO-Add-webGL-site-setting.patch index 1f76a7e3..1f5d63fa 100644 --- a/build/patches/00109-ADDTO-Add-webGL-site-setting.patch +++ b/build/patches/00109-ADDTO-Add-webGL-site-setting.patch @@ -9,7 +9,7 @@ Subject: 109 ADDTO Add webGL site setting diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -616,9 +616,9 @@ void ContentSettingsRegistry::Init() { +@@ -581,9 +581,9 @@ void ContentSettingsRegistry::Init() { Register(ContentSettingsType::WEBGL, "webgl", CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE, diff --git a/build/patches/00109-ADDTO-Add-webRTC-site-settings.patch b/build/patches/00109-ADDTO-Add-webRTC-site-settings.patch index b9b73b22..f3f4c664 100644 --- a/build/patches/00109-ADDTO-Add-webRTC-site-settings.patch +++ b/build/patches/00109-ADDTO-Add-webRTC-site-settings.patch @@ -9,7 +9,7 @@ Subject: 109 ADDTO Add webRTC site settings diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -630,9 +630,9 @@ void ContentSettingsRegistry::Init() { +@@ -595,9 +595,9 @@ void ContentSettingsRegistry::Init() { Register(ContentSettingsType::WEBRTC, "webrtc", CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE, diff --git a/build/patches/00109-ADDTO-Disable-conversion-measurement-api.patch b/build/patches/00109-ADDTO-Disable-conversion-measurement-api.patch index 45cef85d..270a1c24 100644 --- a/build/patches/00109-ADDTO-Disable-conversion-measurement-api.patch +++ b/build/patches/00109-ADDTO-Disable-conversion-measurement-api.patch @@ -10,17 +10,17 @@ Subject: 109 ADDTO Disable conversion measurement api diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc --- a/content/browser/attribution_reporting/attribution_report_network_sender.cc +++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc -@@ -80,6 +80,9 @@ void AttributionReportNetworkSender::SendReport( - void AttributionReportNetworkSender::SendReport(GURL url, - base::ValueView report_body, +@@ -83,6 +83,9 @@ void AttributionReportNetworkSender::SendReport(GURL url, + const std::string& body, + net::HttpRequestHeaders headers, UrlLoaderCallback callback) { + // this is never called on Bromite but nothing would be sent if it were + if ((true)) return; + auto resource_request = std::make_unique(); resource_request->url = std::move(url); - resource_request->method = net::HttpRequestHeaders::kPostMethod; -@@ -140,8 +143,9 @@ void AttributionReportNetworkSender::SendReport(GURL url, + resource_request->headers = std::move(headers); +@@ -143,8 +146,9 @@ void AttributionReportNetworkSender::SendReport(GURL url, network::SimpleURLLoader::RETRY_ON_NAME_NOT_RESOLVED; simple_url_loader_ptr->SetRetryOptions(/*max_retries=*/1, retry_mode); @@ -35,7 +35,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1835,7 +1835,7 @@ RenderThreadImpl::GetOsSupportForAttributionReporting() { +@@ -1833,7 +1833,7 @@ RenderThreadImpl::GetOsSupportForAttributionReporting() { void RenderThreadImpl::SetOsSupportForAttributionReporting( attribution_reporting::mojom::OsSupport attribution_os_support) { @@ -43,6 +43,6 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th + attribution_os_support_ = attribution_reporting::mojom::OsSupport::kDisabled; } - } // namespace content + std::unique_ptr RenderThreadImpl::CreateMediaCodecFactory( -- 2.25.1 diff --git a/build/patches/00109-ADDTO-Timezone-customization.patch b/build/patches/00109-ADDTO-Timezone-customization.patch index 231d8465..26a338f8 100644 --- a/build/patches/00109-ADDTO-Timezone-customization.patch +++ b/build/patches/00109-ADDTO-Timezone-customization.patch @@ -9,7 +9,7 @@ Subject: 109 ADDTO Timezone customization diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -594,10 +594,10 @@ void ContentSettingsRegistry::Init() { +@@ -560,10 +560,10 @@ void ContentSettingsRegistry::Init() { Register(ContentSettingsType::TIMEZONE_OVERRIDE, "timezone-override", CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::SYNCABLE, diff --git a/build/patches/00110-ADDTO-Add-custom-tab-intents-privacy-option.patch b/build/patches/00110-ADDTO-Add-custom-tab-intents-privacy-option.patch index d7b0a8a6..deb69b5b 100644 --- a/build/patches/00110-ADDTO-Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/00110-ADDTO-Add-custom-tab-intents-privacy-option.patch @@ -10,7 +10,7 @@ Subject: 110 ADDTO Add custom tab intents privacy option diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -576,8 +576,8 @@ BASE_FEATURE(kCCTIncognitoAvailableToThirdParty, +@@ -553,8 +553,8 @@ BASE_FEATURE(kCCTIncognitoAvailableToThirdParty, base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite BASE_FEATURE(kCCTIntentFeatureOverrides, @@ -21,7 +21,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse BASE_FEATURE(kCCTPackageNameRecording, "CCTPackageNameRecording", -@@ -585,7 +585,7 @@ BASE_FEATURE(kCCTPackageNameRecording, +@@ -562,7 +562,7 @@ BASE_FEATURE(kCCTPackageNameRecording, BASE_FEATURE(kCCTPostMessageAPI, "CCTPostMessageAPI", diff --git a/build/patches/00110-ADDTO-Add-lifetime-options-for-permissions.patch b/build/patches/00110-ADDTO-Add-lifetime-options-for-permissions.patch index f469a8b9..76f3701f 100644 --- a/build/patches/00110-ADDTO-Add-lifetime-options-for-permissions.patch +++ b/build/patches/00110-ADDTO-Add-lifetime-options-for-permissions.patch @@ -23,7 +23,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr diff --git a/components/permissions/permission_request.cc b/components/permissions/permission_request.cc --- a/components/permissions/permission_request.cc +++ b/components/permissions/permission_request.cc -@@ -245,7 +245,7 @@ void PermissionRequest::PermissionGranted(bool is_one_time, +@@ -247,7 +247,7 @@ void PermissionRequest::PermissionGranted(bool is_one_time, content_settings::LifetimeMode lifetime_option) { if (permission_decided_callback_withlifetime_) { std::move(permission_decided_callback_withlifetime_) @@ -32,7 +32,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio return; } std::move(permission_decided_callback_) -@@ -257,7 +257,7 @@ void PermissionRequest::PermissionDenied(bool is_one_time, +@@ -259,7 +259,7 @@ void PermissionRequest::PermissionDenied(bool is_one_time, content_settings::LifetimeMode lifetime_option) { if (permission_decided_callback_withlifetime_) { std::move(permission_decided_callback_withlifetime_) @@ -41,7 +41,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio return; } std::move(permission_decided_callback_) -@@ -268,7 +268,7 @@ void PermissionRequest::PermissionDenied(bool is_one_time, +@@ -270,7 +270,7 @@ void PermissionRequest::PermissionDenied(bool is_one_time, void PermissionRequest::Cancelled(bool is_final_decision) { if (permission_decided_callback_withlifetime_) { std::move(permission_decided_callback_withlifetime_) diff --git a/build/patches/00110-ADDTO-Content-settings-infrastructure.patch b/build/patches/00110-ADDTO-Content-settings-infrastructure.patch index b5928735..dd4b856a 100644 --- a/build/patches/00110-ADDTO-Content-settings-infrastructure.patch +++ b/build/patches/00110-ADDTO-Content-settings-infrastructure.patch @@ -23,7 +23,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git 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 --- 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 -@@ -917,12 +917,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -955,12 +955,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment default: break; } @@ -38,7 +38,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (allowSpecifyingExceptions) { getPreferenceScreen().addPreference(new AddExceptionPreference(getStyledContext(), ADD_EXCEPTION_KEY, getAddExceptionDialogMessage(), mCategory, this)); -@@ -1462,12 +1458,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1500,12 +1496,12 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment @ContentSettingValues Integer value = site.getContentSetting(browserContextHandle, contentSettingsType); diff --git a/build/patches/00110-ADDTO-Disable-all-predictors-code.patch b/build/patches/00110-ADDTO-Disable-all-predictors-code.patch index 2856d461..c96b34f2 100644 --- a/build/patches/00110-ADDTO-Disable-all-predictors-code.patch +++ b/build/patches/00110-ADDTO-Disable-all-predictors-code.patch @@ -24,7 +24,7 @@ diff --git a/chrome/browser/predictors/loading_predictor_config.cc b/chrome/brow 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 -@@ -2217,7 +2217,7 @@ +@@ -2252,7 +2252,7 @@ { // https://crbug.com/1126305 name: "Prerender2", diff --git a/build/patches/00110-ADDTO-Enable-native-Android-autofill.patch b/build/patches/00110-ADDTO-Enable-native-Android-autofill.patch index 22c586c7..141ffb93 100644 --- a/build/patches/00110-ADDTO-Enable-native-Android-autofill.patch +++ b/build/patches/00110-ADDTO-Enable-native-Android-autofill.patch @@ -9,7 +9,7 @@ Subject: 110 ADDTO Enable native Android autofill diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc --- a/components/autofill/content/browser/content_autofill_driver.cc +++ b/components/autofill/content/browser/content_autofill_driver.cc -@@ -435,7 +435,7 @@ void ContentAutofillDriver::AskForValuesToFill( +@@ -423,7 +423,7 @@ void ContentAutofillDriver::AskForValuesToFill( form, field, bounding_box, autoselect_first_suggestion, form_element_was_clicked); if (target->secondary_autofill_manager_) diff --git a/build/patches/00110-ADDTO-JIT-site-settings.patch b/build/patches/00110-ADDTO-JIT-site-settings.patch index ae0d13b3..c22d7d8a 100644 --- a/build/patches/00110-ADDTO-JIT-site-settings.patch +++ b/build/patches/00110-ADDTO-JIT-site-settings.patch @@ -9,7 +9,7 @@ Subject: 110 ADDTO JIT site settings diff --git 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 --- 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 -@@ -920,6 +920,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -958,6 +958,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case SiteSettingsCategory.Type.AUTOPLAY: allowSpecifyingExceptions = true; break; @@ -19,7 +19,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c default: break; } -@@ -1184,8 +1187,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1222,8 +1225,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment infoText.setSummary(R.string.website_settings_cookie_info); } else if (mCategory.getType() == SiteSettingsCategory.Type.IMAGES) { allowSpecifyingExceptions = true; diff --git a/build/patches/00110-ADDTO-Multiple-fingerprinting-mitigations.patch b/build/patches/00110-ADDTO-Multiple-fingerprinting-mitigations.patch index f4eb4de2..2ad50136 100644 --- a/build/patches/00110-ADDTO-Multiple-fingerprinting-mitigations.patch +++ b/build/patches/00110-ADDTO-Multiple-fingerprinting-mitigations.patch @@ -12,7 +12,7 @@ Subject: 110 ADDTO Multiple fingerprinting mitigations diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -826,10 +826,12 @@ Document::Document(const DocumentInit& initializer, +@@ -829,10 +829,12 @@ Document::Document(const DocumentInit& initializer, : nullptr), data_(MakeGarbageCollected(GetExecutionContext())) { DCHECK(agent_); @@ -116,7 +116,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscre #include "base/trace_event/trace_event.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_union_gpucanvascontext_imagebitmaprenderingcontext_offscreencanvasrenderingcontext2d_webgl2renderingcontext_webglrenderingcontext.h" -@@ -756,9 +757,15 @@ TextMetrics* OffscreenCanvasRenderingContext2D::measureText( +@@ -754,9 +755,15 @@ TextMetrics* OffscreenCanvasRenderingContext2D::measureText( TextDirection direction = ToTextDirection(GetState().GetDirection()); diff --git a/build/patches/00110-ADDTO-Remove-signin-and-sync-integrations.patch b/build/patches/00110-ADDTO-Remove-signin-and-sync-integrations.patch index a9e6da10..6da9fa2b 100644 --- a/build/patches/00110-ADDTO-Remove-signin-and-sync-integrations.patch +++ b/build/patches/00110-ADDTO-Remove-signin-and-sync-integrations.patch @@ -14,7 +14,7 @@ Subject: 110 ADDTO Remove signin and sync integrations diff --git a/chrome/android/java/res/xml/privacy_preferences_v2.xml b/chrome/android/java/res/xml/privacy_preferences_v2.xml --- a/chrome/android/java/res/xml/privacy_preferences_v2.xml +++ b/chrome/android/java/res/xml/privacy_preferences_v2.xml -@@ -74,8 +74,4 @@ found in the LICENSE file. +@@ -70,8 +70,4 @@ found in the LICENSE file. android:key="can_make_payment" android:title="@string/can_make_payment_title" android:summary="@string/settings_can_make_payment_toggle_label" /> diff --git a/build/patches/00110-ADDTO-Revert-removal-of-execution-context-addr.patch b/build/patches/00110-ADDTO-Revert-removal-of-execution-context-addr.patch index 5eede5c8..e4244279 100644 --- a/build/patches/00110-ADDTO-Revert-removal-of-execution-context-addr.patch +++ b/build/patches/00110-ADDTO-Revert-removal-of-execution-context-addr.patch @@ -9,7 +9,7 @@ Subject: 110 ADDTO Revert removal of execution context addr 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 -@@ -162,7 +162,7 @@ BASE_FEATURE(kBlockInsecurePrivateNetworkRequestsFromPrivate, +@@ -181,7 +181,7 @@ BASE_FEATURE(kBlockInsecurePrivateNetworkRequestsFromPrivate, // - kBlockInsecurePrivateNetworkRequests BASE_FEATURE(kBlockInsecurePrivateNetworkRequestsFromUnknown, "BlockInsecurePrivateNetworkRequestsFromUnknown", diff --git a/build/patches/00110-ADDTO-Revert-the-removal-of-an-option-to-block.patch b/build/patches/00110-ADDTO-Revert-the-removal-of-an-option-to-block.patch index 9fe2fc2f..d75720a1 100644 --- a/build/patches/00110-ADDTO-Revert-the-removal-of-an-option-to-block.patch +++ b/build/patches/00110-ADDTO-Revert-the-removal-of-an-option-to-block.patch @@ -9,7 +9,7 @@ Subject: 110 ADDTO Revert the removal of an option to block diff --git 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 --- 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 -@@ -917,6 +917,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -955,6 +955,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case SiteSettingsCategory.Type.TIMEZONE_OVERRIDE: allowSpecifyingExceptions = true; break; @@ -19,7 +19,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c default: break; } -@@ -1179,8 +1182,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1217,8 +1220,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment Preference infoText = screen.findPreference(INFO_TEXT_KEY); if (mCategory.getType() == SiteSettingsCategory.Type.COOKIES) { infoText.setSummary(R.string.website_settings_cookie_info); diff --git a/build/patches/00110-ADDTO-Site-setting-for-images.patch b/build/patches/00110-ADDTO-Site-setting-for-images.patch index 943ae114..40f23397 100644 --- a/build/patches/00110-ADDTO-Site-setting-for-images.patch +++ b/build/patches/00110-ADDTO-Site-setting-for-images.patch @@ -9,7 +9,7 @@ Subject: 110 ADDTO Site setting for images diff --git 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 --- 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 -@@ -920,6 +920,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -958,6 +958,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case SiteSettingsCategory.Type.AUTOPLAY: allowSpecifyingExceptions = true; break; @@ -19,7 +19,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c case SiteSettingsCategory.Type.JAVASCRIPT_JIT: allowSpecifyingExceptions = true; break; -@@ -1185,8 +1188,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1223,8 +1226,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment Preference infoText = screen.findPreference(INFO_TEXT_KEY); if (mCategory.getType() == SiteSettingsCategory.Type.COOKIES) { infoText.setSummary(R.string.website_settings_cookie_info); diff --git a/build/patches/00110-ADDTO-Timezone-customization.patch b/build/patches/00110-ADDTO-Timezone-customization.patch index 7333d180..1527a335 100644 --- a/build/patches/00110-ADDTO-Timezone-customization.patch +++ b/build/patches/00110-ADDTO-Timezone-customization.patch @@ -10,7 +10,7 @@ Subject: 110 ADDTO Timezone customization diff --git 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 --- 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 -@@ -153,7 +153,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -165,7 +165,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment // The websites that are currently displayed to the user. private List mWebsites; // Whether tri-state ContentSetting is required. @@ -19,7 +19,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c // The "notifications_quiet_ui" preference to allow hiding/showing it. private ChromeBaseCheckBoxPreference mNotificationsQuietUiPref; // The "desktop_site_peripheral" preference to allow hiding/showing it. -@@ -791,7 +791,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -829,7 +829,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment resource = WebsitePreferenceBridge.isCategoryEnabled( browserContextHandle, ContentSettingsType.TIMEZONE_OVERRIDE) ? R.string.website_settings_category_timezone_override_allowed @@ -28,7 +28,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c break; } if (resource == 0) -@@ -914,6 +914,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -952,6 +952,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment case SiteSettingsCategory.Type.THIRD_PARTY_COOKIES: allowSpecifyingExceptions = getCookieControlsMode() != CookieControlsMode.OFF; break; @@ -38,7 +38,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c default: break; } -@@ -1135,6 +1138,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1173,6 +1176,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment PreferenceGroup blockedGroup = screen.findPreference(BLOCKED_GROUP); PreferenceGroup managedGroup = screen.findPreference(MANAGED_GROUP); boolean permissionBlockedByOs = mCategory.showPermissionBlockedMessage(getContext()); @@ -48,7 +48,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (mGlobalToggleLayout != GlobalToggleLayout.BINARY_TOGGLE) { screen.removePreference(binaryToggle); -@@ -1148,11 +1154,18 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1186,11 +1192,18 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment if (mGlobalToggleLayout != GlobalToggleLayout.FOUR_STATE_COOKIE_TOGGLE) { screen.removePreference(fourStateCookieToggle); } @@ -67,7 +67,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c configureTriStateToggle(triStateToggle, contentType); break; case GlobalToggleLayout.TRI_STATE_COOKIE_TOGGLE: -@@ -1179,6 +1192,13 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1217,6 +1230,13 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment } else { screen.removePreference(infoText); } @@ -81,7 +81,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c BromiteCustomContentSettingImpl.configureGlobalToggles(mCategory, screen); if (permissionBlockedByOs) { -@@ -1249,18 +1269,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment +@@ -1287,18 +1307,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment mListView.setFocusable(true); } diff --git a/build/patches/00Add-setting-to-clear-data-on-exit.patch b/build/patches/00Add-setting-to-clear-data-on-exit.patch index a0ea3b26..3ab49134 100644 --- a/build/patches/00Add-setting-to-clear-data-on-exit.patch +++ b/build/patches/00Add-setting-to-clear-data-on-exit.patch @@ -31,7 +31,7 @@ Subject: Add setting to clear data on exit 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 -@@ -272,6 +272,7 @@ chrome_java_sources = [ +@@ -274,6 +274,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAdvanced.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java", @@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler; import org.chromium.chrome.browser.read_later.ReadingListUtils; import org.chromium.chrome.browser.reengagement.ReengagementNotificationController; -@@ -1321,7 +1322,11 @@ public class ChromeTabbedActivity extends ChromeActivity Clear browsing data @@ -317,7 +317,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -474,6 +474,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -484,6 +484,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] = settings_api::PrefType::PREF_TYPE_NUMBER; @@ -362,7 +362,7 @@ diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/browser/profiles/android/profile_manager_utils.cc --- a/chrome/browser/profiles/android/profile_manager_utils.cc +++ b/chrome/browser/profiles/android/profile_manager_utils.cc -@@ -66,3 +66,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles( +@@ -67,3 +67,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles( g_browser_process->profile_manager()->GetLoadedProfiles(), RemoveSessionCookiesForProfile); } @@ -374,7 +374,7 @@ diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/b diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1390,6 +1390,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, +@@ -1407,6 +1407,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, } } @@ -409,7 +409,7 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html -@@ -283,6 +283,50 @@ +@@ -282,6 +282,50 @@ disabled="[[clearingInProgress_]]" no-set-pref> @@ -463,7 +463,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts -@@ -229,6 +229,7 @@ export class SettingsClearBrowsingDataDialogElement extends +@@ -201,6 +201,7 @@ export class SettingsClearBrowsingDataDialogElement extends value: () => [loadTimeData.getString('basicPageTitle'), loadTimeData.getString('advancedPageTitle'), @@ -474,7 +474,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ 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 -@@ -1649,6 +1649,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1489,6 +1489,9 @@ Your Google account may have other forms of browsing history like searches and a Basic @@ -487,7 +487,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -1705,6 +1705,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1686,6 +1686,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"clearedData", IDS_SETTINGS_CLEARED_DATA}, {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, diff --git a/build/patches/00Disable-BackForwardCache.patch b/build/patches/00Disable-BackForwardCache.patch index 926fa277..94e8aa5e 100644 --- a/build/patches/00Disable-BackForwardCache.patch +++ b/build/patches/00Disable-BackForwardCache.patch @@ -3,22 +3,24 @@ Date: Tue, 14 Feb 2023 16:29:12 +0000 Subject: Disable BackForwardCache --- - content/public/common/content_features.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + content/public/common/content_features.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) 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 -@@ -87,8 +87,8 @@ BASE_FEATURE(kBackgroundFetch, +@@ -92,9 +92,9 @@ BASE_FEATURE(kBackgroundFetch, + base::FEATURE_ENABLED_BY_DEFAULT); // Enable using the BackForwardCache. - BASE_FEATURE(kBackForwardCache, +-BASE_FEATURE(kBackForwardCache, - "BackForwardCache", - base::FEATURE_ENABLED_BY_DEFAULT); ++BASE_FEATURE(kBackForwardCache, // **** + "BackForwardCache", // always disabled + base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - // Allows pages that created a MediaSession service to stay eligible for the - // back/forward cache. + // Enables reporting ResourceTiming entries for document, who initiated a + // cancelled navigation in one of their