OLD | NEW |
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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "content/browser/bad_message.h" | 10 #include "content/browser/bad_message.h" |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 GetProcess()->FilterURL(false, &validated_url); | 250 GetProcess()->FilterURL(false, &validated_url); |
251 | 251 |
252 // Verify that we are in the same BrowsingInstance as the current | 252 // Verify that we are in the same BrowsingInstance as the current |
253 // RenderFrameHost. | 253 // RenderFrameHost. |
254 RenderFrameHostImpl* current_rfh = frame_tree_node_->current_frame_host(); | 254 RenderFrameHostImpl* current_rfh = frame_tree_node_->current_frame_host(); |
255 if (!site_instance_->IsRelatedSiteInstance(current_rfh->GetSiteInstance())) | 255 if (!site_instance_->IsRelatedSiteInstance(current_rfh->GetSiteInstance())) |
256 return; | 256 return; |
257 | 257 |
258 // Since this navigation targeted a specific RenderFrameProxy, it should stay | 258 // Since this navigation targeted a specific RenderFrameProxy, it should stay |
259 // in the current tab. | 259 // in the current tab. |
260 DCHECK_EQ(CURRENT_TAB, params.disposition); | 260 DCHECK_EQ(WindowOpenDisposition::CURRENT_TAB, params.disposition); |
261 | 261 |
262 // TODO(alexmos, creis): Figure out whether |params.user_gesture| needs to be | 262 // TODO(alexmos, creis): Figure out whether |params.user_gesture| needs to be |
263 // passed in as well. | 263 // passed in as well. |
264 frame_tree_node_->navigator()->RequestTransferURL( | 264 frame_tree_node_->navigator()->RequestTransferURL( |
265 current_rfh, validated_url, site_instance_.get(), std::vector<GURL>(), | 265 current_rfh, validated_url, site_instance_.get(), std::vector<GURL>(), |
266 params.referrer, ui::PAGE_TRANSITION_LINK, GlobalRequestID(), | 266 params.referrer, ui::PAGE_TRANSITION_LINK, GlobalRequestID(), |
267 params.should_replace_current_entry, params.uses_post ? "POST" : "GET", | 267 params.should_replace_current_entry, params.uses_post ? "POST" : "GET", |
268 params.resource_request_body); | 268 params.resource_request_body); |
269 } | 269 } |
270 | 270 |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type, | 369 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type, |
370 source_proxy_routing_id)); | 370 source_proxy_routing_id)); |
371 } | 371 } |
372 | 372 |
373 void RenderFrameProxyHost::OnFrameFocused() { | 373 void RenderFrameProxyHost::OnFrameFocused() { |
374 frame_tree_node_->current_frame_host()->delegate()->SetFocusedFrame( | 374 frame_tree_node_->current_frame_host()->delegate()->SetFocusedFrame( |
375 frame_tree_node_, GetSiteInstance()); | 375 frame_tree_node_, GetSiteInstance()); |
376 } | 376 } |
377 | 377 |
378 } // namespace content | 378 } // namespace content |
OLD | NEW |