replace OVERRIDE and FINAL with override and final in athena/

athena/home/athena_start_page_view.cc

 // Copyright 2014 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 "athena/home/athena_start_page_view.h"
 
 #include "athena/home/home_card_constants.h"
 #include "athena/system/public/system_ui.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
@@ skipping 55 matching lines @@
         gfx::Point(kIconSize / 2, kIconSize / 2), kIconSize / 2, paint);
 
     scoped_ptr<gfx::ImageSkia> image(
         new gfx::ImageSkia(canvas.ExtractImageRep()));
     SetImage(STATE_NORMAL, image.get());
   }
 
  private:
   // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE {
+                             const ui::Event& event) override {
     // Do nothing: remove these place holders.
   }
 
   DISALLOW_COPY_AND_ASSIGN(PlaceHolderButton);
 };
 
 class AppIconButton : public views::ImageButton,
                       public views::ButtonListener {
  public:
   explicit AppIconButton(app_list::AppListItem* item)
       : ImageButton(this),
         item_(item) {
     // TODO(mukai): icon should be resized.
     SetImage(STATE_NORMAL, &item->icon());
   }
 
  private:
   // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE {
+                             const ui::Event& event) override {
     DCHECK_EQ(sender, this);
     item_->Activate(event.flags());
   }
 
   app_list::AppListItem* item_;
 
   DISALLOW_COPY_AND_ASSIGN(AppIconButton);
 };
 
 // The background to paint the round rectangle of the view area.
 class RoundRectBackground : public views::Background {
  public:
   RoundRectBackground(SkColor color, int corner_radius)
       : color_(color),
         corner_radius_(corner_radius) {}
   virtual ~RoundRectBackground() {}
 
  private:
   // views::Background:
-  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
+  virtual void Paint(gfx::Canvas* canvas, views::View* view) const override {
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(color_);
     canvas->DrawRoundRect(view->GetContentsBounds(), corner_radius_, paint);
   }
 
   SkColor color_;
   int corner_radius_;
 
   DISALLOW_COPY_AND_ASSIGN(RoundRectBackground);
 };
 
 class SearchBoxContainer : public views::View {
  public:
   explicit SearchBoxContainer(app_list::SearchBoxView* search_box)
       : search_box_(search_box) {
     search_box->set_background(
         new RoundRectBackground(SK_ColorWHITE, kSearchBoxCornerRadius));
     search_box->SetBorder(views::Border::CreateBorderPainter(
         new views::RoundRectPainter(SK_ColorGRAY, kSearchBoxCornerRadius),
         gfx::Insets(kSearchBoxBorderWidth, kSearchBoxBorderWidth,
                     kSearchBoxBorderWidth, kSearchBoxBorderWidth)));
     SetLayoutManager(new views::FillLayout());
     AddChildView(search_box_);
   }
   virtual ~SearchBoxContainer() {}
 
  private:
   // views::View:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE {
+  virtual gfx::Size GetPreferredSize() const override {
     return gfx::Size(kSearchBoxWidth, kSearchBoxHeight);
   }
 
   // Owned by the views hierarchy.
   app_list::SearchBoxView* search_box_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBoxContainer);
 };
 
 }  // namespace
@@ skipping 275 matching lines @@
   base::TrimWhitespace(
       delegate_->GetModel()->search_box()->text(), base::TRIM_ALL, &query);
 
   if (!query.empty())
     search_results_view_->SetSelectedIndex(0);
 
   LayoutSearchResults(!query.empty());
 }
 
 }  // namespace athena