Update to Chromium version 124.0.6367.29

This commit is contained in:
Marshall Greenblatt
2024-04-09 18:40:59 -04:00
parent 759cdc7584
commit 41036f7624
6 changed files with 32 additions and 34 deletions

View File

@ -384,7 +384,7 @@ index 2f0fe9d22667c..f50fe7bf75df3 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 011ffe3477b67..e56c0581ab844 100644
index ac42bd8b0c899..b82517b3e52f9 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -47,6 +47,7 @@
@ -416,7 +416,7 @@ index 011ffe3477b67..e56c0581ab844 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -3612,9 +3620,24 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs,
@@ -3624,9 +3632,24 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs,
: blink::mojom::PreferredColorScheme::kLight;
}
#else
@ -442,7 +442,7 @@ index 011ffe3477b67..e56c0581ab844 100644
#endif // BUILDFLAG(IS_ANDROID)
// Reauth WebUI doesn't support dark mode yet because it shares the dialog
@@ -4360,9 +4383,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -4372,9 +4395,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@ -454,7 +454,7 @@ index 011ffe3477b67..e56c0581ab844 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -6469,7 +6494,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -6481,7 +6506,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
#endif
}
@ -463,7 +463,7 @@ index 011ffe3477b67..e56c0581ab844 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -6487,6 +6512,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -6499,6 +6524,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -472,7 +472,7 @@ index 011ffe3477b67..e56c0581ab844 100644
}
std::vector<base::FilePath>
@@ -7612,10 +7639,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -7624,10 +7651,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -485,7 +485,7 @@ index 011ffe3477b67..e56c0581ab844 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -7634,7 +7661,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -7646,7 +7673,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@ -495,7 +495,7 @@ index 011ffe3477b67..e56c0581ab844 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -7774,7 +7802,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -7786,7 +7814,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {