| 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 de78df1b008a679665336147ce250c5ad9bf3a98..698a26b5321f58b1a3db0baf87ac442572bb5c8c 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -2085,7 +2085,10 @@ void RenderFrameHostImpl::Stop() {
|
| Send(new FrameMsg_Stop(routing_id_));
|
| }
|
|
|
| -void RenderFrameHostImpl::DispatchBeforeUnload(bool for_navigation) {
|
| +void RenderFrameHostImpl::DispatchBeforeUnload(bool for_navigation,
|
| + bool is_reload) {
|
| + DCHECK(for_navigation || !is_reload);
|
| +
|
| // TODO(creis): Support beforeunload on subframes. For now just pretend that
|
| // the handler ran and allowed the navigation to proceed.
|
| if (!ShouldDispatchBeforeUnload()) {
|
| @@ -2120,7 +2123,7 @@ void RenderFrameHostImpl::DispatchBeforeUnload(bool for_navigation) {
|
| render_view_host_->GetWidget()->StartHangMonitorTimeout(
|
| TimeDelta::FromMilliseconds(RenderViewHostImpl::kUnloadTimeoutMS));
|
| send_before_unload_start_time_ = base::TimeTicks::Now();
|
| - Send(new FrameMsg_BeforeUnload(routing_id_));
|
| + Send(new FrameMsg_BeforeUnload(routing_id_, is_reload));
|
| }
|
| }
|
|
|
|
|