PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Git apply result for master branch
This commit is contained in:
uazo
2024-02-08 07:28:21 +00:00
committed by GitHub
parent 74cf1d1c0e b65b503086
commit 0b445ac869
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/AdblockPlus-connect-popup-blocker.patch
+1 -1
View File
@@ -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;
}
build/patches/Enable-search-engine-settings-desktop-ui.patch
+1 -1
View File
@@ -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},