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

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 1922923002: bluetooth: Move requestDevice to mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-separate-tests-request-device
Patch Set: Rebase Created 4 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 side-by-side diff with in-line comments
Download patch
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 5190f12dcd1237f6f88800b7770b879ade702528..3b48e4271ba79107a8c3db437938256636875ae8 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -51,7 +51,6 @@
#include "content/browser/bad_message.h"
#include "content/browser/blob_storage/blob_dispatcher_host.h"
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
-#include "content/browser/bluetooth/bluetooth_dispatcher_host.h"
#include "content/browser/browser_child_process_host_impl.h"
#include "content/browser/browser_main.h"
#include "content/browser/browser_main_loop.h"
@@ -811,8 +810,6 @@ std::unique_ptr<IPC::ChannelProxy> RenderProcessHostImpl::CreateChannelProxy(
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- const base::CommandLine& browser_command_line =
- *base::CommandLine::ForCurrentProcess();
AddFilter(new ResourceSchedulerFilter(GetID()));
MediaInternals* media_internals = MediaInternals::GetInstance();
media::AudioManager* audio_manager =
@@ -1005,17 +1002,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
#if defined(OS_ANDROID)
AddFilter(new ScreenOrientationMessageFilterAndroid());
#endif
-
- bool enable_web_bluetooth =
- browser_command_line.HasSwitch(switches::kEnableWebBluetooth);
-#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- enable_web_bluetooth = true;
-#endif
-
- if (enable_web_bluetooth) {
- bluetooth_dispatcher_host_ = new BluetoothDispatcherHost(GetID());
- AddFilter(bluetooth_dispatcher_host_.get());
- }
}
void RenderProcessHostImpl::RegisterMojoServices() {
@@ -2749,8 +2735,9 @@ void RenderProcessHostImpl::GetAudioOutputControllers(
audio_renderer_host()->GetOutputControllers(callback);
}
-BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
- return bluetooth_dispatcher_host_.get();
+BluetoothAdapterFactoryWrapper*
+RenderProcessHostImpl::GetBluetoothAdapterFactoryWrapper() {
+ return &bluetooth_adapter_factory_wrapper_;
}
void RenderProcessHostImpl::RecomputeAndUpdateWebKitPreferences() {

Powered by Google App Engine
This is Rietveld 408576698