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

Unified Diff: device/bluetooth/bluetooth_adapter_mac.mm

Issue 2924753002: Allow device/bluetooth to build on the macOS 10.13 SDK (Closed)
Patch Set: Use new enum values in tests too Created 3 years, 6 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 | « device/bluetooth/bluetooth_adapter_mac.h ('k') | device/bluetooth/bluetooth_adapter_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter_mac.mm
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
index 64dbb0393113d9c2e73dd6784db11c77994f2d9f..f02859d3719a9ce5ebbb81a64a2c8837fed9d154 100644
--- a/device/bluetooth/bluetooth_adapter_mac.mm
+++ b/device/bluetooth/bluetooth_adapter_mac.mm
@@ -155,7 +155,7 @@ bool BluetoothAdapterMac::IsPresent() const {
bool is_present = !address_.empty();
if (IsLowEnergyAvailable()) {
is_present = is_present || ([low_energy_central_manager_ state] !=
- CBCentralManagerStateUnsupported);
+ CBManagerStateUnsupported);
}
return is_present;
}
@@ -164,7 +164,7 @@ bool BluetoothAdapterMac::IsPowered() const {
bool is_powered = classic_powered_;
if (IsLowEnergyAvailable()) {
is_powered = is_powered || ([low_energy_central_manager_ state] ==
- CBCentralManagerStatePoweredOn);
+ CBManagerStatePoweredOn);
}
return is_powered;
}
@@ -588,17 +588,17 @@ void BluetoothAdapterMac::LowEnergyDeviceUpdated(
}
}
-// TODO(crbug.com/511025): Handle state < CBCentralManagerStatePoweredOff.
+// TODO(crbug.com/511025): Handle state < CBManagerStatePoweredOff.
void BluetoothAdapterMac::LowEnergyCentralManagerUpdatedState() {
VLOG(1) << "Central manager state updated: "
<< [low_energy_central_manager_ state];
- // A state with a value lower than CBCentralManagerStatePoweredOn implies that
+ // A state with a value lower than CBManagerStatePoweredOn implies that
// scanning has stopped and that any connected peripherals have been
// disconnected. Call DidDisconnectPeripheral manually to update the devices'
// states since macOS doesn't call it.
// See
// https://developer.apple.com/reference/corebluetooth/cbcentralmanagerdelegate/1518888-centralmanagerdidupdatestate?language=objc
- if ([low_energy_central_manager_ state] < CBCentralManagerStatePoweredOn) {
+ if ([low_energy_central_manager_ state] < CBManagerStatePoweredOn) {
VLOG(1)
<< "Central no longer powered on. Notifying of device disconnection.";
for (BluetoothDevice* device : GetDevices()) {
« no previous file with comments | « device/bluetooth/bluetooth_adapter_mac.h ('k') | device/bluetooth/bluetooth_adapter_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698