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

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: Nits in #16, s/FindByFrameTreeNodeID/FindFrameByFrameTreeNodeID/ Created 5 years, 1 month 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 return process_; 266 return process_;
267 } 267 }
268 268
269 RenderFrameHost* RenderFrameHostImpl::GetParent() { 269 RenderFrameHost* RenderFrameHostImpl::GetParent() {
270 FrameTreeNode* parent_node = frame_tree_node_->parent(); 270 FrameTreeNode* parent_node = frame_tree_node_->parent();
271 if (!parent_node) 271 if (!parent_node)
272 return NULL; 272 return NULL;
273 return parent_node->current_frame_host(); 273 return parent_node->current_frame_host();
274 } 274 }
275 275
276 int RenderFrameHostImpl::GetFrameTreeNodeID() {
277 return frame_tree_node_->frame_tree_node_id();
278 }
279
276 const std::string& RenderFrameHostImpl::GetFrameName() { 280 const std::string& RenderFrameHostImpl::GetFrameName() {
277 return frame_tree_node_->frame_name(); 281 return frame_tree_node_->frame_name();
278 } 282 }
279 283
280 bool RenderFrameHostImpl::IsCrossProcessSubframe() { 284 bool RenderFrameHostImpl::IsCrossProcessSubframe() {
281 FrameTreeNode* parent_node = frame_tree_node_->parent(); 285 FrameTreeNode* parent_node = frame_tree_node_->parent();
282 if (!parent_node) 286 if (!parent_node)
283 return false; 287 return false;
284 return GetSiteInstance() != 288 return GetSiteInstance() !=
285 parent_node->current_frame_host()->GetSiteInstance(); 289 parent_node->current_frame_host()->GetSiteInstance();
(...skipping 1981 matching lines...) Expand 10 before | Expand all | Expand 10 after
2267 BrowserPluginInstanceIDToAXTreeID(value))); 2271 BrowserPluginInstanceIDToAXTreeID(value)));
2268 break; 2272 break;
2269 case AX_CONTENT_INT_ATTRIBUTE_LAST: 2273 case AX_CONTENT_INT_ATTRIBUTE_LAST:
2270 NOTREACHED(); 2274 NOTREACHED();
2271 break; 2275 break;
2272 } 2276 }
2273 } 2277 }
2274 } 2278 }
2275 2279
2276 } // namespace content 2280 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698