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

Unified Diff: content/browser/frame_host/render_frame_proxy_host.cc

Issue 503933002: Remove implicit conversions from scoped_refptr to T* in content/browser/frame_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_proxy_host.cc
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 5cbad79015f58ca18e4fd008ab31a396e7e8da7e..e6032f2fd73d84951de26e3f933a9cdd83da41a5 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -53,7 +53,8 @@ void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) {
}
RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() {
- return frame_tree_node_->frame_tree()->GetRenderViewHost(site_instance_);
+ return frame_tree_node_->frame_tree()->GetRenderViewHost(
+ site_instance_.get());
}
scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() {
@@ -94,16 +95,17 @@ bool RenderFrameProxyHost::InitRenderFrameProxy() {
int parent_routing_id = MSG_ROUTING_NONE;
if (frame_tree_node_->parent()) {
- parent_routing_id = frame_tree_node_->parent()->render_manager()->
- GetRoutingIdForSiteInstance(site_instance_);
+ parent_routing_id = frame_tree_node_->parent()
+ ->render_manager()
+ ->GetRoutingIdForSiteInstance(site_instance_.get());
CHECK_NE(parent_routing_id, MSG_ROUTING_NONE);
}
- Send(new FrameMsg_NewFrameProxy(
- routing_id_,
- parent_routing_id,
- frame_tree_node_->frame_tree()->GetRenderViewHost(
- site_instance_)->GetRoutingID()));
+ Send(new FrameMsg_NewFrameProxy(routing_id_,
+ parent_routing_id,
+ frame_tree_node_->frame_tree()
+ ->GetRenderViewHost(site_instance_.get())
+ ->GetRoutingID()));
return true;
}
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698