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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 19777002: Revert 211950 "Display DNS probe results." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1568/src/
Patch Set: 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
« no previous file with comments | « chrome/common/render_messages.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 212348)
+++ chrome/renderer/chrome_content_renderer_client.cc (working copy)
@@ -849,7 +849,7 @@
}
void ChromeContentRendererClient::GetNavigationErrorStrings(
- WebKit::WebFrame* frame,
+ WebKit::WebFrame* /* frame */,
const WebKit::WebURLRequest& failed_request,
const WebKit::WebURLError& error,
std::string* error_html,
@@ -877,13 +877,11 @@
// error messages?
resource_id = IDR_ERROR_APP_HTML;
} else {
- 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);
- }
+ LocalizedError::GetStrings(
+ error,
+ is_post,
+ RenderThread::Get()->GetLocale(),
+ &error_strings);
resource_id = IDR_NET_ERROR_HTML;
}
« no previous file with comments | « chrome/common/render_messages.h ('k') | chrome/renderer/net/net_error_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698