replace OVERRIDE and FINAL with override and final in ash/

BUG=417463 Review URL: https://codereview.chromium.org/621133002 Cr-Commit-Position: refs/heads/master@{#298040}
280723148 · Oct 3, 2014 · 10d6b38 · 10d6b38
1 parent 90b32ca
commit 10d6b38
Show file tree

Hide file tree

Showing 421 changed files with 2,280 additions and 2,280 deletions.
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h
@@ -96,8 +96,8 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
   AcceleratorProcessingRestriction GetCurrentAcceleratorRestriction();
 
   // Overridden from ui::AcceleratorTarget:
-  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
-  virtual bool CanHandleAccelerators() const OVERRIDE;
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+  virtual bool CanHandleAccelerators() const override;
 
   void SetBrightnessControlDelegate(
       scoped_ptr<BrightnessControlDelegate> brightness_control_delegate);

diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
@@ -63,8 +63,8 @@ class TestTarget : public ui::AcceleratorTarget {
   }
 
   // Overridden from ui::AcceleratorTarget:
-  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
-  virtual bool CanHandleAccelerators() const OVERRIDE;
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+  virtual bool CanHandleAccelerators() const override;
 
  private:
   int accelerator_pressed_count_;
@@ -91,19 +91,19 @@ class DummyBrightnessControlDelegate : public BrightnessControlDelegate {
   virtual ~DummyBrightnessControlDelegate() {}
 
   virtual bool HandleBrightnessDown(
-      const ui::Accelerator& accelerator) OVERRIDE {
+      const ui::Accelerator& accelerator) override {
     ++handle_brightness_down_count_;
     last_accelerator_ = accelerator;
     return consume_;
   }
-  virtual bool HandleBrightnessUp(const ui::Accelerator& accelerator) OVERRIDE {
+  virtual bool HandleBrightnessUp(const ui::Accelerator& accelerator) override {
     ++handle_brightness_up_count_;
     last_accelerator_ = accelerator;
     return consume_;
   }
-  virtual void SetBrightnessPercent(double percent, bool gradual) OVERRIDE {}
+  virtual void SetBrightnessPercent(double percent, bool gradual) override {}
   virtual void GetBrightnessPercent(
-      const base::Callback<void(double)>& callback) OVERRIDE {
+      const base::Callback<void(double)>& callback) override {
     callback.Run(100.0);
   }
 
@@ -136,15 +136,15 @@ class DummyImeControlDelegate : public ImeControlDelegate {
   }
   virtual ~DummyImeControlDelegate() {}
 
-  virtual void HandleNextIme() OVERRIDE {
+  virtual void HandleNextIme() override {
     ++handle_next_ime_count_;
   }
-  virtual bool HandlePreviousIme(const ui::Accelerator& accelerator) OVERRIDE {
+  virtual bool HandlePreviousIme(const ui::Accelerator& accelerator) override {
     ++handle_previous_ime_count_;
     last_accelerator_ = accelerator;
     return consume_;
   }
-  virtual bool HandleSwitchIme(const ui::Accelerator& accelerator) OVERRIDE {
+  virtual bool HandleSwitchIme(const ui::Accelerator& accelerator) override {
     ++handle_switch_ime_count_;
     last_accelerator_ = accelerator;
     return consume_;
@@ -163,7 +163,7 @@ class DummyImeControlDelegate : public ImeControlDelegate {
     return last_accelerator_;
   }
   virtual ui::Accelerator RemapAccelerator(
-      const ui::Accelerator& accelerator) OVERRIDE {
+      const ui::Accelerator& accelerator) override {
     return ui::Accelerator(accelerator);
   }
 
@@ -188,14 +188,14 @@ class DummyKeyboardBrightnessControlDelegate
   virtual ~DummyKeyboardBrightnessControlDelegate() {}
 
   virtual bool HandleKeyboardBrightnessDown(
-      const ui::Accelerator& accelerator) OVERRIDE {
+      const ui::Accelerator& accelerator) override {
     ++handle_keyboard_brightness_down_count_;
     last_accelerator_ = accelerator;
     return consume_;
   }
 
   virtual bool HandleKeyboardBrightnessUp(
-      const ui::Accelerator& accelerator) OVERRIDE {
+      const ui::Accelerator& accelerator) override {
     ++handle_keyboard_brightness_up_count_;
     last_accelerator_ = accelerator;
     return consume_;
@@ -1101,7 +1101,7 @@ class PreferredReservedAcceleratorsTest : public test::AshTestBase {
   virtual ~PreferredReservedAcceleratorsTest() {}
 
   // test::AshTestBase:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AshTestBase::SetUp();
     Shell::GetInstance()->lock_state_controller()->
         set_animator_for_test(new test::TestSessionStateAnimator);

diff --git a/ash/accelerators/accelerator_delegate.h b/ash/accelerators/accelerator_delegate.h
@@ -20,7 +20,7 @@ class ASH_EXPORT AcceleratorDelegate
   // wm::AcceleratorDelegate:
   virtual bool ProcessAccelerator(const ui::KeyEvent& event,
                                   const ui::Accelerator& accelerator,
-                                  KeyType key_type) OVERRIDE;
+                                  KeyType key_type) override;
 
  private:
   // Returns true if the window should be allowed a chance to handle

diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc
@@ -68,19 +68,19 @@ class ExitWarningWidgetDelegateView : public views::WidgetDelegateView {
     SetLayoutManager(new views::FillLayout);
   }
 
-  virtual gfx::Size GetPreferredSize() const OVERRIDE {
+  virtual gfx::Size GetPreferredSize() const override {
     return gfx::Size(width_, height_);
   }
 
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+  virtual void OnPaint(gfx::Canvas* canvas) override {
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(kWindowBackgroundColor);
     canvas->DrawRoundRect(GetLocalBounds(), kWindowCornerRadius, paint);
     views::WidgetDelegateView::OnPaint(canvas);
   }
 
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE {
+  virtual void GetAccessibleState(ui::AXViewState* state) override {
     state->name = accessible_name_;
     state->role = ui::AX_ROLE_ALERT;
   }

diff --git a/ash/accelerators/focus_manager_factory.h b/ash/accelerators/focus_manager_factory.h
@@ -23,16 +23,16 @@ class AshFocusManagerFactory : public views::FocusManagerFactory {
   // views::FocusManagerFactory overrides:
   virtual views::FocusManager* CreateFocusManager(
       views::Widget* widget,
-      bool desktop_widget) OVERRIDE;
+      bool desktop_widget) override;
 
  private:
   class Delegate : public views::FocusManagerDelegate {
    public:
     // views::FocusManagerDelegate overrides:
     virtual bool ProcessAccelerator(
-        const ui::Accelerator& accelerator) OVERRIDE;
+        const ui::Accelerator& accelerator) override;
     virtual ui::AcceleratorTarget* GetCurrentTargetForAccelerator(
-        const ui::Accelerator& accelerator) const OVERRIDE;
+        const ui::Accelerator& accelerator) const override;
   };
 
   DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory);

diff --git a/ash/accelerators/key_hold_detector.h b/ash/accelerators/key_hold_detector.h
@@ -42,7 +42,7 @@ class ASH_EXPORT KeyHoldDetector : public ui::EventHandler {
   virtual ~KeyHoldDetector();
 
   // ui::EventHandler overrides:
-  virtual void OnKeyEvent(ui::KeyEvent* key_event) OVERRIDE;
+  virtual void OnKeyEvent(ui::KeyEvent* key_event) override;
 
  private:
   // A state to keep track of one click and click and hold operation.

diff --git a/ash/accelerators/magnifier_key_scroller.h b/ash/accelerators/magnifier_key_scroller.h
@@ -39,10 +39,10 @@ class ASH_EXPORT MagnifierKeyScroller : public KeyHoldDetector::Delegate {
 
  private:
   // KeyHoldDetector overrides:
-  virtual bool ShouldProcessEvent(const ui::KeyEvent* event) const OVERRIDE;
-  virtual bool IsStartEvent(const ui::KeyEvent* event) const OVERRIDE;
-  virtual void OnKeyHold(const ui::KeyEvent* event) OVERRIDE;
-  virtual void OnKeyUnhold(const ui::KeyEvent* event) OVERRIDE;
+  virtual bool ShouldProcessEvent(const ui::KeyEvent* event) const override;
+  virtual bool IsStartEvent(const ui::KeyEvent* event) const override;
+  virtual void OnKeyHold(const ui::KeyEvent* event) override;
+  virtual void OnKeyUnhold(const ui::KeyEvent* event) override;
 
   MagnifierKeyScroller();
   virtual ~MagnifierKeyScroller();

diff --git a/ash/accelerators/magnifier_key_scroller_unittest.cc b/ash/accelerators/magnifier_key_scroller_unittest.cc
@@ -20,7 +20,7 @@ class KeyEventDelegate : public aura::test::TestWindowDelegate {
   virtual ~KeyEventDelegate() {}
 
   // ui::EventHandler overrides:
-  virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
+  virtual void OnKeyEvent(ui::KeyEvent* event) override {
     key_event.reset(new ui::KeyEvent(
         event->type(), event->key_code(), event->flags()));
   }

diff --git a/ash/accelerators/nested_accelerator_delegate.h b/ash/accelerators/nested_accelerator_delegate.h
@@ -17,7 +17,7 @@ class NestedAcceleratorDelegate : public wm::NestedAcceleratorDelegate {
 
   // wm::AcceleratorDispatcher::Delegate
   virtual Result ProcessAccelerator(
-      const ui::Accelerator& accelerator) OVERRIDE;
+      const ui::Accelerator& accelerator) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorDelegate);

diff --git a/ash/accelerators/spoken_feedback_toggler.h b/ash/accelerators/spoken_feedback_toggler.h
@@ -39,10 +39,10 @@ class ASH_EXPORT SpokenFeedbackToggler : public KeyHoldDetector::Delegate {
 
  private:
   // KeyHoldDetector overrides:
-  virtual bool ShouldProcessEvent(const ui::KeyEvent* event) const OVERRIDE;
-  virtual bool IsStartEvent(const ui::KeyEvent* event) const OVERRIDE;
-  virtual void OnKeyHold(const ui::KeyEvent* event) OVERRIDE;
-  virtual void OnKeyUnhold(const ui::KeyEvent* event) OVERRIDE;
+  virtual bool ShouldProcessEvent(const ui::KeyEvent* event) const override;
+  virtual bool IsStartEvent(const ui::KeyEvent* event) const override;
+  virtual void OnKeyHold(const ui::KeyEvent* event) override;
+  virtual void OnKeyUnhold(const ui::KeyEvent* event) override;
 
   SpokenFeedbackToggler();
   virtual ~SpokenFeedbackToggler();

diff --git a/ash/accelerometer/accelerometer_controller.h b/ash/accelerometer/accelerometer_controller.h
@@ -47,7 +47,7 @@ class ASH_EXPORT AccelerometerController
   // override a method.
   // chromeos::AccelerometerReader::Delegate:
   virtual void HandleAccelerometerUpdate(
-      const ui::AccelerometerUpdate& update) OVERRIDE;
+      const ui::AccelerometerUpdate& update) override;
 #endif
 
  private:

diff --git a/ash/ash_touch_exploration_manager_chromeos.h b/ash/ash_touch_exploration_manager_chromeos.h
@@ -30,15 +30,15 @@ class ASH_EXPORT AshTouchExplorationManager
 
   // AccessibilityObserver overrides:
   virtual void OnAccessibilityModeChanged(
-      AccessibilityNotificationVisibility notify) OVERRIDE;
+      AccessibilityNotificationVisibility notify) override;
 
   // TouchExplorationControllerDelegate overrides:
-  virtual void SetOutputLevel(int volume) OVERRIDE;
-  virtual void SilenceSpokenFeedback() OVERRIDE;
-  virtual void PlayVolumeAdjustEarcon() OVERRIDE;
-  virtual void PlayPassthroughEarcon() OVERRIDE;
-  virtual void PlayExitScreenEarcon() OVERRIDE;
-  virtual void PlayEnterScreenEarcon() OVERRIDE;
+  virtual void SetOutputLevel(int volume) override;
+  virtual void SilenceSpokenFeedback() override;
+  virtual void PlayVolumeAdjustEarcon() override;
+  virtual void PlayPassthroughEarcon() override;
+  virtual void PlayExitScreenEarcon() override;
+  virtual void PlayEnterScreenEarcon() override;
 
  private:
   void UpdateTouchExplorationState();

diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc
@@ -49,17 +49,17 @@ class AutoclickControllerImpl : public AutoclickController,
 
  private:
   // AutoclickController overrides:
-  virtual void SetEnabled(bool enabled) OVERRIDE;
-  virtual bool IsEnabled() const OVERRIDE;
-  virtual void SetAutoclickDelay(int delay_ms) OVERRIDE;
-  virtual int GetAutoclickDelay() const OVERRIDE;
+  virtual void SetEnabled(bool enabled) override;
+  virtual bool IsEnabled() const override;
+  virtual void SetAutoclickDelay(int delay_ms) override;
+  virtual int GetAutoclickDelay() const override;
 
   // ui::EventHandler overrides:
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
-  virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
-  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
-  virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
+  virtual void OnMouseEvent(ui::MouseEvent* event) override;
+  virtual void OnKeyEvent(ui::KeyEvent* event) override;
+  virtual void OnTouchEvent(ui::TouchEvent* event) override;
+  virtual void OnGestureEvent(ui::GestureEvent* event) override;
+  virtual void OnScrollEvent(ui::ScrollEvent* event) override;
 
   void InitClickTimer();
 

diff --git a/ash/autoclick/autoclick_unittest.cc b/ash/autoclick/autoclick_unittest.cc
@@ -25,7 +25,7 @@ class MouseEventCapturer : public ui::EventHandler {
     events_.clear();
   }
 
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual void OnMouseEvent(ui::MouseEvent* event) override {
     if (!(event->flags() & ui::EF_LEFT_MOUSE_BUTTON))
       return;
     // Filter out extraneous mouse events like mouse entered, exited,
@@ -64,7 +64,7 @@ class AutoclickTest : public test::AshTestBase {
   AutoclickTest() {}
   virtual ~AutoclickTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     test::AshTestBase::SetUp();
     Shell::GetInstance()->AddPreTargetHandler(&mouse_event_capturer_);
     GetAutoclickController()->SetAutoclickDelay(0);
@@ -73,7 +73,7 @@ class AutoclickTest : public test::AshTestBase {
     GetEventGenerator().MoveMouseTo(100, 100);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     Shell::GetInstance()->RemovePreTargetHandler(&mouse_event_capturer_);
     test::AshTestBase::TearDown();
   }

diff --git a/ash/content_support/gpu_support_impl.h b/ash/content_support/gpu_support_impl.h
@@ -18,10 +18,10 @@ class ASH_WITH_CONTENT_EXPORT GPUSupportImpl : public GPUSupport {
 
  private:
   // Overridden from GPUSupport:
-  virtual bool IsPanelFittingDisabled() const OVERRIDE;
-  virtual void DisableGpuWatchdog() OVERRIDE;
+  virtual bool IsPanelFittingDisabled() const override;
+  virtual void DisableGpuWatchdog() override;
   virtual void GetGpuProcessHandles(
-      const GetGpuProcessHandlesCallback& callback) const OVERRIDE;
+      const GetGpuProcessHandlesCallback& callback) const override;
 
   DISALLOW_COPY_AND_ASSIGN(GPUSupportImpl);
 };

diff --git a/ash/default_accessibility_delegate.h b/ash/default_accessibility_delegate.h
@@ -17,30 +17,30 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {
   DefaultAccessibilityDelegate();
   virtual ~DefaultAccessibilityDelegate();
 
-  virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;
-  virtual void ToggleHighContrast() OVERRIDE;
-  virtual bool IsHighContrastEnabled() const OVERRIDE;
-  virtual void SetMagnifierEnabled(bool enabled) OVERRIDE;
-  virtual void SetMagnifierType(MagnifierType type) OVERRIDE;
-  virtual bool IsMagnifierEnabled() const OVERRIDE;
-  virtual MagnifierType GetMagnifierType() const OVERRIDE;
-  virtual void SetLargeCursorEnabled(bool enabled) OVERRIDE;
-  virtual bool IsLargeCursorEnabled() const OVERRIDE;
-  virtual void SetAutoclickEnabled(bool enabled) OVERRIDE;
-  virtual bool IsAutoclickEnabled() const OVERRIDE;
-  virtual void SetVirtualKeyboardEnabled(bool enabled) OVERRIDE;
-  virtual bool IsVirtualKeyboardEnabled() const OVERRIDE;
-  virtual bool ShouldShowAccessibilityMenu() const OVERRIDE;
-  virtual bool IsBrailleDisplayConnected() const OVERRIDE;
-  virtual void SilenceSpokenFeedback() const OVERRIDE;
+  virtual bool IsSpokenFeedbackEnabled() const override;
+  virtual void ToggleHighContrast() override;
+  virtual bool IsHighContrastEnabled() const override;
+  virtual void SetMagnifierEnabled(bool enabled) override;
+  virtual void SetMagnifierType(MagnifierType type) override;
+  virtual bool IsMagnifierEnabled() const override;
+  virtual MagnifierType GetMagnifierType() const override;
+  virtual void SetLargeCursorEnabled(bool enabled) override;
+  virtual bool IsLargeCursorEnabled() const override;
+  virtual void SetAutoclickEnabled(bool enabled) override;
+  virtual bool IsAutoclickEnabled() const override;
+  virtual void SetVirtualKeyboardEnabled(bool enabled) override;
+  virtual bool IsVirtualKeyboardEnabled() const override;
+  virtual bool ShouldShowAccessibilityMenu() const override;
+  virtual bool IsBrailleDisplayConnected() const override;
+  virtual void SilenceSpokenFeedback() const override;
   virtual void ToggleSpokenFeedback(
-      AccessibilityNotificationVisibility notify) OVERRIDE;
-  virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
-  virtual double GetSavedScreenMagnifierScale() OVERRIDE;
-  virtual void TriggerAccessibilityAlert(AccessibilityAlert alert) OVERRIDE;
-  virtual AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE;
-  virtual void PlayEarcon(int sound_key) OVERRIDE;
-  virtual base::TimeDelta PlayShutdownSound() const OVERRIDE;
+      AccessibilityNotificationVisibility notify) override;
+  virtual void SaveScreenMagnifierScale(double scale) override;
+  virtual double GetSavedScreenMagnifierScale() override;
+  virtual void TriggerAccessibilityAlert(AccessibilityAlert alert) override;
+  virtual AccessibilityAlert GetLastAccessibilityAlert() override;
+  virtual void PlayEarcon(int sound_key) override;
+  virtual base::TimeDelta PlayShutdownSound() const override;
 
  private:
   bool spoken_feedback_enabled_;

diff --git a/ash/default_user_wallpaper_delegate.h b/ash/default_user_wallpaper_delegate.h
@@ -18,17 +18,17 @@ class ASH_EXPORT DefaultUserWallpaperDelegate : public UserWallpaperDelegate {
   virtual ~DefaultUserWallpaperDelegate() {}
 
   // UserWallpaperDelegate overrides:
-  virtual int GetAnimationType() OVERRIDE;
-  virtual int GetAnimationDurationOverride() OVERRIDE;
+  virtual int GetAnimationType() override;
+  virtual int GetAnimationDurationOverride() override;
   virtual void SetAnimationDurationOverride(
-      int animation_duration_in_ms) OVERRIDE;
-  virtual bool ShouldShowInitialAnimation() OVERRIDE;
-  virtual void UpdateWallpaper(bool clear_cache) OVERRIDE;
-  virtual void InitializeWallpaper() OVERRIDE;
-  virtual void OpenSetWallpaperPage() OVERRIDE;
-  virtual bool CanOpenSetWallpaperPage() OVERRIDE;
-  virtual void OnWallpaperAnimationFinished() OVERRIDE;
-  virtual void OnWallpaperBootAnimationFinished() OVERRIDE;
+      int animation_duration_in_ms) override;
+  virtual bool ShouldShowInitialAnimation() override;
+  virtual void UpdateWallpaper(bool clear_cache) override;
+  virtual void InitializeWallpaper() override;
+  virtual void OpenSetWallpaperPage() override;
+  virtual bool CanOpenSetWallpaperPage() override;
+  virtual void OnWallpaperAnimationFinished() override;
+  virtual void OnWallpaperBootAnimationFinished() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultUserWallpaperDelegate);