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

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

Issue 2367393002: Migrating MediaSession messages to mojo (Closed)
Patch Set: fix build 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"
(...skipping 18 matching lines...) Expand all
29 #include "content/browser/frame_host/frame_tree_node.h" 29 #include "content/browser/frame_host/frame_tree_node.h"
30 #include "content/browser/frame_host/navigation_entry_impl.h" 30 #include "content/browser/frame_host/navigation_entry_impl.h"
31 #include "content/browser/frame_host/navigation_handle_impl.h" 31 #include "content/browser/frame_host/navigation_handle_impl.h"
32 #include "content/browser/frame_host/navigation_request.h" 32 #include "content/browser/frame_host/navigation_request.h"
33 #include "content/browser/frame_host/navigator.h" 33 #include "content/browser/frame_host/navigator.h"
34 #include "content/browser/frame_host/navigator_impl.h" 34 #include "content/browser/frame_host/navigator_impl.h"
35 #include "content/browser/frame_host/render_frame_host_delegate.h" 35 #include "content/browser/frame_host/render_frame_host_delegate.h"
36 #include "content/browser/frame_host/render_frame_proxy_host.h" 36 #include "content/browser/frame_host/render_frame_proxy_host.h"
37 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 37 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
38 #include "content/browser/loader/resource_dispatcher_host_impl.h" 38 #include "content/browser/loader/resource_dispatcher_host_impl.h"
39 #include "content/browser/media/android/media_session_service_impl.h"
39 #include "content/browser/permissions/permission_service_context.h" 40 #include "content/browser/permissions/permission_service_context.h"
40 #include "content/browser/permissions/permission_service_impl.h" 41 #include "content/browser/permissions/permission_service_impl.h"
41 #include "content/browser/presentation/presentation_service_impl.h" 42 #include "content/browser/presentation/presentation_service_impl.h"
42 #include "content/browser/renderer_host/input/input_router_impl.h" 43 #include "content/browser/renderer_host/input/input_router_impl.h"
43 #include "content/browser/renderer_host/input/timeout_monitor.h" 44 #include "content/browser/renderer_host/input/timeout_monitor.h"
44 #include "content/browser/renderer_host/render_process_host_impl.h" 45 #include "content/browser/renderer_host/render_process_host_impl.h"
45 #include "content/browser/renderer_host/render_view_host_delegate.h" 46 #include "content/browser/renderer_host/render_view_host_delegate.h"
46 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 47 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
47 #include "content/browser/renderer_host/render_view_host_impl.h" 48 #include "content/browser/renderer_host/render_view_host_impl.h"
48 #include "content/browser/renderer_host/render_widget_host_delegate.h" 49 #include "content/browser/renderer_host/render_widget_host_delegate.h"
(...skipping 2100 matching lines...) Expand 10 before | Expand all | Expand 10 after
2149 if (!permission_service_context_) 2150 if (!permission_service_context_)
2150 permission_service_context_.reset(new PermissionServiceContext(this)); 2151 permission_service_context_.reset(new PermissionServiceContext(this));
2151 2152
2152 GetInterfaceRegistry()->AddInterface( 2153 GetInterfaceRegistry()->AddInterface(
2153 base::Bind(&PermissionServiceContext::CreateService, 2154 base::Bind(&PermissionServiceContext::CreateService,
2154 base::Unretained(permission_service_context_.get()))); 2155 base::Unretained(permission_service_context_.get())));
2155 2156
2156 GetInterfaceRegistry()->AddInterface(base::Bind( 2157 GetInterfaceRegistry()->AddInterface(base::Bind(
2157 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); 2158 &PresentationServiceImpl::CreateMojoService, base::Unretained(this)));
2158 2159
2160 #if defined(OS_ANDROID)
2161 GetInterfaceRegistry()->AddInterface(base::Bind(
2162 &MediaSessionServiceImpl::Create, base::Unretained(this)));
2163 #endif
2164
2159 #if !defined(OS_ANDROID) 2165 #if !defined(OS_ANDROID)
2160 GetInterfaceRegistry()->AddInterface( 2166 GetInterfaceRegistry()->AddInterface(
2161 base::Bind(&device::VibrationManagerImpl::Create)); 2167 base::Bind(&device::VibrationManagerImpl::Create));
2162 #endif 2168 #endif
2163 2169
2164 bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch( 2170 bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch(
2165 switches::kEnableWebBluetooth); 2171 switches::kEnableWebBluetooth);
2166 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX) 2172 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX)
2167 enable_web_bluetooth = true; 2173 enable_web_bluetooth = true;
2168 #endif 2174 #endif
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
3099 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 3105 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
3100 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 3106 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
3101 return web_bluetooth_service_.get(); 3107 return web_bluetooth_service_.get();
3102 } 3108 }
3103 3109
3104 void RenderFrameHostImpl::DeleteWebBluetoothService() { 3110 void RenderFrameHostImpl::DeleteWebBluetoothService() {
3105 web_bluetooth_service_.reset(); 3111 web_bluetooth_service_.reset();
3106 } 3112 }
3107 3113
3108 } // namespace content 3114 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698