commit 3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6
author mostynb <mostynb@opera.com> Thu Oct 09 10:54:27 2014
committer Commit bot <commit-bot@chromium.org> Thu Oct 09 10:55:07 2014
tree 720b6c8d126123e087abffedaedd8a9fa4907132
parent 002d02909368b7067cc3df9149c5e46ce445861c

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/compositor/layer.h

diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index d009af46..8b5f862 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -327,9 +327,9 @@
   virtual void PaintContents(
       SkCanvas* canvas,
       const gfx::Rect& clip,
-      ContentLayerClient::GraphicsContextStatus gc_status) OVERRIDE;
-  virtual void DidChangeLayerCanUseLCDText() OVERRIDE {}
-  virtual bool FillsBoundsCompletely() const OVERRIDE;
+      ContentLayerClient::GraphicsContextStatus gc_status) override;
+  virtual void DidChangeLayerCanUseLCDText() override {}
+  virtual bool FillsBoundsCompletely() const override;
 
   cc::Layer* cc_layer() { return cc_layer_; }
 
@@ -337,7 +337,7 @@
   virtual bool PrepareTextureMailbox(
       cc::TextureMailbox* mailbox,
       scoped_ptr<cc::SingleReleaseCallback>* release_callback,
-      bool use_shared_memory) OVERRIDE;
+      bool use_shared_memory) override;
 
   float device_scale_factor() const { return device_scale_factor_; }
 
@@ -348,10 +348,10 @@
 
   // LayerClient
   virtual scoped_refptr<base::debug::ConvertableToTraceFormat>
-      TakeDebugInfo() OVERRIDE;
+      TakeDebugInfo() override;
 
   // LayerAnimationEventObserver
-  virtual void OnAnimationStarted(const cc::AnimationEvent& event) OVERRIDE;
+  virtual void OnAnimationStarted(const cc::AnimationEvent& event) override;
 
   // Whether this layer has animations waiting to get sent to its cc::Layer.
   bool HasPendingThreadedAnimations() {
@@ -374,27 +374,27 @@
   bool ConvertPointFromAncestor(const Layer* ancestor, gfx::Point* point) const;
 
   // Implementation of LayerAnimatorDelegate
-  virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) OVERRIDE;
+  virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) override;
   virtual void SetTransformFromAnimation(
-      const gfx::Transform& transform) OVERRIDE;
-  virtual void SetOpacityFromAnimation(float opacity) OVERRIDE;
-  virtual void SetVisibilityFromAnimation(bool visibility) OVERRIDE;
-  virtual void SetBrightnessFromAnimation(float brightness) OVERRIDE;
-  virtual void SetGrayscaleFromAnimation(float grayscale) OVERRIDE;
-  virtual void SetColorFromAnimation(SkColor color) OVERRIDE;
-  virtual void ScheduleDrawForAnimation() OVERRIDE;
-  virtual const gfx::Rect& GetBoundsForAnimation() const OVERRIDE;
-  virtual gfx::Transform GetTransformForAnimation() const OVERRIDE;
-  virtual float GetOpacityForAnimation() const OVERRIDE;
-  virtual bool GetVisibilityForAnimation() const OVERRIDE;
-  virtual float GetBrightnessForAnimation() const OVERRIDE;
-  virtual float GetGrayscaleForAnimation() const OVERRIDE;
-  virtual SkColor GetColorForAnimation() const OVERRIDE;
-  virtual float GetDeviceScaleFactor() const OVERRIDE;
+      const gfx::Transform& transform) override;
+  virtual void SetOpacityFromAnimation(float opacity) override;
+  virtual void SetVisibilityFromAnimation(bool visibility) override;
+  virtual void SetBrightnessFromAnimation(float brightness) override;
+  virtual void SetGrayscaleFromAnimation(float grayscale) override;
+  virtual void SetColorFromAnimation(SkColor color) override;
+  virtual void ScheduleDrawForAnimation() override;
+  virtual const gfx::Rect& GetBoundsForAnimation() const override;
+  virtual gfx::Transform GetTransformForAnimation() const override;
+  virtual float GetOpacityForAnimation() const override;
+  virtual bool GetVisibilityForAnimation() const override;
+  virtual float GetBrightnessForAnimation() const override;
+  virtual float GetGrayscaleForAnimation() const override;
+  virtual SkColor GetColorForAnimation() const override;
+  virtual float GetDeviceScaleFactor() const override;
   virtual void AddThreadedAnimation(
-      scoped_ptr<cc::Animation> animation) OVERRIDE;
-  virtual void RemoveThreadedAnimation(int animation_id) OVERRIDE;
-  virtual LayerAnimatorCollection* GetLayerAnimatorCollection() OVERRIDE;
+      scoped_ptr<cc::Animation> animation) override;
+  virtual void RemoveThreadedAnimation(int animation_id) override;
+  virtual LayerAnimatorCollection* GetLayerAnimatorCollection() override;
 
   // Creates a corresponding composited layer for |type_|.
   void CreateWebLayer();