Index: device/bluetooth/bluetooth_device_win.h |
diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h |
index 8479fbe6b94f28e01182270f2f2dc675aaad2033..ddbde8e035f8df5ef04dcd937cdee5a72395632e 100644 |
--- a/device/bluetooth/bluetooth_device_win.h |
+++ b/device/bluetooth/bluetooth_device_win.h |
@@ -30,46 +30,46 @@ class BluetoothDeviceWin : public BluetoothDevice { |
virtual ~BluetoothDeviceWin(); |
// BluetoothDevice override |
- virtual uint32 GetBluetoothClass() const OVERRIDE; |
- virtual std::string GetAddress() const OVERRIDE; |
- virtual VendorIDSource GetVendorIDSource() const OVERRIDE; |
- virtual uint16 GetVendorID() const OVERRIDE; |
- virtual uint16 GetProductID() const OVERRIDE; |
- virtual uint16 GetDeviceID() const OVERRIDE; |
- virtual int GetRSSI() const OVERRIDE; |
- virtual int GetCurrentHostTransmitPower() const OVERRIDE; |
- virtual int GetMaximumHostTransmitPower() const OVERRIDE; |
- virtual bool IsPaired() const OVERRIDE; |
- virtual bool IsConnected() const OVERRIDE; |
- virtual bool IsConnectable() const OVERRIDE; |
- virtual bool IsConnecting() const OVERRIDE; |
- virtual UUIDList GetUUIDs() const OVERRIDE; |
- virtual bool ExpectingPinCode() const OVERRIDE; |
- virtual bool ExpectingPasskey() const OVERRIDE; |
- virtual bool ExpectingConfirmation() const OVERRIDE; |
+ virtual uint32 GetBluetoothClass() const override; |
+ virtual std::string GetAddress() const override; |
+ virtual VendorIDSource GetVendorIDSource() const override; |
+ virtual uint16 GetVendorID() const override; |
+ virtual uint16 GetProductID() const override; |
+ virtual uint16 GetDeviceID() const override; |
+ virtual int GetRSSI() const override; |
+ virtual int GetCurrentHostTransmitPower() const override; |
+ virtual int GetMaximumHostTransmitPower() const override; |
+ virtual bool IsPaired() const override; |
+ virtual bool IsConnected() const override; |
+ virtual bool IsConnectable() const override; |
+ virtual bool IsConnecting() const override; |
+ virtual UUIDList GetUUIDs() const override; |
+ virtual bool ExpectingPinCode() const override; |
+ virtual bool ExpectingPasskey() const override; |
+ virtual bool ExpectingConfirmation() const override; |
virtual void Connect( |
PairingDelegate* pairing_delegate, |
const base::Closure& callback, |
- const ConnectErrorCallback& error_callback) OVERRIDE; |
- virtual void SetPinCode(const std::string& pincode) OVERRIDE; |
- virtual void SetPasskey(uint32 passkey) OVERRIDE; |
- virtual void ConfirmPairing() OVERRIDE; |
- virtual void RejectPairing() OVERRIDE; |
- virtual void CancelPairing() OVERRIDE; |
+ const ConnectErrorCallback& error_callback) override; |
+ virtual void SetPinCode(const std::string& pincode) override; |
+ virtual void SetPasskey(uint32 passkey) override; |
+ virtual void ConfirmPairing() override; |
+ virtual void RejectPairing() override; |
+ virtual void CancelPairing() override; |
virtual void Disconnect( |
const base::Closure& callback, |
- const ErrorCallback& error_callback) OVERRIDE; |
- virtual void Forget(const ErrorCallback& error_callback) OVERRIDE; |
+ const ErrorCallback& error_callback) override; |
+ virtual void Forget(const ErrorCallback& error_callback) override; |
virtual void ConnectToService( |
const BluetoothUUID& uuid, |
const ConnectToServiceCallback& callback, |
- const ConnectToServiceErrorCallback& error_callback) OVERRIDE; |
+ const ConnectToServiceErrorCallback& error_callback) override; |
virtual void CreateGattConnection( |
const GattConnectionCallback& callback, |
- const ConnectErrorCallback& error_callback) OVERRIDE; |
+ const ConnectErrorCallback& error_callback) override; |
virtual void StartConnectionMonitor( |
const base::Closure& callback, |
- const ErrorCallback& error_callback) OVERRIDE; |
+ const ErrorCallback& error_callback) override; |
// Used by BluetoothProfileWin to retrieve the service record for the given |
// |uuid|. |
@@ -86,7 +86,7 @@ class BluetoothDeviceWin : public BluetoothDevice { |
protected: |
// BluetoothDevice override |
- virtual std::string GetDeviceName() const OVERRIDE; |
+ virtual std::string GetDeviceName() const override; |
private: |
friend class BluetoothAdapterWin; |