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 965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
976 } | 976 } |
977 | 977 |
978 RenderWidgetHostImpl::WasShown(latency_info); | 978 RenderWidgetHostImpl::WasShown(latency_info); |
979 } | 979 } |
980 | 980 |
981 bool RenderViewHostImpl::IsRenderView() const { | 981 bool RenderViewHostImpl::IsRenderView() const { |
982 return true; | 982 return true; |
983 } | 983 } |
984 | 984 |
985 void RenderViewHostImpl::CreateNewWindow( | 985 void RenderViewHostImpl::CreateNewWindow( |
986 int route_id, | 986 int32 route_id, |
987 int main_frame_route_id, | 987 int32 main_frame_route_id, |
| 988 int32 main_frame_widget_route_id, |
988 const ViewHostMsg_CreateWindow_Params& params, | 989 const ViewHostMsg_CreateWindow_Params& params, |
989 SessionStorageNamespace* session_storage_namespace) { | 990 SessionStorageNamespace* session_storage_namespace) { |
990 ViewHostMsg_CreateWindow_Params validated_params(params); | 991 ViewHostMsg_CreateWindow_Params validated_params(params); |
991 GetProcess()->FilterURL(false, &validated_params.target_url); | 992 GetProcess()->FilterURL(false, &validated_params.target_url); |
992 GetProcess()->FilterURL(false, &validated_params.opener_url); | 993 GetProcess()->FilterURL(false, &validated_params.opener_url); |
993 GetProcess()->FilterURL(true, &validated_params.opener_security_origin); | 994 GetProcess()->FilterURL(true, &validated_params.opener_security_origin); |
994 | 995 |
995 delegate_->CreateNewWindow(GetSiteInstance(), route_id, main_frame_route_id, | 996 delegate_->CreateNewWindow(GetSiteInstance(), route_id, main_frame_route_id, |
996 validated_params, session_storage_namespace); | 997 main_frame_widget_route_id, validated_params, |
| 998 session_storage_namespace); |
997 } | 999 } |
998 | 1000 |
999 void RenderViewHostImpl::CreateNewWidget(int route_id, | 1001 void RenderViewHostImpl::CreateNewWidget(int route_id, |
1000 blink::WebPopupType popup_type) { | 1002 blink::WebPopupType popup_type) { |
1001 delegate_->CreateNewWidget(GetProcess()->GetID(), route_id, popup_type); | 1003 delegate_->CreateNewWidget(GetProcess()->GetID(), route_id, popup_type); |
1002 } | 1004 } |
1003 | 1005 |
1004 void RenderViewHostImpl::CreateNewFullscreenWidget(int route_id) { | 1006 void RenderViewHostImpl::CreateNewFullscreenWidget(int route_id) { |
1005 delegate_->CreateNewFullscreenWidget(GetProcess()->GetID(), route_id); | 1007 delegate_->CreateNewFullscreenWidget(GetProcess()->GetID(), route_id); |
1006 } | 1008 } |
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1425 if (!policy->CanReadFile(GetProcess()->GetID(), file)) | 1427 if (!policy->CanReadFile(GetProcess()->GetID(), file)) |
1426 policy->GrantReadFile(GetProcess()->GetID(), file); | 1428 policy->GrantReadFile(GetProcess()->GetID(), file); |
1427 } | 1429 } |
1428 } | 1430 } |
1429 | 1431 |
1430 void RenderViewHostImpl::SelectWordAroundCaret() { | 1432 void RenderViewHostImpl::SelectWordAroundCaret() { |
1431 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1433 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1432 } | 1434 } |
1433 | 1435 |
1434 } // namespace content | 1436 } // namespace content |
OLD | NEW |