Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(476)

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2380793002: Migrate MediaDevices.enumerateDevices to Mojo (Closed)
Patch Set: rebase, hta@ comments, fix tests, histograms.xml Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "base/containers/hash_tables.h" 11 #include "base/containers/hash_tables.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/metrics/histogram_macros.h" 14 #include "base/metrics/histogram_macros.h"
15 #include "base/process/kill.h" 15 #include "base/process/kill.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "content/browser/accessibility/accessibility_mode_helper.h" 18 #include "content/browser/accessibility/accessibility_mode_helper.h"
19 #include "content/browser/accessibility/ax_tree_id_registry.h" 19 #include "content/browser/accessibility/ax_tree_id_registry.h"
20 #include "content/browser/accessibility/browser_accessibility_manager.h" 20 #include "content/browser/accessibility/browser_accessibility_manager.h"
21 #include "content/browser/accessibility/browser_accessibility_state_impl.h" 21 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
22 #include "content/browser/bluetooth/web_bluetooth_service_impl.h" 22 #include "content/browser/bluetooth/web_bluetooth_service_impl.h"
23 #include "content/browser/browser_main_loop.h"
23 #include "content/browser/child_process_security_policy_impl.h" 24 #include "content/browser/child_process_security_policy_impl.h"
24 #include "content/browser/devtools/render_frame_devtools_agent_host.h" 25 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
25 #include "content/browser/download/mhtml_generation_manager.h" 26 #include "content/browser/download/mhtml_generation_manager.h"
26 #include "content/browser/frame_host/cross_process_frame_connector.h" 27 #include "content/browser/frame_host/cross_process_frame_connector.h"
27 #include "content/browser/frame_host/cross_site_transferring_request.h" 28 #include "content/browser/frame_host/cross_site_transferring_request.h"
28 #include "content/browser/frame_host/debug_urls.h" 29 #include "content/browser/frame_host/debug_urls.h"
29 #include "content/browser/frame_host/frame_tree.h" 30 #include "content/browser/frame_host/frame_tree.h"
30 #include "content/browser/frame_host/frame_tree_node.h" 31 #include "content/browser/frame_host/frame_tree_node.h"
31 #include "content/browser/frame_host/navigation_entry_impl.h" 32 #include "content/browser/frame_host/navigation_entry_impl.h"
32 #include "content/browser/frame_host/navigation_handle_impl.h" 33 #include "content/browser/frame_host/navigation_handle_impl.h"
33 #include "content/browser/frame_host/navigation_request.h" 34 #include "content/browser/frame_host/navigation_request.h"
34 #include "content/browser/frame_host/navigator.h" 35 #include "content/browser/frame_host/navigator.h"
35 #include "content/browser/frame_host/navigator_impl.h" 36 #include "content/browser/frame_host/navigator_impl.h"
36 #include "content/browser/frame_host/render_frame_host_delegate.h" 37 #include "content/browser/frame_host/render_frame_host_delegate.h"
37 #include "content/browser/frame_host/render_frame_proxy_host.h" 38 #include "content/browser/frame_host/render_frame_proxy_host.h"
38 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 39 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
39 #include "content/browser/loader/resource_dispatcher_host_impl.h" 40 #include "content/browser/loader/resource_dispatcher_host_impl.h"
40 #include "content/browser/media/android/media_session_service_impl.h" 41 #include "content/browser/media/android/media_session_service_impl.h"
41 #include "content/browser/permissions/permission_service_context.h" 42 #include "content/browser/permissions/permission_service_context.h"
42 #include "content/browser/permissions/permission_service_impl.h" 43 #include "content/browser/permissions/permission_service_impl.h"
43 #include "content/browser/presentation/presentation_service_impl.h" 44 #include "content/browser/presentation/presentation_service_impl.h"
44 #include "content/browser/renderer_host/input/input_router_impl.h" 45 #include "content/browser/renderer_host/input/input_router_impl.h"
45 #include "content/browser/renderer_host/input/timeout_monitor.h" 46 #include "content/browser/renderer_host/input/timeout_monitor.h"
47 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h"
46 #include "content/browser/renderer_host/render_process_host_impl.h" 48 #include "content/browser/renderer_host/render_process_host_impl.h"
47 #include "content/browser/renderer_host/render_view_host_delegate.h" 49 #include "content/browser/renderer_host/render_view_host_delegate.h"
48 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 50 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
49 #include "content/browser/renderer_host/render_view_host_impl.h" 51 #include "content/browser/renderer_host/render_view_host_impl.h"
50 #include "content/browser/renderer_host/render_widget_host_delegate.h" 52 #include "content/browser/renderer_host/render_widget_host_delegate.h"
51 #include "content/browser/renderer_host/render_widget_host_impl.h" 53 #include "content/browser/renderer_host/render_widget_host_impl.h"
52 #include "content/browser/renderer_host/render_widget_host_view_base.h" 54 #include "content/browser/renderer_host/render_widget_host_view_base.h"
53 #include "content/browser/shared_worker/shared_worker_service_impl.h" 55 #include "content/browser/shared_worker/shared_worker_service_impl.h"
54 #include "content/browser/websockets/websocket_manager.h" 56 #include "content/browser/websockets/websocket_manager.h"
55 #include "content/browser/webui/web_ui_controller_factory_registry.h" 57 #include "content/browser/webui/web_ui_controller_factory_registry.h"
(...skipping 11 matching lines...) Expand all
67 #include "content/public/browser/ax_event_notification_details.h" 69 #include "content/public/browser/ax_event_notification_details.h"
68 #include "content/public/browser/browser_accessibility_state.h" 70 #include "content/public/browser/browser_accessibility_state.h"
69 #include "content/public/browser/browser_context.h" 71 #include "content/public/browser/browser_context.h"
70 #include "content/public/browser/browser_plugin_guest_manager.h" 72 #include "content/public/browser/browser_plugin_guest_manager.h"
71 #include "content/public/browser/browser_thread.h" 73 #include "content/public/browser/browser_thread.h"
72 #include "content/public/browser/content_browser_client.h" 74 #include "content/public/browser/content_browser_client.h"
73 #include "content/public/browser/permission_manager.h" 75 #include "content/public/browser/permission_manager.h"
74 #include "content/public/browser/permission_type.h" 76 #include "content/public/browser/permission_type.h"
75 #include "content/public/browser/render_process_host.h" 77 #include "content/public/browser/render_process_host.h"
76 #include "content/public/browser/render_widget_host_view.h" 78 #include "content/public/browser/render_widget_host_view.h"
79 #include "content/public/browser/resource_context.h"
77 #include "content/public/browser/storage_partition.h" 80 #include "content/public/browser/storage_partition.h"
78 #include "content/public/browser/stream_handle.h" 81 #include "content/public/browser/stream_handle.h"
79 #include "content/public/browser/user_metrics.h" 82 #include "content/public/browser/user_metrics.h"
80 #include "content/public/common/browser_side_navigation_policy.h" 83 #include "content/public/common/browser_side_navigation_policy.h"
81 #include "content/public/common/content_constants.h" 84 #include "content/public/common/content_constants.h"
82 #include "content/public/common/content_switches.h" 85 #include "content/public/common/content_switches.h"
83 #include "content/public/common/file_chooser_file_info.h" 86 #include "content/public/common/file_chooser_file_info.h"
84 #include "content/public/common/file_chooser_params.h" 87 #include "content/public/common/file_chooser_params.h"
85 #include "content/public/common/isolated_world_ids.h" 88 #include "content/public/common/isolated_world_ids.h"
86 #include "content/public/common/service_manager_connection.h" 89 #include "content/public/common/service_manager_connection.h"
(...skipping 2122 matching lines...) Expand 10 before | Expand all | Expand 10 after
2209 base::Bind(&device::VRServiceImpl::BindRequest)); 2212 base::Bind(&device::VRServiceImpl::BindRequest));
2210 } 2213 }
2211 #endif 2214 #endif
2212 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 2215 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
2213 switches::kEnableGenericSensors)) { 2216 switches::kEnableGenericSensors)) {
2214 GetInterfaceRegistry()->AddInterface( 2217 GetInterfaceRegistry()->AddInterface(
2215 base::Bind(&device::SensorProviderImpl::Create), 2218 base::Bind(&device::SensorProviderImpl::Create),
2216 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); 2219 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
2217 } 2220 }
2218 2221
2222 #if defined(ENABLE_WEBRTC)
2223 // BrowserMainLoop::GetInstance() may be null on unit tests.
dcheng 2016/10/10 17:51:52 Out of curiosity, which unit tests does this trip
2224 if (BrowserMainLoop::GetInstance()) {
2225 MediaStreamManager* media_stream_manager =
2226 BrowserMainLoop::GetInstance()->media_stream_manager();
2227 GetInterfaceRegistry()->AddInterface(
2228 base::Bind(&MediaDevicesDispatcherHost::Create, GetProcess()->GetID(),
2229 GetRoutingID(), GetProcess()
2230 ->GetBrowserContext()
2231 ->GetResourceContext()
2232 ->GetMediaDeviceIDSalt(),
2233 base::Unretained(media_stream_manager),
alexmos 2016/10/10 17:56:13 Can you please explain (and add a comment about) w
Guido Urdaneta 2016/10/10 18:34:42 Done.
2234 base::CommandLine::ForCurrentProcess()->HasSwitch(
2235 switches::kUseFakeUIForMediaStream)),
2236 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
2237 }
2238 #endif
2239
2219 GetContentClient()->browser()->RegisterRenderFrameMojoInterfaces( 2240 GetContentClient()->browser()->RegisterRenderFrameMojoInterfaces(
2220 GetInterfaceRegistry(), this); 2241 GetInterfaceRegistry(), this);
2221 } 2242 }
2222 2243
2223 void RenderFrameHostImpl::ResetWaitingState() { 2244 void RenderFrameHostImpl::ResetWaitingState() {
2224 DCHECK(is_active()); 2245 DCHECK(is_active());
2225 2246
2226 // Whenever we reset the RFH state, we should not be waiting for beforeunload 2247 // Whenever we reset the RFH state, we should not be waiting for beforeunload
2227 // or close acks. We clear them here to be safe, since they can cause 2248 // or close acks. We clear them here to be safe, since they can cause
2228 // navigations to be ignored in OnDidCommitProvisionalLoad. 2249 // navigations to be ignored in OnDidCommitProvisionalLoad.
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
3114 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 3135 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
3115 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 3136 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
3116 return web_bluetooth_service_.get(); 3137 return web_bluetooth_service_.get();
3117 } 3138 }
3118 3139
3119 void RenderFrameHostImpl::DeleteWebBluetoothService() { 3140 void RenderFrameHostImpl::DeleteWebBluetoothService() {
3120 web_bluetooth_service_.reset(); 3141 web_bluetooth_service_.reset();
3121 } 3142 }
3122 3143
3123 } // namespace content 3144 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698