update and fix adblock plus

2023-02-03 16:45:41 +01:00
parent 55fe6f07e1
commit e8de884fea
4 changed files with 164400 additions and 39 deletions
@@ -214,7 +214,7 @@ Add-kill-switch-for-unsupported-clangd-flags.patch
 00Add-a-proxy-configuration-page--add-fixup-.patch

 00OpenSearch--miscellaneous--fixup-.patch
-00Eyeo-Adblock.patch
+00AdblockPlus.patch
 00Eyeo-Adblock-Remove-Privacy-Issues.patch
 00Add-an-always-incognito-mode--win-fixup-.patch
 00Experimental-user-scripts-support--win-fixup-.patch
@@ -272,4 +272,5 @@ AudioBuffer-AnalyserNode-fp-mitigations.patch
 00Remove-experimental-relative-c---abi-vtables.patch
 00Disable-MathMLCore.patch
 00fix-InitiatorOrigin--add-fixup-.patch
-00109-Add-an-always-incognito-mode-fixup.patch
+00109-Add-an-always-incognito-mode-fixup.patch
+00109-Fix-Adblock.patch
@@ -0,0 +1,22 @@
+From: Your Name <you@example.com>
+Date: Fri, 3 Feb 2023 15:31:39 +0000
+Subject: 109 Fix Adblock
+
+---
+ chrome/browser/ui/tab_helpers.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
+--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
+@@ -335,6 +335,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+   }
+ #endif
+ 
+  adblock::AdblockControllerFactory::GetForBrowserContext(
+      web_contents->GetBrowserContext());
+   AdblockWebContentObserver::CreateForWebContents(
+       web_contents,
+       adblock::SubscriptionServiceFactory::GetForBrowserContext(
+--
+2.25.1
@@ -1,37 +0,0 @@
-From: Your Name <you@example.com>
-Date: Thu, 13 Oct 2022 10:24:51 +0000
-Subject: Eyeo Adblock (win fixup)
-
---
- .../browser/resources/settings/adblock_page/adblock_page.ts   | 2 +-
- chrome/test/BUILD.gn                                          | 4 ----
- 2 files changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/chrome/browser/resources/settings/adblock_page/adblock_page.ts b/chrome/browser/resources/settings/adblock_page/adblock_page.ts
--- a/chrome/browser/resources/settings/adblock_page/adblock_page.ts
-+++ b/chrome/browser/resources/settings/adblock_page/adblock_page.ts
-@@ -15,7 +15,7 @@
-  * along with eyeo Chromium SDK.  If not, see <http://www.gnu.org/licenses/>.
-  */
- import 'chrome://resources/cr_elements/cr_button/cr_button.js';
-import 'chrome://resources/cr_elements/cr_shared_style.css.js';
-+//import 'chrome://resources/cr_elements/cr_shared_style.css.js';
- import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
- import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
- import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
-diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
-+++ b/chrome/test/BUILD.gn
-@@ -2392,10 +2392,6 @@ if (!is_android) {
-       "v8/wasm_trap_handler_browsertest.cc",
-     ]
- 
-    if (eyeo_intercept_debug_url) {
-      sources += [ "../browser/adblock/adblock_debug_url_browsertest.cc" ]
-    }
-
-     if (is_chrome_branded) {
-       sources += [ "../browser/ui/views/side_panel/lens/lens_side_panel_coordinator_browsertest.cc" ]
-     }
--
-2.25.1