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

Unified Diff: chrome/renderer/net/net_error_helper.cc

Issue 24503004: Show IDN in error screens (DNS failure etc.) (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 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/renderer/net/net_error_helper.cc
===================================================================
--- chrome/renderer/net/net_error_helper.cc (revision 225096)
+++ chrome/renderer/net/net_error_helper.cc (working copy)
@@ -174,6 +174,7 @@
const WebKit::WebURLError& error,
bool is_failed_post,
const std::string& locale,
+ const std::string& accept_languages,
base::DictionaryValue* error_strings) {
if (!IsMainFrame(frame))
return false;
@@ -186,7 +187,7 @@
chrome_common_net::DNS_PROBE_POSSIBLE,
chrome_common_net::kDnsProbeErrorDomain,
error.unreachableURL,
- is_failed_post, locale, error_strings);
+ is_failed_post, locale, accept_languages, error_strings);
return true;
}
@@ -214,11 +215,14 @@
WebKit::WebURLError error = GetUpdatedError();
base::DictionaryValue error_strings;
+ const std::string accept_languages =
+ render_view() ? render_view()->GetAcceptLanguages() : std::string();
mmenke 2013/09/26 16:23:01 The test that render_view() isn't NULL isn't neede
yuusuke 2013/09/27 14:16:52 Done.
LocalizedError::GetStrings(error.reason,
error.domain.utf8(),
error.unreachableURL,
is_failed_post_,
RenderThread::Get()->GetLocale(),
+ accept_languages,
&error_strings);
std::string json;

Powered by Google App Engine
This is Rietveld 408576698