| Index: chrome/browser/extensions/api/audio/audio_service_chromeos.cc
|
| diff --git a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc
|
| index a9c9ebd1a4ce5e0669e2f6f7b46b6d83d82a843f..bc20d21df6979236d7ce99532bc23371c4ad422c 100644
|
| --- a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc
|
| +++ b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc
|
| @@ -25,26 +25,26 @@ class AudioServiceImpl : public AudioService,
|
| virtual ~AudioServiceImpl();
|
|
|
| // Called by listeners to this service to add/remove themselves as observers.
|
| - virtual void AddObserver(AudioService::Observer* observer) OVERRIDE;
|
| - virtual void RemoveObserver(AudioService::Observer* observer) OVERRIDE;
|
| + virtual void AddObserver(AudioService::Observer* observer) override;
|
| + virtual void RemoveObserver(AudioService::Observer* observer) override;
|
|
|
| // Start to query audio device information.
|
| - virtual void StartGetInfo(const GetInfoCallback& callback) OVERRIDE;
|
| - virtual void SetActiveDevices(const DeviceIdList& device_list) OVERRIDE;
|
| + virtual void StartGetInfo(const GetInfoCallback& callback) override;
|
| + virtual void SetActiveDevices(const DeviceIdList& device_list) override;
|
| virtual bool SetDeviceProperties(const std::string& device_id,
|
| bool muted,
|
| int volume,
|
| - int gain) OVERRIDE;
|
| + int gain) override;
|
|
|
| protected:
|
| // chromeos::CrasAudioHandler::AudioObserver overrides.
|
| - virtual void OnOutputVolumeChanged() OVERRIDE;
|
| - virtual void OnInputGainChanged() OVERRIDE;
|
| - virtual void OnOutputMuteChanged() OVERRIDE;
|
| - virtual void OnInputMuteChanged() OVERRIDE;
|
| - virtual void OnAudioNodesChanged() OVERRIDE;
|
| - virtual void OnActiveOutputNodeChanged() OVERRIDE;
|
| - virtual void OnActiveInputNodeChanged() OVERRIDE;
|
| + virtual void OnOutputVolumeChanged() override;
|
| + virtual void OnInputGainChanged() override;
|
| + virtual void OnOutputMuteChanged() override;
|
| + virtual void OnInputMuteChanged() override;
|
| + virtual void OnAudioNodesChanged() override;
|
| + virtual void OnActiveOutputNodeChanged() override;
|
| + virtual void OnActiveInputNodeChanged() override;
|
|
|
| private:
|
| void NotifyDeviceChanged();
|
|
|