Index: device/bluetooth/bluetooth_profile.cc |
diff --git a/device/bluetooth/bluetooth_profile.cc b/device/bluetooth/bluetooth_profile.cc |
index 73f1128346ac1d1a5dd997fae35b38145cc81712..b96010dc1e4a17b5e72e10ac60f5e301661f726c 100644 |
--- a/device/bluetooth/bluetooth_profile.cc |
+++ b/device/bluetooth/bluetooth_profile.cc |
@@ -4,7 +4,9 @@ |
#include "device/bluetooth/bluetooth_profile.h" |
-#if defined(OS_MACOSX) |
+#if defined(OS_CHROMEOS) |
+#include "device/bluetooth/bluetooth_profile_experimental_chromeos.h" |
+#elif defined(OS_MACOSX) |
#include "base/mac/mac_util.h" |
#include "device/bluetooth/bluetooth_profile_mac.h" |
#endif |
@@ -41,14 +43,17 @@ BluetoothProfile::~BluetoothProfile() { |
void BluetoothProfile::Register(const std::string& uuid, |
const Options& options, |
const ProfileCallback& callback) { |
+#if defined(OS_CHROMEOS) |
+ chromeos::BluetoothProfileExperimentalChromeOS* profile = NULL; |
+ profile = new chromeos::BluetoothProfileExperimentalChromeOS(); |
+ profile->Init(uuid, options, callback); |
+#elif defined(OS_MACOSX) |
BluetoothProfile* profile = NULL; |
-#if defined(OS_MACOSX) |
if (base::mac::IsOSLionOrLater()) |
profile = new BluetoothProfileMac(uuid, options.name); |
-#endif |
- |
callback.Run(profile); |
+#endif |
youngki
2013/04/25 14:34:34
We should run callback.Run(NULL) for #else.
keybuk
2013/04/25 17:16:41
Done.
|
} |
} // namespace device |