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

Unified Diff: components/error_page/common/localized_error.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/error_page/common/localized_error.cc
diff --git a/components/error_page/common/localized_error.cc b/components/error_page/common/localized_error.cc
index c915a772e670849cd992483fb77a150b5b1867f4..7285d969c5bea00ee143fe960cf82e5a37484a9d 100644
--- a/components/error_page/common/localized_error.cc
+++ b/components/error_page/common/localized_error.cc
@@ -845,7 +845,6 @@ void LocalizedError::GetStrings(int error_code,
bool can_show_network_diagnostics_dialog,
bool has_offline_pages,
const std::string& locale,
- const std::string& accept_languages,
scoped_ptr<error_page::ErrorPageParams> params,
base::DictionaryValue* error_strings) {
webui::SetLoadTimeDataDefaults(locale, error_strings);
@@ -881,7 +880,7 @@ void LocalizedError::GetStrings(int error_code,
}
base::string16 failed_url_string(url_formatter::FormatUrl(
- failed_url, accept_languages, url_formatter::kFormatUrlOmitNothing,
+ failed_url, url_formatter::kFormatUrlOmitNothing,
net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr));
// URLs are always LTR.
if (base::i18n::IsRTL())
@@ -891,8 +890,7 @@ void LocalizedError::GetStrings(int error_code,
std::string icon_class = GetIconClassForError(error_domain, error_code);
error_strings->SetString("iconClass", icon_class);
- base::string16 host_name(url_formatter::IDNToUnicode(failed_url.host(),
- accept_languages));
+ base::string16 host_name(url_formatter::IDNToUnicode(failed_url.host()));
base::DictionaryValue* heading = new base::DictionaryValue;
heading->SetString("msg",
« no previous file with comments | « components/error_page/common/localized_error.h ('k') | components/error_page/renderer/net_error_helper_core.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698