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

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: More fixes Created 6 years, 10 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..28b1eae24119079c409374e2db8db785df3849b2 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -988,6 +988,9 @@ bool ChromeContentRendererClient::HasErrorPage(int http_status_code,
bool ChromeContentRendererClient::ShouldSuppressErrorPage(
content::RenderFrame* render_frame,
const GURL& url) {
+ if (render_frame->GetRenderView()->GetMainRenderFrame() == render_frame
+ && NetErrorHelper::Get(render_frame)->ShouldSuppressErrorPage(url))
mmenke 2014/03/04 17:26:25 Optional: I think it's cleaner not to have the ma
Elly Fong-Jones 2014/03/06 21:48:37 Done.
+ return true;
mmenke 2014/03/04 17:26:25 nit: Use braces when either part of an if takes m
Elly Fong-Jones 2014/03/06 21:48:37 Done.
// 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