mojo/services/surfaces/surfaces_impl.h - Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/

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: mojo/services/surfaces/surfaces_impl.h

Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/ (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

« mojo/services/network/web_socket_impl.h ('K') | « mojo/services/public/cpp/view_manager/tests/view_unittest.cc ('k') | mojo/services/surfaces/surfaces_service_application.h » ('j') | mojo/services/view_manager/view_manager_init_service_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/surfaces/surfaces_impl.h

diff --git a/mojo/services/surfaces/surfaces_impl.h b/mojo/services/surfaces/surfaces_impl.h

index 5ee6161b29a136b9ab01e4cee7dd8637ad5f9118..f92991805566d3952e3ea2b809dbaa7c5cae04a0 100644

--- a/mojo/services/surfaces/surfaces_impl.h

+++ b/mojo/services/surfaces/surfaces_impl.h

@@ -38,25 +38,25 @@ class SurfacesImpl : public InterfaceImpl<Surface>,

virtual ~SurfacesImpl();

// Surface implementation.

- virtual void CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) OVERRIDE;

- virtual void SubmitFrame(SurfaceIdPtr id, FramePtr frame) OVERRIDE;

- virtual void DestroySurface(SurfaceIdPtr id) OVERRIDE;

+ virtual void CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) override;

+ virtual void SubmitFrame(SurfaceIdPtr id, FramePtr frame) override;

+ virtual void DestroySurface(SurfaceIdPtr id) override;

virtual void CreateGLES2BoundSurface(CommandBufferPtr gles2_client,

SurfaceIdPtr id,

- mojo::SizePtr size) OVERRIDE;

+ mojo::SizePtr size) override;

// SurfaceFactoryClient implementation.

virtual void ReturnResources(

- const cc::ReturnedResourceArray& resources) OVERRIDE;

+ const cc::ReturnedResourceArray& resources) override;

// DisplayClient implementation.

- virtual void DisplayDamaged() OVERRIDE;

- virtual void DidSwapBuffers() OVERRIDE;

- virtual void DidSwapBuffersComplete() OVERRIDE;

+ virtual void DisplayDamaged() override;

+ virtual void DidSwapBuffers() override;

+ virtual void DidSwapBuffersComplete() override;

virtual void CommitVSyncParameters(base::TimeTicks timebase,

- base::TimeDelta interval) OVERRIDE;

- virtual void OutputSurfaceLost() OVERRIDE;

- virtual void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) OVERRIDE;

+ base::TimeDelta interval) override;

+ virtual void OutputSurfaceLost() override;

+ virtual void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;

cc::SurfaceFactory* factory() { return &factory_; }