diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 53dbda39d..31ac5f916 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 5186cdf0bcf3b..deb65db4ed097 100644 +index 2af2794b353d8..3bae40ac0fe9d 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -10,7 +10,7 @@ index 5186cdf0bcf3b..deb65db4ed097 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/browser/request_header_integrity/buildflags.gni") -@@ -1876,6 +1877,7 @@ static_library("browser") { +@@ -1878,6 +1879,7 @@ static_library("browser") { "//build/config/compiler:compiler_buildflags", "//build/config/linux/dbus:buildflags", "//cc", @@ -18,7 +18,7 @@ index 5186cdf0bcf3b..deb65db4ed097 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2575,6 +2577,10 @@ static_library("browser") { +@@ -2577,6 +2579,10 @@ static_library("browser") { sources += [ "net/net_error_diagnostics_dialog_stub.cc" ] } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index a251fd95a..87725beca 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -83,7 +83,7 @@ index 8e0717f34f37f..df852d4b2e69f 100644 OverrideAndSyncDevToolsRendererPrefs(); } diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 51c55cb054ae7..df9aa9bc45a67 100644 +index 7151a2ff7d5f9..74ea94c6908e8 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -7,6 +7,7 @@ import("//build/config/compiler/compiler.gni") @@ -113,7 +113,7 @@ index 51c55cb054ae7..df9aa9bc45a67 100644 "//chrome:resources", "//chrome:strings", "//chrome/app:chrome_dll_resources", -@@ -701,6 +707,13 @@ static_library("ui") { +@@ -703,6 +709,13 @@ static_library("ui") { deps += [ "//components/plus_addresses/resources:vector_icons" ] } @@ -127,7 +127,7 @@ index 51c55cb054ae7..df9aa9bc45a67 100644 # TODO(crbug.com/41437292): Remove this circular dependency. # Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies". # These are all-platform circular includes. -@@ -5501,6 +5514,7 @@ static_library("ui") { +@@ -5503,6 +5516,7 @@ static_library("ui") { if (enable_printing) { deps += [ "//components/printing/browser", diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 785270f40..35b2eeb11 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -433,7 +433,7 @@ index e26e3625c99c8..c0d4a95607e37 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 5b8b1bf1bc86e..8d2274c606ef4 100644 +index a7d66215ad0b7..3282ea58c5872 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -48,6 +48,7 @@ @@ -444,7 +444,7 @@ index 5b8b1bf1bc86e..8d2274c606ef4 100644 #include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/ai/ai_manager.h" #include "chrome/browser/app_mode/app_mode_utils.h" -@@ -1494,6 +1495,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() { +@@ -1495,6 +1496,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() { } ChromeContentBrowserClient::ChromeContentBrowserClient() { @@ -453,7 +453,7 @@ index 5b8b1bf1bc86e..8d2274c606ef4 100644 #if BUILDFLAG(ENABLE_PLUGINS) extra_parts_.push_back( std::make_unique()); -@@ -1531,6 +1534,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { +@@ -1532,6 +1535,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { } } @@ -465,7 +465,7 @@ index 5b8b1bf1bc86e..8d2274c606ef4 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -4792,9 +4800,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -4793,9 +4801,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -477,7 +477,7 @@ index 5b8b1bf1bc86e..8d2274c606ef4 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -6876,7 +6886,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -6877,7 +6887,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( } } @@ -486,7 +486,7 @@ index 5b8b1bf1bc86e..8d2274c606ef4 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -6894,6 +6904,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -6895,6 +6905,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -495,7 +495,7 @@ index 5b8b1bf1bc86e..8d2274c606ef4 100644 } std::vector -@@ -8032,11 +8044,11 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -8033,11 +8045,11 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -509,7 +509,7 @@ index 5b8b1bf1bc86e..8d2274c606ef4 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -8058,7 +8070,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -8059,7 +8071,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -519,7 +519,7 @@ index 5b8b1bf1bc86e..8d2274c606ef4 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -8236,7 +8249,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -8237,7 +8250,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { @@ -529,7 +529,7 @@ index 5b8b1bf1bc86e..8d2274c606ef4 100644 base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired, weak_factory_.GetWeakPtr(), diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h -index 3542dd8ea5593..dfd89fec1e4a6 100644 +index 0751efb504919..7a45c45e92c44 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h @@ -159,6 +159,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -550,7 +550,7 @@ index 3542dd8ea5593..dfd89fec1e4a6 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1358,7 +1360,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -1366,7 +1368,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { #if !BUILDFLAG(IS_ANDROID) uint64_t num_keepalive_requests_ = 0; diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 255fa9e99..fb32d8dd4 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -47,7 +47,7 @@ index 085e9a60031ea..15e8ba49573e9 100644 return std::make_pair( /*is_cacheable=*/false, diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index 47750f538148c..3260524e74306 100644 +index e2382e9769cb7..f5738329609c9 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc @@ -1181,7 +1181,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( @@ -68,10 +68,10 @@ index 47750f538148c..3260524e74306 100644 std::vector diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index b7864a93b53a3..5b6174340e2cc 100644 +index 9b75a6c3c222a..30cf0e43f3f09 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h -@@ -1379,6 +1379,12 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1380,6 +1380,12 @@ class CONTENT_EXPORT ContentBrowserClient { bool opener_suppressed, bool* no_javascript_access); @@ -84,7 +84,7 @@ index b7864a93b53a3..5b6174340e2cc 100644 // Allows the embedder to return a delegate for the SpeechRecognitionManager. // The delegate will be owned by the manager. It's valid to return nullptr. virtual SpeechRecognitionManagerDelegate* -@@ -2230,7 +2236,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2231,7 +2237,7 @@ class CONTENT_EXPORT ContentBrowserClient { // // If |relative_partition_path| is the empty string, it means this needs to // create the default NetworkContext for the BrowserContext. @@ -93,7 +93,7 @@ index b7864a93b53a3..5b6174340e2cc 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -2472,6 +2478,22 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2473,6 +2479,22 @@ class CONTENT_EXPORT ContentBrowserClient { const net::IsolationInfo& isolation_info, mojo::PendingRemote* out_factory); @@ -116,7 +116,7 @@ index b7864a93b53a3..5b6174340e2cc 100644 // Creates an OverlayWindow to be used for video or Picture-in-Picture. // This window will house the content shown when in Picture-in-Picture mode. // This will return a new OverlayWindow. -@@ -2537,6 +2559,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2538,6 +2560,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct();