Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1337)

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: remove compiler_specific.h inclusions 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
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..c074834a880dc6d306ce4bb64d9e1a35c4548225 100644
--- a/mojo/services/surfaces/surfaces_impl.h
+++ b/mojo/services/surfaces/surfaces_impl.h
@@ -5,7 +5,6 @@
#ifndef MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
#define MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
-#include "base/compiler_specific.h"
#include "cc/surfaces/display_client.h"
#include "cc/surfaces/surface_factory.h"
#include "cc/surfaces/surface_factory_client.h"
@@ -38,25 +37,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_; }
« no previous file with comments | « mojo/services/public/cpp/view_manager/tests/view_unittest.cc ('k') | mojo/services/surfaces/surfaces_service_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698