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( |