| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1314 const ViewHostMsg_CreateWindow_Params& params, | 1314 const ViewHostMsg_CreateWindow_Params& params, |
| 1315 SessionStorageNamespace* session_storage_namespace) { | 1315 SessionStorageNamespace* session_storage_namespace) { |
| 1316 ViewHostMsg_CreateWindow_Params validated_params(params); | 1316 ViewHostMsg_CreateWindow_Params validated_params(params); |
| 1317 ChildProcessSecurityPolicyImpl* policy = | 1317 ChildProcessSecurityPolicyImpl* policy = |
| 1318 ChildProcessSecurityPolicyImpl::GetInstance(); | 1318 ChildProcessSecurityPolicyImpl::GetInstance(); |
| 1319 FilterURL(policy, GetProcess(), false, &validated_params.target_url); | 1319 FilterURL(policy, GetProcess(), false, &validated_params.target_url); |
| 1320 FilterURL(policy, GetProcess(), false, &validated_params.opener_url); | 1320 FilterURL(policy, GetProcess(), false, &validated_params.opener_url); |
| 1321 FilterURL(policy, GetProcess(), true, | 1321 FilterURL(policy, GetProcess(), true, |
| 1322 &validated_params.opener_security_origin); | 1322 &validated_params.opener_security_origin); |
| 1323 | 1323 |
| 1324 delegate_->CreateNewWindow(route_id, main_frame_route_id, | 1324 delegate_->CreateNewWindow( |
| 1325 validated_params, session_storage_namespace); | 1325 GetProcess()->GetID(), route_id, main_frame_route_id, validated_params, |
| 1326 session_storage_namespace); |
| 1326 } | 1327 } |
| 1327 | 1328 |
| 1328 void RenderViewHostImpl::CreateNewWidget(int route_id, | 1329 void RenderViewHostImpl::CreateNewWidget(int route_id, |
| 1329 blink::WebPopupType popup_type) { | 1330 blink::WebPopupType popup_type) { |
| 1330 delegate_->CreateNewWidget(route_id, popup_type); | 1331 delegate_->CreateNewWidget(route_id, popup_type); |
| 1331 } | 1332 } |
| 1332 | 1333 |
| 1333 void RenderViewHostImpl::CreateNewFullscreenWidget(int route_id) { | 1334 void RenderViewHostImpl::CreateNewFullscreenWidget(int route_id) { |
| 1334 delegate_->CreateNewFullscreenWidget(route_id); | 1335 delegate_->CreateNewFullscreenWidget(route_id); |
| 1335 } | 1336 } |
| (...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2300 void RenderViewHostImpl::AttachToFrameTree() { | 2301 void RenderViewHostImpl::AttachToFrameTree() { |
| 2301 FrameTree* frame_tree = delegate_->GetFrameTree(); | 2302 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 2302 | 2303 |
| 2303 frame_tree->SwapMainFrame(main_render_frame_host_.get()); | 2304 frame_tree->SwapMainFrame(main_render_frame_host_.get()); |
| 2304 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { | 2305 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { |
| 2305 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); | 2306 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); |
| 2306 } | 2307 } |
| 2307 } | 2308 } |
| 2308 | 2309 |
| 2309 } // namespace content | 2310 } // namespace content |
| OLD | NEW |