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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 136203009: Support auto-reload on errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Add MockableOneShotTimer tests. Created 6 years, 9 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 1ab1cc4852560656c4c473b1e607d295a3b131b2..6caa35dc1ccdca1811e905193f2b632bf44daa0d 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -988,6 +988,12 @@ bool ChromeContentRendererClient::HasErrorPage(int http_status_code,
bool ChromeContentRendererClient::ShouldSuppressErrorPage(
content::RenderFrame* render_frame,
const GURL& url) {
+ content::RenderView* render_view = render_frame->GetRenderView();
+ content::RenderFrame* main_render_frame = render_view->GetMainRenderFrame();
+ blink::WebFrame* web_frame = render_frame->GetWebFrame();
mmenke 2014/03/11 20:07:54 optional: May want to get rid of this local varia
Elly Fong-Jones 2014/03/12 15:08:58 I inserted it to keep the ShouldSuppressErrorPage
+ NetErrorHelper* net_error_helper = NetErrorHelper::Get(main_render_frame);
+ if (net_error_helper->ShouldSuppressErrorPage(web_frame, url))
+ return true;
// Do not flash an error page if the Instant new tab page fails to load.
return search_bouncer_.get() && search_bouncer_->IsNewTabPage(url);
}

Powered by Google App Engine
This is Rietveld 408576698