summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/render_view_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/renderer/render_view_impl.cc')
-rw-r--r--chromium/content/renderer/render_view_impl.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chromium/content/renderer/render_view_impl.cc b/chromium/content/renderer/render_view_impl.cc
index f52080eb8d2..6efebffe5f9 100644
--- a/chromium/content/renderer/render_view_impl.cc
+++ b/chromium/content/renderer/render_view_impl.cc
@@ -3646,8 +3646,16 @@ void RenderViewImpl::didFailProvisionalLoad(WebFrame* frame,
return;
}
- if (RenderThreadImpl::current()->layout_test_mode())
+ // Allow the embedder to suppress an error page.
+ if (GetContentClient()->renderer()->ShouldSuppressErrorPage(
+ error.unreachableURL)) {
return;
+ }
+
+ if (RenderThreadImpl::current() &&
+ RenderThreadImpl::current()->layout_test_mode()) {
+ return;
+ }
// Make sure we never show errors in view source mode.
frame->enableViewSourceMode(false);