| Index: device/bluetooth/bluetooth_device_android.h
|
| diff --git a/device/bluetooth/bluetooth_device_android.h b/device/bluetooth/bluetooth_device_android.h
|
| index 637bcffa0085315255666de35585263ed04fd183..eadcb3955a96167937fcc44e313f9a320e6e6a01 100644
|
| --- a/device/bluetooth/bluetooth_device_android.h
|
| +++ b/device/bluetooth/bluetooth_device_android.h
|
| @@ -5,7 +5,10 @@
|
| #ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_
|
| #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include "base/android/jni_android.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "device/bluetooth/bluetooth_adapter_android.h"
|
| #include "device/bluetooth/bluetooth_device.h"
|
| @@ -49,20 +52,20 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceAndroid final
|
| jobject advertised_uuids); // Java Type: List<ParcelUuid>
|
|
|
| // BluetoothDevice:
|
| - 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;
|
| @@ -71,7 +74,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceAndroid final
|
| 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;
|
|
|