diff options
Diffstat (limited to 'chromeos/dbus/bluetooth_gatt_characteristic_client.cc')
| -rw-r--r-- | chromeos/dbus/bluetooth_gatt_characteristic_client.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chromeos/dbus/bluetooth_gatt_characteristic_client.cc b/chromeos/dbus/bluetooth_gatt_characteristic_client.cc index 45cae14..206b8d4 100644 --- a/chromeos/dbus/bluetooth_gatt_characteristic_client.cc +++ b/chromeos/dbus/bluetooth_gatt_characteristic_client.cc @@ -54,20 +54,20 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual void AddObserver( - BluetoothGattCharacteristicClient::Observer* observer) OVERRIDE { + BluetoothGattCharacteristicClient::Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // BluetoothGattCharacteristicClient override. virtual void RemoveObserver( - BluetoothGattCharacteristicClient::Observer* observer) OVERRIDE { + BluetoothGattCharacteristicClient::Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } // BluetoothGattCharacteristicClient override. - virtual std::vector<dbus::ObjectPath> GetCharacteristics() OVERRIDE { + virtual std::vector<dbus::ObjectPath> GetCharacteristics() override { DCHECK(object_manager_); return object_manager_->GetObjectsWithInterface( bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface); @@ -75,7 +75,7 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { DCHECK(object_manager_); return static_cast<Properties*>( object_manager_->GetProperties( @@ -87,7 +87,7 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual void ReadValue(const dbus::ObjectPath& object_path, const ValueCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -114,7 +114,7 @@ class BluetoothGattCharacteristicClientImpl virtual void WriteValue(const dbus::ObjectPath& object_path, const std::vector<uint8>& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -142,7 +142,7 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual void StartNotify(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -168,7 +168,7 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual void StopNotify(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -195,7 +195,7 @@ class BluetoothGattCharacteristicClientImpl 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, @@ -207,7 +207,7 @@ class BluetoothGattCharacteristicClientImpl // dbus::ObjectManager::Interface override. virtual void ObjectAdded(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { VLOG(2) << "Remote GATT characteristic added: " << object_path.value(); FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer, observers_, GattCharacteristicAdded(object_path)); @@ -230,7 +230,7 @@ class BluetoothGattCharacteristicClientImpl // dbus::ObjectManager::Interface override. virtual void ObjectRemoved(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { VLOG(2) << "Remote GATT characteristic removed: " << object_path.value(); FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer, observers_, GattCharacteristicRemoved(object_path)); @@ -238,7 +238,7 @@ class BluetoothGattCharacteristicClientImpl protected: // chromeos::DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { object_manager_ = bus->GetObjectManager( bluetooth_object_manager::kBluetoothObjectManagerServiceName, dbus::ObjectPath( |