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

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

Issue 1413543005: Use FrameTreeNode ID as frameId in extension APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/:/ / Created 4 years, 11 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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 return process_; 311 return process_;
312 } 312 }
313 313
314 RenderFrameHost* RenderFrameHostImpl::GetParent() { 314 RenderFrameHost* RenderFrameHostImpl::GetParent() {
315 FrameTreeNode* parent_node = frame_tree_node_->parent(); 315 FrameTreeNode* parent_node = frame_tree_node_->parent();
316 if (!parent_node) 316 if (!parent_node)
317 return NULL; 317 return NULL;
318 return parent_node->current_frame_host(); 318 return parent_node->current_frame_host();
319 } 319 }
320 320
321 int RenderFrameHostImpl::GetFrameTreeNodeId() {
322 return frame_tree_node_->frame_tree_node_id();
323 }
324
321 const std::string& RenderFrameHostImpl::GetFrameName() { 325 const std::string& RenderFrameHostImpl::GetFrameName() {
322 return frame_tree_node_->frame_name(); 326 return frame_tree_node_->frame_name();
323 } 327 }
324 328
325 bool RenderFrameHostImpl::IsCrossProcessSubframe() { 329 bool RenderFrameHostImpl::IsCrossProcessSubframe() {
326 FrameTreeNode* parent_node = frame_tree_node_->parent(); 330 FrameTreeNode* parent_node = frame_tree_node_->parent();
327 if (!parent_node) 331 if (!parent_node)
328 return false; 332 return false;
329 return GetSiteInstance() != 333 return GetSiteInstance() !=
330 parent_node->current_frame_host()->GetSiteInstance(); 334 parent_node->current_frame_host()->GetSiteInstance();
(...skipping 2193 matching lines...) Expand 10 before | Expand all | Expand 10 after
2524 *dst = src; 2528 *dst = src;
2525 2529
2526 if (src.routing_id != -1) 2530 if (src.routing_id != -1)
2527 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2531 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2528 2532
2529 if (src.parent_routing_id != -1) 2533 if (src.parent_routing_id != -1)
2530 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2534 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2531 } 2535 }
2532 2536
2533 } // namespace content 2537 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698