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

Unified Diff: device/bluetooth/bluetooth_gatt_characteristic.h

Issue 643213002: Update constants to MACRO_STYLE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_gatt_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_gatt_characteristic.h
diff --git a/device/bluetooth/bluetooth_gatt_characteristic.h b/device/bluetooth/bluetooth_gatt_characteristic.h
index d6140a3ca0e85da413889622b13d4ee36280f36a..522c3d018a713f1a4930631a04d787718883646f 100644
--- a/device/bluetooth/bluetooth_gatt_characteristic.h
+++ b/device/bluetooth/bluetooth_gatt_characteristic.h
@@ -39,24 +39,24 @@ class BluetoothGattCharacteristic {
// Values representing the possible properties of a characteristic, which
// define how the characteristic can be used. Each of these properties serve
// a role as defined in the Bluetooth Specification.
- // |kPropertyExtendedProperties| is a special property that, if present,
+ // |PROPERTY_EXTENDED_PROPERTIES| is a special property that, if present,
// indicates that there is a characteristic descriptor (namely the
// "Characteristic Extended Properties Descriptor" with UUID 0x2900) that
// contains additional properties pertaining to the characteristic.
// The properties "ReliableWrite| and |WriteAuxiliaries| are retrieved from
// that characteristic.
enum Property {
- kPropertyNone = 0,
- kPropertyBroadcast = 1 << 0,
- kPropertyRead = 1 << 1,
- kPropertyWriteWithoutResponse = 1 << 2,
- kPropertyWrite = 1 << 3,
- kPropertyNotify = 1 << 4,
- kPropertyIndicate = 1 << 5,
- kPropertyAuthenticatedSignedWrites = 1 << 6,
- kPropertyExtendedProperties = 1 << 7,
- kPropertyReliableWrite = 1 << 8,
- kPropertyWritableAuxiliaries = 1 << 9
+ PROPERTY_NONE = 0,
+ PROPERTY_BROADCAST = 1 << 0,
+ PROPERTY_READ = 1 << 1,
+ PROPERTY_WRITE_WITHOUT_RESPONSE = 1 << 2,
+ PROPERTY_WRITE = 1 << 3,
+ PROPERTY_NOTIFY = 1 << 4,
+ PROPERTY_INDICATE = 1 << 5,
+ PROPERTY_AUTHENTICATED_SIGNED_WRITES = 1 << 6,
+ PROPERTY_EXTENDED_PROPERTIES = 1 << 7,
+ PROPERTY_RELIABLE_WRITE = 1 << 8,
+ PROPERTY_WRITABLE_AUXILIARIES = 1 << 9
};
typedef uint32 Properties;
@@ -66,17 +66,17 @@ class BluetoothGattCharacteristic {
// value permissions are left up to the higher-level profile.
//
// Attribute permissions are distinct from the characteristic properties. For
- // example, a characteristic may have the property |kPropertyRead| to make
+ // example, a characteristic may have the property |PROPERTY_READ| to make
// clients know that it is possible to read the characteristic value and have
- // the permission |kPermissionReadEncrypted| to require a secure connection.
+ // the permission |PERMISSION_READ_ENCRYPTED| to require a secure connection.
// It is up to the application to properly specify the permissions and
// properties for a local characteristic.
enum Permission {
- kPermissionNone = 0,
- kPermissionRead = 1 << 0,
- kPermissionWrite = 1 << 1,
- kPermissionReadEncrypted = 1 << 2,
- kPermissionWriteEncrypted = 1 << 3
+ PERMISSION_NONE = 0,
+ PERMISSION_READ = 1 << 0,
+ PERMISSION_WRITE = 1 << 1,
+ PERMISSION_READ_ENCRYPTED = 1 << 2,
+ PERMISSION_WRITE_ENCRYPTED = 1 << 3
};
typedef uint32 Permissions;
@@ -106,11 +106,11 @@ class BluetoothGattCharacteristic {
// BluetoothGattService instance, in which case the delegate will handle read
// and write requests.
//
- // NOTE: Don't explicitly set |kPropertyExtendedProperties| in |properties|.
+ // NOTE: Don't explicitly set |PROPERTY_EXTENDED_PROPERTIES| in |properties|.
// Instead, create and add a BluetoothGattDescriptor that represents the
// "Characteristic Extended Properties" descriptor and this will automatically
// set the correspoding bit in the characteristic's properties field. If
- // |properties| has |kPropertyExtendedProperties| set, it will be ignored.
+ // |properties| has |PROPERTY_EXTENDED_PROPERTIES| set, it will be ignored.
static BluetoothGattCharacteristic* Create(const BluetoothUUID& uuid,
const std::vector<uint8>& value,
Properties properties,
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_gatt_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698