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

Unified Diff: chrome/renderer/chrome_content_renderer_client.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, 2 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
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | chrome/renderer/net/net_error_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc (revision 226965)
+++ chrome/renderer/chrome_content_renderer_client.cc (working copy)
@@ -879,6 +879,7 @@
WebKit::WebFrame* frame,
const WebKit::WebURLRequest& failed_request,
const WebKit::WebURLError& error,
+ const std::string& accept_languages,
std::string* error_html,
string16* error_description) {
const GURL failed_url = error.unreachableURL;
@@ -905,12 +906,13 @@
} else {
const std::string locale = RenderThread::Get()->GetLocale();
if (!NetErrorHelper::GetErrorStringsForDnsProbe(
- frame, error, is_post, locale, &error_strings)) {
+ frame, error, is_post, locale, accept_languages,
+ &error_strings)) {
// In most cases, the NetErrorHelper won't provide DNS-probe-specific
// error pages, so fall back to LocalizedError.
LocalizedError::GetStrings(error.reason, error.domain.utf8(),
error.unreachableURL, is_post, locale,
- &error_strings);
+ accept_languages, &error_strings);
}
resource_id = IDR_NET_ERROR_HTML;
}
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | chrome/renderer/net/net_error_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698