content/renderer/media/mock_media_stream_video_source.h - Issue 1091093006: Update {virtual,override} to follow C++11 style in content.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Back out some webrtc files. Created 5 years, 8 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/mock_media_stream_video_sink.h ('k') | content/renderer/media/video_capture_message_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/mock_media_stream_video_source.h

diff --git a/content/renderer/media/mock_media_stream_video_source.h b/content/renderer/media/mock_media_stream_video_source.h

index 0ae75074e0162055ea63b2890ca09bbf86884762..d00a5feb612bb015cac9b65b94fa2194d1611f08 100644

--- a/content/renderer/media/mock_media_stream_video_source.h

+++ b/content/renderer/media/mock_media_stream_video_source.h

@@ -44,22 +44,22 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource {

int max_requested_width() const { return max_requested_width_; }

double max_requested_frame_rate() const { return max_requested_frame_rate_; }

- virtual void SetMutedState(bool muted_state) override {

+ void SetMutedState(bool muted_state) override {

MediaStreamVideoSource::SetMutedState(muted_state);

DoSetMutedState(muted_state);

}

protected:

// Implements MediaStreamVideoSource.

- virtual void GetCurrentSupportedFormats(

+ void GetCurrentSupportedFormats(

int max_requested_height,

int max_requested_width,

double max_requested_frame_rate,

const VideoCaptureDeviceFormatsCB& callback) override;

- virtual void StartSourceImpl(

+ void StartSourceImpl(

const media::VideoCaptureFormat& format,

const VideoCaptureDeliverFrameCB& frame_callback) override;

- virtual void StopSourceImpl() override;

+ void StopSourceImpl() override;

private:

media::VideoCaptureFormat format_;