content/browser/media/capture/web_contents_video_capture_device.cc - Issue 629963002: Replacing the OVERRIDE with override and FINAL with final in content/browser/media

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/browser/media/capture/web_contents_video_capture_device.cc

Issue 629963002: Replacing the OVERRIDE with override and FINAL with final in content/browser/media (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/browser/media/capture/web_contents_video_capture_device.h ('k') | content/browser/media/capture/web_contents_video_capture_device_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/web_contents_video_capture_device.cc

diff --git a/content/browser/media/capture/web_contents_video_capture_device.cc b/content/browser/media/capture/web_contents_video_capture_device.cc

index 3bd7906b18b3730fca3ecc1305b144f80f3cc7a3..1d87f01097a518b2b397e32b370b74f9e2593d1a 100644

--- a/content/browser/media/capture/web_contents_video_capture_device.cc

+++ b/content/browser/media/capture/web_contents_video_capture_device.cc

@@ -147,7 +147,7 @@ class FrameSubscriber : public RenderWidgetHostViewFrameSubscriber {

base::TimeTicks present_time,

scoped_refptr<media::VideoFrame>* storage,

RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback*

- deliver_frame_cb) OVERRIDE;

+ deliver_frame_cb) override;

private:

const VideoCaptureOracle::Event event_type_;

@@ -190,7 +190,7 @@ class ContentCaptureSubscription : public content::NotificationObserver {

// content::NotificationObserver implementation.

virtual void Observe(int type,

const content::NotificationSource& source,

- const content::NotificationDetails& details) OVERRIDE;

+ const content::NotificationDetails& details) override;

private:

void OnTimer();

@@ -233,8 +233,8 @@ class WebContentsCaptureMachine : public VideoCaptureMachine {

// VideoCaptureMachine overrides.

virtual bool Start(const scoped_refptr<ThreadSafeCaptureOracle>& oracle_proxy,

- const media::VideoCaptureParams& params) OVERRIDE;

- virtual void Stop(const base::Closure& callback) OVERRIDE;

+ const media::VideoCaptureParams& params) override;

+ virtual void Stop(const base::Closure& callback) override;

// Starts a copy from the backing store or the composited surface. Must be run

// on the UI BrowserThread. |deliver_frame_cb| will be run when the operation