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

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

Issue 692973005: Pass origin information for remote frame creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add EXPECT_TRUE to NavigateToURL in new tests; nits Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_proxy_host.h" 5 #include "content/browser/frame_host/render_frame_proxy_host.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "content/browser/frame_host/cross_process_frame_connector.h" 8 #include "content/browser/frame_host/cross_process_frame_connector.h"
9 #include "content/browser/frame_host/frame_tree.h" 9 #include "content/browser/frame_host/frame_tree.h"
10 #include "content/browser/frame_host/frame_tree_node.h" 10 #include "content/browser/frame_host/frame_tree_node.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 parent_routing_id = frame_tree_node_->parent() 148 parent_routing_id = frame_tree_node_->parent()
149 ->render_manager() 149 ->render_manager()
150 ->GetRoutingIdForSiteInstance(site_instance_.get()); 150 ->GetRoutingIdForSiteInstance(site_instance_.get());
151 CHECK_NE(parent_routing_id, MSG_ROUTING_NONE); 151 CHECK_NE(parent_routing_id, MSG_ROUTING_NONE);
152 } 152 }
153 153
154 Send(new FrameMsg_NewFrameProxy(routing_id_, 154 Send(new FrameMsg_NewFrameProxy(routing_id_,
155 parent_routing_id, 155 parent_routing_id,
156 frame_tree_node_->frame_tree() 156 frame_tree_node_->frame_tree()
157 ->GetRenderViewHost(site_instance_.get()) 157 ->GetRenderViewHost(site_instance_.get())
158 ->GetRoutingID())); 158 ->GetRoutingID(),
159 frame_tree_node_
160 ->current_replication_state()));
159 161
160 return true; 162 return true;
161 } 163 }
162 164
163 void RenderFrameProxyHost::DisownOpener() { 165 void RenderFrameProxyHost::DisownOpener() {
164 Send(new FrameMsg_DisownOpener(GetRoutingID())); 166 Send(new FrameMsg_DisownOpener(GetRoutingID()));
165 } 167 }
166 168
167 void RenderFrameProxyHost::OnOpenURL( 169 void RenderFrameProxyHost::OnOpenURL(
168 const FrameHostMsg_OpenURL_Params& params) { 170 const FrameHostMsg_OpenURL_Params& params) {
169 frame_tree_node_->current_frame_host()->OpenURL(params); 171 frame_tree_node_->current_frame_host()->OpenURL(params);
170 } 172 }
171 173
172 } // namespace content 174 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698