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

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: Refactor a bit again (DnsProbeRunner is now tied to a single DnsClient), other fixes Created 7 years, 6 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 2b61ebe2f2bce603de2b7dd6011dfe53349e9c97..a439c41e7c78882249db99c84abbd3f968a4835f 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -815,7 +815,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,
@@ -843,11 +843,14 @@ 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)) {
+ // We got error strings for the "DNS probe possible" page.
+ // NetErrorHelper will update it later.
+ } else {
+ LocalizedError::GetStrings(error, is_post, locale, &error_strings);
+ }
resource_id = IDR_NET_ERROR_HTML;
}

Powered by Google App Engine
This is Rietveld 408576698