replace OVERRIDE and FINAL with override and final in athena/

BUG=417463

Review URL: https://codereview.chromium.org/623103002

Cr-Commit-Position: refs/heads/master@{#298050}

8 files changed, 64 insertions, 64 deletions

diff --git a/athena/home/app_list_view_delegate.h b/athena/home/app_list_view_delegate.h
index 7ea9240..8bf25d5 100644
--- a/athena/home/app_list_view_delegate.h
+++ b/athena/home/app_list_view_delegate.h
@@ -27,39 +27,39 @@ class AppListViewDelegate : public app_list::AppListViewDelegate {
   void SearchResultChanged();
 
   // Overridden from app_list::AppListViewDelegate:
-  virtual bool ForceNativeDesktop() const OVERRIDE;
-  virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE;
-  virtual app_list::AppListModel* GetModel() OVERRIDE;
-  virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE;
+  virtual bool ForceNativeDesktop() const override;
+  virtual void SetProfileByPath(const base::FilePath& profile_path) override;
+  virtual app_list::AppListModel* GetModel() override;
+  virtual app_list::SpeechUIModel* GetSpeechUI() override;
   virtual void GetShortcutPathForApp(
       const std::string& app_id,
-      const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE;
-  virtual void StartSearch() OVERRIDE;
-  virtual void StopSearch() OVERRIDE;
+      const base::Callback<void(const base::FilePath&)>& callback) override;
+  virtual void StartSearch() override;
+  virtual void StopSearch() override;
   virtual void OpenSearchResult(app_list::SearchResult* result,
                                 bool auto_launch,
-                                int event_flags) OVERRIDE;
+                                int event_flags) override;
   virtual void InvokeSearchResultAction(app_list::SearchResult* result,
                                         int action_index,
-                                        int event_flags) OVERRIDE;
-  virtual base::TimeDelta GetAutoLaunchTimeout() OVERRIDE;
-  virtual void AutoLaunchCanceled() OVERRIDE;
-  virtual void ViewInitialized() OVERRIDE;
-  virtual void Dismiss() OVERRIDE;
-  virtual void ViewClosing() OVERRIDE;
-  virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
-  virtual void OpenSettings() OVERRIDE;
-  virtual void OpenHelp() OVERRIDE;
-  virtual void OpenFeedback() OVERRIDE;
-  virtual void ToggleSpeechRecognition() OVERRIDE;
+                                        int event_flags) override;
+  virtual base::TimeDelta GetAutoLaunchTimeout() override;
+  virtual void AutoLaunchCanceled() override;
+  virtual void ViewInitialized() override;
+  virtual void Dismiss() override;
+  virtual void ViewClosing() override;
+  virtual gfx::ImageSkia GetWindowIcon() override;
+  virtual void OpenSettings() override;
+  virtual void OpenHelp() override;
+  virtual void OpenFeedback() override;
+  virtual void ToggleSpeechRecognition() override;
   virtual void ShowForProfileByPath(
-      const base::FilePath& profile_path) OVERRIDE;
-  virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE;
+      const base::FilePath& profile_path) override;
+  virtual views::View* CreateStartPageWebView(const gfx::Size& size) override;
   virtual std::vector<views::View*> CreateCustomPageWebViews(
-      const gfx::Size& size) OVERRIDE;
-  virtual bool IsSpeechRecognitionEnabled() OVERRIDE;
-  virtual const Users& GetUsers() const OVERRIDE;
-  virtual bool ShouldCenterWindow() const OVERRIDE;
+      const gfx::Size& size) override;
+  virtual bool IsSpeechRecognitionEnabled() override;
+  virtual const Users& GetUsers() const override;
+  virtual bool ShouldCenterWindow() const override;
 
   scoped_ptr<app_list::AppListModel> model_;
   scoped_ptr<app_list::SpeechUIModel> speech_ui_;
diff --git a/athena/home/athena_start_page_view.cc b/athena/home/athena_start_page_view.cc
index 4a65100..7058a84 100644
--- a/athena/home/athena_start_page_view.cc
+++ b/athena/home/athena_start_page_view.cc
@@ -73,7 +73,7 @@ class PlaceHolderButton : public views::ImageButton,
  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.
   }
 
@@ -93,7 +93,7 @@ class AppIconButton : public views::ImageButton,
  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());
   }
@@ -113,7 +113,7 @@ class RoundRectBackground : public views::Background {
 
  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_);
