| Index: chromeos/dbus/bluetooth_input_client.cc
|
| diff --git a/chromeos/dbus/bluetooth_input_client.cc b/chromeos/dbus/bluetooth_input_client.cc
|
| index 5f0cb4f4f5bc0f78979ac9da43d18ba78dc34210..a433538d255a056980a79953bdc0b117d14a8b38 100644
|
| --- a/chromeos/dbus/bluetooth_input_client.cc
|
| +++ b/chromeos/dbus/bluetooth_input_client.cc
|
| @@ -43,14 +43,14 @@ class BluetoothInputClientImpl
|
|
|
| // BluetoothInputClient override.
|
| virtual void AddObserver(BluetoothInputClient::Observer* observer)
|
| - OVERRIDE {
|
| + override {
|
| DCHECK(observer);
|
| observers_.AddObserver(observer);
|
| }
|
|
|
| // BluetoothInputClient override.
|
| virtual void RemoveObserver(BluetoothInputClient::Observer* observer)
|
| - OVERRIDE {
|
| + override {
|
| DCHECK(observer);
|
| observers_.RemoveObserver(observer);
|
| }
|
| @@ -59,7 +59,7 @@ class BluetoothInputClientImpl
|
| 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,
|
| @@ -71,7 +71,7 @@ class BluetoothInputClientImpl
|
|
|
| // BluetoothInputClient override.
|
| virtual Properties* GetProperties(const dbus::ObjectPath& object_path)
|
| - OVERRIDE {
|
| + override {
|
| return static_cast<Properties*>(
|
| object_manager_->GetProperties(
|
| object_path,
|
| @@ -79,7 +79,7 @@ class BluetoothInputClientImpl
|
| }
|
|
|
| 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(
|
| @@ -92,7 +92,7 @@ class BluetoothInputClientImpl
|
| // Called by dbus::ObjectManager when an object with the input 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(BluetoothInputClient::Observer, observers_,
|
| InputAdded(object_path));
|
| }
|
| @@ -100,7 +100,7 @@ class BluetoothInputClientImpl
|
| // Called by dbus::ObjectManager when an object with the input 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(BluetoothInputClient::Observer, observers_,
|
| InputRemoved(object_path));
|
| }
|
|
|