Index: device/bluetooth/bluetooth_adapter_win.h |
diff --git a/device/bluetooth/bluetooth_adapter_win.h b/device/bluetooth/bluetooth_adapter_win.h |
index a6b36097efe3f50c18a8734629d40cf620798fa8..6d62d2e8a237f11b53a3f02a25799f0a31274f6f 100644 |
--- a/device/bluetooth/bluetooth_adapter_win.h |
+++ b/device/bluetooth/bluetooth_adapter_win.h |
@@ -35,44 +35,44 @@ class BluetoothAdapterWin : public BluetoothAdapter, |
const InitCallback& init_callback); |
// BluetoothAdapter: |
- virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE; |
- virtual void RemoveObserver(BluetoothAdapter::Observer* observer) OVERRIDE; |
- virtual std::string GetAddress() const OVERRIDE; |
- virtual std::string GetName() const OVERRIDE; |
+ virtual void AddObserver(BluetoothAdapter::Observer* observer) override; |
+ virtual void RemoveObserver(BluetoothAdapter::Observer* observer) override; |
+ virtual std::string GetAddress() const override; |
+ virtual std::string GetName() const override; |
virtual void SetName(const std::string& name, |
const base::Closure& callback, |
- const ErrorCallback& error_callback) OVERRIDE; |
- virtual bool IsInitialized() const OVERRIDE; |
- virtual bool IsPresent() const OVERRIDE; |
- virtual bool IsPowered() const OVERRIDE; |
+ const ErrorCallback& error_callback) override; |
+ virtual bool IsInitialized() const override; |
+ virtual bool IsPresent() const override; |
+ virtual bool IsPowered() const override; |
virtual void SetPowered( |
bool discoverable, |
const base::Closure& callback, |
- const ErrorCallback& error_callback) OVERRIDE; |
- virtual bool IsDiscoverable() const OVERRIDE; |
+ const ErrorCallback& error_callback) override; |
+ virtual bool IsDiscoverable() const override; |
virtual void SetDiscoverable( |
bool discoverable, |
const base::Closure& callback, |
- const ErrorCallback& error_callback) OVERRIDE; |
- virtual bool IsDiscovering() const OVERRIDE; |
+ const ErrorCallback& error_callback) override; |
+ virtual bool IsDiscovering() const override; |
virtual void CreateRfcommService( |
const BluetoothUUID& uuid, |
const ServiceOptions& options, |
const CreateServiceCallback& callback, |
- const CreateServiceErrorCallback& error_callback) OVERRIDE; |
+ const CreateServiceErrorCallback& error_callback) override; |
virtual void CreateL2capService( |
const BluetoothUUID& uuid, |
const ServiceOptions& options, |
const CreateServiceCallback& callback, |
- const CreateServiceErrorCallback& error_callback) OVERRIDE; |
+ const CreateServiceErrorCallback& error_callback) override; |
// BluetoothTaskManagerWin::Observer override |
virtual void AdapterStateChanged( |
- const BluetoothTaskManagerWin::AdapterState& state) OVERRIDE; |
- virtual void DiscoveryStarted(bool success) OVERRIDE; |
- virtual void DiscoveryStopped() OVERRIDE; |
+ const BluetoothTaskManagerWin::AdapterState& state) override; |
+ virtual void DiscoveryStarted(bool success) override; |
+ virtual void DiscoveryStopped() override; |
virtual void DevicesPolled(const ScopedVector< |
- BluetoothTaskManagerWin::DeviceState>& devices) OVERRIDE; |
+ BluetoothTaskManagerWin::DeviceState>& devices) override; |
const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner() const { |
return ui_task_runner_; |
@@ -84,7 +84,7 @@ class BluetoothAdapterWin : public BluetoothAdapter, |
protected: |
// BluetoothAdapter: |
virtual void RemovePairingDelegateInternal( |
- device::BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE; |
+ device::BluetoothDevice::PairingDelegate* pairing_delegate) override; |
private: |
friend class BluetoothAdapterWinTest; |
@@ -102,10 +102,10 @@ class BluetoothAdapterWin : public BluetoothAdapter, |
// BluetoothAdapter: |
virtual void AddDiscoverySession( |
const base::Closure& callback, |
- const ErrorCallback& error_callback) OVERRIDE; |
+ const ErrorCallback& error_callback) override; |
virtual void RemoveDiscoverySession( |
const base::Closure& callback, |
- const ErrorCallback& error_callback) OVERRIDE; |
+ const ErrorCallback& error_callback) override; |
void Init(); |
void InitForTest( |