diff options
| author | mostynb <mostynb@opera.com> | 2014-10-06 11:58:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-06 18:59:32 +0000 |
| commit | 53cd3c4dcc32e26f5bf3fb0a1e9cf27bd47b9d6b (patch) | |
| tree | 8d5842cd29ae43752b5f4ebc8d190e5a73282186 | |
| parent | dafebe67bfde1d352b552016db93d089d6693799 (diff) | |
| download | chromium_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}
71 files changed, 514 insertions, 514 deletions
diff --git a/device/bluetooth/bluetooth_adapter_chromeos.h b/device/bluetooth/bluetooth_adapter_chromeos.h index 7e1e50e..bd9ec9e 100644 --- a/device/bluetooth/bluetooth_adapter_chromeos.h +++ b/device/bluetooth/bluetooth_adapter_chromeos.h @@ -44,37 +44,37 @@ class BluetoothAdapterChromeOS // BluetoothAdapter: virtual void AddObserver( - device::BluetoothAdapter::Observer* observer) OVERRIDE; + device::BluetoothAdapter::Observer* observer) override; virtual void RemoveObserver( - device::BluetoothAdapter::Observer* observer) OVERRIDE; - virtual std::string GetAddress() const OVERRIDE; - virtual std::string GetName() const OVERRIDE; + device::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 powered, 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 device::BluetoothUUID& uuid, const ServiceOptions& options, const CreateServiceCallback& callback, - const CreateServiceErrorCallback& error_callback) OVERRIDE; + const CreateServiceErrorCallback& error_callback) override; virtual void CreateL2capService( const device::BluetoothUUID& uuid, const ServiceOptions& options, const CreateServiceCallback& callback, - const CreateServiceErrorCallback& error_callback) OVERRIDE; + const CreateServiceErrorCallback& error_callback) override; // Locates the device object by object path (the devices map and // BluetoothDevice methods are by address). @@ -112,7 +112,7 @@ class BluetoothAdapterChromeOS protected: // BluetoothAdapter: virtual void RemovePairingDelegateInternal( - device::BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE; + device::BluetoothDevice::PairingDelegate* pairing_delegate) override; private: friend class BluetoothChromeOSTest; @@ -127,43 +127,43 @@ class BluetoothAdapterChromeOS virtual ~BluetoothAdapterChromeOS(); // BluetoothAdapterClient::Observer override. - virtual void AdapterAdded(const dbus::ObjectPath& object_path) OVERRIDE; - virtual void AdapterRemoved(const dbus::ObjectPath& object_path) OVERRIDE; + virtual void AdapterAdded(const dbus::ObjectPath& object_path) override; + virtual void AdapterRemoved(const dbus::ObjectPath& object_path) override; virtual void AdapterPropertyChanged( const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE; + const std::string& property_name) override; // BluetoothDeviceClient::Observer override. - virtual void DeviceAdded(const dbus::ObjectPath& object_path) OVERRIDE; - virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE; + virtual void DeviceAdded(const dbus::ObjectPath& object_path) override; + virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override; virtual void DevicePropertyChanged(const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE; + const std::string& property_name) override; // BluetoothInputClient::Observer override. virtual void InputPropertyChanged(const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE; + const std::string& property_name) override; // BluetoothAgentServiceProvider::Delegate override. - virtual void Released() OVERRIDE; + virtual void Released() override; virtual void RequestPinCode(const dbus::ObjectPath& device_path, - const PinCodeCallback& callback) OVERRIDE; + const PinCodeCallback& callback) override; virtual void DisplayPinCode(const dbus::ObjectPath& device_path, - const std::string& pincode) OVERRIDE; + const std::string& pincode) override; virtual void RequestPasskey(const dbus::ObjectPath& device_path, - const PasskeyCallback& callback) OVERRIDE; + const PasskeyCallback& callback) override; virtual void DisplayPasskey(const dbus::ObjectPath& device_path, - uint32 passkey, uint16 entered) OVERRIDE; + uint32 passkey, uint16 entered) override; virtual void RequestConfirmation(const dbus::ObjectPath& device_path, uint32 passkey, const ConfirmationCallback& callback) - OVERRIDE; + override; virtual void RequestAuthorization(const dbus::ObjectPath& device_path, const ConfirmationCallback& callback) - OVERRIDE; + override; virtual void AuthorizeService(const dbus::ObjectPath& device_path, const std::string& uuid, - const ConfirmationCallback& callback) OVERRIDE; - virtual void Cancel() OVERRIDE; + const ConfirmationCallback& callback) override; + virtual void Cancel() override; // Called by dbus:: on completion of the D-Bus method call to register the // pairing agent. @@ -214,10 +214,10 @@ class BluetoothAdapterChromeOS // 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; // Called by dbus:: on completion of the D-Bus method call to start discovery. void OnStartDiscovery(const base::Closure& callback); diff --git a/device/bluetooth/bluetooth_adapter_mac.h b/device/bluetooth/bluetooth_adapter_mac.h index a460d1d..7f1cc51 100644 --- a/device/bluetooth/bluetooth_adapter_mac.h +++ b/device/bluetooth/bluetooth_adapter_mac.h @@ -38,40 +38,40 @@ class BluetoothAdapterMac : public BluetoothAdapter, static base::WeakPtr<BluetoothAdapter> CreateAdapter(); // 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 powered, 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; // BluetoothDiscoveryManagerMac::Observer overrides - virtual void DeviceFound(IOBluetoothDevice* device) OVERRIDE; - virtual void DiscoveryStopped(bool unexpected) OVERRIDE; + virtual void DeviceFound(IOBluetoothDevice* device) override; + virtual void DiscoveryStopped(bool unexpected) override; // Registers that a new |device| has connected to the local host. void DeviceConnected(IOBluetoothDevice* device); @@ -79,7 +79,7 @@ class BluetoothAdapterMac : public BluetoothAdapter, protected: // BluetoothAdapter: virtual void RemovePairingDelegateInternal( - device::BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE; + device::BluetoothDevice::PairingDelegate* pairing_delegate) override; private: friend class BluetoothAdapterMacTest; @@ -90,10 +90,10 @@ class BluetoothAdapterMac : 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(scoped_refptr<base::SequencedTaskRunner> ui_task_runner); diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc index 06fd5fe..88d94c9 100644 --- a/device/bluetooth/bluetooth_adapter_unittest.cc +++ b/device/bluetooth/bluetooth_adapter_unittest.cc @@ -17,75 +17,75 @@ class TestBluetoothAdapter : public BluetoothAdapter { TestBluetoothAdapter() { } - virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE { + virtual void AddObserver(BluetoothAdapter::Observer* observer) override { } - virtual void RemoveObserver(BluetoothAdapter::Observer* observer) OVERRIDE { + virtual void RemoveObserver(BluetoothAdapter::Observer* observer) override { } - virtual std::string GetAddress() const OVERRIDE { + virtual std::string GetAddress() const override { return ""; } - virtual std::string GetName() const OVERRIDE { + virtual std::string GetName() const override { return ""; } virtual void SetName(const std::string& name, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { } - virtual bool IsInitialized() const OVERRIDE { + virtual bool IsInitialized() const override { return false; } - virtual bool IsPresent() const OVERRIDE { + virtual bool IsPresent() const override { return false; } - virtual bool IsPowered() const OVERRIDE { + virtual bool IsPowered() const override { return false; } virtual void SetPowered( bool powered, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { } - virtual bool IsDiscoverable() const OVERRIDE { + virtual bool IsDiscoverable() const override { return false; } virtual void SetDiscoverable( bool discoverable, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { } - virtual bool IsDiscovering() const OVERRIDE { + virtual bool IsDiscovering() const override { return false; } virtual void StartDiscoverySession( const DiscoverySessionCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) 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 { } protected: @@ -93,32 +93,32 @@ class TestBluetoothAdapter : public 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 { } virtual void RemovePairingDelegateInternal( - BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE { + BluetoothDevice::PairingDelegate* pairing_delegate) override { } }; class TestPairingDelegate : public BluetoothDevice::PairingDelegate { public: - virtual void RequestPinCode(BluetoothDevice* device) OVERRIDE {} - virtual void RequestPasskey(BluetoothDevice* device) OVERRIDE {} + virtual void RequestPinCode(BluetoothDevice* device) override {} + virtual void RequestPasskey(BluetoothDevice* device) override {} virtual void DisplayPinCode(BluetoothDevice* device, - const std::string& pincode) OVERRIDE {} + const std::string& pincode) override {} virtual void DisplayPasskey(BluetoothDevice* device, - uint32 passkey) OVERRIDE {} + uint32 passkey) override {} virtual void KeysEntered(BluetoothDevice* device, - uint32 entered) OVERRIDE {} + uint32 entered) override {} virtual void ConfirmPasskey(BluetoothDevice* device, - uint32 passkey) OVERRIDE {} - virtual void AuthorizePairing(BluetoothDevice* device) OVERRIDE {} + uint32 passkey) override {} + virtual void AuthorizePairing(BluetoothDevice* device) override {} }; diff --git a/device/bluetooth/bluetooth_adapter_win.h b/device/bluetooth/bluetooth_adapter_win.h index a6b3609..6d62d2e 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( diff --git a/device/bluetooth/bluetooth_adapter_win_unittest.cc b/device/bluetooth/bluetooth_adapter_win_unittest.cc index ed3a304..4a7abd7 100644 --- a/device/bluetooth/bluetooth_adapter_win_unittest.cc +++ b/device/bluetooth/bluetooth_adapter_win_unittest.cc @@ -51,33 +51,33 @@ class AdapterObserver : public device::BluetoothAdapter::Observer { } virtual void AdapterPresentChanged( - device::BluetoothAdapter* adapter, bool present) OVERRIDE { + device::BluetoothAdapter* adapter, bool present) override { num_present_changed_++; } virtual void AdapterPoweredChanged( - device::BluetoothAdapter* adapter, bool powered) OVERRIDE { + device::BluetoothAdapter* adapter, bool powered) override { num_powered_changed_++; } virtual void AdapterDiscoveringChanged( - device::BluetoothAdapter* adapter, bool discovering) OVERRIDE { + device::BluetoothAdapter* adapter, bool discovering) override { num_discovering_changed_++; } virtual void DeviceAdded( device::BluetoothAdapter* adapter, - device::BluetoothDevice* device) OVERRIDE { + device::BluetoothDevice* device) override { num_device_added_++; } virtual void DeviceRemoved(device::BluetoothAdapter* adapter, - device::BluetoothDevice* device) OVERRIDE { + device::BluetoothDevice* device) override { num_device_removed_++; } virtual void DeviceChanged(device::BluetoothAdapter* adapter, - device::BluetoothDevice* device) OVERRIDE { + device::BluetoothDevice* device) override { num_device_changed_++; } @@ -119,7 +119,7 @@ class BluetoothAdapterWinTest : public testing::Test { adapter_win_->InitForTest(ui_task_runner_, bluetooth_task_runner_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { adapter_win_->AddObserver(&adapter_observer_); num_start_discovery_callbacks_ = 0; num_start_discovery_error_callbacks_ = 0; @@ -127,7 +127,7 @@ class BluetoothAdapterWinTest : public testing::Test { num_stop_discovery_error_callbacks_ = 0; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { adapter_win_->RemoveObserver(&adapter_observer_); } diff --git a/device/bluetooth/bluetooth_chromeos_unittest.cc b/device/bluetooth/bluetooth_chromeos_unittest.cc index e083829..3bb252e 100644 --- a/device/bluetooth/bluetooth_chromeos_unittest.cc +++ b/device/bluetooth/bluetooth_chromeos_unittest.cc @@ -55,7 +55,7 @@ class TestObserver : public BluetoothAdapter::Observer { } virtual void AdapterPresentChanged(BluetoothAdapter* adapter, - bool present) OVERRIDE { + bool present) override { EXPECT_EQ(adapter_.get(), adapter); ++present_changed_count_; @@ -63,7 +63,7 @@ class TestObserver : public BluetoothAdapter::Observer { } virtual void AdapterPoweredChanged(BluetoothAdapter* adapter, - bool powered) OVERRIDE { + bool powered) override { EXPECT_EQ(adapter_.get(), adapter); ++powered_changed_count_; @@ -71,14 +71,14 @@ class TestObserver : public BluetoothAdapter::Observer { } virtual void AdapterDiscoverableChanged(BluetoothAdapter* adapter, - bool discoverable) OVERRIDE { + bool discoverable) override { EXPECT_EQ(adapter_.get(), adapter); ++discoverable_changed_count_; } virtual void AdapterDiscoveringChanged(BluetoothAdapter* adapter, - bool discovering) OVERRIDE { + bool discovering) override { EXPECT_EQ(adapter_.get(), adapter); ++discovering_changed_count_; @@ -86,7 +86,7 @@ class TestObserver : public BluetoothAdapter::Observer { } virtual void DeviceAdded(BluetoothAdapter* adapter, - BluetoothDevice* device) OVERRIDE { + BluetoothDevice* device) override { EXPECT_EQ(adapter_.get(), adapter); ++device_added_count_; @@ -97,7 +97,7 @@ class TestObserver : public BluetoothAdapter::Observer { } virtual void DeviceChanged(BluetoothAdapter* adapter, - BluetoothDevice* device) OVERRIDE { + BluetoothDevice* device) override { EXPECT_EQ(adapter_.get(), adapter); ++device_changed_count_; @@ -108,7 +108,7 @@ class TestObserver : public BluetoothAdapter::Observer { } virtual void DeviceRemoved(BluetoothAdapter* adapter, - BluetoothDevice* device) OVERRIDE { + BluetoothDevice* device) override { EXPECT_EQ(adapter_.get(), adapter); ++device_removed_count_; @@ -160,20 +160,20 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate { last_entered_(999U) {} virtual ~TestPairingDelegate() {} - virtual void RequestPinCode(BluetoothDevice* device) OVERRIDE { + virtual void RequestPinCode(BluetoothDevice* device) override { ++call_count_; ++request_pincode_count_; QuitMessageLoop(); } - virtual void RequestPasskey(BluetoothDevice* device) OVERRIDE { + virtual void RequestPasskey(BluetoothDevice* device) override { ++call_count_; ++request_passkey_count_; QuitMessageLoop(); } virtual void DisplayPinCode(BluetoothDevice* device, - const std::string& pincode) OVERRIDE { + const std::string& pincode) override { ++call_count_; ++display_pincode_count_; last_pincode_ = pincode; @@ -181,14 +181,14 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate { } virtual void DisplayPasskey(BluetoothDevice* device, - uint32 passkey) OVERRIDE { + uint32 passkey) override { ++call_count_; ++display_passkey_count_; last_passkey_ = passkey; QuitMessageLoop(); } - virtual void KeysEntered(BluetoothDevice* device, uint32 entered) OVERRIDE { + virtual void KeysEntered(BluetoothDevice* device, uint32 entered) override { ++call_count_; ++keys_entered_count_; last_entered_ = entered; @@ -196,14 +196,14 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate { } virtual void ConfirmPasskey(BluetoothDevice* device, - uint32 passkey) OVERRIDE { + uint32 passkey) override { ++call_count_; ++confirm_passkey_count_; last_passkey_ = passkey; QuitMessageLoop(); } - virtual void AuthorizePairing(BluetoothDevice* device) OVERRIDE { + virtual void AuthorizePairing(BluetoothDevice* device) override { ++call_count_; ++authorize_pairing_count_; QuitMessageLoop(); diff --git a/device/bluetooth/bluetooth_device_chromeos.h b/device/bluetooth/bluetooth_device_chromeos.h index 85ed070..aa12e0b 100644 --- a/device/bluetooth/bluetooth_device_chromeos.h +++ b/device/bluetooth/bluetooth_device_chromeos.h @@ -32,46 +32,46 @@ class BluetoothDeviceChromeOS public BluetoothGattServiceClient::Observer { public: // 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( device::BluetoothDevice::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 device::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; // Attempts to initiate an insecure outgoing L2CAP or RFCOMM connection to the // advertised service on this device matching |uuid|, performing an SDP lookup @@ -104,7 +104,7 @@ class BluetoothDeviceChromeOS protected: // BluetoothDevice override - virtual std::string GetDeviceName() const OVERRIDE; + virtual std::string GetDeviceName() const override; private: friend class BluetoothAdapterChromeOS; @@ -117,8 +117,8 @@ class BluetoothDeviceChromeOS virtual ~BluetoothDeviceChromeOS(); // BluetoothGattServiceClient::Observer overrides. - virtual void GattServiceAdded(const dbus::ObjectPath& object_path) OVERRIDE; - virtual void GattServiceRemoved(const dbus::ObjectPath& object_path) OVERRIDE; + virtual void GattServiceAdded(const dbus::ObjectPath& object_path) override; + virtual void GattServiceRemoved(const dbus::ObjectPath& object_path) override; // Internal method to initiate a connection to this device, and methods called // by dbus:: on completion of the D-Bus method call. diff --git a/device/bluetooth/bluetooth_device_mac.h b/device/bluetooth/bluetooth_device_mac.h index b107573..eed7816 100644 --- a/device/bluetooth/bluetooth_device_mac.h +++ b/device/bluetooth/bluetooth_device_mac.h @@ -24,46 +24,46 @@ class BluetoothDeviceMac : public BluetoothDevice { virtual ~BluetoothDeviceMac(); // 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; // Returns the timestamp when the device was last seen during an inquiry. // Returns nil if the device has never been seen during an inquiry. @@ -75,7 +75,7 @@ class BluetoothDeviceMac : public BluetoothDevice { protected: // BluetoothDevice override - virtual std::string GetDeviceName() const OVERRIDE; + virtual std::string GetDeviceName() const override; private: friend class BluetoothAdapterMac; 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; diff --git a/device/bluetooth/bluetooth_discovery_manager_mac.mm b/device/bluetooth/bluetooth_discovery_manager_mac.mm index 2262891..abc9cd8 100644 --- a/device/bluetooth/bluetooth_discovery_manager_mac.mm +++ b/device/bluetooth/bluetooth_discovery_manager_mac.mm @@ -47,10 +47,10 @@ class BluetoothDiscoveryManagerMacClassic virtual ~BluetoothDiscoveryManagerMacClassic() {} // BluetoothDiscoveryManagerMac override. - virtual bool IsDiscovering() const OVERRIDE { return should_do_discovery_; } + virtual bool IsDiscovering() const override { return should_do_discovery_; } // BluetoothDiscoveryManagerMac override. - virtual bool StartDiscovery() OVERRIDE { + virtual bool StartDiscovery() override { DVLOG(1) << "Bluetooth Classic: StartDiscovery"; DCHECK(!should_do_discovery_); @@ -78,7 +78,7 @@ class BluetoothDiscoveryManagerMacClassic } // BluetoothDiscoveryManagerMac override. - virtual bool StopDiscovery() OVERRIDE { + virtual bool StopDiscovery() override { DVLOG(1) << "Bluetooth Classic: StopDiscovery"; DCHECK(should_do_discovery_); diff --git a/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc b/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc index 60cd54c..636b467 100644 --- a/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc +++ b/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc @@ -81,7 +81,7 @@ class TestObserver : public BluetoothAdapter::Observer { // BluetoothAdapter::Observer overrides. virtual void GattServiceAdded(BluetoothAdapter* adapter, BluetoothDevice* device, - BluetoothGattService* service) OVERRIDE { + BluetoothGattService* service) override { ASSERT_EQ(adapter_.get(), adapter); ASSERT_EQ(service->GetDevice(), device); @@ -99,7 +99,7 @@ class TestObserver : public BluetoothAdapter::Observer { virtual void GattServiceRemoved(BluetoothAdapter* adapter, BluetoothDevice* device, - BluetoothGattService* service) OVERRIDE { + BluetoothGattService* service) override { ASSERT_EQ(adapter_.get(), adapter); ASSERT_EQ(service->GetDevice(), device); @@ -118,7 +118,7 @@ class TestObserver : public BluetoothAdapter::Observer { virtual void GattDiscoveryCompleteForService( BluetoothAdapter* adapter, - BluetoothGattService* service) OVERRIDE { + BluetoothGattService* service) override { ASSERT_EQ(adapter_.get(), adapter); ++gatt_discovery_complete_count_; @@ -126,7 +126,7 @@ class TestObserver : public BluetoothAdapter::Observer { } virtual void GattServiceChanged(BluetoothAdapter* adapter, - BluetoothGattService* service) OVERRIDE { + BluetoothGattService* service) override { ASSERT_EQ(adapter_.get(), adapter); ++gatt_service_changed_count_; @@ -135,7 +135,7 @@ class TestObserver : public BluetoothAdapter::Observer { virtual void GattCharacteristicAdded( BluetoothAdapter* adapter, - BluetoothGattCharacteristic* characteristic) OVERRIDE { + BluetoothGattCharacteristic* characteristic) override { ASSERT_EQ(adapter_.get(), adapter); ++gatt_characteristic_added_count_; @@ -152,7 +152,7 @@ class TestObserver : public BluetoothAdapter::Observer { virtual void GattCharacteristicRemoved( BluetoothAdapter* adapter, - BluetoothGattCharacteristic* characteristic) OVERRIDE { + BluetoothGattCharacteristic* characteristic) override { ASSERT_EQ(adapter_.get(), adapter); ++gatt_characteristic_removed_count_; @@ -170,7 +170,7 @@ class TestObserver : public BluetoothAdapter::Observer { virtual void GattCharacteristicValueChanged( BluetoothAdapter* adapter, BluetoothGattCharacteristic* characteristic, - const std::vector<uint8>& value) OVERRIDE { + const std::vector<uint8>& value) override { ASSERT_EQ(adapter_.get(), adapter); ++gatt_characteristic_value_changed_count_; @@ -188,7 +188,7 @@ class TestObserver : public BluetoothAdapter::Observer { virtual void GattDescriptorAdded( BluetoothAdapter* adapter, - BluetoothGattDescriptor* descriptor) OVERRIDE { + BluetoothGattDescriptor* descriptor) override { ASSERT_EQ(adapter_.get(), adapter); ++gatt_descriptor_added_count_; @@ -205,7 +205,7 @@ class TestObserver : public BluetoothAdapter::Observer { virtual void GattDescriptorRemoved( BluetoothAdapter* adapter, - BluetoothGattDescriptor* descriptor) OVERRIDE { + BluetoothGattDescriptor* descriptor) override { ASSERT_EQ(adapter_.get(), adapter); ++gatt_descriptor_removed_count_; @@ -223,7 +223,7 @@ class TestObserver : public BluetoothAdapter::Observer { virtual void GattDescriptorValueChanged( BluetoothAdapter* adapter, BluetoothGattDescriptor* descriptor, - const std::vector<uint8>& value) OVERRIDE { + const std::vector<uint8>& value) override { ASSERT_EQ(adapter_.get(), adapter); ++gatt_descriptor_value_changed_count_; diff --git a/device/bluetooth/bluetooth_gatt_connection_chromeos.h b/device/bluetooth/bluetooth_gatt_connection_chromeos.h index beade19..5f5c4bf 100644 --- a/device/bluetooth/bluetooth_gatt_connection_chromeos.h +++ b/device/bluetooth/bluetooth_gatt_connection_chromeos.h @@ -34,16 +34,16 @@ class BluetoothGattConnectionChromeOS virtual ~BluetoothGattConnectionChromeOS(); // BluetoothGattConnection overrides. - virtual std::string GetDeviceAddress() const OVERRIDE; - virtual bool IsConnected() OVERRIDE; - virtual void Disconnect(const base::Closure& callback) OVERRIDE; + virtual std::string GetDeviceAddress() const override; + virtual bool IsConnected() override; + virtual void Disconnect(const base::Closure& callback) override; private: // chromeos::BluetoothDeviceClient::Observer overrides. - virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE; + virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override; virtual void DevicePropertyChanged(const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE; + const std::string& property_name) override; // True, if the connection is currently active. bool connected_; diff --git a/device/bluetooth/bluetooth_gatt_notify_session_chromeos.h b/device/bluetooth/bluetooth_gatt_notify_session_chromeos.h index 1202fd8..3ad3843 100644 --- a/device/bluetooth/bluetooth_gatt_notify_session_chromeos.h +++ b/device/bluetooth/bluetooth_gatt_notify_session_chromeos.h @@ -30,9 +30,9 @@ class BluetoothGattNotifySessionChromeOS virtual ~BluetoothGattNotifySessionChromeOS(); // BluetoothGattNotifySession overrides. - virtual std::string GetCharacteristicIdentifier() const OVERRIDE; - virtual bool IsActive() OVERRIDE; - virtual void Stop(const base::Closure& callback) OVERRIDE; + virtual std::string GetCharacteristicIdentifier() const override; + virtual bool IsActive() override; + virtual void Stop(const base::Closure& callback) override; private: friend class BluetoothRemoteGattCharacteristicChromeOS; @@ -46,10 +46,10 @@ class BluetoothGattNotifySessionChromeOS // BluetoothGattCharacteristicClient::Observer overrides. virtual void GattCharacteristicRemoved( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; virtual void GattCharacteristicPropertyChanged( const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE; + const std::string& property_name) override; // True, if this session is currently active. bool active_; diff --git a/device/bluetooth/bluetooth_l2cap_channel_mac.h b/device/bluetooth/bluetooth_l2cap_channel_mac.h index f843608..eafe8f5 100644 --- a/device/bluetooth/bluetooth_l2cap_channel_mac.h +++ b/device/bluetooth/bluetooth_l2cap_channel_mac.h @@ -37,12 +37,12 @@ class BluetoothL2capChannelMac : public BluetoothChannelMac { IOReturn* status); // BluetoothChannelMac: - virtual void SetSocket(BluetoothSocketMac* socket) OVERRIDE; - virtual IOBluetoothDevice* GetDevice() OVERRIDE; - virtual uint16_t GetOutgoingMTU() OVERRIDE; + virtual void SetSocket(BluetoothSocketMac* socket) override; + virtual IOBluetoothDevice* GetDevice() override; + virtual uint16_t GetOutgoingMTU() override; virtual IOReturn WriteAsync(void* data, uint16_t length, - void* refcon) OVERRIDE; + void* refcon) override; void OnChannelOpenComplete(IOBluetoothL2CAPChannel* channel, IOReturn status); diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h index 26fda0b..ab0ce0b 100644 --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h @@ -39,30 +39,30 @@ class BluetoothRemoteGattCharacteristicChromeOS public BluetoothGattDescriptorClient::Observer { public: // device::BluetoothGattCharacteristic overrides. - virtual std::string GetIdentifier() const OVERRIDE; - virtual device::BluetoothUUID GetUUID() const OVERRIDE; - virtual bool IsLocal() const OVERRIDE; - virtual const std::vector<uint8>& GetValue() const OVERRIDE; - virtual device::BluetoothGattService* GetService() const OVERRIDE; - virtual Properties GetProperties() const OVERRIDE; - virtual Permissions GetPermissions() const OVERRIDE; - virtual bool IsNotifying() const OVERRIDE; + virtual std::string GetIdentifier() const override; + virtual device::BluetoothUUID GetUUID() const override; + virtual bool IsLocal() const override; + virtual const std::vector<uint8>& GetValue() const override; + virtual device::BluetoothGattService* GetService() const override; + virtual Properties GetProperties() const override; + virtual Permissions GetPermissions() const override; + virtual bool IsNotifying() const override; virtual std::vector<device::BluetoothGattDescriptor*> - GetDescriptors() const OVERRIDE; + GetDescriptors() const override; virtual device::BluetoothGattDescriptor* GetDescriptor( - const std::string& identifier) const OVERRIDE; + const std::string& identifier) const override; virtual bool AddDescriptor( - device::BluetoothGattDescriptor* descriptor) OVERRIDE; - virtual bool UpdateValue(const std::vector<uint8>& value) OVERRIDE; + device::BluetoothGattDescriptor* descriptor) override; + virtual bool UpdateValue(const std::vector<uint8>& value) override; virtual void ReadRemoteCharacteristic( const ValueCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void WriteRemoteCharacteristic( const std::vector<uint8>& new_value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void StartNotifySession(const NotifySessionCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Removes one value update session and invokes |callback| on completion. This // decrements the session reference count by 1 and if the number reaches 0, @@ -84,13 +84,13 @@ class BluetoothRemoteGattCharacteristicChromeOS // BluetoothGattCharacteristicClient::Observer overrides. virtual void GattCharacteristicValueUpdated( const dbus::ObjectPath& object_path, - const std::vector<uint8>& value) OVERRIDE; + const std::vector<uint8>& value) override; // BluetoothGattDescriptorClient::Observer overrides. virtual void GattDescriptorAdded( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; virtual void GattDescriptorRemoved( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; // Called by dbus:: on successful completion of a request to read // the characteristic value. diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h index d4ea1e6..f4a2a11 100644 --- a/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h +++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h @@ -30,21 +30,21 @@ class BluetoothRemoteGattDescriptorChromeOS : public device::BluetoothGattDescriptor { public: // device::BluetoothGattDescriptor overrides. - virtual std::string GetIdentifier() const OVERRIDE; - virtual device::BluetoothUUID GetUUID() const OVERRIDE; - virtual bool IsLocal() const OVERRIDE; - virtual const std::vector<uint8>& GetValue() const OVERRIDE; + virtual std::string GetIdentifier() const override; + virtual device::BluetoothUUID GetUUID() const override; + virtual bool IsLocal() const override; + virtual const std::vector<uint8>& GetValue() const override; virtual device::BluetoothGattCharacteristic* - GetCharacteristic() const OVERRIDE; + GetCharacteristic() const override; virtual device::BluetoothGattCharacteristic::Permissions - GetPermissions() const OVERRIDE; + GetPermissions() const override; virtual void ReadRemoteDescriptor( const ValueCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void WriteRemoteDescriptor( const std::vector<uint8>& new_value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Object path of the underlying D-Bus characteristic. const dbus::ObjectPath& object_path() const { return object_path_; } diff --git a/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h index e02b56c..d5d4cad 100644 --- a/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h +++ b/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h @@ -40,25 +40,25 @@ class BluetoothRemoteGattServiceChromeOS public BluetoothGattCharacteristicClient::Observer { public: // device::BluetoothGattService overrides. - virtual std::string GetIdentifier() const OVERRIDE; - virtual device::BluetoothUUID GetUUID() const OVERRIDE; - virtual bool IsLocal() const OVERRIDE; - virtual bool IsPrimary() const OVERRIDE; - virtual device::BluetoothDevice* GetDevice() const OVERRIDE; + virtual std::string GetIdentifier() const override; + virtual device::BluetoothUUID GetUUID() const override; + virtual bool IsLocal() const override; + virtual bool IsPrimary() const override; + virtual device::BluetoothDevice* GetDevice() const override; virtual std::vector<device::BluetoothGattCharacteristic*> - GetCharacteristics() const OVERRIDE; + GetCharacteristics() const override; virtual std::vector<device::BluetoothGattService*> - GetIncludedServices() const OVERRIDE; + GetIncludedServices() const override; virtual device::BluetoothGattCharacteristic* GetCharacteristic( - const std::string& identifier) const OVERRIDE; + const std::string& identifier) const override; virtual bool AddCharacteristic( - device::BluetoothGattCharacteristic* characteristic) OVERRIDE; + device::BluetoothGattCharacteristic* characteristic) override; virtual bool AddIncludedService( - device::BluetoothGattService* service) OVERRIDE; + device::BluetoothGattService* service) override; virtual void Register(const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void Unregister(const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Object path of the underlying service. const dbus::ObjectPath& object_path() const { return object_path_; } @@ -113,16 +113,16 @@ class BluetoothRemoteGattServiceChromeOS // BluetoothGattServiceClient::Observer override. virtual void GattServicePropertyChanged( const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE; + const std::string& property_name) override; // BluetoothGattCharacteristicClient::Observer override. virtual void GattCharacteristicAdded( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; virtual void GattCharacteristicRemoved( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; virtual void GattCharacteristicPropertyChanged( const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE; + const std::string& property_name) override; // Object path of the GATT service. dbus::ObjectPath object_path_; diff --git a/device/bluetooth/bluetooth_rfcomm_channel_mac.h b/device/bluetooth/bluetooth_rfcomm_channel_mac.h index cc64010..665e2d3 100644 --- a/device/bluetooth/bluetooth_rfcomm_channel_mac.h +++ b/device/bluetooth/bluetooth_rfcomm_channel_mac.h @@ -37,12 +37,12 @@ class BluetoothRfcommChannelMac : public BluetoothChannelMac { IOReturn* status); // BluetoothChannelMac: - virtual void SetSocket(BluetoothSocketMac* socket) OVERRIDE; - virtual IOBluetoothDevice* GetDevice() OVERRIDE; - virtual uint16_t GetOutgoingMTU() OVERRIDE; + virtual void SetSocket(BluetoothSocketMac* socket) override; + virtual IOBluetoothDevice* GetDevice() override; + virtual uint16_t GetOutgoingMTU() override; virtual IOReturn WriteAsync(void* data, uint16_t length, - void* refcon) OVERRIDE; + void* refcon) override; void OnChannelOpenComplete(IOBluetoothRFCOMMChannel* channel, IOReturn status); diff --git a/device/bluetooth/bluetooth_socket_chromeos.h b/device/bluetooth/bluetooth_socket_chromeos.h index ff8ee77..6ea2c21 100644 --- a/device/bluetooth/bluetooth_socket_chromeos.h +++ b/device/bluetooth/bluetooth_socket_chromeos.h @@ -70,10 +70,10 @@ class CHROMEOS_EXPORT BluetoothSocketChromeOS const ErrorCompletionCallback& error_callback); // BluetoothSocket: - virtual void Close() OVERRIDE; - virtual void Disconnect(const base::Closure& callback) OVERRIDE; + virtual void Close() override; + virtual void Disconnect(const base::Closure& callback) override; virtual void Accept(const AcceptCompletionCallback& success_callback, - const ErrorCompletionCallback& error_callback) OVERRIDE; + const ErrorCompletionCallback& error_callback) override; // Returns the object path of the socket. const dbus::ObjectPath& object_path() const { return object_path_; } @@ -103,7 +103,7 @@ class CHROMEOS_EXPORT BluetoothSocketChromeOS // BluetoothAdapter::Observer: virtual void AdapterPresentChanged(device::BluetoothAdapter* adapter, - bool present) OVERRIDE; + bool present) override; // Called by dbus:: on completion of the RegisterProfile() method call // triggered as a result of the adapter becoming present again. @@ -112,16 +112,16 @@ class CHROMEOS_EXPORT BluetoothSocketChromeOS const std::string& error_message); // BluetoothProfileServiceProvider::Delegate: - virtual void Released() OVERRIDE; + virtual void Released() override; virtual void NewConnection( const dbus::ObjectPath& device_path, scoped_ptr<dbus::FileDescriptor> fd, const BluetoothProfileServiceProvider::Delegate::Options& options, - const ConfirmationCallback& callback) OVERRIDE; + const ConfirmationCallback& callback) override; virtual void RequestDisconnection( const dbus::ObjectPath& device_path, - const ConfirmationCallback& callback) OVERRIDE; - virtual void Cancel() OVERRIDE; + const ConfirmationCallback& callback) override; + virtual void Cancel() override; // Method run to accept a single incoming connection. void AcceptConnectionRequest(); diff --git a/device/bluetooth/bluetooth_socket_chromeos_unittest.cc b/device/bluetooth/bluetooth_socket_chromeos_unittest.cc index e9ee1df..a86e8f1 100644 --- a/device/bluetooth/bluetooth_socket_chromeos_unittest.cc +++ b/device/bluetooth/bluetooth_socket_chromeos_unittest.cc @@ -49,7 +49,7 @@ class BluetoothSocketChromeOSTest : public testing::Test { last_bytes_received_(0), last_reason_(BluetoothSocket::kSystemError) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { scoped_ptr<DBusThreadManagerSetter> dbus_setter = DBusThreadManager::GetSetterForTesting(); @@ -87,7 +87,7 @@ class BluetoothSocketChromeOSTest : public testing::Test { ASSERT_TRUE(adapter_->IsPowered()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { adapter_ = NULL; BluetoothSocketThread::CleanupForTesting(); DBusThreadManager::Shutdown(); diff --git a/device/bluetooth/bluetooth_socket_mac.h b/device/bluetooth/bluetooth_socket_mac.h index 34f8136..f51f252 100644 --- a/device/bluetooth/bluetooth_socket_mac.h +++ b/device/bluetooth/bluetooth_socket_mac.h @@ -75,18 +75,18 @@ class BluetoothSocketMac : public BluetoothSocket { const ErrorCompletionCallback& error_callback); // BluetoothSocket: - virtual void Close() OVERRIDE; - virtual void Disconnect(const base::Closure& callback) OVERRIDE; + virtual void Close() override; + virtual void Disconnect(const base::Closure& callback) override; virtual void Receive( int /* buffer_size */, const ReceiveCompletionCallback& success_callback, - const ReceiveErrorCompletionCallback& error_callback) OVERRIDE; + const ReceiveErrorCompletionCallback& error_callback) override; virtual void Send(scoped_refptr<net::IOBuffer> buffer, int buffer_size, const SendCompletionCallback& success_callback, - const ErrorCompletionCallback& error_callback) OVERRIDE; + const ErrorCompletionCallback& error_callback) override; virtual void Accept(const AcceptCompletionCallback& success_callback, - const ErrorCompletionCallback& error_callback) OVERRIDE; + const ErrorCompletionCallback& error_callback) override; // Callback that is invoked when the OS completes an SDP query. // |status| is the returned status from the SDP query, |device| is the diff --git a/device/bluetooth/bluetooth_socket_net.h b/device/bluetooth/bluetooth_socket_net.h index b31f0fa..ed6323a 100644 --- a/device/bluetooth/bluetooth_socket_net.h +++ b/device/bluetooth/bluetooth_socket_net.h @@ -31,16 +31,16 @@ namespace device { class BluetoothSocketNet : public BluetoothSocket { public: // BluetoothSocket: - virtual void Close() OVERRIDE; - virtual void Disconnect(const base::Closure& callback) OVERRIDE; + virtual void Close() override; + virtual void Disconnect(const base::Closure& callback) override; virtual void Receive(int buffer_size, const ReceiveCompletionCallback& success_callback, const ReceiveErrorCompletionCallback& error_callback) - OVERRIDE; + override; virtual void Send(scoped_refptr<net::IOBuffer> buffer, int buffer_size, const SendCompletionCallback& success_callback, - const ErrorCompletionCallback& error_callback) OVERRIDE; + const ErrorCompletionCallback& error_callback) override; protected: BluetoothSocketNet(scoped_refptr<base::SequencedTaskRunner> ui_task_runner, diff --git a/device/bluetooth/bluetooth_socket_win.h b/device/bluetooth/bluetooth_socket_win.h index c5926b1..38c1664 100644 --- a/device/bluetooth/bluetooth_socket_win.h +++ b/device/bluetooth/bluetooth_socket_win.h @@ -55,7 +55,7 @@ class BluetoothSocketWin : public BluetoothSocketNet { // BluetoothSocket: virtual void Accept(const AcceptCompletionCallback& success_callback, - const ErrorCompletionCallback& error_callback) OVERRIDE; + const ErrorCompletionCallback& error_callback) override; protected: virtual ~BluetoothSocketWin(); diff --git a/device/bluetooth/bluetooth_task_manager_win_unittest.cc b/device/bluetooth/bluetooth_task_manager_win_unittest.cc index d4cd8e5..226db7b 100644 --- a/device/bluetooth/bluetooth_task_manager_win_unittest.cc +++ b/device/bluetooth/bluetooth_task_manager_win_unittest.cc @@ -24,15 +24,15 @@ class BluetoothTaskObserver : public device::BluetoothTaskManagerWin::Observer { } virtual void AdapterStateChanged( - const device::BluetoothTaskManagerWin::AdapterState& state) OVERRIDE { + const device::BluetoothTaskManagerWin::AdapterState& state) override { num_adapter_state_changed_++; } - virtual void DiscoveryStarted(bool success) OVERRIDE { + virtual void DiscoveryStarted(bool success) override { num_discovery_started_++; } - virtual void DiscoveryStopped() OVERRIDE { + virtual void DiscoveryStopped() override { num_discovery_stopped_++; } diff --git a/device/hid/device_monitor_linux.h b/device/hid/device_monitor_linux.h index 2f219dc..7f5d242 100644 --- a/device/hid/device_monitor_linux.h +++ b/device/hid/device_monitor_linux.h @@ -47,11 +47,11 @@ class DeviceMonitorLinux : public base::MessageLoop::DestructionObserver, void Enumerate(const EnumerateCallback& callback); // Implements base::MessageLoop::DestructionObserver - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; // Implements base::MessagePumpLibevent::Watcher - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; private: friend struct base::DefaultDeleter<DeviceMonitorLinux>; diff --git a/device/hid/hid_connection_linux.h b/device/hid/hid_connection_linux.h index 1944a5b..cbb3b8d 100644 --- a/device/hid/hid_connection_linux.h +++ b/device/hid/hid_connection_linux.h @@ -23,20 +23,20 @@ class HidConnectionLinux : public HidConnection, virtual ~HidConnectionLinux(); // HidConnection implementation. - virtual void PlatformRead(const ReadCallback& callback) OVERRIDE; + virtual void PlatformRead(const ReadCallback& callback) override; virtual void PlatformWrite(scoped_refptr<net::IOBuffer> buffer, size_t size, - const WriteCallback& callback) OVERRIDE; + const WriteCallback& callback) override; virtual void PlatformGetFeatureReport(uint8_t report_id, - const ReadCallback& callback) OVERRIDE; + const ReadCallback& callback) override; virtual void PlatformSendFeatureReport( scoped_refptr<net::IOBuffer> buffer, size_t size, - const WriteCallback& callback) OVERRIDE; + const WriteCallback& callback) override; // base::MessagePumpLibevent::Watcher implementation. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; void Disconnect(); diff --git a/device/hid/hid_connection_mac.h b/device/hid/hid_connection_mac.h index 7282760..f1ce414 100644 --- a/device/hid/hid_connection_mac.h +++ b/device/hid/hid_connection_mac.h @@ -32,16 +32,16 @@ class HidConnectionMac : public HidConnection { virtual ~HidConnectionMac(); // HidConnection implementation. - virtual void PlatformRead(const ReadCallback& callback) OVERRIDE; + virtual void PlatformRead(const ReadCallback& callback) override; virtual void PlatformWrite(scoped_refptr<net::IOBuffer> buffer, size_t size, - const WriteCallback& callback) OVERRIDE; + const WriteCallback& callback) override; virtual void PlatformGetFeatureReport(uint8_t report_id, - const ReadCallback& callback) OVERRIDE; + const ReadCallback& callback) override; virtual void PlatformSendFeatureReport( scoped_refptr<net::IOBuffer> buffer, size_t size, - const WriteCallback& callback) OVERRIDE; + const WriteCallback& callback) override; static void InputReportCallback(void* context, IOReturn result, diff --git a/device/hid/hid_connection_unittest.cc b/device/hid/hid_connection_unittest.cc index 113b27e..97b977e 100644 --- a/device/hid/hid_connection_unittest.cc +++ b/device/hid/hid_connection_unittest.cc @@ -69,7 +69,7 @@ class TestCompletionCallback { class HidConnectionTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { if (!UsbTestGadget::IsTestEnabled()) return; message_loop_.reset(new base::MessageLoopForIO()); diff --git a/device/hid/hid_connection_win.cc b/device/hid/hid_connection_win.cc index 5182d9c..4f39c7c 100644 --- a/device/hid/hid_connection_win.cc +++ b/device/hid/hid_connection_win.cc @@ -39,10 +39,10 @@ struct PendingHidTransfer : public base::RefCounted<PendingHidTransfer>, OVERLAPPED* GetOverlapped() { return &overlapped_; } // Implements base::win::ObjectWatcher::Delegate. - virtual void OnObjectSignaled(HANDLE object) OVERRIDE; + virtual void OnObjectSignaled(HANDLE object) override; // Implements base::MessageLoop::DestructionObserver - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; // The buffer isn't used by this object but it's important that a reference // to it is held until the transfer completes. diff --git a/device/hid/hid_connection_win.h b/device/hid/hid_connection_win.h index 14548f0..25e5d7b 100644 --- a/device/hid/hid_connection_win.h +++ b/device/hid/hid_connection_win.h @@ -27,16 +27,16 @@ class HidConnectionWin : public HidConnection { ~HidConnectionWin(); // HidConnection implementation. - virtual void PlatformRead(const ReadCallback& callback) OVERRIDE; + virtual void PlatformRead(const ReadCallback& callback) override; virtual void PlatformWrite(scoped_refptr<net::IOBuffer> buffer, size_t size, - const WriteCallback& callback) OVERRIDE; + const WriteCallback& callback) override; virtual void PlatformGetFeatureReport(uint8_t report_id, - const ReadCallback& callback) OVERRIDE; + const ReadCallback& callback) override; virtual void PlatformSendFeatureReport( scoped_refptr<net::IOBuffer> buffer, size_t size, - const WriteCallback& callback) OVERRIDE; + const WriteCallback& callback) override; bool available() const { return file_.IsValid(); } diff --git a/device/hid/hid_device_filter_unittest.cc b/device/hid/hid_device_filter_unittest.cc index 599dda4..155663b 100644 --- a/device/hid/hid_device_filter_unittest.cc +++ b/device/hid/hid_device_filter_unittest.cc @@ -12,7 +12,7 @@ namespace { class HidFilterTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { device_info_.vendor_id = 0x046d; device_info_.product_id = 0xc31c; diff --git a/device/hid/hid_report_descriptor_unittest.cc b/device/hid/hid_report_descriptor_unittest.cc index 8bc04f1..681459c 100644 --- a/device/hid/hid_report_descriptor_unittest.cc +++ b/device/hid/hid_report_descriptor_unittest.cc @@ -286,9 +286,9 @@ const uint8_t kLogitechUnifyingReceiver[] = { class HidReportDescriptorTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { descriptor_ = NULL; } + virtual void SetUp() override { descriptor_ = NULL; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (descriptor_) { delete descriptor_; } diff --git a/device/hid/hid_service.cc b/device/hid/hid_service.cc index 2dfdb89..455999f 100644 --- a/device/hid/hid_service.cc +++ b/device/hid/hid_service.cc @@ -35,7 +35,7 @@ class HidService::Destroyer : public base::MessageLoop::DestructionObserver { private: // base::MessageLoop::DestructionObserver implementation. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE { + virtual void WillDestroyCurrentMessageLoop() override { base::MessageLoop::current()->RemoveDestructionObserver(this); delete hid_service_; delete this; diff --git a/device/hid/hid_service_linux.h b/device/hid/hid_service_linux.h index 7b62fc0..7c61def 100644 --- a/device/hid/hid_service_linux.h +++ b/device/hid/hid_service_linux.h @@ -24,11 +24,11 @@ class HidServiceLinux : public HidService, HidServiceLinux(scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner); virtual scoped_refptr<HidConnection> Connect(const HidDeviceId& device_id) - OVERRIDE; + override; // Implements DeviceMonitorLinux::Observer: - virtual void OnDeviceAdded(udev_device* device) OVERRIDE; - virtual void OnDeviceRemoved(udev_device* device) OVERRIDE; + virtual void OnDeviceAdded(udev_device* device) override; + virtual void OnDeviceRemoved(udev_device* device) override; private: virtual ~HidServiceLinux(); diff --git a/device/hid/hid_service_mac.h b/device/hid/hid_service_mac.h index 7c43234..eb9da5b 100644 --- a/device/hid/hid_service_mac.h +++ b/device/hid/hid_service_mac.h @@ -27,7 +27,7 @@ class HidServiceMac : public HidService { HidServiceMac(); virtual scoped_refptr<HidConnection> Connect(const HidDeviceId& device_id) - OVERRIDE; + override; private: virtual ~HidServiceMac(); diff --git a/device/hid/hid_service_win.h b/device/hid/hid_service_win.h index 51ea8fb..4c9dec6 100644 --- a/device/hid/hid_service_win.h +++ b/device/hid/hid_service_win.h @@ -30,10 +30,10 @@ class HidServiceWin : public HidService { public: HidServiceWin(); - virtual void GetDevices(std::vector<HidDeviceInfo>* devices) OVERRIDE; + virtual void GetDevices(std::vector<HidDeviceInfo>* devices) override; virtual scoped_refptr<HidConnection> Connect(const HidDeviceId& device_id) - OVERRIDE; + override; private: virtual ~HidServiceWin(); diff --git a/device/hid/input_service_linux.cc b/device/hid/input_service_linux.cc index 90132e9..81c7e08 100644 --- a/device/hid/input_service_linux.cc +++ b/device/hid/input_service_linux.cc @@ -77,8 +77,8 @@ class InputServiceLinuxImpl : public InputServiceLinux, public DeviceMonitorLinux::Observer { public: // Implements DeviceMonitorLinux::Observer: - virtual void OnDeviceAdded(udev_device* device) OVERRIDE; - virtual void OnDeviceRemoved(udev_device* device) OVERRIDE; + virtual void OnDeviceAdded(udev_device* device) override; + virtual void OnDeviceRemoved(udev_device* device) override; private: friend class InputServiceLinux; diff --git a/device/hid/input_service_linux.h b/device/hid/input_service_linux.h index dc43dba..8e28f47 100644 --- a/device/hid/input_service_linux.h +++ b/device/hid/input_service_linux.h @@ -70,7 +70,7 @@ class InputServiceLinux : public base::MessageLoop::DestructionObserver { bool GetDeviceInfo(const std::string& id, InputDeviceInfo* info) const; // Implements base::MessageLoop::DestructionObserver - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; protected: virtual ~InputServiceLinux(); diff --git a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc index 5639169..52ce9bd6 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc +++ b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc @@ -37,7 +37,7 @@ class MediaTransferProtocolDaemonClientImpl // MediaTransferProtocolDaemonClient override. virtual void EnumerateStorages(const EnumerateStoragesCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kEnumerateStorages); proxy_->CallMethod( @@ -51,7 +51,7 @@ class MediaTransferProtocolDaemonClientImpl // MediaTransferProtocolDaemonClient override. virtual void GetStorageInfo(const std::string& storage_name, const GetStorageInfoCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kGetStorageInfo); dbus::MessageWriter writer(&method_call); writer.AppendString(storage_name); @@ -68,7 +68,7 @@ class MediaTransferProtocolDaemonClientImpl virtual void OpenStorage(const std::string& storage_name, const std::string& mode, const OpenStorageCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kOpenStorage); dbus::MessageWriter writer(&method_call); writer.AppendString(storage_name); @@ -85,7 +85,7 @@ class MediaTransferProtocolDaemonClientImpl // MediaTransferProtocolDaemonClient override. virtual void CloseStorage(const std::string& handle, const CloseStorageCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kCloseStorage); dbus::MessageWriter writer(&method_call); writer.AppendString(handle); @@ -102,7 +102,7 @@ class MediaTransferProtocolDaemonClientImpl const std::string& handle, uint32 file_id, const ReadDirectoryEntryIdsCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kReadDirectoryEntryIds); dbus::MessageWriter writer(&method_call); @@ -121,7 +121,7 @@ class MediaTransferProtocolDaemonClientImpl size_t offset, size_t entries_to_read, const GetFileInfoCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { if (offset >= file_ids.size()) { error_callback.Run(); return; @@ -156,7 +156,7 @@ class MediaTransferProtocolDaemonClientImpl uint32 offset, uint32 bytes_to_read, const ReadFileCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { DCHECK_LE(bytes_to_read, kMaxChunkSize); dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kReadFileChunk); dbus::MessageWriter writer(&method_call); @@ -174,7 +174,7 @@ class MediaTransferProtocolDaemonClientImpl // MediaTransferProtocolDaemonClient override. virtual void ListenForChanges( - const MTPStorageEventHandler& handler) OVERRIDE { + const MTPStorageEventHandler& handler) override { DCHECK(!listen_for_changes_called_); listen_for_changes_called_ = true; diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc index e923975..dc2c5d0 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc +++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc @@ -92,19 +92,19 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { } // MediaTransferProtocolManager override. - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { DCHECK(thread_checker_.CalledOnValidThread()); observers_.AddObserver(observer); } // MediaTransferProtocolManager override. - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { DCHECK(thread_checker_.CalledOnValidThread()); observers_.RemoveObserver(observer); } // MediaTransferProtocolManager override. - virtual const std::vector<std::string> GetStorages() const OVERRIDE { + virtual const std::vector<std::string> GetStorages() const override { DCHECK(thread_checker_.CalledOnValidThread()); std::vector<std::string> storages; for (StorageInfoMap::const_iterator it = storage_info_map_.begin(); @@ -117,7 +117,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { // MediaTransferProtocolManager override. virtual const MtpStorageInfo* GetStorageInfo( - const std::string& storage_name) const OVERRIDE { + const std::string& storage_name) const override { DCHECK(thread_checker_.CalledOnValidThread()); StorageInfoMap::const_iterator it = storage_info_map_.find(storage_name); return it != storage_info_map_.end() ? &it->second : NULL; @@ -126,7 +126,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { // MediaTransferProtocolManager override. virtual void OpenStorage(const std::string& storage_name, const std::string& mode, - const OpenStorageCallback& callback) OVERRIDE { + const OpenStorageCallback& callback) override { DCHECK(thread_checker_.CalledOnValidThread()); if (!ContainsKey(storage_info_map_, storage_name) || !mtp_client_) { callback.Run(std::string(), true); @@ -144,7 +144,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { // MediaTransferProtocolManager override. virtual void CloseStorage(const std::string& storage_handle, - const CloseStorageCallback& callback) OVERRIDE { + const CloseStorageCallback& callback) override { DCHECK(thread_checker_.CalledOnValidThread()); if (!ContainsKey(handles_, storage_handle) || !mtp_client_) { callback.Run(true); @@ -162,7 +162,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { // MediaTransferProtocolManager override. virtual void ReadDirectory(const std::string& storage_handle, uint32 file_id, - const ReadDirectoryCallback& callback) OVERRIDE { + const ReadDirectoryCallback& callback) override { DCHECK(thread_checker_.CalledOnValidThread()); if (!ContainsKey(handles_, storage_handle) || !mtp_client_) { callback.Run(std::vector<MtpFileEntry>(), @@ -186,7 +186,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { uint32 file_id, uint32 offset, uint32 count, - const ReadFileCallback& callback) OVERRIDE { + const ReadFileCallback& callback) override { DCHECK(thread_checker_.CalledOnValidThread()); if (!ContainsKey(handles_, storage_handle) || !mtp_client_) { callback.Run(std::string(), true); @@ -203,7 +203,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { virtual void GetFileInfo(const std::string& storage_handle, uint32 file_id, - const GetFileInfoCallback& callback) OVERRIDE { + const GetFileInfoCallback& callback) override { DCHECK(thread_checker_.CalledOnValidThread()); if (!ContainsKey(handles_, storage_handle) || !mtp_client_) { callback.Run(MtpFileEntry(), true); diff --git a/device/nfc/nfc_adapter_chromeos.h b/device/nfc/nfc_adapter_chromeos.h index 3511e5d..4bf8fd9 100644 --- a/device/nfc/nfc_adapter_chromeos.h +++ b/device/nfc/nfc_adapter_chromeos.h @@ -29,19 +29,19 @@ class NfcAdapterChromeOS : public device::NfcAdapter, public chromeos::NfcTagClient::Observer { public: // NfcAdapter overrides. - virtual void AddObserver(NfcAdapter::Observer* observer) OVERRIDE; - virtual void RemoveObserver(NfcAdapter::Observer* observer) OVERRIDE; - virtual bool IsPresent() const OVERRIDE; - virtual bool IsPowered() const OVERRIDE; - virtual bool IsPolling() const OVERRIDE; - virtual bool IsInitialized() const OVERRIDE; + virtual void AddObserver(NfcAdapter::Observer* observer) override; + virtual void RemoveObserver(NfcAdapter::Observer* observer) override; + virtual bool IsPresent() const override; + virtual bool IsPowered() const override; + virtual bool IsPolling() const override; + virtual bool IsInitialized() const override; virtual void SetPowered(bool powered, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void StartPolling(const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void StopPolling(const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; private: friend class device::NfcAdapterFactory; @@ -51,19 +51,19 @@ class NfcAdapterChromeOS : public device::NfcAdapter, virtual ~NfcAdapterChromeOS(); // NfcAdapterClient::Observer overrides. - virtual void AdapterAdded(const dbus::ObjectPath& object_path) OVERRIDE; - virtual void AdapterRemoved(const dbus::ObjectPath& object_path) OVERRIDE; + virtual void AdapterAdded(const dbus::ObjectPath& object_path) override; + virtual void AdapterRemoved(const dbus::ObjectPath& object_path) override; virtual void AdapterPropertyChanged( const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE; + const std::string& property_name) override; // NfcDeviceClient::Observer overrides. - virtual void DeviceAdded(const dbus::ObjectPath& object_path) OVERRIDE; - virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE; + virtual void DeviceAdded(const dbus::ObjectPath& object_path) override; + virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override; // NfcTagClient::Observer overrides. - virtual void TagAdded(const dbus::ObjectPath& object_path) OVERRIDE; - virtual void TagRemoved(const dbus::ObjectPath& object_path) OVERRIDE; + virtual void TagAdded(const dbus::ObjectPath& object_path) override; + virtual void TagRemoved(const dbus::ObjectPath& object_path) override; // Set the tracked adapter to the one in |object_path|, this object will // subsequently operate on that adapter until it is removed. diff --git a/device/nfc/nfc_chromeos_unittest.cc b/device/nfc/nfc_chromeos_unittest.cc index 646940c..090f9da1 100644 --- a/device/nfc/nfc_chromeos_unittest.cc +++ b/device/nfc/nfc_chromeos_unittest.cc @@ -60,34 +60,34 @@ class TestObserver : public NfcAdapter::Observer, // NfcAdapter::Observer override. virtual void AdapterPresentChanged(NfcAdapter* adapter, - bool present) OVERRIDE { + bool present) override { EXPECT_EQ(adapter_.get(), adapter); present_changed_count_++; } // NfcAdapter::Observer override. virtual void AdapterPoweredChanged(NfcAdapter* adapter, - bool powered) OVERRIDE { + bool powered) override { EXPECT_EQ(adapter_.get(), adapter); powered_changed_count_++; } // NfcAdapter::Observer override. virtual void AdapterPollingChanged(NfcAdapter* adapter, - bool powered) OVERRIDE { + bool powered) override { EXPECT_EQ(adapter_.get(), adapter); polling_changed_count_++; } // NfcAdapter::Observer override. - virtual void PeerFound(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE { + virtual void PeerFound(NfcAdapter* adapter, NfcPeer* peer) override { EXPECT_EQ(adapter_.get(), adapter); peer_count_++; peer_identifier_ = peer->GetIdentifier(); } // NfcAdapter::Observer override. - virtual void PeerLost(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE { + virtual void PeerLost(NfcAdapter* adapter, NfcPeer* peer) override { EXPECT_EQ(adapter_.get(), adapter); EXPECT_EQ(peer_identifier_, peer->GetIdentifier()); peer_count_--; @@ -95,14 +95,14 @@ class TestObserver : public NfcAdapter::Observer, } // NfcAdapter::Observer override. - virtual void TagFound(NfcAdapter* adapter, NfcTag* tag) OVERRIDE { + virtual void TagFound(NfcAdapter* adapter, NfcTag* tag) override { EXPECT_EQ(adapter_.get(), adapter); tag_count_++; tag_identifier_ = tag->GetIdentifier(); } // NfcAdapter::Observer override. - virtual void TagLost(NfcAdapter* adapter, NfcTag* tag) OVERRIDE { + virtual void TagLost(NfcAdapter* adapter, NfcTag* tag) override { EXPECT_EQ(adapter_.get(), adapter); EXPECT_EQ(tag_identifier_, tag->GetIdentifier()); tag_count_--; @@ -111,7 +111,7 @@ class TestObserver : public NfcAdapter::Observer, // NfcPeer::Observer override. virtual void RecordReceived( - NfcPeer* peer, const NfcNdefRecord* record) OVERRIDE { + NfcPeer* peer, const NfcNdefRecord* record) override { EXPECT_EQ(peer, adapter_->GetPeer(peer_identifier_)); EXPECT_EQ(peer_identifier_, peer->GetIdentifier()); peer_records_received_count_++; @@ -119,7 +119,7 @@ class TestObserver : public NfcAdapter::Observer, // NfcNdefTagTechnology::Observer override. virtual void RecordReceived( - NfcTag* tag, const NfcNdefRecord* record) OVERRIDE { + NfcTag* tag, const NfcNdefRecord* record) override { EXPECT_EQ(tag, adapter_->GetTag(tag_identifier_)); EXPECT_EQ(tag_identifier_, tag->GetIdentifier()); tag_records_received_count_++; diff --git a/device/nfc/nfc_peer_chromeos.h b/device/nfc/nfc_peer_chromeos.h index eec8e4b..c4d8c58 100644 --- a/device/nfc/nfc_peer_chromeos.h +++ b/device/nfc/nfc_peer_chromeos.h @@ -21,16 +21,16 @@ class NfcPeerChromeOS : public device::NfcPeer, public NfcRecordClient::Observer { public: // NfcPeer overrides. - virtual void AddObserver(device::NfcPeer::Observer* observer) OVERRIDE; - virtual void RemoveObserver(device::NfcPeer::Observer* observer) OVERRIDE; - virtual std::string GetIdentifier() const OVERRIDE; - virtual const device::NfcNdefMessage& GetNdefMessage() const OVERRIDE; + virtual void AddObserver(device::NfcPeer::Observer* observer) override; + virtual void RemoveObserver(device::NfcPeer::Observer* observer) override; + virtual std::string GetIdentifier() const override; + virtual const device::NfcNdefMessage& GetNdefMessage() const override; virtual void PushNdef(const device::NfcNdefMessage& message, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void StartHandover(HandoverType handover_type, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; private: friend class NfcAdapterChromeOS; @@ -42,10 +42,10 @@ class NfcPeerChromeOS : public device::NfcPeer, virtual ~NfcPeerChromeOS(); // NfcRecordClient::Observer overrides. - virtual void RecordAdded(const dbus::ObjectPath& object_path) OVERRIDE; - virtual void RecordRemoved(const dbus::ObjectPath& object_path) OVERRIDE; + virtual void RecordAdded(const dbus::ObjectPath& object_path) override; + virtual void RecordRemoved(const dbus::ObjectPath& object_path) override; virtual void RecordPropertiesReceived( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; // Called by dbus:: on completion of the D-Bus method call to push an NDEF. void OnPushNdef(const base::Closure& callback); diff --git a/device/nfc/nfc_tag_chromeos.h b/device/nfc/nfc_tag_chromeos.h index 5e4a723..29f7bfb 100644 --- a/device/nfc/nfc_tag_chromeos.h +++ b/device/nfc/nfc_tag_chromeos.h @@ -23,22 +23,22 @@ class NfcTagChromeOS : public device::NfcTag, public NfcTagClient::Observer { public: // device::NfcTag overrides. - virtual void AddObserver(device::NfcTag::Observer* observer) OVERRIDE; - virtual void RemoveObserver(device::NfcTag::Observer* observer) OVERRIDE; - virtual std::string GetIdentifier() const OVERRIDE; - virtual TagType GetType() const OVERRIDE; - virtual bool IsReadOnly() const OVERRIDE; - virtual device::NfcTag::Protocol GetSupportedProtocol() const OVERRIDE; + virtual void AddObserver(device::NfcTag::Observer* observer) override; + virtual void RemoveObserver(device::NfcTag::Observer* observer) override; + virtual std::string GetIdentifier() const override; + virtual TagType GetType() const override; + virtual bool IsReadOnly() const override; + virtual device::NfcTag::Protocol GetSupportedProtocol() const override; virtual device::NfcTagTechnology::TechnologyTypeMask - GetSupportedTechnologies() const OVERRIDE; - virtual bool IsReady() const OVERRIDE; - virtual device::NfcNdefTagTechnology* GetNdefTagTechnology() OVERRIDE; + GetSupportedTechnologies() const override; + virtual bool IsReady() const override; + virtual device::NfcNdefTagTechnology* GetNdefTagTechnology() override; // NfcTagClient::Observer overrides. virtual void TagPropertyChanged(const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE; + const std::string& property_name) override; virtual void TagPropertiesReceived( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; // Object path representing the remote tag object. const dbus::ObjectPath& object_path() const { return object_path_; } diff --git a/device/nfc/nfc_tag_technology.h b/device/nfc/nfc_tag_technology.h index 35def12..45b3146 100644 --- a/device/nfc/nfc_tag_technology.h +++ b/device/nfc/nfc_tag_technology.h @@ -93,7 +93,7 @@ class NfcNdefTagTechnology : public NfcTagTechnology { virtual void RemoveObserver(Observer* observer) = 0; // NfcTagTechnology override. - virtual bool IsSupportedByTag() const OVERRIDE; + virtual bool IsSupportedByTag() const override; // Returns all NDEF records that were received from the tag in the form of an // NDEF message. If the returned NDEF message contains no records, this only diff --git a/device/nfc/nfc_tag_technology_chromeos.h b/device/nfc/nfc_tag_technology_chromeos.h index 71b070e..6f55f43 100644 --- a/device/nfc/nfc_tag_technology_chromeos.h +++ b/device/nfc/nfc_tag_technology_chromeos.h @@ -28,19 +28,19 @@ class NfcNdefTagTechnologyChromeOS : public device::NfcNdefTagTechnology, // device::NfcNdefTagTechnology overrides. virtual void AddObserver(device::NfcNdefTagTechnology::Observer* observer) - OVERRIDE; + override; virtual void RemoveObserver(device::NfcNdefTagTechnology::Observer* observer) - OVERRIDE; - virtual const device::NfcNdefMessage& GetNdefMessage() const OVERRIDE; + override; + virtual const device::NfcNdefMessage& GetNdefMessage() const override; virtual void WriteNdef(const device::NfcNdefMessage& message, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // NfcRecordClient::Observer overrides. - virtual void RecordAdded(const dbus::ObjectPath& object_path) OVERRIDE; - virtual void RecordRemoved(const dbus::ObjectPath& object_path) OVERRIDE; + virtual void RecordAdded(const dbus::ObjectPath& object_path) override; + virtual void RecordRemoved(const dbus::ObjectPath& object_path) override; virtual void RecordPropertiesReceived( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; private: friend class NfcTagChromeOS; diff --git a/device/serial/data_receiver.cc b/device/serial/data_receiver.cc index 5211437..b6e44a9 100644 --- a/device/serial/data_receiver.cc +++ b/device/serial/data_receiver.cc @@ -66,10 +66,10 @@ class DataReceiver::PendingReceive::Buffer : public ReadOnlyBuffer { virtual ~Buffer(); // ReadOnlyBuffer overrides. - virtual const char* GetData() OVERRIDE; - virtual uint32_t GetSize() OVERRIDE; - virtual void Done(uint32_t bytes_consumed) OVERRIDE; - virtual void DoneWithError(uint32_t bytes_consumed, int32_t error) OVERRIDE; + virtual const char* GetData() override; + virtual uint32_t GetSize() override; + virtual void Done(uint32_t bytes_consumed) override; + virtual void DoneWithError(uint32_t bytes_consumed, int32_t error) override; private: // The DataReceiver whose data pipe we are providing a view. diff --git a/device/serial/data_receiver.h b/device/serial/data_receiver.h index 7e878c3..df37018 100644 --- a/device/serial/data_receiver.h +++ b/device/serial/data_receiver.h @@ -47,10 +47,10 @@ class DataReceiver : public base::RefCounted<DataReceiver>, // serial::DataSourceClient override. Invoked by the DataSource to report // errors. - virtual void OnError(uint32_t bytes_since_last_error, int32_t error) OVERRIDE; + virtual void OnError(uint32_t bytes_since_last_error, int32_t error) override; // mojo::ErrorHandler override. Calls ShutDown(). - virtual void OnConnectionError() OVERRIDE; + virtual void OnConnectionError() override; // Invoked by the PendingReceive to report that the user is done with the // receive buffer, having read |bytes_read| bytes from it. diff --git a/device/serial/data_sender.h b/device/serial/data_sender.h index ab21db4..6e5c89e 100644 --- a/device/serial/data_sender.h +++ b/device/serial/data_sender.h @@ -53,14 +53,14 @@ class DataSender : public serial::DataSinkClient, public mojo::ErrorHandler { class PendingSend; // serial::DataSinkClient overrides. - virtual void ReportBytesSent(uint32_t bytes_sent) OVERRIDE; + virtual void ReportBytesSent(uint32_t bytes_sent) override; virtual void ReportBytesSentAndError( uint32_t bytes_sent, int32_t error, - const mojo::Callback<void(uint32_t)>& callback) OVERRIDE; + const mojo::Callback<void(uint32_t)>& callback) override; // mojo::ErrorHandler override. - virtual void OnConnectionError() OVERRIDE; + virtual void OnConnectionError() override; // Copies data from |pending_sends_| into the data pipe and starts |waiter_| // waiting if the pipe is full. When a PendingSend in |pending_sends_| has diff --git a/device/serial/data_sink_receiver.cc b/device/serial/data_sink_receiver.cc index cadc9e3..767f036 100644 --- a/device/serial/data_sink_receiver.cc +++ b/device/serial/data_sink_receiver.cc @@ -49,10 +49,10 @@ class DataSinkReceiver::Buffer : public ReadOnlyBuffer { void Cancel(int32_t error); // ReadOnlyBuffer overrides. - virtual const char* GetData() OVERRIDE; - virtual uint32_t GetSize() OVERRIDE; - virtual void Done(uint32_t bytes_read) OVERRIDE; - virtual void DoneWithError(uint32_t bytes_read, int32_t error) OVERRIDE; + virtual const char* GetData() override; + virtual uint32_t GetSize() override; + virtual void Done(uint32_t bytes_read) override; + virtual void DoneWithError(uint32_t bytes_read, int32_t error) override; private: // The DataSinkReceiver whose data pipe we are providing a view. diff --git a/device/serial/data_sink_receiver.h b/device/serial/data_sink_receiver.h index 2e63d7a..75d85e6 100644 --- a/device/serial/data_sink_receiver.h +++ b/device/serial/data_sink_receiver.h @@ -49,9 +49,9 @@ class DataSinkReceiver : public base::RefCounted<DataSinkReceiver>, virtual ~DataSinkReceiver(); // mojo::InterfaceImpl<serial::DataSink> overrides. - virtual void Init(mojo::ScopedDataPipeConsumerHandle handle) OVERRIDE; - virtual void Cancel(int32_t error) OVERRIDE; - virtual void OnConnectionError() OVERRIDE; + virtual void Init(mojo::ScopedDataPipeConsumerHandle handle) override; + virtual void Cancel(int32_t error) override; + virtual void OnConnectionError() override; // Starts waiting for |handle_| to be ready for reads. void StartWaiting(); diff --git a/device/serial/data_sink_unittest.cc b/device/serial/data_sink_unittest.cc index 605ccf6..cc983c9 100644 --- a/device/serial/data_sink_unittest.cc +++ b/device/serial/data_sink_unittest.cc @@ -35,7 +35,7 @@ class DataSinkTest : public testing::Test { seen_connection_error_(false), expected_event_(EVENT_NONE) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { message_loop_.reset(new base::MessageLoop); mojo::InterfacePtr<serial::DataSink> sink_handle; sink_receiver_ = mojo::WeakBindToProxy( @@ -47,7 +47,7 @@ class DataSinkTest : public testing::Test { sender_.reset(new DataSender(sink_handle.Pass(), kBufferSize, kFatalError)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { read_buffer_.reset(); message_loop_.reset(); if (sink_receiver_.get()) diff --git a/device/serial/data_source_sender.cc b/device/serial/data_source_sender.cc index e67a81e..4eaee75 100644 --- a/device/serial/data_source_sender.cc +++ b/device/serial/data_source_sender.cc @@ -52,10 +52,10 @@ class DataSourceSender::PendingSend::Buffer : public WritableBuffer { virtual ~Buffer(); // WritableBuffer overrides. - virtual char* GetData() OVERRIDE; - virtual uint32_t GetSize() OVERRIDE; - virtual void Done(uint32_t bytes_written) OVERRIDE; - virtual void DoneWithError(uint32_t bytes_written, int32_t error) OVERRIDE; + virtual char* GetData() override; + virtual uint32_t GetSize() override; + virtual void Done(uint32_t bytes_written) override; + virtual void DoneWithError(uint32_t bytes_written, int32_t error) override; private: // The DataSourceSender whose data pipe we are providing a view. diff --git a/device/serial/data_source_sender.h b/device/serial/data_source_sender.h index 9bbabba..59782aa 100644 --- a/device/serial/data_source_sender.h +++ b/device/serial/data_source_sender.h @@ -41,10 +41,10 @@ class DataSourceSender : public base::RefCounted<DataSourceSender>, virtual ~DataSourceSender(); // mojo::InterfaceImpl<serial::DataSourceSender> overrides. - virtual void Init(mojo::ScopedDataPipeProducerHandle handle) OVERRIDE; - virtual void Resume() OVERRIDE; + virtual void Init(mojo::ScopedDataPipeProducerHandle handle) override; + virtual void Resume() override; // Invoked in the event of a connection error. Calls DispatchFatalError(). - virtual void OnConnectionError() OVERRIDE; + virtual void OnConnectionError() override; // Starts waiting for |handle_| to be ready for writes. void StartWaiting(); diff --git a/device/serial/data_source_unittest.cc b/device/serial/data_source_unittest.cc index e185731..7e4d820 100644 --- a/device/serial/data_source_unittest.cc +++ b/device/serial/data_source_unittest.cc @@ -28,7 +28,7 @@ class DataSourceTest : public testing::Test { DataSourceTest() : error_(0), seen_connection_error_(false), expected_event_(EVENT_NONE) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { message_loop_.reset(new base::MessageLoop); mojo::InterfacePtr<serial::DataSource> source_sender_handle; source_sender_ = mojo::WeakBindToProxy( @@ -39,7 +39,7 @@ class DataSourceTest : public testing::Test { receiver_ = new DataReceiver(source_sender_handle.Pass(), 100, kFatalError); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { write_buffer_.reset(); buffer_.reset(); message_loop_.reset(); diff --git a/device/serial/serial_connection.h b/device/serial/serial_connection.h index 807e173..c578a9d 100644 --- a/device/serial/serial_connection.h +++ b/device/serial/serial_connection.h @@ -27,15 +27,15 @@ class SerialConnection : public mojo::InterfaceImpl<serial::Connection> { // mojo::InterfaceImpl<serial::Connection> overrides. virtual void GetInfo( - const mojo::Callback<void(serial::ConnectionInfoPtr)>& callback) OVERRIDE; + const mojo::Callback<void(serial::ConnectionInfoPtr)>& callback) override; virtual void SetOptions(serial::ConnectionOptionsPtr options, - const mojo::Callback<void(bool)>& callback) OVERRIDE; + const mojo::Callback<void(bool)>& callback) override; virtual void SetControlSignals( serial::HostControlSignalsPtr signals, - const mojo::Callback<void(bool)>& callback) OVERRIDE; + const mojo::Callback<void(bool)>& callback) override; virtual void GetControlSignals(const mojo::Callback< - void(serial::DeviceControlSignalsPtr)>& callback) OVERRIDE; - virtual void Flush(const mojo::Callback<void(bool)>& callback) OVERRIDE; + void(serial::DeviceControlSignalsPtr)>& callback) override; + virtual void Flush(const mojo::Callback<void(bool)>& callback) override; private: void OnSendPipeReady(scoped_ptr<ReadOnlyBuffer> buffer); diff --git a/device/serial/serial_connection_unittest.cc b/device/serial/serial_connection_unittest.cc index ed4fc39..b18e95e 100644 --- a/device/serial/serial_connection_unittest.cc +++ b/device/serial/serial_connection_unittest.cc @@ -24,7 +24,7 @@ namespace device { namespace { class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator { - virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE { + virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override { mojo::Array<serial::DeviceInfoPtr> devices(1); devices[0] = serial::DeviceInfo::New(); devices[0]->path = "device"; @@ -62,7 +62,7 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler { receive_error_(serial::RECEIVE_ERROR_NONE), expected_event_(EVENT_NONE) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { message_loop_.reset(new base::MessageLoop); mojo::InterfacePtr<serial::SerialService> service; mojo::BindToProxy( @@ -168,7 +168,7 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler { EventReceived(EVENT_RECEIVE_ERROR); } - virtual void OnConnectionError() OVERRIDE { + virtual void OnConnectionError() override { EventReceived(EVENT_ERROR); FAIL() << "Connection error"; } diff --git a/device/serial/serial_device_enumerator_linux.h b/device/serial/serial_device_enumerator_linux.h index 193475d..71eee69 100644 --- a/device/serial/serial_device_enumerator_linux.h +++ b/device/serial/serial_device_enumerator_linux.h @@ -19,7 +19,7 @@ class SerialDeviceEnumeratorLinux : public SerialDeviceEnumerator { virtual ~SerialDeviceEnumeratorLinux(); // Implementation for SerialDeviceEnumerator. - virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE; + virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override; private: struct UdevDeleter { diff --git a/device/serial/serial_device_enumerator_mac.h b/device/serial/serial_device_enumerator_mac.h index cbbdb5f..ad4d674 100644 --- a/device/serial/serial_device_enumerator_mac.h +++ b/device/serial/serial_device_enumerator_mac.h @@ -16,7 +16,7 @@ class SerialDeviceEnumeratorMac : public SerialDeviceEnumerator { virtual ~SerialDeviceEnumeratorMac(); // Implementation for SerialDeviceEnumerator. - virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE; + virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override; private: DISALLOW_COPY_AND_ASSIGN(SerialDeviceEnumeratorMac); diff --git a/device/serial/serial_device_enumerator_win.h b/device/serial/serial_device_enumerator_win.h index 4a5ac4d..b1a8f16 100644 --- a/device/serial/serial_device_enumerator_win.h +++ b/device/serial/serial_device_enumerator_win.h @@ -16,7 +16,7 @@ class SerialDeviceEnumeratorWin : public SerialDeviceEnumerator { virtual ~SerialDeviceEnumeratorWin(); // Implementation for SerialDeviceEnumerator. - virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE; + virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override; private: DISALLOW_COPY_AND_ASSIGN(SerialDeviceEnumeratorWin); diff --git a/device/serial/serial_io_handler_posix.h b/device/serial/serial_io_handler_posix.h index a35842c..ef4bd37 100644 --- a/device/serial/serial_io_handler_posix.h +++ b/device/serial/serial_io_handler_posix.h @@ -14,17 +14,17 @@ class SerialIoHandlerPosix : public SerialIoHandler, public base::MessageLoopForIO::Watcher { protected: // SerialIoHandler impl. - virtual void ReadImpl() OVERRIDE; - virtual void WriteImpl() OVERRIDE; - virtual void CancelReadImpl() OVERRIDE; - virtual void CancelWriteImpl() OVERRIDE; - virtual bool Flush() const OVERRIDE; - virtual serial::DeviceControlSignalsPtr GetControlSignals() const OVERRIDE; + virtual void ReadImpl() override; + virtual void WriteImpl() override; + virtual void CancelReadImpl() override; + virtual void CancelWriteImpl() override; + virtual bool Flush() const override; + virtual serial::DeviceControlSignalsPtr GetControlSignals() const override; virtual bool SetControlSignals( - const serial::HostControlSignals& control_signals) OVERRIDE; - virtual bool ConfigurePort(const serial::ConnectionOptions& options) OVERRIDE; - virtual serial::ConnectionInfoPtr GetPortInfo() const OVERRIDE; - virtual bool PostOpen() OVERRIDE; + const serial::HostControlSignals& control_signals) override; + virtual bool ConfigurePort(const serial::ConnectionOptions& options) override; + virtual serial::ConnectionInfoPtr GetPortInfo() const override; + virtual bool PostOpen() override; private: friend class SerialIoHandler; @@ -34,8 +34,8 @@ class SerialIoHandlerPosix : public SerialIoHandler, virtual ~SerialIoHandlerPosix(); // base::MessageLoopForIO::Watcher implementation. - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; + virtual void OnFileCanReadWithoutBlocking(int fd) override; void EnsureWatchingReads(); void EnsureWatchingWrites(); diff --git a/device/serial/serial_io_handler_win.h b/device/serial/serial_io_handler_win.h index a23c39a..ed45f5b 100644 --- a/device/serial/serial_io_handler_win.h +++ b/device/serial/serial_io_handler_win.h @@ -15,17 +15,17 @@ class SerialIoHandlerWin : public SerialIoHandler, public base::MessageLoopForIO::IOHandler { protected: // SerialIoHandler implementation. - virtual void ReadImpl() OVERRIDE; - virtual void WriteImpl() OVERRIDE; - virtual void CancelReadImpl() OVERRIDE; - virtual void CancelWriteImpl() OVERRIDE; - virtual bool Flush() const OVERRIDE; - virtual serial::DeviceControlSignalsPtr GetControlSignals() const OVERRIDE; + virtual void ReadImpl() override; + virtual void WriteImpl() override; + virtual void CancelReadImpl() override; + virtual void CancelWriteImpl() override; + virtual bool Flush() const override; + virtual serial::DeviceControlSignalsPtr GetControlSignals() const override; virtual bool SetControlSignals( - const serial::HostControlSignals& control_signals) OVERRIDE; - virtual bool ConfigurePort(const serial::ConnectionOptions& options) OVERRIDE; - virtual serial::ConnectionInfoPtr GetPortInfo() const OVERRIDE; - virtual bool PostOpen() OVERRIDE; + const serial::HostControlSignals& control_signals) override; + virtual bool ConfigurePort(const serial::ConnectionOptions& options) override; + virtual serial::ConnectionInfoPtr GetPortInfo() const override; + virtual bool PostOpen() override; private: friend class SerialIoHandler; @@ -37,7 +37,7 @@ class SerialIoHandlerWin : public SerialIoHandler, // base::MessageLoopForIO::IOHandler implementation. virtual void OnIOCompleted(base::MessageLoopForIO::IOContext* context, DWORD bytes_transfered, - DWORD error) OVERRIDE; + DWORD error) override; // Context used for asynchronous WaitCommEvent calls. scoped_ptr<base::MessageLoopForIO::IOContext> comm_context_; diff --git a/device/serial/serial_service_impl.h b/device/serial/serial_service_impl.h index 8d78d54..b1c6612 100644 --- a/device/serial/serial_service_impl.h +++ b/device/serial/serial_service_impl.h @@ -32,13 +32,13 @@ class SerialServiceImpl : public mojo::InterfaceImpl<serial::SerialService> { // mojo::InterfaceImpl<SerialService> overrides. virtual void GetDevices(const mojo::Callback< - void(mojo::Array<serial::DeviceInfoPtr>)>& callback) OVERRIDE; + void(mojo::Array<serial::DeviceInfoPtr>)>& callback) override; virtual void Connect( const mojo::String& path, serial::ConnectionOptionsPtr options, mojo::InterfaceRequest<serial::Connection> connection_request, mojo::InterfaceRequest<serial::DataSink> sink, - mojo::InterfaceRequest<serial::DataSource> source) OVERRIDE; + mojo::InterfaceRequest<serial::DataSource> source) override; private: SerialDeviceEnumerator* GetDeviceEnumerator(); diff --git a/device/serial/serial_service_unittest.cc b/device/serial/serial_service_unittest.cc index c24fa18..20ebe3a 100644 --- a/device/serial/serial_service_unittest.cc +++ b/device/serial/serial_service_unittest.cc @@ -17,7 +17,7 @@ namespace device { namespace { class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator { - virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE { + virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override { mojo::Array<serial::DeviceInfoPtr> devices(1); devices[0] = serial::DeviceInfo::New(); devices[0]->path = "device"; @@ -28,7 +28,7 @@ class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator { class FailToOpenIoHandler : public TestSerialIoHandler { public: virtual void Open(const std::string& port, - const OpenCompleteCallback& callback) OVERRIDE { + const OpenCompleteCallback& callback) override { callback.Run(false); } @@ -47,7 +47,7 @@ class SerialServiceTest : public testing::Test, public mojo::ErrorHandler { StopMessageLoop(); } - virtual void OnConnectionError() OVERRIDE { + virtual void OnConnectionError() override { StopMessageLoop(); EXPECT_TRUE(expecting_error_); } diff --git a/device/serial/test_serial_io_handler.h b/device/serial/test_serial_io_handler.h index af62b58..3633555 100644 --- a/device/serial/test_serial_io_handler.h +++ b/device/serial/test_serial_io_handler.h @@ -21,17 +21,17 @@ class TestSerialIoHandler : public SerialIoHandler { // SerialIoHandler overrides. virtual void Open(const std::string& port, - const OpenCompleteCallback& callback) OVERRIDE; - virtual bool ConfigurePort(const serial::ConnectionOptions& options) OVERRIDE; - virtual void ReadImpl() OVERRIDE; - virtual void CancelReadImpl() OVERRIDE; - virtual void WriteImpl() OVERRIDE; - virtual void CancelWriteImpl() OVERRIDE; - virtual serial::DeviceControlSignalsPtr GetControlSignals() const OVERRIDE; - virtual serial::ConnectionInfoPtr GetPortInfo() const OVERRIDE; - virtual bool Flush() const OVERRIDE; + const OpenCompleteCallback& callback) override; + virtual bool ConfigurePort(const serial::ConnectionOptions& options) override; + virtual void ReadImpl() override; + virtual void CancelReadImpl() override; + virtual void WriteImpl() override; + virtual void CancelWriteImpl() override; + virtual serial::DeviceControlSignalsPtr GetControlSignals() const override; + virtual serial::ConnectionInfoPtr GetPortInfo() const override; + virtual bool Flush() const override; virtual bool SetControlSignals( - const serial::HostControlSignals& signals) OVERRIDE; + const serial::HostControlSignals& signals) override; serial::ConnectionInfo* connection_info() { return &info_; } serial::DeviceControlSignals* device_control_signals() { diff --git a/device/test/usb_test_gadget_impl.cc b/device/test/usb_test_gadget_impl.cc index fa4f3d7..e7ae97c 100644 --- a/device/test/usb_test_gadget_impl.cc +++ b/device/test/usb_test_gadget_impl.cc @@ -66,12 +66,12 @@ class UsbTestGadgetImpl : public UsbTestGadget { public: virtual ~UsbTestGadgetImpl(); - virtual bool Unclaim() OVERRIDE; - virtual bool Disconnect() OVERRIDE; - virtual bool Reconnect() OVERRIDE; - virtual bool SetType(Type type) OVERRIDE; - virtual UsbDevice* GetDevice() const OVERRIDE; - virtual std::string GetSerialNumber() const OVERRIDE; + virtual bool Unclaim() override; + virtual bool Disconnect() override; + virtual bool Reconnect() override; + virtual bool SetType(Type type) override; + virtual UsbDevice* GetDevice() const override; + virtual std::string GetSerialNumber() const override; protected: UsbTestGadgetImpl(); @@ -99,7 +99,7 @@ class UsbTestGadgetImpl : public UsbTestGadget { run_loop_.Run(); } - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE { + virtual void OnURLFetchComplete(const net::URLFetcher* source) override { run_loop_.Quit(); } diff --git a/device/usb/usb_context.cc b/device/usb/usb_context.cc index 72a3835..dac86fe 100644 --- a/device/usb/usb_context.cc +++ b/device/usb/usb_context.cc @@ -23,7 +23,7 @@ class UsbContext::UsbEventHandler : public base::PlatformThread::Delegate { virtual ~UsbEventHandler(); // base::PlatformThread::Delegate - virtual void ThreadMain() OVERRIDE; + virtual void ThreadMain() override; private: base::subtle::Atomic32 running_; diff --git a/device/usb/usb_device_filter_unittest.cc b/device/usb/usb_device_filter_unittest.cc index 595519a..5529db1 100644 --- a/device/usb/usb_device_filter_unittest.cc +++ b/device/usb/usb_device_filter_unittest.cc @@ -40,7 +40,7 @@ class MockUsbDevice : public UsbDevice { class UsbFilterTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { UsbInterfaceDescriptor interface; interface.interface_number = 1; interface.alternate_setting = 0; diff --git a/device/usb/usb_device_handle_impl.h b/device/usb/usb_device_handle_impl.h index effb9ba..b92f779 100644 --- a/device/usb/usb_device_handle_impl.h +++ b/device/usb/usb_device_handle_impl.h @@ -33,15 +33,15 @@ typedef libusb_transfer* PlatformUsbTransferHandle; // UsbDeviceHandle class provides basic I/O related functionalities. class UsbDeviceHandleImpl : public UsbDeviceHandle { public: - virtual scoped_refptr<UsbDevice> GetDevice() const OVERRIDE; - virtual void Close() OVERRIDE; - virtual bool ClaimInterface(int interface_number) OVERRIDE; - virtual bool ReleaseInterface(int interface_number) OVERRIDE; + virtual scoped_refptr<UsbDevice> GetDevice() const override; + virtual void Close() override; + virtual bool ClaimInterface(int interface_number) override; + virtual bool ReleaseInterface(int interface_number) override; virtual bool SetInterfaceAlternateSetting(int interface_number, - int alternate_setting) OVERRIDE; - virtual bool ResetDevice() OVERRIDE; + int alternate_setting) override; + virtual bool ResetDevice() override; virtual bool GetStringDescriptor(uint8 string_id, - base::string16* string) OVERRIDE; + base::string16* string) override; virtual void ControlTransfer(UsbEndpointDirection direction, TransferRequestType request_type, @@ -52,21 +52,21 @@ class UsbDeviceHandleImpl : public UsbDeviceHandle { net::IOBuffer* buffer, size_t length, unsigned int timeout, - const UsbTransferCallback& callback) OVERRIDE; + const UsbTransferCallback& callback) override; virtual void BulkTransfer(UsbEndpointDirection direction, uint8 endpoint, net::IOBuffer* buffer, size_t length, unsigned int timeout, - const UsbTransferCallback& callback) OVERRIDE; + const UsbTransferCallback& callback) override; virtual void InterruptTransfer(UsbEndpointDirection direction, uint8 endpoint, net::IOBuffer* buffer, size_t length, unsigned int timeout, - const UsbTransferCallback& callback) OVERRIDE; + const UsbTransferCallback& callback) override; virtual void IsochronousTransfer( UsbEndpointDirection direction, @@ -76,7 +76,7 @@ class UsbDeviceHandleImpl : public UsbDeviceHandle { unsigned int packets, unsigned int packet_length, unsigned int timeout, - const UsbTransferCallback& callback) OVERRIDE; + const UsbTransferCallback& callback) override; PlatformUsbDeviceHandle handle() const { return handle_; } diff --git a/device/usb/usb_device_impl.h b/device/usb/usb_device_impl.h index 5f5228b..9a14947 100644 --- a/device/usb/usb_device_impl.h +++ b/device/usb/usb_device_impl.h @@ -34,14 +34,14 @@ class UsbDeviceImpl : public UsbDevice { #if defined(OS_CHROMEOS) virtual void RequestUsbAccess( int interface_id, - const base::Callback<void(bool success)>& callback) OVERRIDE; + const base::Callback<void(bool success)>& callback) override; #endif // OS_CHROMEOS - virtual scoped_refptr<UsbDeviceHandle> Open() OVERRIDE; - virtual bool Close(scoped_refptr<UsbDeviceHandle> handle) OVERRIDE; - virtual const UsbConfigDescriptor& GetConfiguration() OVERRIDE; - virtual bool GetManufacturer(base::string16* manufacturer) OVERRIDE; - virtual bool GetProduct(base::string16* product) OVERRIDE; - virtual bool GetSerialNumber(base::string16* serial_number) OVERRIDE; + virtual scoped_refptr<UsbDeviceHandle> Open() override; + virtual bool Close(scoped_refptr<UsbDeviceHandle> handle) override; + virtual const UsbConfigDescriptor& GetConfiguration() override; + virtual bool GetManufacturer(base::string16* manufacturer) override; + virtual bool GetProduct(base::string16* product) override; + virtual bool GetSerialNumber(base::string16* serial_number) override; protected: friend class UsbServiceImpl; diff --git a/device/usb/usb_service_impl.cc b/device/usb/usb_service_impl.cc index 5e65608..e639870 100644 --- a/device/usb/usb_service_impl.cc +++ b/device/usb/usb_service_impl.cc @@ -38,12 +38,12 @@ class UsbServiceImpl : public UsbService, private: // device::UsbService implementation - virtual scoped_refptr<UsbDevice> GetDeviceById(uint32 unique_id) OVERRIDE; + virtual scoped_refptr<UsbDevice> GetDeviceById(uint32 unique_id) override; virtual void GetDevices( - std::vector<scoped_refptr<UsbDevice> >* devices) OVERRIDE; + std::vector<scoped_refptr<UsbDevice> >* devices) override; // base::MessageLoop::DestructionObserver implementation. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; // Enumerate USB devices from OS and update devices_ map. void RefreshDevices(); |