summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_device_win.h
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-06 11:58:54 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-06 18:59:32 +0000
commit53cd3c4dcc32e26f5bf3fb0a1e9cf27bd47b9d6b (patch)
tree8d5842cd29ae43752b5f4ebc8d190e5a73282186 /device/bluetooth/bluetooth_device_win.h
parentdafebe67bfde1d352b552016db93d089d6693799 (diff)
downloadchromium_src-53cd3c4dcc32e26f5bf3fb0a1e9cf27bd47b9d6b.zip
chromium_src-53cd3c4dcc32e26f5bf3fb0a1e9cf27bd47b9d6b.tar.gz
chromium_src-53cd3c4dcc32e26f5bf3fb0a1e9cf27bd47b9d6b.tar.bz2
replace OVERRIDE and FINAL with override and final in device/
BUG=417463 Review URL: https://codereview.chromium.org/628873002 Cr-Commit-Position: refs/heads/master@{#298289}
Diffstat (limited to 'device/bluetooth/bluetooth_device_win.h')
-rw-r--r--device/bluetooth/bluetooth_device_win.h58
1 files changed, 29 insertions, 29 deletions
diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h
index 8479fbe..ddbde8e 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;