Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/media/webrtc_audio_device_not_impl.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.h ('k') | content/renderer/media/webrtc_audio_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc_audio_device_not_impl.h
diff --git a/content/renderer/media/webrtc_audio_device_not_impl.h b/content/renderer/media/webrtc_audio_device_not_impl.h
index fad4f3f6a1f1ee907956d8001bc9350bf5bdb2e5..dc7fc8cedb2e7d8fa31f0c227e32db296c6e5fc7 100644
--- a/content/renderer/media/webrtc_audio_device_not_impl.h
+++ b/content/renderer/media/webrtc_audio_device_not_impl.h
@@ -28,84 +28,84 @@ class CONTENT_EXPORT WebRtcAudioDeviceNotImpl
// TODO(henrika): it is possible to add functionality in these methods.
// Only adding very basic support for now without triggering any callback
// in the webrtc::AudioDeviceObserver interface.
- virtual int32_t ChangeUniqueId(const int32_t id) OVERRIDE;
- virtual int32_t TimeUntilNextProcess() OVERRIDE;
- virtual int32_t Process() OVERRIDE;
+ virtual int32_t ChangeUniqueId(const int32_t id) override;
+ virtual int32_t TimeUntilNextProcess() override;
+ virtual int32_t Process() override;
// Methods in webrtc::AudioDeviceModule which are not yet implemented.
// The idea is that we can move methods from this class to the real
// implementation in WebRtcAudioDeviceImpl when needed.
virtual int32_t RegisterEventObserver(
- webrtc::AudioDeviceObserver* event_callback) OVERRIDE;
- virtual int32_t ActiveAudioLayer(AudioLayer* audio_layer) const OVERRIDE;
- virtual webrtc::AudioDeviceModule::ErrorCode LastError() const OVERRIDE;
- virtual int16_t PlayoutDevices() OVERRIDE;
- virtual int16_t RecordingDevices() OVERRIDE;
+ webrtc::AudioDeviceObserver* event_callback) override;
+ virtual int32_t ActiveAudioLayer(AudioLayer* audio_layer) const override;
+ virtual webrtc::AudioDeviceModule::ErrorCode LastError() const override;
+ virtual int16_t PlayoutDevices() override;
+ virtual int16_t RecordingDevices() override;
virtual int32_t PlayoutDeviceName(
uint16_t index, char name[webrtc::kAdmMaxDeviceNameSize],
- char guid[webrtc::kAdmMaxGuidSize]) OVERRIDE;
+ char guid[webrtc::kAdmMaxGuidSize]) override;
virtual int32_t RecordingDeviceName(
uint16_t index, char name[webrtc::kAdmMaxDeviceNameSize],
- char guid[webrtc::kAdmMaxGuidSize]) OVERRIDE;
- virtual int32_t SetPlayoutDevice(uint16_t index) OVERRIDE;
- virtual int32_t SetPlayoutDevice(WindowsDeviceType device) OVERRIDE;
- virtual int32_t SetRecordingDevice(uint16_t index) OVERRIDE;
- virtual int32_t SetRecordingDevice(WindowsDeviceType device) OVERRIDE;
- virtual int32_t InitPlayout() OVERRIDE;
- virtual int32_t InitRecording() OVERRIDE;
+ char guid[webrtc::kAdmMaxGuidSize]) override;
+ virtual int32_t SetPlayoutDevice(uint16_t index) override;
+ virtual int32_t SetPlayoutDevice(WindowsDeviceType device) override;
+ virtual int32_t SetRecordingDevice(uint16_t index) override;
+ virtual int32_t SetRecordingDevice(WindowsDeviceType device) override;
+ virtual int32_t InitPlayout() override;
+ virtual int32_t InitRecording() override;
virtual int32_t SetWaveOutVolume(uint16_t volume_left,
- uint16_t volume_right) OVERRIDE;
+ uint16_t volume_right) override;
virtual int32_t WaveOutVolume(uint16_t* volume_left,
- uint16_t* volume_right) const OVERRIDE;
- virtual int32_t InitSpeaker() OVERRIDE;
- virtual bool SpeakerIsInitialized() const OVERRIDE;
- virtual int32_t InitMicrophone() OVERRIDE;
- virtual bool MicrophoneIsInitialized() const OVERRIDE;
- virtual int32_t SpeakerVolumeIsAvailable(bool* available) OVERRIDE;
- virtual int32_t SetSpeakerVolume(uint32_t volume) OVERRIDE;
- virtual int32_t SpeakerVolume(uint32_t* volume) const OVERRIDE;
- virtual int32_t MaxSpeakerVolume(uint32_t* max_volume) const OVERRIDE;
- virtual int32_t MinSpeakerVolume(uint32_t* min_volume) const OVERRIDE;
- virtual int32_t SpeakerVolumeStepSize(uint16_t* step_size) const OVERRIDE;
- virtual int32_t MicrophoneVolumeIsAvailable(bool* available) OVERRIDE;
+ uint16_t* volume_right) const override;
+ virtual int32_t InitSpeaker() override;
+ virtual bool SpeakerIsInitialized() const override;
+ virtual int32_t InitMicrophone() override;
+ virtual bool MicrophoneIsInitialized() const override;
+ virtual int32_t SpeakerVolumeIsAvailable(bool* available) override;
+ virtual int32_t SetSpeakerVolume(uint32_t volume) override;
+ virtual int32_t SpeakerVolume(uint32_t* volume) const override;
+ virtual int32_t MaxSpeakerVolume(uint32_t* max_volume) const override;
+ virtual int32_t MinSpeakerVolume(uint32_t* min_volume) const override;
+ virtual int32_t SpeakerVolumeStepSize(uint16_t* step_size) const override;
+ virtual int32_t MicrophoneVolumeIsAvailable(bool* available) override;
virtual int32_t MicrophoneVolumeStepSize(
- uint16_t* step_size) const OVERRIDE;
- virtual int32_t SpeakerMuteIsAvailable(bool* available) OVERRIDE;
- virtual int32_t SetSpeakerMute(bool enable) OVERRIDE;
- virtual int32_t SpeakerMute(bool* enabled) const OVERRIDE;
- virtual int32_t MicrophoneMuteIsAvailable(bool* available) OVERRIDE;
- virtual int32_t SetMicrophoneMute(bool enable) OVERRIDE;
- virtual int32_t MicrophoneMute(bool* enabled) const OVERRIDE;
- virtual int32_t MicrophoneBoostIsAvailable(bool* available) OVERRIDE;
- virtual int32_t SetMicrophoneBoost(bool enable) OVERRIDE;
- virtual int32_t MicrophoneBoost(bool* enabled) const OVERRIDE;
- virtual int32_t SetStereoPlayout(bool enable) OVERRIDE;
- virtual int32_t StereoPlayout(bool* enabled) const OVERRIDE;
- virtual int32_t SetStereoRecording(bool enable) OVERRIDE;
- virtual int32_t StereoRecording(bool* enabled) const OVERRIDE;
- virtual int32_t SetRecordingChannel(const ChannelType channel) OVERRIDE;
- virtual int32_t RecordingChannel(ChannelType* channel) const OVERRIDE;
+ uint16_t* step_size) const override;
+ virtual int32_t SpeakerMuteIsAvailable(bool* available) override;
+ virtual int32_t SetSpeakerMute(bool enable) override;
+ virtual int32_t SpeakerMute(bool* enabled) const override;
+ virtual int32_t MicrophoneMuteIsAvailable(bool* available) override;
+ virtual int32_t SetMicrophoneMute(bool enable) override;
+ virtual int32_t MicrophoneMute(bool* enabled) const override;
+ virtual int32_t MicrophoneBoostIsAvailable(bool* available) override;
+ virtual int32_t SetMicrophoneBoost(bool enable) override;
+ virtual int32_t MicrophoneBoost(bool* enabled) const override;
+ virtual int32_t SetStereoPlayout(bool enable) override;
+ virtual int32_t StereoPlayout(bool* enabled) const override;
+ virtual int32_t SetStereoRecording(bool enable) override;
+ virtual int32_t StereoRecording(bool* enabled) const override;
+ virtual int32_t SetRecordingChannel(const ChannelType channel) override;
+ virtual int32_t RecordingChannel(ChannelType* channel) const override;
virtual int32_t SetPlayoutBuffer(
- const BufferType type, uint16_t size_ms) OVERRIDE;
+ const BufferType type, uint16_t size_ms) override;
virtual int32_t PlayoutBuffer(
- BufferType* type, uint16_t* size_ms) const OVERRIDE;
- virtual int32_t CPULoad(uint16_t* load) const OVERRIDE;
+ BufferType* type, uint16_t* size_ms) const override;
+ virtual int32_t CPULoad(uint16_t* load) const override;
virtual int32_t StartRawOutputFileRecording(
- const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) OVERRIDE;
- virtual int32_t StopRawOutputFileRecording() OVERRIDE;
+ const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) override;
+ virtual int32_t StopRawOutputFileRecording() override;
virtual int32_t StartRawInputFileRecording(
- const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) OVERRIDE;
- virtual int32_t StopRawInputFileRecording() OVERRIDE;
+ const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) override;
+ virtual int32_t StopRawInputFileRecording() override;
virtual int32_t SetRecordingSampleRate(
- const uint32_t samples_per_sec) OVERRIDE;
+ const uint32_t samples_per_sec) override;
virtual int32_t SetPlayoutSampleRate(
- const uint32_t samples_per_sec) OVERRIDE;
- virtual int32_t ResetAudioDevice() OVERRIDE;
- virtual int32_t SetLoudspeakerStatus(bool enable) OVERRIDE;
- virtual int32_t GetLoudspeakerStatus(bool* enabled) const OVERRIDE;
- virtual int32_t SetAGC(bool enable) OVERRIDE;
- virtual bool AGC() const OVERRIDE;
+ const uint32_t samples_per_sec) override;
+ virtual int32_t ResetAudioDevice() override;
+ virtual int32_t SetLoudspeakerStatus(bool enable) override;
+ virtual int32_t GetLoudspeakerStatus(bool* enabled) const override;
+ virtual int32_t SetAGC(bool enable) override;
+ virtual bool AGC() const override;
protected:
virtual ~WebRtcAudioDeviceNotImpl() {};
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.h ('k') | content/renderer/media/webrtc_audio_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698