Merge pull request #786 from uazo/create-pull-request/patch-74cf1d1

Git apply result for master branch
uazo · Feb 8, 2024 · 0b445ac · 0b445ac
2 parents 74cf1d1 + b65b503
commit 0b445ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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},