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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/bluetooth/bluetooth_adapter_factory.cc

Issue 1130783004: bluetooth: Enable BluetoothAdapterFactory on android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-ut-permission-
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 side-by-side diff with in-line comments
Download patch
« device/bluetooth/bluetooth_adapter_android.cc ('K') | « device/bluetooth/bluetooth_adapter_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter_factory.cc
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index e04df73d38b2da7c0faf30e96e6931a107ce97d4..c3e6d5cffd975c00a0372a1451bf8702fc08cb8f 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -62,7 +62,7 @@ bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() {
// instance even on platforms that would otherwise not support it.
if (default_adapter.Get())
return true;
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN)
return true;
#elif defined(OS_MACOSX)
return base::mac::IsOSLionOrLater();
« device/bluetooth/bluetooth_adapter_android.cc ('K') | « device/bluetooth/bluetooth_adapter_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698