Index: device/bluetooth/bluetooth_adapter.cc |
diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc |
index dea3593ff1e0d53d1668b49c16b38e246f4bf3f5..7d4b751dfc168e707c7f21616f00862f3f25d1c8 100644 |
--- a/device/bluetooth/bluetooth_adapter.cc |
+++ b/device/bluetooth/bluetooth_adapter.cc |
@@ -37,12 +37,6 @@ base::WeakPtr<BluetoothAdapter> BluetoothAdapter::GetWeakPtrForTesting() { |
return weak_ptr_factory_.GetWeakPtr(); |
} |
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) |
-void BluetoothAdapter::Shutdown() { |
Andrew T Wilson (Slow)
2016/04/13 13:55:10
Restore this :)
Ivan Šandrk
2016/04/13 17:19:04
Done.
|
- NOTIMPLEMENTED(); |
-} |
-#endif |
- |
void BluetoothAdapter::AddObserver(BluetoothAdapter::Observer* observer) { |
DCHECK(observer); |
observers_.AddObserver(observer); |
@@ -53,6 +47,12 @@ void BluetoothAdapter::RemoveObserver(BluetoothAdapter::Observer* observer) { |
observers_.RemoveObserver(observer); |
} |
+#if defined(OS_CHROMEOS) |
+void BluetoothAdapter::SetDisabled(bool disabled) { |
+ NOTIMPLEMENTED(); |
Andrew T Wilson (Slow)
2016/04/13 13:55:11
Remove this since it's now pure virtual.
Ivan Šandrk
2016/04/13 17:19:04
Done.
|
+} |
+#endif |
+ |
void BluetoothAdapter::StartDiscoverySession( |
const DiscoverySessionCallback& callback, |
const ErrorCallback& error_callback) { |