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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 13270005: Display DNS probe results. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix style nits Created 7 years, 5 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/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 7a68264fbab94d920725f2fd78e9ea5e7832adb4..f61db398496516475b4293973e82b13e2ba8dc6d 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -850,7 +850,7 @@ bool ChromeContentRendererClient::HasErrorPage(int http_status_code,
}
void ChromeContentRendererClient::GetNavigationErrorStrings(
- WebKit::WebFrame* /* frame */,
+ WebKit::WebFrame* frame,
const WebKit::WebURLRequest& failed_request,
const WebKit::WebURLError& error,
std::string* error_html,
@@ -878,11 +878,13 @@ void ChromeContentRendererClient::GetNavigationErrorStrings(
// error messages?
resource_id = IDR_ERROR_APP_HTML;
} else {
- LocalizedError::GetStrings(
- error,
- is_post,
- RenderThread::Get()->GetLocale(),
- &error_strings);
+ const std::string locale = RenderThread::Get()->GetLocale();
+ if (!NetErrorHelper::GetErrorStringsForDnsProbe(
+ frame, error, is_post, locale, &error_strings)) {
+ // In most cases, the NetErrorHelper won't provide DNS-probe-specific
+ // error pages, so fall back to LocalizedError.
+ LocalizedError::GetStrings(error, is_post, locale, &error_strings);
+ }
resource_id = IDR_NET_ERROR_HTML;
}

Powered by Google App Engine
This is Rietveld 408576698