content/browser/renderer_host/media/video_capture_manager_unittest.cc - Issue 1091093006: Update {virtual,override} to follow C++11 style in content.

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/browser/renderer_host/media/video_capture_manager_unittest.cc

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

Patch Set: Back out some webrtc files. Created 5 years, 8 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/browser/renderer_host/media/video_capture_host_unittest.cc ('k') | content/browser/renderer_host/pepper/pepper_truetype_font_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_manager_unittest.cc

diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc

index a52ff6c7278b9326ae8c616bf3c72c549531f926..a8e45add526ad806b7584dec26749c7945ff21f5 100644

--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc

+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc

@@ -46,26 +46,25 @@ class MockFrameObserver : public VideoCaptureControllerEventHandler {

public:

MOCK_METHOD1(OnError, void(VideoCaptureControllerID id));

- virtual void OnBufferCreated(VideoCaptureControllerID id,

- base::SharedMemoryHandle handle,

- int length, int buffer_id) override {}

- virtual void OnBufferDestroyed(VideoCaptureControllerID id,

- int buffer_id) override {}

- virtual void OnBufferReady(

+ void OnBufferCreated(VideoCaptureControllerID id,

+ base::SharedMemoryHandle handle,

+ int length, int buffer_id) override {}

+ void OnBufferDestroyed(VideoCaptureControllerID id, int buffer_id) override {}

+ void OnBufferReady(

VideoCaptureControllerID id,

int buffer_id,

const gfx::Size& coded_size,

const gfx::Rect& visible_rect,

const base::TimeTicks& timestamp,

scoped_ptr<base::DictionaryValue> metadata) override {}

- virtual void OnMailboxBufferReady(

+ void OnMailboxBufferReady(

VideoCaptureControllerID id,

int buffer_id,

const gpu::MailboxHolder& mailbox_holder,

const gfx::Size& packed_frame_size,

const base::TimeTicks& timestamp,

scoped_ptr<base::DictionaryValue> metadata) override {}

- virtual void OnEnded(VideoCaptureControllerID id) override {}

+ void OnEnded(VideoCaptureControllerID id) override {}

void OnGotControllerCallback(VideoCaptureControllerID) {}

};