media/video/capture/android/video_capture_device_android.h - Issue 893363002: Update {virtual,override,final} to follow C++11 style.

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/android/video_capture_device_android.h

Issue 893363002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 10 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/midi/usb_midi_device_factory_android.h ('k') | media/video/capture/android/video_capture_device_factory_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/android/video_capture_device_android.h

diff --git a/media/video/capture/android/video_capture_device_android.h b/media/video/capture/android/video_capture_device_android.h

index 0df4c5e52cdccd69207ae56c37f8c159e937505a..832d64fbc8bdc57cdacb18ec21bab250aa040d33 100644

--- a/media/video/capture/android/video_capture_device_android.h

+++ b/media/video/capture/android/video_capture_device_android.h

@@ -37,7 +37,7 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {

};

explicit VideoCaptureDeviceAndroid(const Name& device_name);

- virtual ~VideoCaptureDeviceAndroid();

+ ~VideoCaptureDeviceAndroid() override;

static VideoCaptureDevice* Create(const Name& device_name);

static bool RegisterVideoCaptureDevice(JNIEnv* env);

@@ -48,9 +48,9 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {

bool Init();

// VideoCaptureDevice implementation.

- virtual void AllocateAndStart(const VideoCaptureParams& params,

- scoped_ptr<Client> client) override;

- virtual void StopAndDeAllocate() override;

+ void AllocateAndStart(const VideoCaptureParams& params,

+ scoped_ptr<Client> client) override;

+ void StopAndDeAllocate() override;

// Implement org.chromium.media.VideoCapture.nativeOnFrameAvailable.

void OnFrameAvailable(

« no previous file with comments | « media/midi/usb_midi_device_factory_android.h ('k') | media/video/capture/android/video_capture_device_factory_android.h » ('j') | no next file with comments »