content/browser/media/capture/desktop_capture_device_aura.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_aura.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_aura.h ('k') | content/browser/media/capture/desktop_capture_device_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7fd9426653a4c9611499b6d2935050fae43b9d0e..0302cfbd1c286acb34da4496547e79d18f9453a3 100644

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

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

@@ -100,26 +100,26 @@ class DesktopVideoCaptureMachine

// VideoCaptureFrameSource overrides.

virtual bool Start(const scoped_refptr<ThreadSafeCaptureOracle>& oracle_proxy,

- const media::VideoCaptureParams& params) OVERRIDE;

- virtual void Stop(const base::Closure& callback) OVERRIDE;

+ const media::VideoCaptureParams& params) override;

+ virtual void Stop(const base::Closure& callback) override;

// Implements aura::WindowObserver.

virtual void OnWindowBoundsChanged(aura::Window* window,

const gfx::Rect& old_bounds,

- const gfx::Rect& new_bounds) OVERRIDE;

- virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;

- virtual void OnWindowAddedToRootWindow(aura::Window* window) OVERRIDE;

+ const gfx::Rect& new_bounds) override;

+ virtual void OnWindowDestroyed(aura::Window* window) override;

+ virtual void OnWindowAddedToRootWindow(aura::Window* window) override;

virtual void OnWindowRemovingFromRootWindow(aura::Window* window,

- aura::Window* new_root) OVERRIDE;

+ aura::Window* new_root) override;

// Implements ui::CompositorObserver.

- virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {}

+ virtual void OnCompositingDidCommit(ui::Compositor* compositor) override {}

virtual void OnCompositingStarted(ui::Compositor* compositor,

- base::TimeTicks start_time) OVERRIDE {}

- virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE;

- virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE {}

+ base::TimeTicks start_time) override {}

+ virtual void OnCompositingEnded(ui::Compositor* compositor) override;

+ virtual void OnCompositingAborted(ui::Compositor* compositor) override {}

virtual void OnCompositingLockStateChanged(

- ui::Compositor* compositor) OVERRIDE {}

+ ui::Compositor* compositor) override {}

private:

// Captures a frame.