Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 37 #include "content/browser/frame_host/navigator.h" | 37 #include "content/browser/frame_host/navigator.h" |
| 38 #include "content/browser/frame_host/navigator_impl.h" | 38 #include "content/browser/frame_host/navigator_impl.h" |
| 39 #include "content/browser/frame_host/render_frame_host_delegate.h" | 39 #include "content/browser/frame_host/render_frame_host_delegate.h" |
| 40 #include "content/browser/frame_host/render_frame_proxy_host.h" | 40 #include "content/browser/frame_host/render_frame_proxy_host.h" |
| 41 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 41 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 42 #include "content/browser/installedapp/installed_app_provider_impl_default.h" | 42 #include "content/browser/installedapp/installed_app_provider_impl_default.h" |
| 43 #include "content/browser/keyboard_lock/keyboard_lock_service_impl.h" | 43 #include "content/browser/keyboard_lock/keyboard_lock_service_impl.h" |
| 44 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 44 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| 45 #include "content/browser/media/media_interface_proxy.h" | 45 #include "content/browser/media/media_interface_proxy.h" |
| 46 #include "content/browser/media/session/media_session_service_impl.h" | 46 #include "content/browser/media/session/media_session_service_impl.h" |
| 47 #include "content/browser/net/reporting_service_proxy.h" | |
| 47 #include "content/browser/permissions/permission_service_context.h" | 48 #include "content/browser/permissions/permission_service_context.h" |
| 48 #include "content/browser/permissions/permission_service_impl.h" | 49 #include "content/browser/permissions/permission_service_impl.h" |
| 49 #include "content/browser/presentation/presentation_service_impl.h" | 50 #include "content/browser/presentation/presentation_service_impl.h" |
| 50 #include "content/browser/renderer_host/dip_util.h" | 51 #include "content/browser/renderer_host/dip_util.h" |
| 51 #include "content/browser/renderer_host/input/input_router_impl.h" | 52 #include "content/browser/renderer_host/input/input_router_impl.h" |
| 52 #include "content/browser/renderer_host/input/timeout_monitor.h" | 53 #include "content/browser/renderer_host/input/timeout_monitor.h" |
| 53 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" | 54 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" |
| 54 #include "content/browser/renderer_host/render_process_host_impl.h" | 55 #include "content/browser/renderer_host/render_process_host_impl.h" |
| 55 #include "content/browser/renderer_host/render_view_host_delegate.h" | 56 #include "content/browser/renderer_host/render_view_host_delegate.h" |
| 56 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 57 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 67 #include "content/common/associated_interface_provider_impl.h" | 68 #include "content/common/associated_interface_provider_impl.h" |
| 68 #include "content/common/associated_interface_registry_impl.h" | 69 #include "content/common/associated_interface_registry_impl.h" |
| 69 #include "content/common/associated_interfaces.mojom.h" | 70 #include "content/common/associated_interfaces.mojom.h" |
| 70 #include "content/common/content_security_policy/content_security_policy.h" | 71 #include "content/common/content_security_policy/content_security_policy.h" |
| 71 #include "content/common/frame_messages.h" | 72 #include "content/common/frame_messages.h" |
| 72 #include "content/common/frame_owner_properties.h" | 73 #include "content/common/frame_owner_properties.h" |
| 73 #include "content/common/input/input_handler.mojom.h" | 74 #include "content/common/input/input_handler.mojom.h" |
| 74 #include "content/common/input_messages.h" | 75 #include "content/common/input_messages.h" |
| 75 #include "content/common/inter_process_time_ticks_converter.h" | 76 #include "content/common/inter_process_time_ticks_converter.h" |
| 76 #include "content/common/navigation_params.h" | 77 #include "content/common/navigation_params.h" |
| 78 #include "content/common/net/reporting.mojom.h" | |
| 77 #include "content/common/render_message_filter.mojom.h" | 79 #include "content/common/render_message_filter.mojom.h" |
| 78 #include "content/common/renderer.mojom.h" | 80 #include "content/common/renderer.mojom.h" |
| 79 #include "content/common/site_isolation_policy.h" | 81 #include "content/common/site_isolation_policy.h" |
| 80 #include "content/common/swapped_out_messages.h" | 82 #include "content/common/swapped_out_messages.h" |
| 81 #include "content/public/browser/ax_event_notification_details.h" | 83 #include "content/public/browser/ax_event_notification_details.h" |
| 82 #include "content/public/browser/browser_accessibility_state.h" | 84 #include "content/public/browser/browser_accessibility_state.h" |
| 83 #include "content/public/browser/browser_context.h" | 85 #include "content/public/browser/browser_context.h" |
| 84 #include "content/public/browser/browser_plugin_guest_manager.h" | 86 #include "content/public/browser/browser_plugin_guest_manager.h" |
| 85 #include "content/public/browser/browser_thread.h" | 87 #include "content/public/browser/browser_thread.h" |
| 86 #include "content/public/browser/content_browser_client.h" | 88 #include "content/public/browser/content_browser_client.h" |
| (...skipping 2763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2850 #endif | 2852 #endif |
| 2851 | 2853 |
| 2852 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2854 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| 2853 GetInterfaceRegistry()->AddInterface(base::Bind( | 2855 GetInterfaceRegistry()->AddInterface(base::Bind( |
| 2854 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID())); | 2856 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID())); |
| 2855 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2857 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| 2856 | 2858 |
| 2857 GetInterfaceRegistry()->AddInterface(base::Bind( | 2859 GetInterfaceRegistry()->AddInterface(base::Bind( |
| 2858 &KeyboardLockServiceImpl::CreateMojoService)); | 2860 &KeyboardLockServiceImpl::CreateMojoService)); |
| 2859 | 2861 |
| 2862 GetInterfaceRegistry()->AddInterface<mojom::ReportingServiceProxy>(base::Bind( | |
|
jam
2017/06/05 21:03:44
since this interface is per profile, it can be reg
Julia Tuttle
2017/06/15 20:33:31
I can't -- the ReportingServiceProxy needs to know
jam
2017/06/23 16:39:41
Do you mean StoragePartition instead of SiteInstan
| |
| 2863 &CreateReportingServiceProxy, base::RetainedRef(site_instance_))); | |
| 2864 | |
| 2860 GetContentClient()->browser()->ExposeInterfacesToFrame(GetInterfaceRegistry(), | 2865 GetContentClient()->browser()->ExposeInterfacesToFrame(GetInterfaceRegistry(), |
| 2861 this); | 2866 this); |
| 2862 } | 2867 } |
| 2863 | 2868 |
| 2864 void RenderFrameHostImpl::ResetWaitingState() { | 2869 void RenderFrameHostImpl::ResetWaitingState() { |
| 2865 DCHECK(is_active()); | 2870 DCHECK(is_active()); |
| 2866 | 2871 |
| 2867 // Whenever we reset the RFH state, we should not be waiting for beforeunload | 2872 // Whenever we reset the RFH state, we should not be waiting for beforeunload |
| 2868 // or close acks. We clear them here to be safe, since they can cause | 2873 // or close acks. We clear them here to be safe, since they can cause |
| 2869 // navigations to be ignored in OnDidCommitProvisionalLoad. | 2874 // navigations to be ignored in OnDidCommitProvisionalLoad. |
| (...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4065 } | 4070 } |
| 4066 | 4071 |
| 4067 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 4072 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
| 4068 const std::string& interface_name, | 4073 const std::string& interface_name, |
| 4069 mojo::ScopedMessagePipeHandle pipe) { | 4074 mojo::ScopedMessagePipeHandle pipe) { |
| 4070 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 4075 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
| 4071 } | 4076 } |
| 4072 #endif | 4077 #endif |
| 4073 | 4078 |
| 4074 } // namespace content | 4079 } // namespace content |
| OLD | NEW |