| 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 2718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2729 if (!IsRenderFrameLive()) | 2729 if (!IsRenderFrameLive()) |
| 2730 return false; | 2730 return false; |
| 2731 | 2731 |
| 2732 for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) { | 2732 for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) { |
| 2733 if (node->current_frame_host()->has_beforeunload_handlers_) | 2733 if (node->current_frame_host()->has_beforeunload_handlers_) |
| 2734 return true; | 2734 return true; |
| 2735 } | 2735 } |
| 2736 return false; | 2736 return false; |
| 2737 } | 2737 } |
| 2738 | 2738 |
| 2739 bool RenderFrameHostImpl::ShouldDispatchUnload() { | 2739 bool RenderFrameHostImpl::HasUnloadHandler() { |
| 2740 if (!IsRenderFrameLive()) | 2740 if (!IsRenderFrameLive()) |
| 2741 return false; | 2741 return false; |
| 2742 | 2742 |
| 2743 for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) { | 2743 for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) { |
| 2744 if (node->current_frame_host()->has_unload_handlers_) | 2744 if (node->current_frame_host()->has_unload_handlers_) |
| 2745 return true; | 2745 return true; |
| 2746 } | 2746 } |
| 2747 return false; | 2747 return false; |
| 2748 } | 2748 } |
| 2749 | 2749 |
| (...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3673 service_manager::mojom::InterfaceProviderPtr provider; | 3673 service_manager::mojom::InterfaceProviderPtr provider; |
| 3674 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); | 3674 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); |
| 3675 java_interfaces_.reset(new service_manager::InterfaceProvider); | 3675 java_interfaces_.reset(new service_manager::InterfaceProvider); |
| 3676 java_interfaces_->Bind(std::move(provider)); | 3676 java_interfaces_->Bind(std::move(provider)); |
| 3677 } | 3677 } |
| 3678 return java_interfaces_.get(); | 3678 return java_interfaces_.get(); |
| 3679 } | 3679 } |
| 3680 #endif | 3680 #endif |
| 3681 | 3681 |
| 3682 } // namespace content | 3682 } // namespace content |
| OLD | NEW |