content/browser/media/capture/desktop_capture_device.cc - Issue 629963002: Replacing the OVERRIDE with override and FINAL with final in content/browser/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: content/browser/media/capture/desktop_capture_device.cc

Issue 629963002: Replacing the OVERRIDE with override and FINAL with final in content/browser/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 | « content/browser/media/capture/desktop_capture_device.h ('k') | content/browser/media/capture/desktop_capture_device_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/desktop_capture_device.cc

diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc

index 65f7faa3931bcb96eecddc2760542dd745458df6..e1d28ce0437dd7b65999e80b6f920a814829e816 100644

--- a/content/browser/media/capture/desktop_capture_device.cc

+++ b/content/browser/media/capture/desktop_capture_device.cc

@@ -64,8 +64,8 @@ class DesktopCaptureDevice::Core : public webrtc::DesktopCapturer::Callback {

private:

// webrtc::DesktopCapturer::Callback interface

- virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;

- virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE;

+ virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override;

+ virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;

// Chooses new output properties based on the supplied source size and the

// properties requested to Allocate(), and dispatches OnFrameInfo[Changed]