Update to Chromium version 109.0.5414.74

This commit is contained in:
Marshall Greenblatt 2023-01-05 14:37:33 +00:00 committed by Marshall Greenblatt
parent 2f7620cf4e
commit b5acaf4520
2 changed files with 10 additions and 10 deletions

View File

@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/109.0.5414.61', 'chromium_checkout': 'refs/tags/109.0.5414.74',
'depot_tools_checkout': 'ca3ebf119e' 'depot_tools_checkout': 'ca3ebf119e'
} }

View File

@ -198,7 +198,7 @@ index d12abb3451882..b14d4406c2a76 100644
+#endif +#endif
} }
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 64aab0dd3ceb6..e86a6394ec8ff 100644 index 1c4404185b0b6..500c2c57c9e1c 100644
--- chrome/browser/chrome_content_browser_client.cc --- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
@ -209,7 +209,7 @@ index 64aab0dd3ceb6..e86a6394ec8ff 100644
#include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h" #include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/after_startup_task_utils.h"
@@ -1481,6 +1482,8 @@ void HandleStringData( @@ -1484,6 +1485,8 @@ void HandleStringData(
} // namespace } // namespace
ChromeContentBrowserClient::ChromeContentBrowserClient() { ChromeContentBrowserClient::ChromeContentBrowserClient() {
@ -218,7 +218,7 @@ index 64aab0dd3ceb6..e86a6394ec8ff 100644
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart); extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
#endif #endif
@@ -1506,6 +1509,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { @@ -1509,6 +1512,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
extra_parts_.clear(); extra_parts_.clear();
} }
@ -230,7 +230,7 @@ index 64aab0dd3ceb6..e86a6394ec8ff 100644
// static // static
void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) { PrefRegistrySimple* registry) {
@@ -4180,9 +4188,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( @@ -4183,9 +4191,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite); &search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
@ -242,7 +242,7 @@ index 64aab0dd3ceb6..e86a6394ec8ff 100644
} }
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5991,7 +6001,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( @@ -5994,7 +6004,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
network_service); network_service);
} }
@ -251,7 +251,7 @@ index 64aab0dd3ceb6..e86a6394ec8ff 100644
content::BrowserContext* context, content::BrowserContext* context,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
@@ -6009,6 +6019,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( @@ -6012,6 +6022,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale(); network_context_params->accept_language = GetApplicationLocale();
} }
@ -260,7 +260,7 @@ index 64aab0dd3ceb6..e86a6394ec8ff 100644
} }
std::vector<base::FilePath> std::vector<base::FilePath>
@@ -6853,10 +6865,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( @@ -6856,10 +6868,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now(); const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context); const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -273,7 +273,7 @@ index 64aab0dd3ceb6..e86a6394ec8ff 100644
FROM_HERE, keepalive_deadline_ - now, FROM_HERE, keepalive_deadline_ - now,
base::BindOnce( base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired, &ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -6875,7 +6887,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { @@ -6878,7 +6890,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_; --num_keepalive_requests_;
if (num_keepalive_requests_ == 0) { if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer"; DVLOG(1) << "Stopping the keepalive timer";
@ -283,7 +283,7 @@ index 64aab0dd3ceb6..e86a6394ec8ff 100644
// This deletes the keep alive handle attached to the timer function and // This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence. // unblock the shutdown sequence.
} }
@@ -7011,7 +7024,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( @@ -7014,7 +7027,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now(); const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_; const auto then = keepalive_deadline_;
if (now < then) { if (now < then) {