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

Unified Diff: device/bluetooth/bluetooth_remote_gatt_characteristic.cc

Issue 2638753002: Revert of Bluetooth: macOS: BluetoothRemoteGattCharacteristicMac::SubscribeToNotifications (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_remote_gatt_characteristic.cc
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
index 3be984a7ae7ffd9256deebabde1c937f9209b8d0..8c94e7a5a64609be5e95beced0948ea2caeaf53c 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
@@ -145,14 +145,15 @@
// rid of the entire check, and run SubscribeToNotifications on all
// platforms.
//
+// TODO(http://crbug.com/633191): Remove OS_MACOSX from this check.
// TODO(http://crbug.com/636270): Remove OS_WIN from this check.
-#if defined(OS_WIN)
+#if defined(OS_MACOSX) || defined(OS_WIN)
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&BluetoothRemoteGattCharacteristic::OnStartNotifySessionError,
GetWeakPtr(), error_callback,
BluetoothRemoteGattService::GATT_ERROR_NOT_SUPPORTED));
-#else // defined(OS_WIN))
+#else // !(defined(OS_MACOSX) || defined(OS_WIN))
// Find the Client Characteristic Configuration descriptor.
std::vector<BluetoothRemoteGattDescriptor*> ccc_descriptor =
GetDescriptorsByUUID(BluetoothRemoteGattDescriptor::
@@ -182,7 +183,7 @@
GetWeakPtr(), callback),
base::Bind(&BluetoothRemoteGattCharacteristic::OnStartNotifySessionError,
GetWeakPtr(), error_callback));
-#endif // defined(OS_WIN)
+#endif // defined(OS_MACOSX) || defined(OS_WIN)
}
void BluetoothRemoteGattCharacteristic::CancelStartNotifySession(
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698