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

Unified Diff: content/renderer/render_view_impl.cc

Issue 23455047: InstantExtended: Send search URLs to renderers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 3 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: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6827468ee7e9f251932b47b4b3dd4591ccf714e8..a8bf80dac0a8f9d96099442c34385c7f44fef4ad 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3249,7 +3249,7 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
// browser process, and issue a special POST navigation in WebKit (via
// FrameLoader::loadFrameRequest). See ResourceDispatcher and WebURLLoaderImpl
// for examples of how to send the httpBody data.
- if (!frame->parent() && is_content_initiated &&
+ if (!frame->parent() && (is_content_initiated || is_redirect) &&
!url.SchemeIs(chrome::kAboutScheme)) {
bool send_referrer = false;
@@ -3641,8 +3641,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);

Powered by Google App Engine
This is Rietveld 408576698