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

Unified Diff: content/browser/frame_host/navigator_impl.cc

Issue 2710643003: PlzNavigate: remove NavigatorImpl::FailedNavigation (Closed)
Patch Set: Created 3 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
« no previous file with comments | « content/browser/frame_host/navigator_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 19f822f93fd6485d1c726156dc41a3adc8fafea5..56db4ffb8d892ff927b4b735f481b73053fafeba 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -1039,43 +1039,6 @@ void NavigatorImpl::OnBeginNavigation(
}
// PlzNavigate
-void NavigatorImpl::FailedNavigation(FrameTreeNode* frame_tree_node,
- bool has_stale_copy_in_cache,
- int error_code) {
- CHECK(IsBrowserSideNavigationEnabled());
-
- NavigationRequest* navigation_request = frame_tree_node->navigation_request();
- DCHECK(navigation_request);
-
- // With PlzNavigate, debug URLs will give a failed navigation because the
- // WebUI backend won't find a handler for them. They will be processed in the
- // renderer, however do not discard the pending entry so that the URL bar
- // shows them correctly.
- if (!IsRendererDebugURL(navigation_request->navigation_handle()->GetURL()))
- DiscardPendingEntryIfNeeded(navigation_request->navigation_handle());
-
- // If the request was canceled by the user do not show an error page.
- if (error_code == net::ERR_ABORTED) {
- frame_tree_node->ResetNavigationRequest(false);
- return;
- }
-
- // Select an appropriate renderer to show the error page.
- RenderFrameHostImpl* render_frame_host =
- frame_tree_node->render_manager()->GetFrameHostForNavigation(
- *navigation_request);
- CheckWebUIRendererDoesNotDisplayNormalURL(
- render_frame_host, navigation_request->common_params().url);
-
- navigation_request->TransferNavigationHandleOwnership(render_frame_host);
- render_frame_host->navigation_handle()->ReadyToCommitNavigation(
- render_frame_host);
- render_frame_host->FailedNavigation(navigation_request->common_params(),
- navigation_request->request_params(),
- has_stale_copy_in_cache, error_code);
-}
-
-// PlzNavigate
void NavigatorImpl::CancelNavigation(FrameTreeNode* frame_tree_node) {
CHECK(IsBrowserSideNavigationEnabled());
frame_tree_node->ResetNavigationRequest(false);
« no previous file with comments | « content/browser/frame_host/navigator_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698