replace OVERRIDE and FINAL with override and final in ui/

ui/views/border.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.
 
 #include "ui/views/border.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 namespace {
 
 // A simple border with different thicknesses on each side and single color.
 class SidedSolidBorder : public Border {
  public:
   SidedSolidBorder(int top, int left, int bottom, int right, SkColor color);
 
   // Overridden from Border:
-  virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE;
-  virtual gfx::Insets GetInsets() const OVERRIDE;
-  virtual gfx::Size GetMinimumSize() const OVERRIDE;
+  virtual void Paint(const View& view, gfx::Canvas* canvas) override;
+  virtual gfx::Insets GetInsets() const override;
+  virtual gfx::Size GetMinimumSize() const override;
 
  private:
   const SkColor color_;
   const gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(SidedSolidBorder);
 };
 
 SidedSolidBorder::SidedSolidBorder(int top,
                                    int left,
@@ skipping 35 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(SolidBorder);
 };
 
 class EmptyBorder : public Border {
  public:
   EmptyBorder(int top, int left, int bottom, int right)
       : insets_(top, left, bottom, right) {}
 
   // Overridden from Border:
-  virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE {}
+  virtual void Paint(const View& view, gfx::Canvas* canvas) override {}
 
-  virtual gfx::Insets GetInsets() const OVERRIDE {
+  virtual gfx::Insets GetInsets() const override {
     return insets_;
   }
 
-  virtual gfx::Size GetMinimumSize() const OVERRIDE {
+  virtual gfx::Size GetMinimumSize() const override {
     return gfx::Size();
   }
 
  private:
   const gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(EmptyBorder);
 };
 
 class BorderPainter : public Border {
  public:
   explicit BorderPainter(Painter* painter, const gfx::Insets& insets)
       : painter_(painter),
         insets_(insets) {
     DCHECK(painter);
   }
 
   virtual ~BorderPainter() {}
 
   // Overridden from Border:
-  virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE {
+  virtual void Paint(const View& view, gfx::Canvas* canvas) override {
     Painter::PaintPainterAt(canvas, painter_.get(), view.GetLocalBounds());
   }
 
-  virtual gfx::Insets GetInsets() const OVERRIDE {
+  virtual gfx::Insets GetInsets() const override {
     return insets_;
   }
 
-  virtual gfx::Size GetMinimumSize() const OVERRIDE {
+  virtual gfx::Size GetMinimumSize() const override {
     return painter_->GetMinimumSize();
   }
 
  private:
   scoped_ptr<Painter> painter_;
   const gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(BorderPainter);
 };
 
@@ skipping 33 matching lines @@
       new SidedSolidBorder(top, left, bottom, right, color));
 }
 
 // static
 scoped_ptr<Border> Border::CreateBorderPainter(Painter* painter,
                                                const gfx::Insets& insets) {
   return scoped_ptr<Border>(new BorderPainter(painter, insets));
 }
 
 }  // namespace views