| Index: content/browser/renderer_host/media/media_stream_manager.h
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
|
| index 4edc6dd5afe40dd9aeb96d1f6f45976e2fec5b36..0f48afeca14a03d2c103a903008968578afe625b 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.
|
|
|