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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2808953002: Revert of Followup comments from r460581. (Closed)
Patch Set: manual merge Created 3 years, 8 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 unified diff | Download patch
OLDNEW
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 2728 matching lines...) Expand 10 before | Expand all | Expand 10 after
2739 if (!IsRenderFrameLive()) 2739 if (!IsRenderFrameLive())
2740 return false; 2740 return false;
2741 2741
2742 for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) { 2742 for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) {
2743 if (node->current_frame_host()->has_beforeunload_handlers_) 2743 if (node->current_frame_host()->has_beforeunload_handlers_)
2744 return true; 2744 return true;
2745 } 2745 }
2746 return false; 2746 return false;
2747 } 2747 }
2748 2748
2749 bool RenderFrameHostImpl::HasUnloadHandler() { 2749 bool RenderFrameHostImpl::ShouldDispatchUnload() {
2750 if (!IsRenderFrameLive()) 2750 if (!IsRenderFrameLive())
2751 return false; 2751 return false;
2752 2752
2753 for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) { 2753 for (FrameTreeNode* node : frame_tree_->SubtreeNodes(frame_tree_node_)) {
2754 if (node->current_frame_host()->has_unload_handlers_) 2754 if (node->current_frame_host()->has_unload_handlers_)
2755 return true; 2755 return true;
2756 } 2756 }
2757 return false; 2757 return false;
2758 } 2758 }
2759 2759
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
3698 } 3698 }
3699 3699
3700 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( 3700 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame(
3701 const std::string& interface_name, 3701 const std::string& interface_name,
3702 mojo::ScopedMessagePipeHandle pipe) { 3702 mojo::ScopedMessagePipeHandle pipe) {
3703 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); 3703 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe));
3704 } 3704 }
3705 #endif 3705 #endif
3706 3706
3707 } // namespace content 3707 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/frame_host/render_frame_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698