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

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

Issue 2367393002: Migrating MediaSession messages to mojo (Closed)
Patch Set: blink typemap (need to revert blink typemap, only need content/ reivew) 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.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 2095 matching lines...) Expand 10 before | Expand all | Expand 10 after
2144 base::Bind(&PermissionServiceContext::CreateService, 2145 base::Bind(&PermissionServiceContext::CreateService,
2145 base::Unretained(permission_service_context_.get()))); 2146 base::Unretained(permission_service_context_.get())));
2146 2147
2147 GetInterfaceRegistry()->AddInterface(base::Bind( 2148 GetInterfaceRegistry()->AddInterface(base::Bind(
2148 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); 2149 &PresentationServiceImpl::CreateMojoService, base::Unretained(this)));
2149 2150
2150 #if defined(OS_ANDROID) 2151 #if defined(OS_ANDROID)
2151 GetInterfaceRegistry()->AddInterface( 2152 GetInterfaceRegistry()->AddInterface(
2152 GetGlobalJavaInterfaces() 2153 GetGlobalJavaInterfaces()
2153 ->CreateInterfaceFactory<device::VibrationManager>()); 2154 ->CreateInterfaceFactory<device::VibrationManager>());
2155 GetInterfaceRegistry()->AddInterface(
2156 base::Bind(&MediaSessionService::Create, base::Unretained(this)));
2154 #else 2157 #else
2155 GetInterfaceRegistry()->AddInterface( 2158 GetInterfaceRegistry()->AddInterface(
2156 base::Bind(&device::VibrationManagerImpl::Create)); 2159 base::Bind(&device::VibrationManagerImpl::Create));
2157 #endif 2160 #endif
2158 2161
2159 bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch( 2162 bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch(
2160 switches::kEnableWebBluetooth); 2163 switches::kEnableWebBluetooth);
2161 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX) 2164 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_MACOSX)
2162 enable_web_bluetooth = true; 2165 enable_web_bluetooth = true;
2163 #endif 2166 #endif
(...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after
3086 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 3089 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
3087 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 3090 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
3088 return web_bluetooth_service_.get(); 3091 return web_bluetooth_service_.get();
3089 } 3092 }
3090 3093
3091 void RenderFrameHostImpl::DeleteWebBluetoothService() { 3094 void RenderFrameHostImpl::DeleteWebBluetoothService() {
3092 web_bluetooth_service_.reset(); 3095 web_bluetooth_service_.reset();
3093 } 3096 }
3094 3097
3095 } // namespace content 3098 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698