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

Unified Diff: components/security_interstitials/core/ssl_error_ui.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: components/security_interstitials/core/ssl_error_ui.cc
diff --git a/components/security_interstitials/core/ssl_error_ui.cc b/components/security_interstitials/core/ssl_error_ui.cc
index a02f0b016e5aebf0c65ef6e5064b15fe245d8d99..993b19a844804ba4857b8ba46d03770f6958fec4 100644
--- a/components/security_interstitials/core/ssl_error_ui.cc
+++ b/components/security_interstitials/core/ssl_error_ui.cc
@@ -29,13 +29,11 @@ SSLErrorUI::SSLErrorUI(const GURL& request_url,
const net::SSLInfo& ssl_info,
int display_options,
const base::Time& time_triggered,
- const std::string& languages,
ControllerClient* controller)
: request_url_(request_url),
cert_error_(cert_error),
ssl_info_(ssl_info),
time_triggered_(time_triggered),
- languages_(languages),
requested_strict_enforcement_(
IsMasked(display_options, STRICT_ENFORCEMENT)),
soft_override_enabled_(IsMasked(display_options, SOFT_OVERRIDE_ENABLED)),
@@ -79,7 +77,7 @@ void SSLErrorUI::PopulateStringsForHTML(base::DictionaryValue* load_time_data) {
"primaryParagraph",
l10n_util::GetStringFUTF16(
IDS_SSL_V2_PRIMARY_PARAGRAPH,
- common_string_util::GetFormattedHostName(request_url_, languages_)));
+ common_string_util::GetFormattedHostName(request_url_)));
if (soft_override_enabled_)
PopulateOverridableStrings(load_time_data);
@@ -91,8 +89,7 @@ void SSLErrorUI::PopulateOverridableStrings(
base::DictionaryValue* load_time_data) {
DCHECK(soft_override_enabled_);
- base::string16 url(
- common_string_util::GetFormattedHostName(request_url_, languages_));
+ base::string16 url(common_string_util::GetFormattedHostName(request_url_));
ssl_errors::ErrorInfo error_info = ssl_errors::ErrorInfo::CreateError(
ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_),
ssl_info_.cert.get(), request_url_);
@@ -111,8 +108,7 @@ void SSLErrorUI::PopulateNonOverridableStrings(
base::DictionaryValue* load_time_data) {
DCHECK(!soft_override_enabled_);
- base::string16 url(
- common_string_util::GetFormattedHostName(request_url_, languages_));
+ base::string16 url(common_string_util::GetFormattedHostName(request_url_));
ssl_errors::ErrorInfo::ErrorType type =
ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_);

Powered by Google App Engine
This is Rietveld 408576698