From 7964586035e740bd1d6bd66112f12b93a6dcfa22 Mon Sep 17 00:00:00 2001 From: uazo Date: Mon, 5 Feb 2024 07:36:58 +0000 Subject: [PATCH] AUTOMATED - git apply results --- build/patches/AdblockPlus-connect-popup-blocker.patch | 2 +- build/patches/Enable-search-engine-settings-desktop-ui.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/patches/AdblockPlus-connect-popup-blocker.patch b/build/patches/AdblockPlus-connect-popup-blocker.patch index 3c1bd528c..9449fe264 100644 --- a/build/patches/AdblockPlus-connect-popup-blocker.patch +++ b/build/patches/AdblockPlus-connect-popup-blocker.patch @@ -116,7 +116,7 @@ diff --git a/components/blocked_content/popup_blocker.cc b/components/blocked_co namespace { content::Page& GetSourcePageForPopup( -@@ -88,7 +93,9 @@ PopupBlockType ShouldBlockPopup(content::WebContents* web_contents, +@@ -91,7 +96,9 @@ PopupBlockType ShouldBlockPopup(content::WebContents* web_contents, GetSourcePageForPopup(open_url_params, web_contents))) { return PopupBlockType::kAbusive; } diff --git a/build/patches/Enable-search-engine-settings-desktop-ui.patch b/build/patches/Enable-search-engine-settings-desktop-ui.patch index a239dec19..614d8f722 100644 --- a/build/patches/Enable-search-engine-settings-desktop-ui.patch +++ b/build/patches/Enable-search-engine-settings-desktop-ui.patch @@ -1261,7 +1261,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.h b/chrome/ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2474,6 +2474,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) { +@@ -2475,6 +2475,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) { {"searchEnginesQueryURL", IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL}, {"searchEnginesQueryURLExplanation", IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL_EXPLANATION},