| Index: ash/system/chromeos/bluetooth/bluetooth_notification_controller.h
|
| diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h
|
| index 22b990d3f39c3cbd17a5c2db308918c39466faad..9d7443cd9f5e4bd3fbccd3672e231e7c4c6894ff 100644
|
| --- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h
|
| +++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h
|
| @@ -5,11 +5,13 @@
|
| #ifndef ASH_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_
|
| #define ASH_SYSTEM_CHROMEOS_BLUETOOTH_BLUETOOTH_NOTIFICATION_CONTROLLER_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <set>
|
|
|
| #include "ash/ash_export.h"
|
| -#include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/strings/string16.h"
|
| @@ -44,9 +46,11 @@ class ASH_EXPORT BluetoothNotificationController
|
| void RequestPasskey(device::BluetoothDevice* device) override;
|
| void DisplayPinCode(device::BluetoothDevice* device,
|
| const std::string& pincode) override;
|
| - void DisplayPasskey(device::BluetoothDevice* device, uint32 passkey) override;
|
| - void KeysEntered(device::BluetoothDevice* device, uint32 entered) override;
|
| - void ConfirmPasskey(device::BluetoothDevice* device, uint32 passkey) override;
|
| + void DisplayPasskey(device::BluetoothDevice* device,
|
| + uint32_t passkey) override;
|
| + void KeysEntered(device::BluetoothDevice* device, uint32_t entered) override;
|
| + void ConfirmPasskey(device::BluetoothDevice* device,
|
| + uint32_t passkey) override;
|
| void AuthorizePairing(device::BluetoothDevice* device) override;
|
|
|
| private:
|
|
|