| Index: chromeos/dbus/bluetooth_gatt_service_client.cc
|
| diff --git a/chromeos/dbus/bluetooth_gatt_service_client.cc b/chromeos/dbus/bluetooth_gatt_service_client.cc
|
| index aa671e6e321b7d7040177d95a0cd497ff053599e..4c9dc04bc46c3e5a8b40ef3fa5e4f652e4865eef 100644
|
| --- a/chromeos/dbus/bluetooth_gatt_service_client.cc
|
| +++ b/chromeos/dbus/bluetooth_gatt_service_client.cc
|
| @@ -45,20 +45,20 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient,
|
|
|
| // BluetoothGattServiceClientImpl override.
|
| virtual void AddObserver(
|
| - BluetoothGattServiceClient::Observer* observer) OVERRIDE {
|
| + BluetoothGattServiceClient::Observer* observer) override {
|
| DCHECK(observer);
|
| observers_.AddObserver(observer);
|
| }
|
|
|
| // BluetoothGattServiceClientImpl override.
|
| virtual void RemoveObserver(
|
| - BluetoothGattServiceClient::Observer* observer) OVERRIDE {
|
| + BluetoothGattServiceClient::Observer* observer) override {
|
| DCHECK(observer);
|
| observers_.RemoveObserver(observer);
|
| }
|
|
|
| // BluetoothGattServiceClientImpl override.
|
| - virtual std::vector<dbus::ObjectPath> GetServices() OVERRIDE {
|
| + virtual std::vector<dbus::ObjectPath> GetServices() override {
|
| DCHECK(object_manager_);
|
| return object_manager_->GetObjectsWithInterface(
|
| bluetooth_gatt_service::kBluetoothGattServiceInterface);
|
| @@ -66,7 +66,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient,
|
|
|
| // BluetoothGattServiceClientImpl 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(
|
| @@ -78,7 +78,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient,
|
| 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,
|
| @@ -90,7 +90,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient,
|
|
|
| // 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 service added: " << object_path.value();
|
| FOR_EACH_OBSERVER(BluetoothGattServiceClient::Observer, observers_,
|
| GattServiceAdded(object_path));
|
| @@ -98,7 +98,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient,
|
|
|
| // 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 service removed: " << object_path.value();
|
| FOR_EACH_OBSERVER(BluetoothGattServiceClient::Observer, observers_,
|
| GattServiceRemoved(object_path));
|
| @@ -106,7 +106,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient,
|
|
|
| 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(
|
|
|