From 3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6 Mon Sep 17 00:00:00 2001 From: mostynb Date: Thu, 9 Oct 2014 03:54:27 -0700 Subject: replace OVERRIDE and FINAL with override and final in ui/ BUG=417463 Review URL: https://codereview.chromium.org/623293004 Cr-Commit-Position: refs/heads/master@{#298839} --- ui/gl/gl_image_memory.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'ui/gl/gl_image_memory.h') diff --git a/ui/gl/gl_image_memory.h b/ui/gl/gl_image_memory.h index 6dbec46..067e4fb 100644 --- a/ui/gl/gl_image_memory.h +++ b/ui/gl/gl_image_memory.h @@ -22,20 +22,20 @@ class GL_EXPORT GLImageMemory : public GLImage { bool Initialize(const unsigned char* memory); // Overridden from GLImage: - virtual void Destroy(bool have_context) OVERRIDE; - virtual gfx::Size GetSize() OVERRIDE; - virtual bool BindTexImage(unsigned target) OVERRIDE; - virtual void ReleaseTexImage(unsigned target) OVERRIDE {} - virtual bool CopyTexImage(unsigned target) OVERRIDE; - virtual void WillUseTexImage() OVERRIDE; - virtual void DidUseTexImage() OVERRIDE; - virtual void WillModifyTexImage() OVERRIDE {} - virtual void DidModifyTexImage() OVERRIDE {} + virtual void Destroy(bool have_context) override; + virtual gfx::Size GetSize() override; + virtual bool BindTexImage(unsigned target) override; + virtual void ReleaseTexImage(unsigned target) override {} + virtual bool CopyTexImage(unsigned target) override; + virtual void WillUseTexImage() override; + virtual void DidUseTexImage() override; + virtual void WillModifyTexImage() override {} + virtual void DidModifyTexImage() override {} virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, int z_order, OverlayTransform transform, const Rect& bounds_rect, - const RectF& crop_rect) OVERRIDE; + const RectF& crop_rect) override; protected: virtual ~GLImageMemory(); -- cgit v1.1