| Index: media/audio/pulse/audio_manager_pulse.h
|
| diff --git a/media/audio/pulse/audio_manager_pulse.h b/media/audio/pulse/audio_manager_pulse.h
|
| index 150ea51a3e935fdded33b10c754f02e213778938..65462c4872d64851031995138aeced3ad9234bb6 100644
|
| --- a/media/audio/pulse/audio_manager_pulse.h
|
| +++ b/media/audio/pulse/audio_manager_pulse.h
|
| @@ -22,31 +22,31 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase {
|
| static AudioManager* Create(AudioLogFactory* audio_log_factory);
|
|
|
| // Implementation of AudioManager.
|
| - virtual bool HasAudioOutputDevices() OVERRIDE;
|
| - virtual bool HasAudioInputDevices() OVERRIDE;
|
| - virtual void ShowAudioInputSettings() OVERRIDE;
|
| + virtual bool HasAudioOutputDevices() override;
|
| + virtual bool HasAudioInputDevices() override;
|
| + virtual void ShowAudioInputSettings() override;
|
| virtual void GetAudioInputDeviceNames(
|
| - AudioDeviceNames* device_names) OVERRIDE;
|
| + AudioDeviceNames* device_names) override;
|
| virtual void GetAudioOutputDeviceNames(
|
| - AudioDeviceNames* device_names) OVERRIDE;
|
| + AudioDeviceNames* device_names) override;
|
| virtual AudioParameters GetInputStreamParameters(
|
| - const std::string& device_id) OVERRIDE;
|
| + const std::string& device_id) override;
|
|
|
| // Implementation of AudioManagerBase.
|
| virtual AudioOutputStream* MakeLinearOutputStream(
|
| - const AudioParameters& params) OVERRIDE;
|
| + const AudioParameters& params) override;
|
| virtual AudioOutputStream* MakeLowLatencyOutputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id) OVERRIDE;
|
| + const std::string& device_id) override;
|
| virtual AudioInputStream* MakeLinearInputStream(
|
| - const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
| + const AudioParameters& params, const std::string& device_id) override;
|
| virtual AudioInputStream* MakeLowLatencyInputStream(
|
| - const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
| + const AudioParameters& params, const std::string& device_id) override;
|
|
|
| protected:
|
| virtual AudioParameters GetPreferredOutputStreamParameters(
|
| const std::string& output_device_id,
|
| - const AudioParameters& input_params) OVERRIDE;
|
| + const AudioParameters& input_params) override;
|
|
|
| private:
|
| bool Init();
|
|
|