replace OVERRIDE and FINAL with override and final in ui/

ui/gfx/image/image.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/gfx/image/image.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/logging.h"
@@ skipping 50 matching lines @@
   bitmap.allocN32Pixels(16, 16);
   bitmap.eraseARGB(0xff, 0xff, 0, 0);
   return new ImageSkia(ImageSkiaRep(bitmap, 1.0f));
 }
 
 class PNGImageSource : public ImageSkiaSource {
  public:
   PNGImageSource() {}
   virtual ~PNGImageSource() {}
 
-  virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+  virtual ImageSkiaRep GetImageForScale(float scale) override {
     if (image_skia_reps_.empty())
       return ImageSkiaRep();
 
     const ImageSkiaRep* rep = NULL;
     // gfx::ImageSkia passes one of the resource scale factors. The source
     // should return:
     // 1) The ImageSkiaRep with the highest scale if all available
     // scales are smaller than |scale|.
     // 2) The ImageSkiaRep with the smallest one that is larger than |scale|.
     for (ImageSkiaRepSet::const_iterator iter = image_skia_reps_.begin();
@@ skipping 135 matching lines @@
   }
 
   ImageRepPNG(const std::vector<ImagePNGRep>& image_png_reps)
       : ImageRep(Image::kImageRepPNG),
         image_png_reps_(image_png_reps) {
   }
 
   virtual ~ImageRepPNG() {
   }
 
-  virtual int Width() const OVERRIDE {
+  virtual int Width() const override {
     return Size().width();
   }
 
-  virtual int Height() const OVERRIDE {
+  virtual int Height() const override {
     return Size().height();
   }
 
-  virtual gfx::Size Size() const OVERRIDE {
+  virtual gfx::Size Size() const override {
     // Read the PNG data to get the image size, caching it.
     if (!size_cache_) {
       for (std::vector<ImagePNGRep>::const_iterator it = image_reps().begin();
            it != image_reps().end(); ++it) {
         if (it->scale == 1.0f) {
           size_cache_.reset(new gfx::Size(it->Size()));
           return *size_cache_;
         }
       }
       size_cache_.reset(new gfx::Size);
@@ skipping 17 matching lines @@
  public:
   // Takes ownership of |image|.
   explicit ImageRepSkia(ImageSkia* image)
       : ImageRep(Image::kImageRepSkia),
         image_(image) {
   }
 
   virtual ~ImageRepSkia() {
   }
 
-  virtual int Width() const OVERRIDE {
+  virtual int Width() const override {
     return image_->width();
   }
 
-  virtual int Height() const OVERRIDE {
+  virtual int Height() const override {
     return image_->height();
   }
 
-  virtual gfx::Size Size() const OVERRIDE {
+  virtual gfx::Size Size() const override {
     return image_->size();
   }
 
   ImageSkia* image() { return image_.get(); }
 
  private:
   scoped_ptr<ImageSkia> image_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageRepSkia);
 };
 
 #if defined(OS_IOS)
 class ImageRepCocoaTouch : public ImageRep {
  public:
   explicit ImageRepCocoaTouch(UIImage* image)
       : ImageRep(Image::kImageRepCocoaTouch),
         image_(image) {
     CHECK(image);
   }
 
   virtual ~ImageRepCocoaTouch() {
     base::mac::NSObjectRelease(image_);
     image_ = nil;
   }
 
-  virtual int Width() const OVERRIDE {
+  virtual int Width() const override {
     return Size().width();
   }
 
-  virtual int Height() const OVERRIDE {
+  virtual int Height() const override {
     return Size().height();
   }
 
-  virtual gfx::Size Size() const OVERRIDE {
+  virtual gfx::Size Size() const override {
     return internal::UIImageSize(image_);
   }
 
   UIImage* image() const { return image_; }
 
  private:
   UIImage* image_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageRepCocoaTouch);
 };
 #elif defined(OS_MACOSX)
 class ImageRepCocoa : public ImageRep {
  public:
   explicit ImageRepCocoa(NSImage* image)
       : ImageRep(Image::kImageRepCocoa),
         image_(image) {
     CHECK(image);
   }
 
   virtual ~ImageRepCocoa() {
     base::mac::NSObjectRelease(image_);
     image_ = nil;
   }
 
-  virtual int Width() const OVERRIDE {
+  virtual int Width() const override {
     return Size().width();
   }
 
-  virtual int Height() const OVERRIDE {
+  virtual int Height() const override {
     return Size().height();
   }
 
-  virtual gfx::Size Size() const OVERRIDE {
+  virtual gfx::Size Size() const override {
     return internal::NSImageSize(image_);
   }
 
   NSImage* image() const { return image_; }
 
  private:
   NSImage* image_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageRepCocoa);
 };
@@ skipping 411 matching lines @@
   }
   return it->second;
 }
 
 void Image::AddRepresentation(internal::ImageRep* rep) const {
   CHECK(storage_.get());
   storage_->representations().insert(std::make_pair(rep->type(), rep));
 }
 
 }  // namespace gfx