| Index: components/proximity_auth/ble/bluetooth_low_energy_connection.h
|
| diff --git a/components/proximity_auth/ble/bluetooth_low_energy_connection.h b/components/proximity_auth/ble/bluetooth_low_energy_connection.h
|
| index a16a03aa283bfb60c8874c952e7cbb0acdcea5a4..2f62fee64a7d862f00d049d4d2c42d3ebb937435 100644
|
| --- a/components/proximity_auth/ble/bluetooth_low_energy_connection.h
|
| +++ b/components/proximity_auth/ble/bluetooth_low_energy_connection.h
|
| @@ -5,6 +5,9 @@
|
| #ifndef COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_CONNECTION_H_
|
| #define COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_CONNECTION_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <queue>
|
| #include <string>
|
|
|
| @@ -59,7 +62,7 @@ class BluetoothLowEnergyConnection : public Connection,
|
| public device::BluetoothAdapter::Observer {
|
| public:
|
| // Signals sent to the remote device to indicate connection related events.
|
| - enum class ControlSignal : uint32 {
|
| + enum class ControlSignal : uint32_t {
|
| kInviteToConnectSignal = 0,
|
| kInvitationResponseSignal = 1,
|
| kSendSignal = 2,
|
| @@ -124,7 +127,7 @@ class BluetoothLowEnergyConnection : public Connection,
|
| void GattCharacteristicValueChanged(
|
| device::BluetoothAdapter* adapter,
|
| device::BluetoothGattCharacteristic* characteristic,
|
| - const std::vector<uint8>& value) override;
|
| + const std::vector<uint8_t>& value) override;
|
|
|
| private:
|
| // Represents a request to write |value| to a some characteristic.
|
| @@ -134,10 +137,10 @@ class BluetoothLowEnergyConnection : public Connection,
|
| // a kSendSignal + the size of the WireMessage, and the second containing a
|
| // SendStatusSignal + the serialized WireMessage.
|
| struct WriteRequest {
|
| - WriteRequest(const std::vector<uint8>& val, bool flag);
|
| + WriteRequest(const std::vector<uint8_t>& val, bool flag);
|
| ~WriteRequest();
|
|
|
| - std::vector<uint8> value;
|
| + std::vector<uint8_t> value;
|
| bool is_last_write_for_wire_message;
|
| int number_of_failed_attempts;
|
| };
|
| @@ -215,8 +218,8 @@ class BluetoothLowEnergyConnection : public Connection,
|
|
|
| // Builds the value to be written on |to_peripheral_char_|. The value
|
| // corresponds to |signal| concatenated with |payload|.
|
| - WriteRequest BuildWriteRequest(const std::vector<uint8>& signal,
|
| - const std::vector<uint8>& bytes,
|
| + WriteRequest BuildWriteRequest(const std::vector<uint8_t>& signal,
|
| + const std::vector<uint8_t>& bytes,
|
| bool is_last_message_for_wire_message);
|
|
|
| // Prints the time elapsed since |Connect()| was called.
|
| @@ -234,11 +237,11 @@ class BluetoothLowEnergyConnection : public Connection,
|
| device::BluetoothGattCharacteristic* GetGattCharacteristic(
|
| const std::string& identifier);
|
|
|
| - // Convert the first 4 bytes from a byte vector to a uint32.
|
| - uint32 ToUint32(const std::vector<uint8>& bytes);
|
| + // Convert the first 4 bytes from a byte vector to a uint32_t.
|
| + uint32_t ToUint32(const std::vector<uint8_t>& bytes);
|
|
|
| - // Convert an uint32 to a byte vector.
|
| - const std::vector<uint8> ToByteVector(uint32 value);
|
| + // Convert an uint32_t to a byte vector.
|
| + const std::vector<uint8_t> ToByteVector(uint32_t value);
|
|
|
| // The Bluetooth adapter over which the Bluetooth connection will be made.
|
| scoped_refptr<device::BluetoothAdapter> adapter_;
|
|
|