| 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 30 matching lines...) Expand all  Loading... | 
| 41 #include "content/browser/renderer_host/render_view_host_delegate.h" | 41 #include "content/browser/renderer_host/render_view_host_delegate.h" | 
| 42 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 42 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 
| 43 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 43 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 
| 44 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 44 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 
| 45 #include "content/common/browser_plugin/browser_plugin_messages.h" | 45 #include "content/common/browser_plugin/browser_plugin_messages.h" | 
| 46 #include "content/common/content_switches_internal.h" | 46 #include "content/common/content_switches_internal.h" | 
| 47 #include "content/common/drag_messages.h" | 47 #include "content/common/drag_messages.h" | 
| 48 #include "content/common/frame_messages.h" | 48 #include "content/common/frame_messages.h" | 
| 49 #include "content/common/input_messages.h" | 49 #include "content/common/input_messages.h" | 
| 50 #include "content/common/inter_process_time_ticks_converter.h" | 50 #include "content/common/inter_process_time_ticks_converter.h" | 
|  | 51 #include "content/common/render_message_filter.mojom.h" | 
| 51 #include "content/common/site_isolation_policy.h" | 52 #include "content/common/site_isolation_policy.h" | 
| 52 #include "content/common/speech_recognition_messages.h" | 53 #include "content/common/speech_recognition_messages.h" | 
| 53 #include "content/common/swapped_out_messages.h" | 54 #include "content/common/swapped_out_messages.h" | 
| 54 #include "content/common/view_messages.h" | 55 #include "content/common/view_messages.h" | 
| 55 #include "content/public/browser/ax_event_notification_details.h" | 56 #include "content/public/browser/ax_event_notification_details.h" | 
| 56 #include "content/public/browser/browser_accessibility_state.h" | 57 #include "content/public/browser/browser_accessibility_state.h" | 
| 57 #include "content/public/browser/browser_context.h" | 58 #include "content/public/browser/browser_context.h" | 
| 58 #include "content/public/browser/browser_message_filter.h" | 59 #include "content/public/browser/browser_message_filter.h" | 
| 59 #include "content/public/browser/content_browser_client.h" | 60 #include "content/public/browser/content_browser_client.h" | 
| 60 #include "content/public/browser/focused_node_details.h" | 61 #include "content/public/browser/focused_node_details.h" | 
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 879   } | 880   } | 
| 880 | 881 | 
| 881   GetWidget()->ShutdownAndDestroyWidget(false); | 882   GetWidget()->ShutdownAndDestroyWidget(false); | 
| 882   delete this; | 883   delete this; | 
| 883 } | 884 } | 
| 884 | 885 | 
| 885 void RenderViewHostImpl::CreateNewWindow( | 886 void RenderViewHostImpl::CreateNewWindow( | 
| 886     int32_t route_id, | 887     int32_t route_id, | 
| 887     int32_t main_frame_route_id, | 888     int32_t main_frame_route_id, | 
| 888     int32_t main_frame_widget_route_id, | 889     int32_t main_frame_widget_route_id, | 
| 889     const ViewHostMsg_CreateWindow_Params& params, | 890     const mojom::CreateWindowParams& params, | 
| 890     SessionStorageNamespace* session_storage_namespace) { | 891     SessionStorageNamespace* session_storage_namespace) { | 
| 891   ViewHostMsg_CreateWindow_Params validated_params(params); | 892   mojom::CreateWindowParamsPtr validated_params(params.Clone()); | 
| 892   GetProcess()->FilterURL(false, &validated_params.target_url); | 893   GetProcess()->FilterURL(false, &validated_params->target_url); | 
| 893   GetProcess()->FilterURL(false, &validated_params.opener_url); | 894   GetProcess()->FilterURL(false, &validated_params->opener_url); | 
| 894   GetProcess()->FilterURL(true, &validated_params.opener_security_origin); | 895   GetProcess()->FilterURL(true, &validated_params->opener_security_origin); | 
| 895 | 896 | 
| 896   delegate_->CreateNewWindow(GetSiteInstance(), route_id, main_frame_route_id, | 897   delegate_->CreateNewWindow(GetSiteInstance(), route_id, main_frame_route_id, | 
| 897                              main_frame_widget_route_id, validated_params, | 898                              main_frame_widget_route_id, *validated_params, | 
| 898                              session_storage_namespace); | 899                              session_storage_namespace); | 
| 899 } | 900 } | 
| 900 | 901 | 
| 901 void RenderViewHostImpl::CreateNewWidget(int32_t route_id, | 902 void RenderViewHostImpl::CreateNewWidget(int32_t route_id, | 
| 902                                          blink::WebPopupType popup_type) { | 903                                          blink::WebPopupType popup_type) { | 
| 903   delegate_->CreateNewWidget(GetProcess()->GetID(), route_id, popup_type); | 904   delegate_->CreateNewWidget(GetProcess()->GetID(), route_id, popup_type); | 
| 904 } | 905 } | 
| 905 | 906 | 
| 906 void RenderViewHostImpl::CreateNewFullscreenWidget(int32_t route_id) { | 907 void RenderViewHostImpl::CreateNewFullscreenWidget(int32_t route_id) { | 
| 907   delegate_->CreateNewFullscreenWidget(GetProcess()->GetID(), route_id); | 908   delegate_->CreateNewFullscreenWidget(GetProcess()->GetID(), route_id); | 
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1321     // Note: We are using the origin URL provided by the sender here. It may be | 1322     // Note: We are using the origin URL provided by the sender here. It may be | 
| 1322     // different from the receiver's. | 1323     // different from the receiver's. | 
| 1323     file_system_file.url = | 1324     file_system_file.url = | 
| 1324         GURL(storage::GetIsolatedFileSystemRootURIString( | 1325         GURL(storage::GetIsolatedFileSystemRootURIString( | 
| 1325                  file_system_url.origin(), filesystem_id, std::string()) | 1326                  file_system_url.origin(), filesystem_id, std::string()) | 
| 1326                  .append(register_name)); | 1327                  .append(register_name)); | 
| 1327   } | 1328   } | 
| 1328 } | 1329 } | 
| 1329 | 1330 | 
| 1330 }  // namespace content | 1331 }  // namespace content | 
| OLD | NEW | 
|---|