Index: chromeos/dbus/cras_audio_client.cc |
diff --git a/chromeos/dbus/cras_audio_client.cc b/chromeos/dbus/cras_audio_client.cc |
index dd4e95aa967139afeb57df9ea86810edb0c2c63f..6abf076a31033be62427c7e881de738bfb4b27d8 100644 |
--- a/chromeos/dbus/cras_audio_client.cc |
+++ b/chromeos/dbus/cras_audio_client.cc |
@@ -29,19 +29,19 @@ class CrasAudioClientImpl : public CrasAudioClient { |
} |
// CrasAudioClient overrides: |
- virtual void AddObserver(Observer* observer) OVERRIDE { |
+ virtual void AddObserver(Observer* observer) override { |
observers_.AddObserver(observer); |
} |
- virtual void RemoveObserver(Observer* observer) OVERRIDE { |
+ virtual void RemoveObserver(Observer* observer) override { |
observers_.RemoveObserver(observer); |
} |
- virtual bool HasObserver(Observer* observer) OVERRIDE { |
+ virtual bool HasObserver(Observer* observer) override { |
return observers_.HasObserver(observer); |
} |
- virtual void GetVolumeState(const GetVolumeStateCallback& callback) OVERRIDE { |
+ virtual void GetVolumeState(const GetVolumeStateCallback& callback) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kGetVolumeState); |
cras_proxy_->CallMethod( |
@@ -52,7 +52,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
} |
virtual void GetNodes(const GetNodesCallback& callback, |
- const ErrorCallback& error_callback) OVERRIDE { |
+ const ErrorCallback& error_callback) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kGetNodes); |
cras_proxy_->CallMethodWithErrorCallback( |
@@ -64,7 +64,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
weak_ptr_factory_.GetWeakPtr(), error_callback)); |
} |
- virtual void SetOutputNodeVolume(uint64 node_id, int32 volume) OVERRIDE { |
+ virtual void SetOutputNodeVolume(uint64 node_id, int32 volume) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kSetOutputNodeVolume); |
dbus::MessageWriter writer(&method_call); |
@@ -76,7 +76,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void SetOutputUserMute(bool mute_on) OVERRIDE { |
+ virtual void SetOutputUserMute(bool mute_on) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kSetOutputUserMute); |
dbus::MessageWriter writer(&method_call); |
@@ -87,7 +87,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void SetInputNodeGain(uint64 node_id, int32 input_gain) OVERRIDE { |
+ virtual void SetInputNodeGain(uint64 node_id, int32 input_gain) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kSetInputNodeGain); |
dbus::MessageWriter writer(&method_call); |
@@ -99,7 +99,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void SetInputMute(bool mute_on) OVERRIDE { |
+ virtual void SetInputMute(bool mute_on) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kSetInputMute); |
dbus::MessageWriter writer(&method_call); |
@@ -110,7 +110,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void SetActiveOutputNode(uint64 node_id) OVERRIDE { |
+ virtual void SetActiveOutputNode(uint64 node_id) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kSetActiveOutputNode); |
dbus::MessageWriter writer(&method_call); |
@@ -121,7 +121,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void SetActiveInputNode(uint64 node_id) OVERRIDE { |
+ virtual void SetActiveInputNode(uint64 node_id) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kSetActiveInputNode); |
dbus::MessageWriter writer(&method_call); |
@@ -132,7 +132,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void AddActiveInputNode(uint64 node_id) OVERRIDE { |
+ virtual void AddActiveInputNode(uint64 node_id) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kAddActiveInputNode); |
dbus::MessageWriter writer(&method_call); |
@@ -143,7 +143,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void RemoveActiveInputNode(uint64 node_id) OVERRIDE { |
+ virtual void RemoveActiveInputNode(uint64 node_id) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kRemoveActiveInputNode); |
dbus::MessageWriter writer(&method_call); |
@@ -154,7 +154,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void AddActiveOutputNode(uint64 node_id) OVERRIDE { |
+ virtual void AddActiveOutputNode(uint64 node_id) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kAddActiveOutputNode); |
dbus::MessageWriter writer(&method_call); |
@@ -164,7 +164,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void RemoveActiveOutputNode(uint64 node_id) OVERRIDE { |
+ virtual void RemoveActiveOutputNode(uint64 node_id) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kRemoveActiveOutputNode); |
dbus::MessageWriter writer(&method_call); |
@@ -174,7 +174,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
dbus::ObjectProxy::EmptyResponseCallback()); |
} |
- virtual void SwapLeftRight(uint64 node_id, bool swap) OVERRIDE { |
+ virtual void SwapLeftRight(uint64 node_id, bool swap) override { |
dbus::MethodCall method_call(cras::kCrasControlInterface, |
cras::kSwapLeftRight); |
dbus::MessageWriter writer(&method_call); |
@@ -186,7 +186,7 @@ class CrasAudioClientImpl : public CrasAudioClient { |
} |
protected: |
- virtual void Init(dbus::Bus* bus) OVERRIDE { |
+ virtual void Init(dbus::Bus* bus) override { |
cras_proxy_ = bus->GetObjectProxy(cras::kCrasServiceName, |
dbus::ObjectPath(cras::kCrasServicePath)); |