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 20 matching lines...) Expand all Loading... | |
31 #include "content/browser/frame_host/frame_tree_node.h" | 31 #include "content/browser/frame_host/frame_tree_node.h" |
32 #include "content/browser/frame_host/navigation_handle_impl.h" | 32 #include "content/browser/frame_host/navigation_handle_impl.h" |
33 #include "content/browser/frame_host/navigation_request.h" | 33 #include "content/browser/frame_host/navigation_request.h" |
34 #include "content/browser/frame_host/navigator.h" | 34 #include "content/browser/frame_host/navigator.h" |
35 #include "content/browser/frame_host/navigator_impl.h" | 35 #include "content/browser/frame_host/navigator_impl.h" |
36 #include "content/browser/frame_host/render_frame_host_delegate.h" | 36 #include "content/browser/frame_host/render_frame_host_delegate.h" |
37 #include "content/browser/frame_host/render_frame_proxy_host.h" | 37 #include "content/browser/frame_host/render_frame_proxy_host.h" |
38 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 38 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
39 #include "content/browser/geolocation/geolocation_service_context.h" | 39 #include "content/browser/geolocation/geolocation_service_context.h" |
40 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 40 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
41 #include "content/browser/media/audio_output_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" |
46 #include "content/browser/renderer_host/render_process_host_impl.h" | 47 #include "content/browser/renderer_host/render_process_host_impl.h" |
47 #include "content/browser/renderer_host/render_view_host_delegate.h" | 48 #include "content/browser/renderer_host/render_view_host_delegate.h" |
48 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 49 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
49 #include "content/browser/renderer_host/render_view_host_impl.h" | 50 #include "content/browser/renderer_host/render_view_host_impl.h" |
50 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 51 #include "content/browser/renderer_host/render_widget_host_delegate.h" |
(...skipping 1876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1927 base::Bind(&RenderFrameHostImpl::CreateWebBluetoothService, | 1928 base::Bind(&RenderFrameHostImpl::CreateWebBluetoothService, |
1928 base::Unretained(this))); | 1929 base::Unretained(this))); |
1929 } | 1930 } |
1930 | 1931 |
1931 if (!frame_mojo_shell_) | 1932 if (!frame_mojo_shell_) |
1932 frame_mojo_shell_.reset(new FrameMojoShell(this)); | 1933 frame_mojo_shell_.reset(new FrameMojoShell(this)); |
1933 | 1934 |
1934 GetServiceRegistry()->AddService<shell::mojom::Connector>(base::Bind( | 1935 GetServiceRegistry()->AddService<shell::mojom::Connector>(base::Bind( |
1935 &FrameMojoShell::BindRequest, base::Unretained(frame_mojo_shell_.get()))); | 1936 &FrameMojoShell::BindRequest, base::Unretained(frame_mojo_shell_.get()))); |
1936 | 1937 |
1938 GetServiceRegistry()->AddService( | |
tommi (sloooow) - chröme
2016/05/20 13:26:12
run git cl format? I'm guessing it will delete th
rchtara
2016/05/27 15:24:36
Done.
| |
1939 base::Bind(&AudioOutputImpl::CreateService, | |
1940 process_, routing_id_)); | |
1941 | |
1942 | |
1937 #if defined(ENABLE_WEBVR) | 1943 #if defined(ENABLE_WEBVR) |
1938 const base::CommandLine& browser_command_line = | 1944 const base::CommandLine& browser_command_line = |
1939 *base::CommandLine::ForCurrentProcess(); | 1945 *base::CommandLine::ForCurrentProcess(); |
1940 | 1946 |
1941 if (browser_command_line.HasSwitch(switches::kEnableWebVR)) { | 1947 if (browser_command_line.HasSwitch(switches::kEnableWebVR)) { |
1942 GetServiceRegistry()->AddService<blink::mojom::VRService>( | 1948 GetServiceRegistry()->AddService<blink::mojom::VRService>( |
1943 base::Bind(&VRDeviceManager::BindRequest)); | 1949 base::Bind(&VRDeviceManager::BindRequest)); |
1944 } | 1950 } |
1945 #endif | 1951 #endif |
1946 | 1952 |
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2764 // handler after it's destroyed so it can't run after the RFHI is destroyed. | 2770 // handler after it's destroyed so it can't run after the RFHI is destroyed. |
2765 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 2771 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
2766 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 2772 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
2767 } | 2773 } |
2768 | 2774 |
2769 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 2775 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
2770 web_bluetooth_service_.reset(); | 2776 web_bluetooth_service_.reset(); |
2771 } | 2777 } |
2772 | 2778 |
2773 } // namespace content | 2779 } // namespace content |
OLD | NEW |