From 7eaed0f05d6155072414f8becc591672fd11f5f7 Mon Sep 17 00:00:00 2001 From: uazo Date: Wed, 29 May 2024 15:58:51 +0000 Subject: [PATCH] [AUTO] Patches auto-rebase --- build/patches/Enable-Global-Privacy-Control.patch | 6 +++--- build/patches/Eyeo-Adblock-Remove-Privacy-Issues.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/patches/Enable-Global-Privacy-Control.patch b/build/patches/Enable-Global-Privacy-Control.patch index f228c86c..33d7e875 100644 --- a/build/patches/Enable-Global-Privacy-Control.patch +++ b/build/patches/Enable-Global-Privacy-Control.patch @@ -207,7 +207,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp 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 -@@ -392,6 +392,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -373,6 +373,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { (*s_allowlist)[::prefs::kTrackingProtectionLevel] = settings_api::PrefType::kNumber; (*s_allowlist)[::prefs::kEnableDoNotTrack] = settings_api::PrefType::kBoolean; @@ -231,7 +231,7 @@ diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/render diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -124,6 +124,7 @@ build_webui("build") { +@@ -123,6 +123,7 @@ build_webui("build") { "privacy_page/cookies_page.ts", "privacy_page/fingerprint_progress_arc.ts", "privacy_page/do_not_track_toggle.ts", @@ -439,7 +439,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/pref_watcher.cc --- a/chrome/browser/ui/prefs/pref_watcher.cc +++ b/chrome/browser/ui/prefs/pref_watcher.cc -@@ -168,6 +168,10 @@ void PrefWatcher::OnDoNotTrackEnabledChanged() { +@@ -155,6 +155,10 @@ void PrefWatcher::OnDoNotTrackEnabledChanged() { UpdateRendererPreferences(); } diff --git a/build/patches/Eyeo-Adblock-Remove-Privacy-Issues.patch b/build/patches/Eyeo-Adblock-Remove-Privacy-Issues.patch index 7e959af3..eedaef79 100644 --- a/build/patches/Eyeo-Adblock-Remove-Privacy-Issues.patch +++ b/build/patches/Eyeo-Adblock-Remove-Privacy-Issues.patch @@ -1055,7 +1055,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc "appearance_page/appearance_fonts_page.ts", "appearance_page/appearance_page.ts", "appearance_page/home_url_input.ts", -@@ -398,6 +399,7 @@ build_webui("build") { +@@ -399,6 +400,7 @@ build_webui("build") { ts_definitions = [ "//tools/typescript/definitions/autofill_private.d.ts", "//tools/typescript/definitions/chrome_event.d.ts",