diff --git a/build/patches/Bromite-adblock-engine.patch b/build/patches/Bromite-adblock-engine.patch index e931534e..0a5a8a33 100644 --- a/build/patches/Bromite-adblock-engine.patch +++ b/build/patches/Bromite-adblock-engine.patch @@ -18,12 +18,12 @@ New mechanism for adblocking based on Brave's adblocking hook .../browser/appmenu/AppMenuPropertiesDelegate.java | 38 +++ .../CustomTabAppMenuPropertiesDelegate.java | 2 + .../java/strings/android_chrome_strings.grd | 11 + - chrome/browser/net/chrome_network_delegate.cc | 83 +++-- + chrome/browser/net/chrome_network_delegate.cc | 62 ++++ .../subresource_filter_content_settings_manager.cc | 1 + net/BUILD.gn | 7 + net/url_request/adblock_intercept.cc | 341 +++++++++++++++++++++ net/url_request/adblock_intercept.h | 41 +++ - 12 files changed, 543 insertions(+), 20 deletions(-) + 12 files changed, 542 insertions(+) create mode 100644 net/url_request/adblock_intercept.cc create mode 100644 net/url_request/adblock_intercept.h @@ -213,7 +213,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ #endif #if defined(OS_CHROMEOS) -@@ -194,34 +196,75 @@ void ChromeNetworkDelegate::set_cookie_settings( +@@ -194,16 +196,76 @@ void ChromeNetworkDelegate::set_cookie_settings( cookie_settings_ = cookie_settings; } @@ -223,26 +223,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ net::URLRequest* request, net::CompletionOnceCallback callback, GURL* new_url) { -- extensions_delegate_->ForwardStartRequestStatus(request); -- -- // The non-redirect case is handled in GoogleURLLoaderThrottle. -- bool force_safe_search = -- (force_google_safe_search_ && force_google_safe_search_->GetValue() && -- request->is_redirecting()); -- -- net::CompletionOnceCallback wrapped_callback = std::move(callback); -- -- if (force_safe_search) { -- wrapped_callback = base::BindOnce( -- &ForceGoogleSafeSearchCallbackWrapper, std::move(wrapped_callback), -- base::Unretained(request), base::Unretained(new_url)); -- } - -- int rv = extensions_delegate_->NotifyBeforeURLRequest( -- request, std::move(wrapped_callback), new_url); -- -- if (force_safe_search && rv == net::OK && new_url->is_empty()) -- safe_search_util::ForceGoogleSafeSearch(request->url(), new_url); ++ +#if defined(OS_ANDROID) + if (request) { + bool block = false, isValidUrl; @@ -297,11 +278,11 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ + } // valid URL and info + } // request +#endif // OS_ANDROID ++ + extensions_delegate_->ForwardStartRequestStatus(request); -- return rv; -+ extensions_delegate_->ForwardStartRequestStatus(request); -+ return extensions_delegate_->NotifyBeforeURLRequest( -+ request, std::move(callback), new_url); + return extensions_delegate_->NotifyBeforeURLRequest( + request, std::move(callback), new_url); } +#undef TRANSPARENT1PXGIF diff --git a/build/patches/ungoogled-chromium-disable-safe-browsing.patch b/build/patches/ungoogled-chromium-disable-safe-browsing.patch index 49f76ccc..b1b62c2a 100644 --- a/build/patches/ungoogled-chromium-disable-safe-browsing.patch +++ b/build/patches/ungoogled-chromium-disable-safe-browsing.patch @@ -41,7 +41,7 @@ Subject: ungoogled-chromium: disable safe browsing diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2621,8 +2621,6 @@ jumbo_split_static_library("browser") { +@@ -2619,8 +2619,6 @@ jumbo_split_static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h",