diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index b053b889d..261651c31 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/115.0.5790.0' + 'chromium_checkout': 'refs/tags/115.0.5790.13', + 'depot_tools_checkout': 'df2f11113c' } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index be497aa8e..66508a8e3 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -410,10 +410,10 @@ index 23a838ba30c68..52601ebdcc9bd 100644 // The opener browser of the document picture-in-picture browser. Null if the diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc -index edf4d8c7933e9..9e7c236dbf16a 100644 +index a45328dab1538..981e8e498752b 100644 --- chrome/browser/ui/browser_navigator.cc +++ chrome/browser/ui/browser_navigator.cc -@@ -555,6 +555,13 @@ std::unique_ptr CreateTargetContents( +@@ -556,6 +556,13 @@ std::unique_ptr CreateTargetContents( std::unique_ptr target_contents = WebContents::Create(create_params); diff --git a/patch/patches/chrome_browser_permission_prompt.patch b/patch/patches/chrome_browser_permission_prompt.patch index cf658f77e..45646a6e0 100644 --- a/patch/patches/chrome_browser_permission_prompt.patch +++ b/patch/patches/chrome_browser_permission_prompt.patch @@ -44,7 +44,7 @@ index 16107572d4d0d..409e9ea870482 100644 base::FeatureList::IsEnabled( features::kPeriodicSyncPermissionForDefaultSearchEngine) && diff --git chrome/browser/permissions/chrome_permissions_client.cc chrome/browser/permissions/chrome_permissions_client.cc -index dece5822d8899..855ab4273e916 100644 +index 18e2eec8f64ff..d36b3206aeb63 100644 --- chrome/browser/permissions/chrome_permissions_client.cc +++ chrome/browser/permissions/chrome_permissions_client.cc @@ -14,6 +14,7 @@ @@ -65,7 +65,7 @@ index dece5822d8899..855ab4273e916 100644 return site_engagement::SiteEngagementService::Get( Profile::FromBrowserContext(browser_context)) ->GetScore(origin); -@@ -332,8 +336,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors( +@@ -338,8 +342,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors( std::make_unique()); selectors.emplace_back(std::make_unique( Profile::FromBrowserContext(browser_context))); diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 3038d71c5..ed7c6a75b 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -235,7 +235,7 @@ index 789d147f0b305..64a33cce013c5 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 1b9db89f8dce3..980999042366a 100644 +index dc9912b1dda9d..de1cb5e4eb93c 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -41,6 +41,7 @@ @@ -279,7 +279,7 @@ index 1b9db89f8dce3..980999042366a 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -6229,7 +6239,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -6230,7 +6240,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( #endif } @@ -288,7 +288,7 @@ index 1b9db89f8dce3..980999042366a 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -6247,6 +6257,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -6248,6 +6258,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -297,7 +297,7 @@ index 1b9db89f8dce3..980999042366a 100644 } std::vector -@@ -7260,10 +7272,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -7261,10 +7273,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -310,7 +310,7 @@ index 1b9db89f8dce3..980999042366a 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -7282,7 +7294,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -7283,7 +7295,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -320,7 +320,7 @@ index 1b9db89f8dce3..980999042366a 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -7418,7 +7431,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -7419,7 +7432,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index dfaa9631e..b0735204b 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -237,7 +237,7 @@ index 59024587ef6b7..0c30aa71768cf 100644 void FindBarHost::RegisterAccelerators() { diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc -index 24b85357b90b8..67e1bacb8d518 100644 +index e01f634cbe20f..9ece0073769e5 100644 --- chrome/browser/ui/views/frame/browser_frame.cc +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -75,15 +75,23 @@ bool IsUsingLinuxSystemTheme(Profile* profile) { @@ -347,7 +347,7 @@ index 24b85357b90b8..67e1bacb8d518 100644 #if BUILDFLAG(IS_CHROMEOS_ASH) // ChromeOS SystemWebApps use the OS theme all the time. if (ash::IsSystemWebApp(browser_view_->browser())) { -@@ -533,5 +566,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( +@@ -540,5 +573,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( } bool BrowserFrame::IsIncognitoBrowser() const { diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 136c7ad79..573ff8537 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -178,10 +178,10 @@ index ba7f48e90026c..a509cc4565e9f 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index 660df7d04bff9..f3cb3381ce462 100644 +index 5447074c168f6..793fa6fa439df 100644 --- services/network/network_context.cc +++ services/network/network_context.cc -@@ -2328,16 +2328,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2331,16 +2331,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( network_service_->network_quality_estimator()); }