Chromium Code Reviews| Index: content/browser/renderer_host/render_process_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
| index e438033ed958ec373b3db13e029dbcb13cceaa3f..eec895129567e7afebeff6f769611af9ddb64dfc 100644 |
| --- a/content/browser/renderer_host/render_process_host_impl.cc |
| +++ b/content/browser/renderer_host/render_process_host_impl.cc |
| @@ -46,6 +46,7 @@ |
| #include "content/browser/background_sync/background_sync_service_impl.h" |
| #include "content/browser/bad_message.h" |
| #include "content/browser/bluetooth/bluetooth_dispatcher_host.h" |
| +#include "content/browser/bluetooth/bluetooth_service_impl.h" |
| #include "content/browser/browser_child_process_host_impl.h" |
| #include "content/browser/browser_main.h" |
| #include "content/browser/browser_main_loop.h" |
| @@ -1096,6 +1097,17 @@ void RenderProcessHostImpl::RegisterMojoServices() { |
| mojo_application_host_->service_registry_android()); |
| #endif |
| + bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kEnableWebBluetooth); |
| +#if defined(OS_CHROMEOS) || defined(OS_ANDROID) |
| + enable_web_bluetooth = true; |
| +#endif |
| + |
| + if (enable_web_bluetooth) { |
| + mojo_application_host_->service_registry()->AddService( |
|
Ken Rockot(use gerrit already)
2016/03/09 19:31:26
Use GetServiceRegistry() instead of mojo_applicati
ortuno
2016/03/16 16:29:45
Done.
|
| + base::Bind(&BluetoothServiceImpl::Create, GetID())); |
| + } |
| + |
| GetContentClient()->browser()->RegisterRenderProcessMojoServices( |
| mojo_application_host_->service_registry()); |
| } |