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

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

Issue 976233002: MediaStreamVideo*/VideoTrackAdapter and RTCVideoRenderer (small) cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
Index: content/renderer/media/media_stream_video_capturer_source.h
diff --git a/content/renderer/media/media_stream_video_capturer_source.h b/content/renderer/media/media_stream_video_capturer_source.h
index 35b8f56827d039fc4166cfa2b9d51f25a3282c18..f95dd594b2206949ae62678bb4df91b0df2459f6 100644
--- a/content/renderer/media/media_stream_video_capturer_source.h
+++ b/content/renderer/media/media_stream_video_capturer_source.h
@@ -46,18 +46,18 @@ class CONTENT_EXPORT VideoCapturerDelegate : public media::VideoCapturerSource {
FRIEND_TEST_ALL_PREFIXES(MediaStreamVideoCapturerSourceTest, Ended);
friend class MockVideoCapturerDelegate;
- void OnStateUpdateOnRenderThread(VideoCaptureState state);
+ void OnStateUpdate(VideoCaptureState state);
void OnDeviceFormatsInUseReceived(const media::VideoCaptureFormats& formats);
void OnDeviceSupportedFormatsEnumerated(
const media::VideoCaptureFormats& formats);
// The id identifies which video capture device is used for this video
// capture session.
- media::VideoCaptureSessionId session_id_;
+ const media::VideoCaptureSessionId session_id_;
base::Closure release_device_cb_;
base::Closure stop_capture_cb_;
- bool is_screen_cast_;
+ const bool is_screen_cast_;
// |running_callback| is provided to this class in StartCapture and must be
// valid until StopCapture is called.
@@ -83,7 +83,6 @@ class CONTENT_EXPORT MediaStreamVideoCapturerSource
MediaStreamVideoCapturerSource(
const SourceStoppedCallback& stop_callback,
scoped_ptr<media::VideoCapturerSource> delegate);
-
virtual ~MediaStreamVideoCapturerSource();
void SetDeviceInfo(const StreamDeviceInfo& device_info);
@@ -105,7 +104,7 @@ class CONTENT_EXPORT MediaStreamVideoCapturerSource
private:
void OnStarted(bool result);
// The delegate that provides video frames.
- scoped_ptr<media::VideoCapturerSource> delegate_;
+ const scoped_ptr<media::VideoCapturerSource> delegate_;
DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoCapturerSource);
};

Powered by Google App Engine
This is Rietveld 408576698