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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 1142303002: Revert of bluetooth: Move testing IPC from BluetoothDispatcher to BlinkTestRunner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 #if defined(OS_ANDROID) 926 #if defined(OS_ANDROID)
927 AddFilter(new ScreenOrientationMessageFilterAndroid()); 927 AddFilter(new ScreenOrientationMessageFilterAndroid());
928 #endif 928 #endif
929 AddFilter(new GeofencingDispatcherHost( 929 AddFilter(new GeofencingDispatcherHost(
930 storage_partition_impl_->GetGeofencingManager())); 930 storage_partition_impl_->GetGeofencingManager()));
931 AddFilter(new NavigatorConnectDispatcherHost( 931 AddFilter(new NavigatorConnectDispatcherHost(
932 storage_partition_impl_->GetNavigatorConnectContext(), 932 storage_partition_impl_->GetNavigatorConnectContext(),
933 message_port_message_filter_.get())); 933 message_port_message_filter_.get()));
934 if (browser_command_line.HasSwitch( 934 if (browser_command_line.HasSwitch(
935 switches::kEnableExperimentalWebPlatformFeatures)) { 935 switches::kEnableExperimentalWebPlatformFeatures)) {
936 bluetooth_dispatcher_host_ = new BluetoothDispatcherHost(); 936 AddFilter(new BluetoothDispatcherHost());
937 AddFilter(bluetooth_dispatcher_host_.get());
938 } 937 }
939 } 938 }
940 939
941 void RenderProcessHostImpl::RegisterMojoServices() { 940 void RenderProcessHostImpl::RegisterMojoServices() {
942 mojo_application_host_->service_registry()->AddService( 941 mojo_application_host_->service_registry()->AddService(
943 base::Bind(&device::BatteryMonitorImpl::Create)); 942 base::Bind(&device::BatteryMonitorImpl::Create));
944 943
945 mojo_application_host_->service_registry()->AddService( 944 mojo_application_host_->service_registry()->AddService(
946 base::Bind(&device::VibrationManagerImpl::Create)); 945 base::Bind(&device::VibrationManagerImpl::Create));
947 946
(...skipping 1510 matching lines...) Expand 10 before | Expand all | Expand 10 after
2458 --worker_ref_count_; 2457 --worker_ref_count_;
2459 if (worker_ref_count_ == 0) 2458 if (worker_ref_count_ == 0)
2460 Cleanup(); 2459 Cleanup();
2461 } 2460 }
2462 2461
2463 void RenderProcessHostImpl::GetAudioOutputControllers( 2462 void RenderProcessHostImpl::GetAudioOutputControllers(
2464 const GetAudioOutputControllersCallback& callback) const { 2463 const GetAudioOutputControllersCallback& callback) const {
2465 audio_renderer_host()->GetOutputControllers(callback); 2464 audio_renderer_host()->GetOutputControllers(callback);
2466 } 2465 }
2467 2466
2468 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
2469 return bluetooth_dispatcher_host_.get();
2470 }
2471
2472 } // namespace content 2467 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.h ('k') | content/child/blink_platform_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698