diff options
Diffstat (limited to 'device/bluetooth/bluetooth_adapter_factory.cc')
| -rw-r--r-- | device/bluetooth/bluetooth_adapter_factory.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc index 9771439..c3e6d5c 100644 --- a/device/bluetooth/bluetooth_adapter_factory.cc +++ b/device/bluetooth/bluetooth_adapter_factory.cc @@ -12,8 +12,8 @@ #include "base/memory/weak_ptr.h" #include "device/bluetooth/bluetooth_adapter.h" -#if defined(OS_CHROMEOS) || defined(OS_LINUX) -#include "device/bluetooth/bluetooth_adapter_bluez.h" +#if defined(OS_CHROMEOS) +#include "device/bluetooth/bluetooth_adapter_chromeos.h" #endif #if defined(OS_MACOSX) @@ -62,8 +62,6 @@ bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() { // instance even on platforms that would otherwise not support it. if (default_adapter.Get()) return true; -// Even though the adapter is available on Linux, we only want to use it for -// the Chrome API, which is why defines(OS_LINUX) is missing from here. #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) return true; #elif defined(OS_MACOSX) @@ -75,12 +73,7 @@ bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() { // static void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) { -// TODO(rkc): This is a very slight hack to allow us to be able to create -// an adapter on Linux, 'without' exposing the adapter to all Bluetooth -// services within the browser. -#if !defined(OS_LINUX) DCHECK(IsBluetoothAdapterAvailable()); -#endif #if defined(OS_WIN) if (!default_adapter.Get()) { @@ -105,7 +98,7 @@ void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) { } -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) // static void BluetoothAdapterFactory::Shutdown() { if (default_adapter.Get()) |