replace OVERRIDE and FINAL with override and final in ash/

ash/frame/caption_buttons/frame_size_button_unittest.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 "ash/frame/caption_buttons/frame_size_button.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button.h"
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 13 matching lines @@
 namespace test {
 
 namespace {
 
 class TestWidgetDelegate : public views::WidgetDelegateView {
  public:
   TestWidgetDelegate() {}
   virtual ~TestWidgetDelegate() {}
 
   // Overridden from views::WidgetDelegate:
-  virtual views::View* GetContentsView() OVERRIDE {
+  virtual views::View* GetContentsView() override {
     return this;
   }
-  virtual bool CanResize() const OVERRIDE {
+  virtual bool CanResize() const override {
     return true;
   }
-  virtual bool CanMaximize() const OVERRIDE {
+  virtual bool CanMaximize() const override {
     return true;
   }
-  virtual bool CanMinimize() const OVERRIDE {
+  virtual bool CanMinimize() const override {
     return true;
   }
 
   ash::FrameCaptionButtonContainerView* caption_button_container() {
     return caption_button_container_;
   }
 
  private:
   // Overridden from views::View:
-  virtual void Layout() OVERRIDE {
+  virtual void Layout() override {
     caption_button_container_->Layout();
 
     // Right align the caption button container.
     gfx::Size preferred_size = caption_button_container_->GetPreferredSize();
     caption_button_container_->SetBounds(width() - preferred_size.width(), 0,
         preferred_size.width(), preferred_size.height());
   }
 
   virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE {
+      const ViewHierarchyChangedDetails& details) override {
     if (details.is_add && details.child == this) {
       caption_button_container_ = new FrameCaptionButtonContainerView(
           GetWidget(), FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
 
       // Set arbitrary images for the container's buttons so that the buttons
       // have non-empty sizes.
       for (int icon = 0; icon < CAPTION_BUTTON_ICON_COUNT; ++icon) {
         caption_button_container_->SetButtonImages(
             static_cast<CaptionButtonIcon>(icon),
             IDR_AURA_WINDOW_CONTROL_ICON_CLOSE,
@@ skipping 44 matching lines @@
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.context = CurrentContext();
     params.delegate = delegate;
     params.bounds = gfx::Rect(10, 10, 100, 100);
     widget->Init(params);
     widget->Show();
     return widget;
   }
 
   // AshTestBase overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AshTestBase::SetUp();
 
     TestWidgetDelegate* delegate = new TestWidgetDelegate();
     window_state_ = ash::wm::GetWindowState(
         CreateWidget(delegate)->GetNativeWindow());
 
     FrameCaptionButtonContainerView::TestApi test(
         delegate->caption_button_container());
 
     minimize_button_ = test.minimize_button();
@@ skipping 262 matching lines @@
   EXPECT_EQ(views::Button::STATE_NORMAL, minimize_button()->state());
   EXPECT_EQ(views::Button::STATE_PRESSED, size_button()->state());
   EXPECT_EQ(views::Button::STATE_HOVERED, close_button()->state());
 }
 
 class FrameSizeButtonTestRTL : public FrameSizeButtonTest {
  public:
   FrameSizeButtonTestRTL() {}
   virtual ~FrameSizeButtonTestRTL() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     original_locale_ = l10n_util::GetApplicationLocale(std::string());
     base::i18n::SetICUDefaultLocale("he");
 
     FrameSizeButtonTest::SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     FrameSizeButtonTest::TearDown();
     base::i18n::SetICUDefaultLocale(original_locale_);
   }
 
  private:
   std::string original_locale_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameSizeButtonTestRTL);
 };
 
@@ skipping 37 matching lines @@
 
   // None of the buttons should stay pressed and the buttons should have their
   // regular icons.
   EXPECT_TRUE(AllButtonsInNormalState());
   EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon());
   EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon());
 }
 
 }  // namespace test
 }  // namespace ash