media/video/capture/mac/video_capture_device_decklink_mac.h - Issue 655713003: Standardize usage of virtual/override/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_decklink_mac.h

Issue 655713003: Standardize usage of virtual/override/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/file_video_capture_device_factory.h ('k') | media/video/capture/mac/video_capture_device_decklink_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 13cc9d81276cc6e6f7b10cc2fa1f6696242a3a50..45e697d4fdb204ca70506b752d1beb36834b7dd6 100644

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

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

@@ -41,7 +41,7 @@ class MEDIA_EXPORT VideoCaptureDeviceDeckLinkMac : public VideoCaptureDevice {

VideoCaptureFormats* supported_formats);

explicit VideoCaptureDeviceDeckLinkMac(const Name& device_name);

- virtual ~VideoCaptureDeviceDeckLinkMac();

+ ~VideoCaptureDeviceDeckLinkMac() override;

// Copy of VideoCaptureDevice::Client::OnIncomingCapturedData(). Used by

// |decklink_capture_delegate_| to forward captured frames.

@@ -59,10 +59,9 @@ class MEDIA_EXPORT VideoCaptureDeviceDeckLinkMac : public VideoCaptureDevice {

private:

// VideoCaptureDevice implementation.

- virtual void AllocateAndStart(

- const VideoCaptureParams& params,

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

- virtual void StopAndDeAllocate() override;

+ void AllocateAndStart(const VideoCaptureParams& params,

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

+ void StopAndDeAllocate() override;

// Protects concurrent setting and using of |client_|.

base::Lock lock_;