Index: device/bluetooth/bluetooth_device_bluez.h |
diff --git a/device/bluetooth/bluetooth_device_bluez.h b/device/bluetooth/bluetooth_device_bluez.h |
index aa546863884b6d50cd689e1ae7aa51b71d22ee83..595bab40284a8fed19e27ab1cd8e34cc589c9615 100644 |
--- a/device/bluetooth/bluetooth_device_bluez.h |
+++ b/device/bluetooth/bluetooth_device_bluez.h |
@@ -5,6 +5,8 @@ |
#ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_BLUEZ_H_ |
#define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_BLUEZ_H_ |
+#include <stdint.h> |
+ |
#include <string> |
#include "base/macros.h" |
@@ -39,20 +41,20 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceBlueZ |
public bluez::BluetoothGattServiceClient::Observer { |
public: |
// BluetoothDevice override |
- uint32 GetBluetoothClass() const override; |
+ uint32_t GetBluetoothClass() const override; |
std::string GetAddress() const override; |
VendorIDSource GetVendorIDSource() const override; |
- uint16 GetVendorID() const override; |
- uint16 GetProductID() const override; |
- uint16 GetDeviceID() const override; |
+ uint16_t GetVendorID() const override; |
+ uint16_t GetProductID() const override; |
+ uint16_t GetDeviceID() const override; |
bool IsPaired() const override; |
bool IsConnected() const override; |
bool IsGattConnected() const override; |
bool IsConnectable() const override; |
bool IsConnecting() const override; |
UUIDList GetUUIDs() const override; |
- int16 GetInquiryRSSI() const override; |
- int16 GetInquiryTxPower() const override; |
+ int16_t GetInquiryRSSI() const override; |
+ int16_t GetInquiryTxPower() const override; |
bool ExpectingPinCode() const override; |
bool ExpectingPasskey() const override; |
bool ExpectingConfirmation() const override; |
@@ -61,7 +63,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceBlueZ |
const base::Closure& callback, |
const ConnectErrorCallback& error_callback) override; |
void SetPinCode(const std::string& pincode) override; |
- void SetPasskey(uint32 passkey) override; |
+ void SetPasskey(uint32_t passkey) override; |
void ConfirmPairing() override; |
void RejectPairing() override; |
void CancelPairing() override; |
@@ -126,9 +128,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceBlueZ |
// Called by dbus:: on completion of the D-Bus method call to get the |
// connection attributes of the current connection to the device. |
void OnGetConnInfo(const ConnectionInfoCallback& callback, |
- int16 rssi, |
- int16 transmit_power, |
- int16 max_transmit_power); |
+ int16_t rssi, |
+ int16_t transmit_power, |
+ int16_t max_transmit_power); |
void OnGetConnInfoError(const ConnectionInfoCallback& callback, |
const std::string& error_name, |
const std::string& error_message); |