| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1715 // RenderFrameHostManager which handles closing. | 1715 // RenderFrameHostManager which handles closing. |
| 1716 if (IsBrowserSideNavigationEnabled() && unload_ack_is_for_navigation_) { | 1716 if (IsBrowserSideNavigationEnabled() && unload_ack_is_for_navigation_) { |
| 1717 // TODO(clamy): see if before_unload_end_time should be transmitted to the | 1717 // TODO(clamy): see if before_unload_end_time should be transmitted to the |
| 1718 // Navigator. | 1718 // Navigator. |
| 1719 frame_tree_node_->navigator()->OnBeforeUnloadACK(frame_tree_node_, proceed, | 1719 frame_tree_node_->navigator()->OnBeforeUnloadACK(frame_tree_node_, proceed, |
| 1720 before_unload_end_time); | 1720 before_unload_end_time); |
| 1721 } else { | 1721 } else { |
| 1722 frame_tree_node_->render_manager()->OnBeforeUnloadACK( | 1722 frame_tree_node_->render_manager()->OnBeforeUnloadACK( |
| 1723 unload_ack_is_for_navigation_, proceed, before_unload_end_time); | 1723 unload_ack_is_for_navigation_, proceed, before_unload_end_time); |
| 1724 } | 1724 } |
| 1725 | |
| 1726 // If canceled, notify the delegate to cancel its pending navigation entry. | |
| 1727 if (!proceed) | |
| 1728 render_view_host_->GetDelegate()->DidCancelLoading(); | |
| 1729 } | 1725 } |
| 1730 | 1726 |
| 1731 bool RenderFrameHostImpl::IsWaitingForUnloadACK() const { | 1727 bool RenderFrameHostImpl::IsWaitingForUnloadACK() const { |
| 1732 return render_view_host_->is_waiting_for_close_ack_ || | 1728 return render_view_host_->is_waiting_for_close_ack_ || |
| 1733 is_waiting_for_swapout_ack_; | 1729 is_waiting_for_swapout_ack_; |
| 1734 } | 1730 } |
| 1735 | 1731 |
| 1736 void RenderFrameHostImpl::OnSwapOutACK() { | 1732 void RenderFrameHostImpl::OnSwapOutACK() { |
| 1737 OnSwappedOut(); | 1733 OnSwappedOut(); |
| 1738 } | 1734 } |
| (...skipping 2380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4119 } | 4115 } |
| 4120 | 4116 |
| 4121 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 4117 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
| 4122 const std::string& interface_name, | 4118 const std::string& interface_name, |
| 4123 mojo::ScopedMessagePipeHandle pipe) { | 4119 mojo::ScopedMessagePipeHandle pipe) { |
| 4124 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 4120 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
| 4125 } | 4121 } |
| 4126 #endif | 4122 #endif |
| 4127 | 4123 |
| 4128 } // namespace content | 4124 } // namespace content |
| OLD | NEW |