summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/media
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 20:07:38 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 20:07:38 +0000
commitedc64de774e1af065b16996295053f0b92d22cb0 (patch)
tree9370bffca9da7615718c67448bcb5631016a8ad1 /content/browser/renderer_host/media
parentc193faf261d5542429d6363a9f5f295ee7c1d70f (diff)
downloadchromium_src-edc64de774e1af065b16996295053f0b92d22cb0.zip
chromium_src-edc64de774e1af065b16996295053f0b92d22cb0.tar.gz
chromium_src-edc64de774e1af065b16996295053f0b92d22cb0.tar.bz2
Add OVERRIDE to content/.
BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8587009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/media')
-rw-r--r--content/browser/renderer_host/media/audio_input_device_manager.h10
-rw-r--r--content/browser/renderer_host/media/audio_input_renderer_host.h18
-rw-r--r--content/browser/renderer_host/media/audio_input_sync_writer.h6
-rw-r--r--content/browser/renderer_host/media/audio_renderer_host.h16
-rw-r--r--content/browser/renderer_host/media/audio_sync_reader.h8
-rw-r--r--content/browser/renderer_host/media/media_stream_dispatcher_host.h17
-rw-r--r--content/browser/renderer_host/media/media_stream_manager.h19
-rw-r--r--content/browser/renderer_host/media/video_capture_host.h16
-rw-r--r--content/browser/renderer_host/media/video_capture_manager.h10
9 files changed, 62 insertions, 58 deletions
diff --git a/content/browser/renderer_host/media/audio_input_device_manager.h b/content/browser/renderer_host/media/audio_input_device_manager.h
index 342e1c0..c8c6014 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.h
+++ b/content/browser/renderer_host/media/audio_input_device_manager.h
@@ -39,11 +39,11 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
virtual ~AudioInputDeviceManager();
// MediaStreamProvider implementation, called on IO thread.
- virtual void Register(MediaStreamProviderListener* listener);
- virtual void Unregister();
- virtual void EnumerateDevices();
- virtual int Open(const StreamDeviceInfo& device);
- virtual void Close(int session_id);
+ virtual void Register(MediaStreamProviderListener* listener) OVERRIDE;
+ virtual void Unregister() OVERRIDE;
+ virtual void EnumerateDevices() OVERRIDE;
+ virtual int Open(const StreamDeviceInfo& device) OVERRIDE;
+ virtual void Close(int session_id) OVERRIDE;
// Functions used by AudioInputRenderHost, called on IO thread.
// Start the device referenced by the session id.
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h
index 8daa31f..b03556e 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
@@ -107,23 +107,23 @@ class CONTENT_EXPORT AudioInputRendererHost
const content::ResourceContext* resource_context);
// BrowserMessageFilter implementation.
- virtual void OnChannelClosing();
- virtual void OnDestruct() const;
+ virtual void OnChannelClosing() OVERRIDE;
+ virtual void OnDestruct() const OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message,
- bool* message_was_ok);
+ bool* message_was_ok) OVERRIDE;
// AudioInputController::EventHandler implementation.
- virtual void OnCreated(media::AudioInputController* controller);
- virtual void OnRecording(media::AudioInputController* controller);
+ virtual void OnCreated(media::AudioInputController* controller) OVERRIDE;
+ virtual void OnRecording(media::AudioInputController* controller) OVERRIDE;
virtual void OnError(media::AudioInputController* controller,
- int error_code);
+ int error_code) OVERRIDE;
virtual void OnData(media::AudioInputController* controller,
const uint8* data,
- uint32 size);
+ uint32 size) OVERRIDE;
// media_stream::AudioInputDeviceManagerEventHandler implementation.
- virtual void OnDeviceStarted(int session_id, int index);
- virtual void OnDeviceStopped(int session_id);
+ virtual void OnDeviceStarted(int session_id, int index) OVERRIDE;
+ virtual void OnDeviceStopped(int session_id) OVERRIDE;
private:
// TODO(henrika): extend test suite (compare AudioRenderHost)
diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.h b/content/browser/renderer_host/media/audio_input_sync_writer.h
index 5dc89df..b3f69a8b 100644
--- a/content/browser/renderer_host/media/audio_input_sync_writer.h
+++ b/content/browser/renderer_host/media/audio_input_sync_writer.h
@@ -26,9 +26,9 @@ class AudioInputSyncWriter : public media::AudioInputController::SyncWriter {
virtual ~AudioInputSyncWriter();
// media::AudioOutputController::SyncWriter implementation.
- virtual void UpdateRecordedBytes(uint32 bytes);
- virtual uint32 Write(const void* data, uint32 size);
- virtual void Close();
+ virtual void UpdateRecordedBytes(uint32 bytes) OVERRIDE;
+ virtual uint32 Write(const void* data, uint32 size) OVERRIDE;
+ virtual void Close() OVERRIDE;
bool Init();
bool PrepareForeignSocketHandle(base::ProcessHandle process_handle,
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 6709111..cfa6245 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -108,19 +108,19 @@ class CONTENT_EXPORT AudioRendererHost
AudioRendererHost(const content::ResourceContext* resource_context);
// BrowserMessageFilter implementation.
- virtual void OnChannelClosing();
- virtual void OnDestruct() const;
+ virtual void OnChannelClosing() OVERRIDE;
+ virtual void OnDestruct() const OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message,
- bool* message_was_ok);
+ bool* message_was_ok) OVERRIDE;
// AudioOutputController::EventHandler implementations.
- virtual void OnCreated(media::AudioOutputController* controller);
- virtual void OnPlaying(media::AudioOutputController* controller);
- virtual void OnPaused(media::AudioOutputController* controller);
+ virtual void OnCreated(media::AudioOutputController* controller) OVERRIDE;
+ virtual void OnPlaying(media::AudioOutputController* controller) OVERRIDE;
+ virtual void OnPaused(media::AudioOutputController* controller) OVERRIDE;
virtual void OnError(media::AudioOutputController* controller,
- int error_code);
+ int error_code) OVERRIDE;
virtual void OnMoreData(media::AudioOutputController* controller,
- AudioBuffersState buffers_state);
+ AudioBuffersState buffers_state) OVERRIDE;
private:
friend class AudioRendererHostTest;
diff --git a/content/browser/renderer_host/media/audio_sync_reader.h b/content/browser/renderer_host/media/audio_sync_reader.h
index 809e117..4aff8aa9 100644
--- a/content/browser/renderer_host/media/audio_sync_reader.h
+++ b/content/browser/renderer_host/media/audio_sync_reader.h
@@ -28,10 +28,10 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader {
virtual ~AudioSyncReader();
// media::AudioOutputController::SyncReader implementations.
- virtual void UpdatePendingBytes(uint32 bytes);
- virtual uint32 Read(void* data, uint32 size);
- virtual void Close();
- virtual bool DataReady();
+ virtual void UpdatePendingBytes(uint32 bytes) OVERRIDE;
+ virtual uint32 Read(void* data, uint32 size) OVERRIDE;
+ virtual void Close() OVERRIDE;
+ virtual bool DataReady() OVERRIDE;
bool Init();
bool PrepareForeignSocketHandle(base::ProcessHandle process_handle,
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
index cc315ed..b57ea58 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
@@ -33,18 +33,19 @@ class CONTENT_EXPORT MediaStreamDispatcherHost
virtual ~MediaStreamDispatcherHost();
// MediaStreamRequester implementation.
- virtual void StreamGenerated(const std::string& label,
- const StreamDeviceInfoArray& audio_devices,
- const StreamDeviceInfoArray& video_devices);
+ virtual void StreamGenerated(
+ const std::string& label,
+ const StreamDeviceInfoArray& audio_devices,
+ const StreamDeviceInfoArray& video_devices) OVERRIDE;
- virtual void StreamGenerationFailed(const std::string& label);
- virtual void AudioDeviceFailed(const std::string& label, int index);
- virtual void VideoDeviceFailed(const std::string& label, int index);
+ virtual void StreamGenerationFailed(const std::string& label) OVERRIDE;
+ virtual void AudioDeviceFailed(const std::string& label, int index) OVERRIDE;
+ virtual void VideoDeviceFailed(const std::string& label, int index) OVERRIDE;
// BrowserMessageFilter implementation.
virtual bool OnMessageReceived(const IPC::Message& message,
- bool* message_was_ok);
- virtual void OnChannelClosing();
+ bool* message_was_ok) OVERRIDE;
+ virtual void OnChannelClosing() OVERRIDE;
private:
friend class MockMediaStreamDispatcherHost;
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index 4edc6dd..0f48afe 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -69,19 +69,22 @@ class CONTENT_EXPORT MediaStreamManager
void StopGeneratedStream(const std::string& label);
// Implements MediaStreamProviderListener.
- virtual void Opened(MediaStreamType stream_type, int capture_session_id);
- virtual void Closed(MediaStreamType stream_type, int capture_session_id);
+ virtual void Opened(MediaStreamType stream_type,
+ int capture_session_id) OVERRIDE;
+ virtual void Closed(MediaStreamType stream_type,
+ int capture_session_id) OVERRIDE;
virtual void DevicesEnumerated(MediaStreamType stream_type,
- const StreamDeviceInfoArray& devices);
- virtual void Error(MediaStreamType stream_type, int capture_session_id,
- MediaStreamProviderError error);
+ const StreamDeviceInfoArray& devices) OVERRIDE;
+ virtual void Error(MediaStreamType stream_type,
+ int capture_session_id,
+ MediaStreamProviderError error) OVERRIDE;
// Implements SettingsRequester.
virtual void GetDevices(const std::string& label,
- MediaStreamType stream_type);
+ MediaStreamType stream_type) OVERRIDE;
virtual void DevicesAccepted(const std::string& label,
- const StreamDeviceInfoArray& devices);
- virtual void SettingsError(const std::string& label);
+ const StreamDeviceInfoArray& devices) OVERRIDE;
+ virtual void SettingsError(const std::string& label) OVERRIDE;
// Used by unit test to make sure fake devices are used instead of a real
// devices, which is needed for server based testing.
diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h
index 5306e55..168c4f3 100644
--- a/content/browser/renderer_host/media/video_capture_host.h
+++ b/content/browser/renderer_host/media/video_capture_host.h
@@ -55,24 +55,24 @@ class CONTENT_EXPORT VideoCaptureHost
explicit VideoCaptureHost(const content::ResourceContext* resource_context);
// BrowserMessageFilter implementation.
- virtual void OnChannelClosing();
- virtual void OnDestruct() const;
+ virtual void OnChannelClosing() OVERRIDE;
+ virtual void OnDestruct() const OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message,
- bool* message_was_ok);
+ bool* message_was_ok) OVERRIDE;
// VideoCaptureControllerEventHandler implementation.
- virtual void OnError(const VideoCaptureControllerID& id);
+ virtual void OnError(const VideoCaptureControllerID& id) OVERRIDE;
virtual void OnBufferCreated(const VideoCaptureControllerID& id,
base::SharedMemoryHandle handle,
- int length, int buffer_id);
+ int length, int buffer_id) OVERRIDE;
virtual void OnBufferReady(const VideoCaptureControllerID& id,
int buffer_id,
- base::Time timestamp);
+ base::Time timestamp) OVERRIDE;
virtual void OnFrameInfo(const VideoCaptureControllerID& id,
int width,
int height,
- int frame_per_second);
- virtual void OnReadyToDelete(const VideoCaptureControllerID& id);
+ int frame_per_second) OVERRIDE;
+ virtual void OnReadyToDelete(const VideoCaptureControllerID& id) OVERRIDE;
private:
friend class content::BrowserThread;
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index 58870ef..dbce623 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -38,15 +38,15 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
virtual ~VideoCaptureManager();
// Implements MediaStreamProvider.
- virtual void Register(MediaStreamProviderListener* listener);
+ virtual void Register(MediaStreamProviderListener* listener) OVERRIDE;
- virtual void Unregister();
+ virtual void Unregister() OVERRIDE;
- virtual void EnumerateDevices();
+ virtual void EnumerateDevices() OVERRIDE;
- virtual int Open(const StreamDeviceInfo& device);
+ virtual int Open(const StreamDeviceInfo& device) OVERRIDE;
- virtual void Close(int capture_session_id);
+ virtual void Close(int capture_session_id) OVERRIDE;
// Functions used to start and stop media flow.
// Start allocates the device and no other application can use the device