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

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

Issue 1513293002: kFrameTreeNodeInvalidID -> kFrameTreeNodeInvalidId (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix RFHM Created 5 years 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_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 RenderWidgetHostView* RenderFrameHostManager::GetRenderWidgetHostView() const { 308 RenderWidgetHostView* RenderFrameHostManager::GetRenderWidgetHostView() const {
309 if (interstitial_page_) 309 if (interstitial_page_)
310 return interstitial_page_->GetView(); 310 return interstitial_page_->GetView();
311 if (render_frame_host_) 311 if (render_frame_host_)
312 return render_frame_host_->GetView(); 312 return render_frame_host_->GetView();
313 return nullptr; 313 return nullptr;
314 } 314 }
315 315
316 bool RenderFrameHostManager::ForInnerDelegate() { 316 bool RenderFrameHostManager::ForInnerDelegate() {
317 return delegate_->GetOuterDelegateFrameTreeNodeId() != 317 return delegate_->GetOuterDelegateFrameTreeNodeId() !=
318 FrameTreeNode::kFrameTreeNodeInvalidID; 318 FrameTreeNode::kFrameTreeNodeInvalidId;
319 } 319 }
320 320
321 RenderWidgetHostImpl* 321 RenderWidgetHostImpl*
322 RenderFrameHostManager::GetOuterRenderWidgetHostForKeyboardInput() { 322 RenderFrameHostManager::GetOuterRenderWidgetHostForKeyboardInput() {
323 if (!ForInnerDelegate() || !frame_tree_node_->IsMainFrame()) 323 if (!ForInnerDelegate() || !frame_tree_node_->IsMainFrame())
324 return nullptr; 324 return nullptr;
325 325
326 FrameTreeNode* outer_contents_frame_tree_node = 326 FrameTreeNode* outer_contents_frame_tree_node =
327 FrameTreeNode::GloballyFindByID( 327 FrameTreeNode::GloballyFindByID(
328 delegate_->GetOuterDelegateFrameTreeNodeId()); 328 delegate_->GetOuterDelegateFrameTreeNodeId());
(...skipping 2340 matching lines...) Expand 10 before | Expand all | Expand 10 after
2669 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { 2669 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) {
2670 if (!frame_tree_node_->opener()) 2670 if (!frame_tree_node_->opener())
2671 return MSG_ROUTING_NONE; 2671 return MSG_ROUTING_NONE;
2672 2672
2673 return frame_tree_node_->opener() 2673 return frame_tree_node_->opener()
2674 ->render_manager() 2674 ->render_manager()
2675 ->GetRoutingIdForSiteInstance(instance); 2675 ->GetRoutingIdForSiteInstance(instance);
2676 } 2676 }
2677 2677
2678 } // namespace content 2678 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.h ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698