content/renderer/media/webrtc/webrtc_video_capturer_adapter.h - Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer

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/webrtc/webrtc_video_capturer_adapter.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/webrtc/webrtc_media_stream_adapter_unittest.cc ('k') | content/renderer/media/webrtc/webrtc_video_track_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webrtc/webrtc_video_capturer_adapter.h

diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h

index e007b3301f757ba9dbf1e20f74dc9189b7e99092..52245526d3b6fd0e8edf4295dfa910c7cd39ed98 100644

--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h

+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h

@@ -40,13 +40,13 @@ class CONTENT_EXPORT WebRtcVideoCapturerAdapter

// cricket::VideoCapturer implementation.

// These methods are accessed from a libJingle worker thread.

virtual cricket::CaptureState Start(

- const cricket::VideoFormat& capture_format) OVERRIDE;

- virtual void Stop() OVERRIDE;

- virtual bool IsRunning() OVERRIDE;

- virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) OVERRIDE;

+ const cricket::VideoFormat& capture_format) override;

+ virtual void Stop() override;

+ virtual bool IsRunning() override;

+ virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) override;

virtual bool GetBestCaptureFormat(const cricket::VideoFormat& desired,

- cricket::VideoFormat* best_format) OVERRIDE;

- virtual bool IsScreencast() const OVERRIDE;

+ cricket::VideoFormat* best_format) override;

+ virtual bool IsScreencast() const override;

void UpdateI420Buffer(const scoped_refptr<media::VideoFrame>& src);