content/renderer/media/video_capture_impl.h - Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer

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/renderer/media/video_capture_impl.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (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/renderer/media/user_media_client_impl_unittest.cc ('k') | content/renderer/media/video_capture_impl_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/video_capture_impl.h

diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h

index 008117739024ca43addc7b5ff02b20ce357ea3c7..746f9e81e45f7333377cb39fc5d765f728595cb8 100644

--- a/content/renderer/media/video_capture_impl.h

+++ b/content/renderer/media/video_capture_impl.h

@@ -110,22 +110,22 @@ class CONTENT_EXPORT VideoCaptureImpl

// VideoCaptureMessageFilter::Delegate interface.

virtual void OnBufferCreated(base::SharedMemoryHandle handle,

int length,

- int buffer_id) OVERRIDE;

- virtual void OnBufferDestroyed(int buffer_id) OVERRIDE;

+ int buffer_id) override;

+ virtual void OnBufferDestroyed(int buffer_id) override;

virtual void OnBufferReceived(int buffer_id,

const media::VideoCaptureFormat& format,

const gfx::Rect& visible_rect,

- base::TimeTicks) OVERRIDE;

+ base::TimeTicks) override;

virtual void OnMailboxBufferReceived(int buffer_id,

const gpu::MailboxHolder& mailbox_holder,

const media::VideoCaptureFormat& format,

- base::TimeTicks timestamp) OVERRIDE;

- virtual void OnStateChanged(VideoCaptureState state) OVERRIDE;

+ base::TimeTicks timestamp) override;

+ virtual void OnStateChanged(VideoCaptureState state) override;

virtual void OnDeviceSupportedFormatsEnumerated(

- const media::VideoCaptureFormats& supported_formats) OVERRIDE;

+ const media::VideoCaptureFormats& supported_formats) override;

virtual void OnDeviceFormatsInUseReceived(

- const media::VideoCaptureFormats& formats_in_use) OVERRIDE;

- virtual void OnDelegateAdded(int32 device_id) OVERRIDE;

+ const media::VideoCaptureFormats& formats_in_use) override;

+ virtual void OnDelegateAdded(int32 device_id) override;

// Sends an IPC message to browser process when all clients are done with the

// buffer.