Index: device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.cc |
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.cc |
index f477fa77a9ed12ea35894d502051c6d1b6a43d27..13a70ae98b00e0a43f35f6c88f21895c42ba8a8c 100644 |
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.cc |
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.cc |
@@ -112,31 +112,31 @@ BluetoothRemoteGattCharacteristicChromeOS::GetProperties() const { |
GetProperties(object_path_); |
DCHECK(properties); |
- Properties props = kPropertyNone; |
+ Properties props = PROPERTY_NONE; |
const std::vector<std::string>& flags = properties->flags.value(); |
for (std::vector<std::string>::const_iterator iter = flags.begin(); |
iter != flags.end(); |
++iter) { |
if (*iter == bluetooth_gatt_characteristic::kFlagBroadcast) |
- props |= kPropertyBroadcast; |
+ props |= PROPERTY_BROADCAST; |
if (*iter == bluetooth_gatt_characteristic::kFlagRead) |
- props |= kPropertyRead; |
+ props |= PROPERTY_READ; |
if (*iter == bluetooth_gatt_characteristic::kFlagWriteWithoutResponse) |
- props |= kPropertyWriteWithoutResponse; |
+ props |= PROPERTY_WRITE_WITHOUT_RESPONSE; |
if (*iter == bluetooth_gatt_characteristic::kFlagWrite) |
- props |= kPropertyWrite; |
+ props |= PROPERTY_WRITE; |
if (*iter == bluetooth_gatt_characteristic::kFlagNotify) |
- props |= kPropertyNotify; |
+ props |= PROPERTY_NOTIFY; |
if (*iter == bluetooth_gatt_characteristic::kFlagIndicate) |
- props |= kPropertyIndicate; |
+ props |= PROPERTY_INDICATE; |
if (*iter == bluetooth_gatt_characteristic::kFlagAuthenticatedSignedWrites) |
- props |= kPropertyAuthenticatedSignedWrites; |
+ props |= PROPERTY_AUTHENTICATED_SIGNED_WRITES; |
if (*iter == bluetooth_gatt_characteristic::kFlagExtendedProperties) |
- props |= kPropertyExtendedProperties; |
+ props |= PROPERTY_EXTENDED_PROPERTIES; |
if (*iter == bluetooth_gatt_characteristic::kFlagReliableWrite) |
- props |= kPropertyReliableWrite; |
+ props |= PROPERTY_RELIABLE_WRITE; |
if (*iter == bluetooth_gatt_characteristic::kFlagWritableAuxiliaries) |
- props |= kPropertyWritableAuxiliaries; |
+ props |= PROPERTY_WRITABLE_AUXILIARIES; |
} |
return props; |
@@ -146,7 +146,7 @@ device::BluetoothGattCharacteristic::Permissions |
BluetoothRemoteGattCharacteristicChromeOS::GetPermissions() const { |
// TODO(armansito): Once BlueZ defines the permissions, return the correct |
// values here. |
- return kPermissionNone; |
+ return PERMISSION_NONE; |
} |
bool BluetoothRemoteGattCharacteristicChromeOS::IsNotifying() const { |