|
@@ -215,7 +215,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
|
|
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
|
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
-@@ -830,30 +830,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
|
|
|
|
|
|
+@@ -833,30 +833,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
|
|
GetIOThreadApplicationLocale() = locale;
|
|
GetIOThreadApplicationLocale() = locale;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -246,7 +246,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
|
#if defined(OS_ANDROID)
|
|
#if defined(OS_ANDROID)
|
|
float GetDeviceScaleAdjustment() {
|
|
float GetDeviceScaleAdjustment() {
|
|
static const float kMinFSM = 1.05f;
|
|
static const float kMinFSM = 1.05f;
|
|
-@@ -2004,7 +1980,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
|
|
|
|
|
|
+@@ -2007,7 +1983,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
|
|
// Disable client-side phishing detection in the renderer if it is
|
|
// Disable client-side phishing detection in the renderer if it is
|
|
// disabled in the Profile preferences or the browser process.
|
|
// disabled in the Profile preferences or the browser process.
|
|
if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
|
|
if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
|
|
@@ -255,7 +255,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
|
command_line->AppendSwitch(
|
|
command_line->AppendSwitch(
|
|
switches::kDisableClientSidePhishingDetection);
|
|
switches::kDisableClientSidePhishingDetection);
|
|
}
|
|
}
|
|
-@@ -2694,7 +2670,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
|
|
|
|
|
|
+@@ -2697,7 +2673,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
|
|
SSLErrorHandler::HandleSSLError(
|
|
SSLErrorHandler::HandleSSLError(
|
|
web_contents, cert_error, ssl_info, request_url,
|
|
web_contents, cert_error, ssl_info, request_url,
|
|
expired_previous_decision,
|
|
expired_previous_decision,
|
|
@@ -264,7 +264,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
|
callback, SSLErrorHandler::BlockingPageReadyCallback());
|
|
callback, SSLErrorHandler::BlockingPageReadyCallback());
|
|
}
|
|
}
|
|
|
|
|
|
-@@ -2974,8 +2950,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
|
|
|
|
|
|
+@@ -2977,8 +2953,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
|
|
void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
|
|
void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
|
|
|
@@ -273,7 +273,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
|
for (size_t i = 0; i < extra_parts_.size(); ++i)
|
|
for (size_t i = 0; i < extra_parts_.size(); ++i)
|
|
extra_parts_[i]->ResourceDispatcherHostCreated();
|
|
extra_parts_[i]->ResourceDispatcherHostCreated();
|
|
|
|
|
|
-@@ -4181,7 +4155,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
|
|
|
|
|
+@@ -4201,7 +4175,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
|
if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) {
|
|
if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) {
|
|
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
|
|
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
|
|
handle,
|
|
handle,
|