Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6311)

Unified Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo in elide_url.cc Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ssl/ssl_blocking_page.cc
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index 0775e98aad4211ed63009f67fbae3e5daac84931..19b5c802bd725cfc3de04d61c82e111950f84850 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -123,15 +123,12 @@ SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,
expired_but_previously_allowed_(
(options_mask & SSLErrorUI::EXPIRED_BUT_PREVIOUSLY_ALLOWED) != 0),
controller_(new ChromeControllerClient(web_contents)) {
- // Get the language and override prefs for the SSLErrorUI.
- std::string languages;
+ // Override prefs for the SSLErrorUI.
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
- if (profile) {
- languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
- if (!profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed)) {
- options_mask |= SSLErrorUI::HARD_OVERRIDE_DISABLED;
- }
+ if (profile &&
+ !profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed)) {
+ options_mask |= SSLErrorUI::HARD_OVERRIDE_DISABLED;
}
if (overridable_)
options_mask |= SSLErrorUI::SOFT_OVERRIDE_ENABLED;
@@ -156,7 +153,7 @@ SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,
controller_->metrics_helper()));
ssl_error_ui_.reset(new SSLErrorUI(request_url, cert_error, ssl_info,
- options_mask, time_triggered, languages,
+ options_mask, time_triggered,
controller_.get()));
// Creating an interstitial without showing (e.g. from chrome://interstitials)
« no previous file with comments | « chrome/browser/ssl/captive_portal_blocking_page.cc ('k') | chrome/browser/ui/android/bluetooth_chooser_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698