media/video/capture/mac/video_capture_device_factory_mac.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/mac/video_capture_device_factory_mac.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/mac/video_capture_device_decklink_mac.mm ('k') | media/video/capture/mac/video_capture_device_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/mac/video_capture_device_factory_mac.h

diff --git a/media/video/capture/mac/video_capture_device_factory_mac.h b/media/video/capture/mac/video_capture_device_factory_mac.h

index 7bc815381e05d6bfc21a6a44e40ecd1d792b4fa4..9756c1235acf2f1df1156f9abd1524ebeed17fb0 100644

--- a/media/video/capture/mac/video_capture_device_factory_mac.h

+++ b/media/video/capture/mac/video_capture_device_factory_mac.h

@@ -22,13 +22,13 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryMac :

virtual ~VideoCaptureDeviceFactoryMac();

virtual scoped_ptr<VideoCaptureDevice> Create(

- const VideoCaptureDevice::Name& device_name) OVERRIDE;

- virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE;

+ const VideoCaptureDevice::Name& device_name) override;

+ virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;

virtual void EnumerateDeviceNames(const base::Callback<

- void(scoped_ptr<media::VideoCaptureDevice::Names>)>& callback) OVERRIDE;

+ void(scoped_ptr<media::VideoCaptureDevice::Names>)>& callback) override;

virtual void GetDeviceSupportedFormats(

const VideoCaptureDevice::Name& device,

- VideoCaptureFormats* supported_formats) OVERRIDE;

+ VideoCaptureFormats* supported_formats) override;

private:

// Cache of |ui_task_runner| for enumerating devices there for QTKit.

« no previous file with comments | « media/video/capture/mac/video_capture_device_decklink_mac.mm ('k') | media/video/capture/mac/video_capture_device_mac.h » ('j') | no next file with comments »