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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2439903003: PlzNavigate: Allow frames to fallback to alternative content. (Closed)
Patch Set: Created 4 years, 2 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_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f10589b80ab246a62641b8e0061c1129fe971ee0..66b6e0b8371dedeedbd428eeab602bed1e118372 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5070,6 +5070,10 @@ void RenderFrameImpl::OnFailedNavigation(
if (request_params.page_state.IsValid())
history_entry = PageStateToHistoryEntry(request_params.page_state);
LoadNavigationErrorPage(failed_request, error, replace, history_entry.get());
+
+ // On load failure, a frame may render fallback content which replaces the
+ // navigation error page.
+ frame_->didFailNavigation();
clamy 2016/10/21 16:09:42 I'm a bit worried about how this interacts with th
nasko 2016/10/21 17:00:04 Should we be loading an error page (last statement
Nate Chapin 2016/10/21 18:53:59 That seems reasonable to me.
}
WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(

Powered by Google App Engine
This is Rietveld 408576698