@@ -143,7 +143,7 @@ class SearchBoxContainer : public views::View {
 
  private:
   // views::View:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE {
+  virtual gfx::Size GetPreferredSize() const override {
     return gfx::Size(kSearchBoxWidth, kSearchBoxHeight);
   }
 
diff --git a/athena/home/athena_start_page_view.h b/athena/home/athena_start_page_view.h
index fda3ab6..d21404d 100644
--- a/athena/home/athena_start_page_view.h
+++ b/athena/home/athena_start_page_view.h
@@ -69,11 +69,11 @@ class ATHENA_EXPORT AthenaStartPageView
   void OnSearchResultLayoutAnimationCompleted(bool should_show_search_results);
 
   // views::View:
-  virtual void Layout() OVERRIDE;
-  virtual bool OnKeyPressed(const ui::KeyEvent& key_event) OVERRIDE;
+  virtual void Layout() override;
+  virtual bool OnKeyPressed(const ui::KeyEvent& key_event) override;
 
   // app_list::SearchBoxViewDelegate:
-  virtual void QueryChanged(app_list::SearchBoxView* sender) OVERRIDE;
+  virtual void QueryChanged(app_list::SearchBoxView* sender) override;
 
   // Not owned.
   app_list::AppListViewDelegate* delegate_;
diff --git a/athena/home/athena_start_page_view_unittest.cc b/athena/home/athena_start_page_view_unittest.cc
index 2598c9a..aa11f57 100644
--- a/athena/home/athena_start_page_view_unittest.cc
+++ b/athena/home/athena_start_page_view_unittest.cc
@@ -33,7 +33,7 @@ class AthenaTestViewDelegate : public app_list::test::AppListTestViewDelegate {
 
  private:
   // app_list::AppListViewDelegate:
-  virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE {
+  virtual views::View* CreateStartPageWebView(const gfx::Size& size) override {
     return new views::View();
   }
 
@@ -46,7 +46,7 @@ class AthenaStartPageViewTest : public test::AthenaTestBase {
   virtual ~AthenaStartPageViewTest() {}
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     test::AthenaTestBase::SetUp();
     app_list::test::AppListTestModel* model = view_delegate_.GetTestModel();
     for (size_t i = 0; i < kNumApps; ++i) {
@@ -57,7 +57,7 @@ class AthenaStartPageViewTest : public test::AthenaTestBase {
     view_.reset(new AthenaStartPageView(&view_delegate_));
     SetSize(gfx::Size(1280, 800));
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     view_.reset();
     test::AthenaTestBase::TearDown();
   }
diff --git a/athena/home/home_card_gesture_manager_unittest.cc b/athena/home/home_card_gesture_manager_unittest.cc
index 47f03c8..3769250 100644
--- a/athena/home/home_card_gesture_manager_unittest.cc
+++ b/athena/home/home_card_gesture_manager_unittest.cc
@@ -28,7 +28,7 @@ class HomeCardGestureManagerTest : public test::AthenaTestBase,
   virtual ~HomeCardGestureManagerTest() {}
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     test::AthenaTestBase::SetUp();
     gesture_manager_.reset(new HomeCardGestureManager(this, screen_bounds()));
   }
@@ -97,7 +97,7 @@ class HomeCardGestureManagerTest : public test::AthenaTestBase,
 
   // HomeCardGestureManager::Delegate:
   virtual void OnGestureEnded(HomeCard::State final_state,
-                              bool is_fling) OVERRIDE {
+                              bool is_fling) override {
     final_state_ = final_state;
     was_fling_ = is_fling;
     ++end_count_;
@@ -105,7 +105,7 @@ class HomeCardGestureManagerTest : public test::AthenaTestBase,
 
   virtual void OnGestureProgressed(HomeCard::State from_state,
                                    HomeCard::State to_state,
-                                   float progress) OVERRIDE {
+                                   float progress) override {
     last_from_state_ = from_state;
     last_to_state_ = to_state;
     last_progress_ = progress;
diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc
index 3b285fb..c96af41 100644
--- a/athena/home/home_card_impl.cc
+++ b/athena/home/home_card_impl.cc
@@ -106,29 +106,29 @@ class HomeCardLayoutManager : public aura::LayoutManager {
   }
 
   // aura::LayoutManager:
-  virtual void OnWindowResized() OVERRIDE {
+  virtual void OnWindowResized() override {
     Layout(false, gfx::Tween::LINEAR);
     UpdateMinimizedHomeBounds();
   }
-  virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
+  virtual void OnWindowAddedToLayout(aura::Window* child) override {
     if (!home_card_) {
       home_card_ = child;
       Layout(false, gfx::Tween::LINEAR);
     }
   }
-  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {
+  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {
     if (home_card_ == child)
       home_card_ = NULL;
   }
-  virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {
+  virtual void OnWindowRemovedFromLayout(aura::Window* child) override {
   }
   virtual void OnChildWindowVisibilityChanged(aura::Window* child,
-                                              bool visible) OVERRIDE {
+                                              bool visible) override {
     if (home_card_ == child)
       Layout(false, gfx::Tween::LINEAR);
   }
   virtual void SetChildBounds(aura::Window* child,
-                              const gfx::Rect& requested_bounds) OVERRIDE {
+                              const gfx::Rect& requested_bounds) override {
     SetChildBoundsDirect(child, requested_bounds);
   }
 
@@ -183,7 +183,7 @@ class HomeCardView : public views::WidgetDelegateView {
   }
 
   // views::View:
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
+  virtual void OnGestureEvent(ui::GestureEvent* event) override {
     if (!gesture_manager_ &&
         event->type() == ui::ET_GESTURE_SCROLL_BEGIN) {
       gesture_manager_.reset(new HomeCardGestureManager(
@@ -194,7 +194,7 @@ class HomeCardView : public views::WidgetDelegateView {
     if (gesture_manager_)
       gesture_manager_->ProcessGestureEvent(event);
   }
-  virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
+  virtual bool OnMousePressed(const ui::MouseEvent& event) override {
     if (HomeCard::Get()->GetState() == HomeCard::VISIBLE_MINIMIZED &&
         event.IsLeftMouseButton() && event.GetClickCount() == 1) {
       athena::WindowManager::Get()->ToggleOverview();
@@ -211,7 +211,7 @@ class HomeCardView : public views::WidgetDelegateView {
   }
 
   // views::WidgetDelegate:
-  virtual views::View* GetContentsView() OVERRIDE {
+  virtual views::View* GetContentsView() override {
     return this;
   }
 
diff --git a/athena/home/home_card_impl.h b/athena/home/home_card_impl.h
index 1235095..0f7b330 100644
--- a/athena/home/home_card_impl.h
+++ b/athena/home/home_card_impl.h
@@ -63,35 +63,35 @@ class ATHENA_EXPORT HomeCardImpl
   void InstallAccelerators();
 
   // Overridden from HomeCard:
-  virtual void SetState(HomeCard::State state) OVERRIDE;
-  virtual State GetState() OVERRIDE;
+  virtual void SetState(HomeCard::State state) override;
+  virtual State GetState() override;
   virtual void RegisterSearchProvider(
-      app_list::SearchProvider* search_provider) OVERRIDE;
+      app_list::SearchProvider* search_provider) override;
   virtual void UpdateVirtualKeyboardBounds(
-      const gfx::Rect& bounds) OVERRIDE;
+      const gfx::Rect& bounds) override;
 
   // AcceleratorHandler:
-  virtual bool IsCommandEnabled(int command_id) const OVERRIDE;
+  virtual bool IsCommandEnabled(int command_id) const override;
   virtual bool OnAcceleratorFired(int command_id,
-                                  const ui::Accelerator& accelerator) OVERRIDE;
+                                  const ui::Accelerator& accelerator) override;
 
   // HomeCardGestureManager::Delegate:
   virtual void OnGestureEnded(HomeCard::State final_state,
-                              bool is_fling) OVERRIDE;
+                              bool is_fling) override;
   virtual void OnGestureProgressed(
       HomeCard::State from_state,
       HomeCard::State to_state,
-      float progress) OVERRIDE;
+      float progress) override;
 
   // WindowManagerObserver:
-  virtual void OnOverviewModeEnter() OVERRIDE;
-  virtual void OnOverviewModeExit() OVERRIDE;
-  virtual void OnSplitViewModeEnter() OVERRIDE;
-  virtual void OnSplitViewModeExit() OVERRIDE;
+  virtual void OnOverviewModeEnter() override;
+  virtual void OnOverviewModeExit() override;
+  virtual void OnSplitViewModeEnter() override;
+  virtual void OnSplitViewModeExit() override;
 
   // aura::client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_active,
-                                 aura::Window* lost_active) OVERRIDE;
+                                 aura::Window* lost_active) override;
 
   scoped_ptr<AppModelBuilder> model_builder_;
 
diff --git a/athena/home/minimized_home.cc b/athena/home/minimized_home.cc
index 2b0bafb..a257112 100644
--- a/athena/home/minimized_home.cc
+++ b/athena/home/minimized_home.cc
@@ -26,7 +26,7 @@ class MinimizedHomePainter : public ui::LayerDelegate,
 
  private:
   // ui::LayerDelegate:
-  virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
+  virtual void OnPaintLayer(gfx::Canvas* canvas) override {
     gfx::Rect bounds(layer()->GetTargetBounds().size());
     canvas->FillRect(bounds, SK_ColorBLACK);
     canvas->FillRect(gfx::Rect((bounds.width() - kDragHandleWidth) / 2,
@@ -37,13 +37,13 @@ class MinimizedHomePainter : public ui::LayerDelegate,
   }
 
   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();
   }