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

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: Tweak things, clean up unit tests 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 6de2af162203c6a3221a8b1cf78da7ec6c1e6840..23ea4a778f35aafa730ab9623c58b1a1b3448be5 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -835,7 +835,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,
@@ -863,11 +863,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)) {
mmenke 2013/06/13 20:04:55 Don't really need an else/if here, and I don't thi
Deprecated (see juliatuttle) 2013/06/18 19:36:37 Done.
+ // We got error strings for the "DNS probe possible" page.
+ // NetErrorHelper will update it later.
mmenke 2013/06/13 20:04:55 nit: Also, if you keep a comment here, get rid of
Deprecated (see juliatuttle) 2013/06/18 19:36:37 Obsolete.
+ } else {
+ LocalizedError::GetStrings(error, is_post, locale, &error_strings);
+ }
resource_id = IDR_NET_ERROR_HTML;
}

Powered by Google App Engine
This is Rietveld 408576698