replace OVERRIDE and FINAL with override and final in ui/

ui/aura/bench/bench_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 42 matching lines @@
   explicit ColoredLayer(SkColor color)
       : Layer(ui::LAYER_TEXTURED),
         color_(color),
         draw_(true) {
     set_delegate(this);
   }
 
   virtual ~ColoredLayer() {}
 
   // Overridden from LayerDelegate:
-  virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
+  virtual void OnPaintLayer(gfx::Canvas* canvas) override {
     if (draw_) {
       canvas->DrawColor(color_);
     }
   }
 
   virtual void OnDelegatedFrameDamage(
-      const gfx::Rect& damage_rect_in_dip) OVERRIDE {}
+      const gfx::Rect& damage_rect_in_dip) override {}
 
-  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {
+  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {
   }
 
-  virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE {
+  virtual base::Closure PrepareForLayerBoundsChange() override {
     return base::Closure();
   }
 
   void set_color(SkColor color) { color_ = color; }
   void set_draw(bool draw) { draw_ = draw; }
 
  private:
   SkColor color_;
   bool draw_;
 
   DISALLOW_COPY_AND_ASSIGN(ColoredLayer);
 };
 
 const int kFrames = 100;
 
 // Benchmark base class, hooks up drawing callback and displaying FPS.
 class BenchCompositorObserver : public ui::CompositorObserver {
  public:
   explicit BenchCompositorObserver(int max_frames)
       : start_time_(),
         frames_(0),
         max_frames_(max_frames) {
   }
 
-  virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {}
+  virtual void OnCompositingDidCommit(ui::Compositor* compositor) override {}
 
   virtual void OnCompositingStarted(Compositor* compositor,
-                                    base::TimeTicks start_time) OVERRIDE {}
+                                    base::TimeTicks start_time) override {}
 
-  virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE {
+  virtual void OnCompositingEnded(Compositor* compositor) override {
     if (start_time_.is_null()) {
       start_time_ = TimeTicks::Now();
     } else {
       ++frames_;
       if (frames_ % kFrames == 0) {
         TimeTicks now = TimeTicks::Now();
         double ms = (now - start_time_).InMillisecondsF() / kFrames;
         LOG(INFO) << "FPS: " << 1000.f / ms << " (" << ms << " ms)";
         start_time_ = now;
       }
     }
     if (max_frames_ && frames_ == max_frames_) {
       base::MessageLoop::current()->Quit();
     } else {
       Draw();
     }
   }
 
-  virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE {}
+  virtual void OnCompositingAborted(Compositor* compositor) override {}
 
   virtual void OnCompositingLockStateChanged(
-      Compositor* compositor) OVERRIDE {}
+      Compositor* compositor) override {}
 
   virtual void Draw() {}
 
   int frames() const { return frames_; }
 
  private:
   TimeTicks start_time_;
   int frames_;
   int max_frames_;
 
@@ skipping 84 matching lines @@
     compositor->AddObserver(this);
   }
 
   virtual ~WebGLBench() {
     webgl_.SetShowPaintedContent();
     gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
     gl->DeleteFramebuffers(1, &fbo_);
     compositor_->RemoveObserver(this);
   }
 
-  virtual void Draw() OVERRIDE {
+  virtual void Draw() override {
     if (do_draw_) {
       gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
       gl->ClearColor((frames() % kFrames)*1.0/kFrames, 1.f, 0.f, 1.f);
       gl->Clear(GL_COLOR_BUFFER_BIT);
       gl->Flush();
     }
     webgl_.SchedulePaint(gfx::Rect(webgl_.bounds().size()));
     compositor_->ScheduleDraw();
   }
 
@@ skipping 23 matching lines @@
         compositor_(compositor) {
     compositor->AddObserver(this);
     layer_->set_draw(
         !CommandLine::ForCurrentProcess()->HasSwitch("disable-draw"));
   }
 
   virtual ~SoftwareScrollBench() {
     compositor_->RemoveObserver(this);
   }
 
-  virtual void Draw() OVERRIDE {
+  virtual void Draw() override {
     layer_->set_color(
         SkColorSetARGBInline(255*(frames() % kFrames)/kFrames, 255, 0, 255));
     layer_->SchedulePaint(gfx::Rect(layer_->bounds().size()));
   }
 
  private:
   ColoredLayer* layer_;
   Compositor* compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareScrollBench);
@@ skipping 77 matching lines @@
   ui::PrintLayerHierarchy(host->window()->layer(), gfx::Point(100, 100));
 #endif
 
   host->Show();
   base::MessageLoopForUI::current()->Run();
   focus_client.reset();
   host.reset();
 
   return 0;
 }