content/browser/frame_host/navigator_impl.cc - Issue 1890493002: PlzNavigate: properly execute BeforeUnload on renderer initiated navigations

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1890493002: PlzNavigate: properly execute BeforeUnload on renderer initiated navigations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments Created 4 years, 7 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

« components/test_runner/test_runner_for_specific_view.cc ('K') | « components/test_runner/test_runner_for_specific_view.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 6fcdb074b4a0f6badd1ea04256214a7e2223480d..a53483fbaf2521b8f76ae661a43011010e60be81 100644

--- a/content/browser/frame_host/navigator_impl.cc

+++ b/content/browser/frame_host/navigator_impl.cc

@@ -336,8 +336,9 @@ bool NavigatorImpl::NavigateToEntry(

} else {

RenderFrameHostImpl* dest_render_frame_host =

- frame_tree_node->render_manager()->Navigate(dest_url, frame_entry,

- entry);

+ frame_tree_node->render_manager()->Navigate(

+ dest_url, frame_entry, entry,

+ reload_type != NavigationController::NO_RELOAD);

if (!dest_render_frame_host)

return false; // Unable to create the desired RenderFrameHost.

@@ -1005,7 +1006,8 @@ void NavigatorImpl::RequestNavigation(

ShouldMakeNetworkRequestForURL(

navigation_request->common_params().url)) {

navigation_request->SetWaitingForRendererResponse();

- frame_tree_node->current_frame_host()->DispatchBeforeUnload(true);

+ frame_tree_node->current_frame_host()->DispatchBeforeUnload(

+ true, reload_type != NavigationController::NO_RELOAD);

} else {

navigation_request->BeginNavigation();

}