media/video/capture/file_video_capture_device.h - Issue 623263003: replace OVERRIDE and FINAL with override and final in 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: media/video/capture/file_video_capture_device.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in 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 | « media/video/capture/fake_video_capture_device_unittest.cc ('k') | media/video/capture/file_video_capture_device_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/file_video_capture_device.h

diff --git a/media/video/capture/file_video_capture_device.h b/media/video/capture/file_video_capture_device.h

index e2e066b3b25558ae82e40ea767342879e71e76a6..85c63d940fa5ea64e573b0f930177d065a5c0466 100644

--- a/media/video/capture/file_video_capture_device.h

+++ b/media/video/capture/file_video_capture_device.h

@@ -38,8 +38,8 @@ class MEDIA_EXPORT FileVideoCaptureDevice : public VideoCaptureDevice {

virtual ~FileVideoCaptureDevice();

virtual void AllocateAndStart(

const VideoCaptureParams& params,

- scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE;

- virtual void StopAndDeAllocate() OVERRIDE;

+ scoped_ptr<VideoCaptureDevice::Client> client) override;

+ virtual void StopAndDeAllocate() override;

private:

// Returns size in bytes of an I420 frame, not including possible paddings,