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

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

Issue 912833002: PlzNavigate: update Navigator tests post-removal of the RequestNavigation IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes from CR comments. Created 5 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
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 641793ea6e1c8ad720f71c07612c5f853d77365b..bab5138bc610268eb6e22e149ed69a9f7a546123 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -1547,7 +1547,8 @@ void RenderFrameHostImpl::DispatchBeforeUnload(bool for_navigation) {
// TODO(creis): Support beforeunload on subframes. For now just pretend that
// the handler ran and allowed the navigation to proceed.
if (GetParent() || !IsRenderFrameLive()) {
- // We don't have a live renderer, so just skip running beforeunload.
+ // If there's no live renderer or this is a subframe navigation then just
clamy 2015/02/11 10:54:27 Please remove this change. The subframe navigation
carlosk 2015/02/11 15:36:21 OK, reverted as it's being updated anyway in anoth
+ // skip running beforeunload.
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableBrowserSideNavigation)) {
frame_tree_node_->navigator()->OnBeforeUnloadACK(

Powered by Google App Engine
This is Rietveld 408576698