diff options
author | mostynb <mostynb@opera.com> | 2014-10-06 06:57:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-06 13:58:09 +0000 |
commit | 4f4cf14943aba9f3ea42f631f9eb491ce0c87857 (patch) | |
tree | 1618fda16904edf449107e4088b7eb7316538816 /chromeos/dbus/bluetooth_device_client.cc | |
parent | 71fc3adc68bb1feb651b7f38cd0a4eb777186de9 (diff) | |
download | chromium_src-4f4cf14943aba9f3ea42f631f9eb491ce0c87857.zip chromium_src-4f4cf14943aba9f3ea42f631f9eb491ce0c87857.tar.gz chromium_src-4f4cf14943aba9f3ea42f631f9eb491ce0c87857.tar.bz2 |
replace OVERRIDE and FINAL with override and final in chromeos/
BUG=417463
Review URL: https://codereview.chromium.org/628883002
Cr-Commit-Position: refs/heads/master@{#298229}
Diffstat (limited to 'chromeos/dbus/bluetooth_device_client.cc')
-rw-r--r-- | chromeos/dbus/bluetooth_device_client.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/chromeos/dbus/bluetooth_device_client.cc b/chromeos/dbus/bluetooth_device_client.cc index 00e10d3..777b1aa 100644 --- a/chromeos/dbus/bluetooth_device_client.cc +++ b/chromeos/dbus/bluetooth_device_client.cc @@ -66,14 +66,14 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual void AddObserver(BluetoothDeviceClient::Observer* observer) - OVERRIDE { + override { DCHECK(observer); observers_.AddObserver(observer); } // BluetoothDeviceClient override. virtual void RemoveObserver(BluetoothDeviceClient::Observer* observer) - OVERRIDE { + override { DCHECK(observer); observers_.RemoveObserver(observer); } @@ -82,7 +82,7 @@ class BluetoothDeviceClientImpl virtual dbus::PropertySet* CreateProperties( dbus::ObjectProxy* object_proxy, const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { Properties* properties = new Properties( object_proxy, interface_name, @@ -94,7 +94,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual std::vector<dbus::ObjectPath> GetDevicesForAdapter( - const dbus::ObjectPath& adapter_path) OVERRIDE { + const dbus::ObjectPath& adapter_path) override { std::vector<dbus::ObjectPath> object_paths, device_paths; device_paths = object_manager_->GetObjectsWithInterface( bluetooth_device::kBluetoothDeviceInterface); @@ -109,7 +109,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE { + override { return static_cast<Properties*>( object_manager_->GetProperties( object_path, @@ -119,7 +119,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual void Connect(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kConnect); @@ -144,7 +144,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual void Disconnect(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kDisconnect); @@ -169,7 +169,7 @@ class BluetoothDeviceClientImpl virtual void ConnectProfile(const dbus::ObjectPath& object_path, const std::string& uuid, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kConnectProfile); @@ -199,7 +199,7 @@ class BluetoothDeviceClientImpl const std::string& uuid, const base::Closure& callback, const ErrorCallback& error_callback) - OVERRIDE { + override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kDisconnectProfile); @@ -226,7 +226,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual void Pair(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kPair); @@ -252,7 +252,7 @@ class BluetoothDeviceClientImpl virtual void CancelPairing(const dbus::ObjectPath& object_path, const base::Closure& callback, const ErrorCallback& error_callback) - OVERRIDE { + override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kCancelPairing); @@ -276,7 +276,7 @@ class BluetoothDeviceClientImpl virtual void StartConnectionMonitor( const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kStartConnectionMonitor); @@ -301,7 +301,7 @@ class BluetoothDeviceClientImpl virtual void StopConnectionMonitor( const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kStopConnectionMonitor); @@ -323,7 +323,7 @@ class BluetoothDeviceClientImpl } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { object_manager_ = bus->GetObjectManager( bluetooth_object_manager::kBluetoothObjectManagerServiceName, dbus::ObjectPath( @@ -336,7 +336,7 @@ class BluetoothDeviceClientImpl // Called by dbus::ObjectManager when an object with the device interface // is created. Informs observers. virtual void ObjectAdded(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_, DeviceAdded(object_path)); } @@ -344,7 +344,7 @@ class BluetoothDeviceClientImpl // Called by dbus::ObjectManager when an object with the device interface // is removed. Informs observers. virtual void ObjectRemoved(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_, DeviceRemoved(object_path)); } |