| Index: media/audio/android/audio_manager_android.h
|
| diff --git a/media/audio/android/audio_manager_android.h b/media/audio/android/audio_manager_android.h
|
| index ee5ad28e36e46e33e069554301f671fe178d8847..d1a8c8bf6236b230f411c1346f885c07bdc8e7d4 100644
|
| --- a/media/audio/android/audio_manager_android.h
|
| +++ b/media/audio/android/audio_manager_android.h
|
| @@ -23,36 +23,36 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
|
| AudioManagerAndroid(AudioLogFactory* audio_log_factory);
|
|
|
| // Implementation of AudioManager.
|
| - virtual bool HasAudioOutputDevices() OVERRIDE;
|
| - virtual bool HasAudioInputDevices() OVERRIDE;
|
| + virtual bool HasAudioOutputDevices() override;
|
| + virtual bool HasAudioInputDevices() 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;
|
|
|
| virtual AudioOutputStream* MakeAudioOutputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id) OVERRIDE;
|
| + const std::string& device_id) override;
|
| virtual AudioInputStream* MakeAudioInputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id) OVERRIDE;
|
| - virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE;
|
| - virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE;
|
| + const std::string& device_id) override;
|
| + virtual void ReleaseOutputStream(AudioOutputStream* stream) override;
|
| + virtual void ReleaseInputStream(AudioInputStream* stream) 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 std::string& device_id) override;
|
| virtual AudioInputStream* MakeLowLatencyInputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id) OVERRIDE;
|
| + const std::string& device_id) override;
|
|
|
| static bool RegisterAudioManager(JNIEnv* env);
|
|
|
| @@ -63,7 +63,7 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
|
|
|
| virtual AudioParameters GetPreferredOutputStreamParameters(
|
| const std::string& output_device_id,
|
| - const AudioParameters& input_params) OVERRIDE;
|
| + const AudioParameters& input_params) override;
|
|
|
| private:
|
| void InitializeOnAudioThread();
|
|
|