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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 #include "content/public/browser/render_widget_host_view.h" | 77 #include "content/public/browser/render_widget_host_view.h" |
78 #include "content/public/browser/storage_partition.h" | 78 #include "content/public/browser/storage_partition.h" |
79 #include "content/public/browser/stream_handle.h" | 79 #include "content/public/browser/stream_handle.h" |
80 #include "content/public/browser/user_metrics.h" | 80 #include "content/public/browser/user_metrics.h" |
81 #include "content/public/common/browser_side_navigation_policy.h" | 81 #include "content/public/common/browser_side_navigation_policy.h" |
82 #include "content/public/common/content_constants.h" | 82 #include "content/public/common/content_constants.h" |
83 #include "content/public/common/content_switches.h" | 83 #include "content/public/common/content_switches.h" |
84 #include "content/public/common/file_chooser_file_info.h" | 84 #include "content/public/common/file_chooser_file_info.h" |
85 #include "content/public/common/file_chooser_params.h" | 85 #include "content/public/common/file_chooser_params.h" |
86 #include "content/public/common/isolated_world_ids.h" | 86 #include "content/public/common/isolated_world_ids.h" |
87 #include "content/public/common/mojo_shell_connection.h" | 87 #include "content/public/common/service_manager_connection.h" |
88 #include "content/public/common/url_constants.h" | 88 #include "content/public/common/url_constants.h" |
89 #include "content/public/common/url_utils.h" | 89 #include "content/public/common/url_utils.h" |
90 #include "device/generic_sensor/sensor_provider_impl.h" | 90 #include "device/generic_sensor/sensor_provider_impl.h" |
91 #include "device/geolocation/geolocation_service_context.h" | 91 #include "device/geolocation/geolocation_service_context.h" |
92 #include "device/vibration/vibration_manager_impl.h" | 92 #include "device/vibration/vibration_manager_impl.h" |
93 #include "media/mojo/interfaces/media_service.mojom.h" | 93 #include "media/mojo/interfaces/media_service.mojom.h" |
94 #include "media/mojo/interfaces/service_factory.mojom.h" | 94 #include "media/mojo/interfaces/service_factory.mojom.h" |
95 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" | 95 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" |
96 #include "services/shell/public/cpp/connector.h" | 96 #include "services/shell/public/cpp/connector.h" |
97 #include "services/shell/public/cpp/interface_provider.h" | 97 #include "services/shell/public/cpp/interface_provider.h" |
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
823 #endif | 823 #endif |
824 GetContentClient()->browser()->ExposeInterfacesToMediaService(registry.get(), | 824 GetContentClient()->browser()->ExposeInterfacesToMediaService(registry.get(), |
825 this); | 825 this); |
826 shell::mojom::InterfaceProviderPtr interfaces; | 826 shell::mojom::InterfaceProviderPtr interfaces; |
827 registry->Bind(GetProxy(&interfaces)); | 827 registry->Bind(GetProxy(&interfaces)); |
828 media_registries_.push_back(std::move(registry)); | 828 media_registries_.push_back(std::move(registry)); |
829 | 829 |
830 // TODO(slan): Use the BrowserContext Connector instead. See crbug.com/638950. | 830 // TODO(slan): Use the BrowserContext Connector instead. See crbug.com/638950. |
831 media::mojom::MediaServicePtr media_service; | 831 media::mojom::MediaServicePtr media_service; |
832 shell::Connector* connector = | 832 shell::Connector* connector = |
833 MojoShellConnection::GetForProcess()->GetConnector(); | 833 ServiceManagerConnection::GetForProcess()->GetConnector(); |
834 connector->ConnectToInterface("service:media", &media_service); | 834 connector->ConnectToInterface("service:media", &media_service); |
835 media_service->CreateServiceFactory(std::move(request), | 835 media_service->CreateServiceFactory(std::move(request), |
836 std::move(interfaces)); | 836 std::move(interfaces)); |
837 } | 837 } |
838 | 838 |
839 bool RenderFrameHostImpl::CreateRenderFrame(int proxy_routing_id, | 839 bool RenderFrameHostImpl::CreateRenderFrame(int proxy_routing_id, |
840 int opener_routing_id, | 840 int opener_routing_id, |
841 int parent_routing_id, | 841 int parent_routing_id, |
842 int previous_sibling_routing_id) { | 842 int previous_sibling_routing_id) { |
843 TRACE_EVENT0("navigation", "RenderFrameHostImpl::CreateRenderFrame"); | 843 TRACE_EVENT0("navigation", "RenderFrameHostImpl::CreateRenderFrame"); |
(...skipping 2270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3114 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3114 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
3115 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3115 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
3116 return web_bluetooth_service_.get(); | 3116 return web_bluetooth_service_.get(); |
3117 } | 3117 } |
3118 | 3118 |
3119 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3119 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
3120 web_bluetooth_service_.reset(); | 3120 web_bluetooth_service_.reset(); |
3121 } | 3121 } |
3122 | 3122 |
3123 } // namespace content | 3123 } // namespace content |
OLD | NEW |