| Index: device/bluetooth/bluetooth_device_win.h
|
| diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h
|
| index cfc3f87b1a7b12b5cf479b9d8f3fab43e3b9a3f7..cd2106a49d736bc454d4c2098dc7377c778daa7e 100644
|
| --- a/device/bluetooth/bluetooth_device_win.h
|
| +++ b/device/bluetooth/bluetooth_device_win.h
|
| @@ -5,10 +5,12 @@
|
| #ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_WIN_H_
|
| #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_WIN_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/observer_list.h"
|
| #include "device/bluetooth/bluetooth_device.h"
|
| #include "device/bluetooth/bluetooth_export.h"
|
| @@ -32,20 +34,20 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceWin : public BluetoothDevice {
|
| ~BluetoothDeviceWin() override;
|
|
|
| // 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;
|
| @@ -54,7 +56,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceWin : public BluetoothDevice {
|
| 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;
|
| @@ -112,7 +114,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceWin : public BluetoothDevice {
|
|
|
| // The Bluetooth class of the device, a bitmask that may be decoded using
|
| // https://www.bluetooth.org/Technical/AssignedNumbers/baseband.htm
|
| - uint32 bluetooth_class_;
|
| + uint32_t bluetooth_class_;
|
|
|
| // The name of the device, as supplied by the remote device.
|
| std::string name_;
|
|
|