| 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 d5dbf9fed57acdf4b3c818d3aabd96ddeb2df298..78c722e713e28af58923680618496286f5d7100e 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.h
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.h
|
| @@ -72,7 +72,7 @@ class CONTENT_EXPORT MediaStreamManager
|
| MediaRequestResponseCallback;
|
|
|
| explicit MediaStreamManager(media::AudioManager* audio_manager);
|
| - virtual ~MediaStreamManager();
|
| + ~MediaStreamManager() override;
|
|
|
| // Used to access VideoCaptureManager.
|
| VideoCaptureManager* video_capture_manager();
|
| @@ -165,18 +165,14 @@ class CONTENT_EXPORT MediaStreamManager
|
| void EnsureDeviceMonitorStarted();
|
|
|
| // Implements MediaStreamProviderListener.
|
| - 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) override;
|
| - virtual void Aborted(MediaStreamType stream_type,
|
| - int capture_session_id) override;
|
| + void Opened(MediaStreamType stream_type, int capture_session_id) override;
|
| + void Closed(MediaStreamType stream_type, int capture_session_id) override;
|
| + void DevicesEnumerated(MediaStreamType stream_type,
|
| + const StreamDeviceInfoArray& devices) override;
|
| + void Aborted(MediaStreamType stream_type, int capture_session_id) override;
|
|
|
| // Implements base::SystemMonitor::DevicesChangedObserver.
|
| - virtual void OnDevicesChanged(
|
| - base::SystemMonitor::DeviceType device_type) override;
|
| + void OnDevicesChanged(base::SystemMonitor::DeviceType device_type) override;
|
|
|
| // Called by the tests to specify a fake UI that should be used for next
|
| // generated stream (or when using --use-fake-ui-for-media-stream).
|
| @@ -195,7 +191,7 @@ class CONTENT_EXPORT MediaStreamManager
|
| // But for some tests which use TestBrowserThreadBundle, we need to call
|
| // WillDestroyCurrentMessageLoop explicitly because the notification happens
|
| // too late. (see http://crbug.com/247525#c14).
|
| - virtual void WillDestroyCurrentMessageLoop() override;
|
| + void WillDestroyCurrentMessageLoop() override;
|
|
|
| // Sends log messages to the render process hosts whose corresponding render
|
| // processes are making device requests, to be used by the
|
| @@ -208,8 +204,8 @@ class CONTENT_EXPORT MediaStreamManager
|
| static void SendMessageToNativeLog(const std::string& message);
|
|
|
| // base::PowerObserver overrides.
|
| - virtual void OnSuspend() override;
|
| - virtual void OnResume() override;
|
| + void OnSuspend() override;
|
| + void OnResume() override;
|
|
|
| protected:
|
| // Used for testing.
|
|
|