diff options
421 files changed, 2280 insertions, 2280 deletions
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h index cc1c914..b0baa9c 100644 --- 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 index 8030a86..c677fea 100644 --- 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 index 37990c6..7027d68 100644 --- 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 index d0d6851..275dc5a 100644 --- a/ash/accelerators/exit_warning_handler.cc +++ b/ash/accelerators/exit_warning_handler.cc @@ -68,11 +68,11 @@ 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); @@ -80,7 +80,7 @@ class ExitWarningWidgetDelegateView : public views::WidgetDelegateView { 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 index cbe27cb..1f6a1cf 100644 --- 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 index b77f4cd..96c89fd 100644 --- 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 index a28db86..1ef78fb 100644 --- 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 index 9de8c95..c8670a7 100644 --- 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 index 1a12851..5a8dfad 100644 --- 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 index 592c71c..067a7d1 100644 --- 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 index 8bda2a6..05489d0 100644 --- 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 index bce2a52..817f242 100644 --- 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 index 95ab012..d331f70f 100644 --- 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 index 2af2dde..7166dae 100644 --- 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 index 7842a29..e7b243d 100644 --- 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 index 70d24e8..86115dc 100644 --- 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 index ad7da6c..42fb1a3 100644 --- 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); diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h index ec9cd5f..e9bf639 100644 --- a/ash/desktop_background/desktop_background_controller.h +++ b/ash/desktop_background/desktop_background_controller.h @@ -97,10 +97,10 @@ class ASH_EXPORT DesktopBackgroundController bool MoveDesktopToUnlockedContainer(); // DisplayController::Observer: - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplayConfigurationChanged() override; // ShellObserver: - virtual void OnRootWindowAdded(aura::Window* root_window) OVERRIDE; + virtual void OnRootWindowAdded(aura::Window* root_window) override; // Returns the maximum size of all displays combined in native // resolutions. Note that this isn't the bounds of the display who diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc index 01a7159..e504f03 100644 --- a/ash/desktop_background/desktop_background_controller_unittest.cc +++ b/ash/desktop_background/desktop_background_controller_unittest.cc @@ -73,7 +73,7 @@ class DesktopBackgroundControllerTest : public test::AshTestBase { } virtual ~DesktopBackgroundControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); // Ash shell initialization creates wallpaper. Reset it so we can manually // control wallpaper creation and animation in our tests. diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index 1c6f6db..3af8599 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -49,7 +49,7 @@ class LayerControlView : public views::View { } // Overrides views::View. - virtual void Layout() OVERRIDE { + virtual void Layout() override { gfx::Display display = Shell::GetScreen()->GetDisplayNearestWindow( GetWidget()->GetNativeView()); DisplayManager* display_manager = Shell::GetInstance()->display_manager(); @@ -83,7 +83,7 @@ class PreEventDispatchHandler : public ui::EventHandler { private: // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { CHECK_EQ(ui::EP_PRETARGET, event->phase()); WindowSelectorController* controller = Shell::GetInstance()->window_selector_controller(); @@ -93,7 +93,7 @@ class PreEventDispatchHandler : public ui::EventHandler { } } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { CHECK_EQ(ui::EP_PRETARGET, event->phase()); WindowSelectorController* controller = Shell::GetInstance()->window_selector_controller(); diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h index 8a598f3..6a93823 100644 --- a/ash/desktop_background/desktop_background_view.h +++ b/ash/desktop_background/desktop_background_view.h @@ -22,13 +22,13 @@ class DesktopBackgroundView : public views::View, private: // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; // Overridden from views::ContextMenuController: virtual void ShowContextMenuForView(views::View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; scoped_ptr<PreEventDispatchHandler> pre_dispatch_handler_; DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView); diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc index 4a19538..cd90318 100644 --- a/ash/desktop_background/desktop_background_widget_controller.cc +++ b/ash/desktop_background/desktop_background_widget_controller.cc @@ -38,20 +38,20 @@ class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver, private: // Overridden from ui::ImplicitAnimationObserver: - virtual void OnImplicitAnimationsScheduled() OVERRIDE { + virtual void OnImplicitAnimationsScheduled() override { if (is_initial_animation_) { root_window_controller_-> HandleInitialDesktopBackgroundAnimationStarted(); } } - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { root_window_controller_->OnWallpaperAnimationFinished(desktop_widget_); delete this; } // Overridden from views::WidgetObserver. - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(views::Widget* widget) override { delete this; } diff --git a/ash/desktop_background/desktop_background_widget_controller.h b/ash/desktop_background/desktop_background_widget_controller.h index 6a40a2d..0aafe2e 100644 --- a/ash/desktop_background/desktop_background_widget_controller.h +++ b/ash/desktop_background/desktop_background_widget_controller.h @@ -28,7 +28,7 @@ class ASH_EXPORT DesktopBackgroundWidgetController virtual ~DesktopBackgroundWidgetController(); // Overridden from views::WidgetObserver. - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; // Set bounds of component that draws background. void SetBounds(gfx::Rect bounds); diff --git a/ash/desktop_background/wallpaper_resizer_unittest.cc b/ash/desktop_background/wallpaper_resizer_unittest.cc index fb951ef..97bd249 100644 --- a/ash/desktop_background/wallpaper_resizer_unittest.cc +++ b/ash/desktop_background/wallpaper_resizer_unittest.cc @@ -79,7 +79,7 @@ class WallpaperResizerTest : public testing::Test, message_loop_.Run(); } - virtual void OnWallpaperResized() OVERRIDE { + virtual void OnWallpaperResized() override { message_loop_.Quit(); } diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc index e4a0c1e..14a905c 100644 --- a/ash/display/cursor_window_controller.cc +++ b/ash/display/cursor_window_controller.cc @@ -29,34 +29,34 @@ class CursorWindowDelegate : public aura::WindowDelegate { virtual ~CursorWindowDelegate() {} // aura::WindowDelegate overrides: - virtual gfx::Size GetMinimumSize() const OVERRIDE { return size_; } - virtual gfx::Size GetMaximumSize() const OVERRIDE { return size_; } + virtual gfx::Size GetMinimumSize() const override { return size_; } + virtual gfx::Size GetMaximumSize() const override { return size_; } virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE {} - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { + const gfx::Rect& new_bounds) override {} + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override { return gfx::kNullCursor; } virtual int GetNonClientComponent( - const gfx::Point& point) const OVERRIDE { + const gfx::Point& point) const override { return HTNOWHERE; } virtual bool ShouldDescendIntoChildForEventHandling( aura::Window* child, - const gfx::Point& location) OVERRIDE { + const gfx::Point& location) override { return false; } - virtual bool CanFocus() OVERRIDE { return false; } - virtual void OnCaptureLost() OVERRIDE {} - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual bool CanFocus() override { return false; } + virtual void OnCaptureLost() override {} + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->DrawImageInt(cursor_image_, 0, 0); } virtual void OnDeviceScaleFactorChanged( - float device_scale_factor) OVERRIDE {} - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {} - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {} - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} - virtual bool HasHitTestMask() const OVERRIDE { return false; } - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} + float device_scale_factor) override {} + virtual void OnWindowDestroying(aura::Window* window) override {} + virtual void OnWindowDestroyed(aura::Window* window) override {} + virtual void OnWindowTargetVisibilityChanged(bool visible) override {} + virtual bool HasHitTestMask() const override { return false; } + virtual void GetHitTestMask(gfx::Path* mask) const override {} // Sets cursor compositing mode on/off. void SetCursorCompositingEnabled(bool enabled) { diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h index 2edcf9c..905db78 100644 --- a/ash/display/display_change_observer_chromeos.h +++ b/ash/display/display_change_observer_chromeos.h @@ -37,19 +37,19 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController, // ui::DisplayConfigurator::StateController overrides: virtual ui::MultipleDisplayState GetStateForDisplayIds( - const std::vector<int64>& outputs) const OVERRIDE; + const std::vector<int64>& outputs) const override; virtual bool GetResolutionForDisplayId(int64 display_id, - gfx::Size* size) const OVERRIDE; + gfx::Size* size) const override; // Overriden from ui::DisplayConfigurator::Observer: virtual void OnDisplayModeChanged( - const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE; + const ui::DisplayConfigurator::DisplayStateList& outputs) override; // Overriden from ui::InputDeviceEventObserver: - virtual void OnInputDeviceConfigurationChanged() OVERRIDE; + virtual void OnInputDeviceConfigurationChanged() override; // Overriden from ShellObserver: - virtual void OnAppTerminating() OVERRIDE; + virtual void OnAppTerminating() override; // Exposed for testing. ASH_EXPORT static float FindDeviceScaleFactor(float dpi); diff --git a/ash/display/display_configurator_animation.cc b/ash/display/display_configurator_animation.cc index 300556b..a376568 100644 --- a/ash/display/display_configurator_animation.cc +++ b/ash/display/display_configurator_animation.cc @@ -64,19 +64,19 @@ class CallbackRunningObserver { protected: // ui::LayerAnimationObserver overrides: virtual void OnLayerAnimationEnded( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { animator_->RemoveObserver(this); observer_->OnSingleTaskCompleted(); } virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { animator_->RemoveObserver(this); observer_->OnSingleTaskAborted(); } virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { } - virtual bool RequiresNotificationWhenAnimatorDestroyed() const OVERRIDE { + virtual bool RequiresNotificationWhenAnimatorDestroyed() const override { return true; } diff --git a/ash/display/display_configurator_animation.h b/ash/display/display_configurator_animation.h index b0f490a..ffc46b1 100644 --- a/ash/display/display_configurator_animation.h +++ b/ash/display/display_configurator_animation.h @@ -44,9 +44,9 @@ class ASH_EXPORT DisplayConfiguratorAnimation protected: // ui::DisplayConfigurator::Observer overrides: virtual void OnDisplayModeChanged( - const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE; + const ui::DisplayConfigurator::DisplayStateList& outputs) override; virtual void OnDisplayModeChangeFailed( - ui::MultipleDisplayState failed_new_state) OVERRIDE; + ui::MultipleDisplayState failed_new_state) override; private: // Clears all hiding layers. Note that in case that this method is called diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h index a656d54..ec65fe0 100644 --- a/ash/display/display_controller.h +++ b/ash/display/display_controller.h @@ -144,20 +144,20 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver, bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window, const gfx::Insets& insets); // gfx::DisplayObserver overrides: - virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& display) override; + virtual void OnDisplayRemoved(const gfx::Display& display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; // aura::WindowTreeHostObserver overrides: - virtual void OnHostResized(const aura::WindowTreeHost* host) OVERRIDE; + virtual void OnHostResized(const aura::WindowTreeHost* host) override; // aura::DisplayManager::Delegate overrides: virtual void CreateOrUpdateNonDesktopDisplay(const DisplayInfo& info) - OVERRIDE; - virtual void CloseNonDesktopDisplay() OVERRIDE; - virtual void PreDisplayConfigurationChange(bool clear_focus) OVERRIDE; - virtual void PostDisplayConfigurationChange() OVERRIDE; + override; + virtual void CloseNonDesktopDisplay() override; + virtual void PreDisplayConfigurationChange(bool clear_focus) override; + virtual void PostDisplayConfigurationChange() override; private: FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated); diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 1499298..ff78b71 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -90,16 +90,16 @@ class TestObserver : public DisplayController::Observer, } // Overridden from DisplayController::Observer - virtual void OnDisplayConfigurationChanging() OVERRIDE { + virtual void OnDisplayConfigurationChanging() override { ++changing_count_; } - virtual void OnDisplayConfigurationChanged() OVERRIDE { + virtual void OnDisplayConfigurationChanged() override { ++changed_count_; } // Overrideen from gfx::DisplayObserver virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE { + uint32_t metrics) override { changed_display_id_ = display.id(); if (metrics & DISPLAY_METRIC_BOUNDS) ++bounds_changed_count_; @@ -108,25 +108,25 @@ class TestObserver : public DisplayController::Observer, if (metrics & DISPLAY_METRIC_WORK_AREA) ++workarea_changed_count_; } - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE { + virtual void OnDisplayAdded(const gfx::Display& new_display) override { } - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE { + virtual void OnDisplayRemoved(const gfx::Display& old_display) override { } // Overridden from aura::client::FocusChangeObserver virtual void OnWindowFocused(aura::Window* gained_focus, - aura::Window* lost_focus) OVERRIDE { + aura::Window* lost_focus) override { focus_changed_count_++; } // Overridden from aura::client::ActivationChangeObserver virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE { + aura::Window* lost_active) override { activation_changed_count_++; } virtual void OnAttemptToReactivateWindow( aura::Window* request_active, - aura::Window* actual_active) OVERRIDE { + aura::Window* actual_active) override { } int CountAndReset() { @@ -206,7 +206,7 @@ class DisplayControllerShutdownTest : public test::AshTestBase { DisplayControllerShutdownTest() {} virtual ~DisplayControllerShutdownTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test::AshTestBase::TearDown(); if (!SupportsMultipleDisplays()) return; @@ -228,12 +228,12 @@ class StartupHelper : public test::TestShellDelegate, virtual ~StartupHelper() {} // ash::ShellSelegate: - virtual void PreInit() OVERRIDE { + virtual void PreInit() override { Shell::GetInstance()->display_controller()->AddObserver(this); } // ash::DisplayController::Observer: - virtual void OnDisplaysInitialized() OVERRIDE { + virtual void OnDisplaysInitialized() override { DCHECK(!displays_initialized_); displays_initialized_ = true; } @@ -254,11 +254,11 @@ class DisplayControllerStartupTest : public test::AshTestBase { virtual ~DisplayControllerStartupTest() {} // ash::test::AshTestBase: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ash_test_helper()->set_test_shell_delegate(startup_helper_); test::AshTestBase::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { Shell::GetInstance()->display_controller()->RemoveObserver(startup_helper_); test::AshTestBase::TearDown(); } @@ -282,7 +282,7 @@ class TestEventHandler : public ui::EventHandler { scroll_y_offset_ordinal_(0.0) {} virtual ~TestEventHandler() {} - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (event->flags() & ui::EF_IS_SYNTHESIZED && event->type() != ui::ET_MOUSE_EXITED && event->type() != ui::ET_MOUSE_ENTERED) { @@ -294,7 +294,7 @@ class TestEventHandler : public ui::EventHandler { event->StopPropagation(); } - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { aura::Window* target = static_cast<aura::Window*>(event->target()); // Only record when the target is the background which covers // entire root window. @@ -305,7 +305,7 @@ class TestEventHandler : public ui::EventHandler { event->StopPropagation(); } - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE { + virtual void OnScrollEvent(ui::ScrollEvent* event) override { aura::Window* target = static_cast<aura::Window*>(event->target()); // Only record when the target is the background which covers // entire root window. diff --git a/ash/display/display_error_observer_chromeos.h b/ash/display/display_error_observer_chromeos.h index 58de819..7ad66ea 100644 --- a/ash/display/display_error_observer_chromeos.h +++ b/ash/display/display_error_observer_chromeos.h @@ -22,7 +22,7 @@ class ASH_EXPORT DisplayErrorObserver // ui::DisplayConfigurator::Observer overrides: virtual void OnDisplayModeChangeFailed( - ui::MultipleDisplayState failed_new_state) OVERRIDE; + ui::MultipleDisplayState failed_new_state) override; private: friend class DisplayErrorObserverTest; diff --git a/ash/display/display_error_observer_chromeos_unittest.cc b/ash/display/display_error_observer_chromeos_unittest.cc index a1436f0..b52afdf 100644 --- a/ash/display/display_error_observer_chromeos_unittest.cc +++ b/ash/display/display_error_observer_chromeos_unittest.cc @@ -23,7 +23,7 @@ class DisplayErrorObserverTest : public test::AshTestBase { virtual ~DisplayErrorObserverTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); observer_.reset(new DisplayErrorObserver()); } diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h index 0dc917a..3df8597 100644 --- a/ash/display/display_manager.h +++ b/ash/display/display_manager.h @@ -280,8 +280,8 @@ class ASH_EXPORT DisplayManager // SoftwareMirroringController override: #if defined(OS_CHROMEOS) - virtual void SetSoftwareMirroring(bool enabled) OVERRIDE; - virtual bool SoftwareMirroringEnabled() const OVERRIDE; + virtual void SetSoftwareMirroring(bool enabled) override; + virtual bool SoftwareMirroringEnabled() const override; #endif bool software_mirroring_enabled() const { return second_display_mode_ == MIRRORING; diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 311c4de..aa2330c 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -52,12 +52,12 @@ class DisplayManagerTest : public test::AshTestBase, } virtual ~DisplayManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); Shell::GetScreen()->AddObserver(this); Shell::GetPrimaryRootWindow()->AddObserver(this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { Shell::GetPrimaryRootWindow()->RemoveObserver(this); Shell::GetScreen()->RemoveObserver(this); AshTestBase::TearDown(); @@ -103,18 +103,18 @@ class DisplayManagerTest : public test::AshTestBase, // aura::DisplayObserver overrides: virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t) OVERRIDE { + uint32_t) override { changed_.push_back(display); } - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE { + virtual void OnDisplayAdded(const gfx::Display& new_display) override { added_.push_back(new_display); } - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE { + virtual void OnDisplayRemoved(const gfx::Display& old_display) override { ++removed_count_; } // aura::WindowObserver overrides: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override { ASSERT_EQ(Shell::GetPrimaryRootWindow(), window); root_window_destroyed_ = true; } @@ -1155,14 +1155,14 @@ class TestDisplayObserver : public gfx::DisplayObserver { virtual ~TestDisplayObserver() {} // gfx::DisplayObserver overrides: - virtual void OnDisplayMetricsChanged(const gfx::Display&,uint32_t) OVERRIDE {} - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE { + virtual void OnDisplayMetricsChanged(const gfx::Display&,uint32_t) override {} + virtual void OnDisplayAdded(const gfx::Display& new_display) override { // Mirror window should already be delete before restoring // the external display. EXPECT_FALSE(test_api.GetHost()); changed_ = true; } - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE { + virtual void OnDisplayRemoved(const gfx::Display& old_display) override { // Mirror window should not be created until the external display // is removed. EXPECT_FALSE(test_api.GetHost()); @@ -1389,7 +1389,7 @@ class ScreenShutdownTest : public test::AshTestBase { } virtual ~ScreenShutdownTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { gfx::Screen* orig_screen = gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE); AshTestBase::TearDown(); @@ -1444,7 +1444,7 @@ class FontTestHelper : public test::AshTestBase { } // test::AshTestBase: - virtual void TestBody() OVERRIDE { + virtual void TestBody() override { NOTREACHED(); } diff --git a/ash/display/event_transformation_handler.h b/ash/display/event_transformation_handler.h index cd38b95..efa69f0 100644 --- a/ash/display/event_transformation_handler.h +++ b/ash/display/event_transformation_handler.h @@ -30,7 +30,7 @@ class ASH_EXPORT EventTransformationHandler : public ui::EventHandler { } // Overridden from ui::EventHandler. - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; private: TransformationMode transformation_mode_; diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index f21c844..978449e 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -62,16 +62,16 @@ class NoneCaptureClient : public aura::client::CaptureClient { private: // Does a capture on the |window|. - virtual void SetCapture(aura::Window* window) OVERRIDE {} + virtual void SetCapture(aura::Window* window) override {} // Releases a capture from the |window|. - virtual void ReleaseCapture(aura::Window* window) OVERRIDE {} + virtual void ReleaseCapture(aura::Window* window) override {} // Returns the current capture window. - virtual aura::Window* GetCaptureWindow() OVERRIDE { + virtual aura::Window* GetCaptureWindow() override { return NULL; } - virtual aura::Window* GetGlobalCaptureWindow() OVERRIDE { + virtual aura::Window* GetGlobalCaptureWindow() override { return NULL; } diff --git a/ash/display/mirror_window_controller.h b/ash/display/mirror_window_controller.h index beb703a..6a3f697 100644 --- a/ash/display/mirror_window_controller.h +++ b/ash/display/mirror_window_controller.h @@ -50,7 +50,7 @@ class ASH_EXPORT MirrorWindowController : public aura::WindowTreeHostObserver { void Close(); // aura::WindowTreeHostObserver overrides: - virtual void OnHostResized(const aura::WindowTreeHost* host) OVERRIDE; + virtual void OnHostResized(const aura::WindowTreeHost* host) override; // Return the root window used to mirror the content. NULL if the // display is not mirrored by the compositor path. diff --git a/ash/display/mirror_window_controller_unittest.cc b/ash/display/mirror_window_controller_unittest.cc index a071279..6bbe040 100644 --- a/ash/display/mirror_window_controller_unittest.cc +++ b/ash/display/mirror_window_controller_unittest.cc @@ -33,14 +33,14 @@ class MirrorOnBootTest : public test::AshTestBase { MirrorOnBootTest() {} virtual ~MirrorOnBootTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitchASCII( switches::kAshHostWindowBounds, "1+1-300x300,1+301-300x300"); CommandLine::ForCurrentProcess()->AppendSwitch( switches::kAshEnableSoftwareMirroring); test::AshTestBase::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test::AshTestBase::TearDown(); } diff --git a/ash/display/mouse_cursor_event_filter.h b/ash/display/mouse_cursor_event_filter.h index 2b60601..80defb9 100644 --- a/ash/display/mouse_cursor_event_filter.h +++ b/ash/display/mouse_cursor_event_filter.h @@ -47,11 +47,11 @@ class ASH_EXPORT MouseCursorEventFilter : public ui::EventHandler, void HideSharedEdgeIndicator(); // DisplayController::Observer: - virtual void OnDisplaysInitialized() OVERRIDE; - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplaysInitialized() override; + virtual void OnDisplayConfigurationChanged() override; // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; private: friend class DragWindowResizerTest; diff --git a/ash/display/projecting_observer_chromeos.h b/ash/display/projecting_observer_chromeos.h index be41cbb..d43336d 100644 --- a/ash/display/projecting_observer_chromeos.h +++ b/ash/display/projecting_observer_chromeos.h @@ -20,7 +20,7 @@ class ASH_EXPORT ProjectingObserver : public ui::DisplayConfigurator::Observer { // DisplayConfigurator::Observer implementation: virtual void OnDisplayModeChanged( - const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE; + const ui::DisplayConfigurator::DisplayStateList& outputs) override; private: // Sends the current projecting state to power manager. diff --git a/ash/display/resolution_notification_controller.cc b/ash/display/resolution_notification_controller.cc index 9819b69..35ee07b 100644 --- a/ash/display/resolution_notification_controller.cc +++ b/ash/display/resolution_notification_controller.cc @@ -40,12 +40,12 @@ class ResolutionChangeNotificationDelegate private: // message_center::NotificationDelegate overrides: - virtual void Display() OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual void Click() OVERRIDE; - virtual bool HasClickedListener() OVERRIDE; - virtual void ButtonClick(int button_index) OVERRIDE; + virtual void Display() override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual void Click() override; + virtual bool HasClickedListener() override; + virtual void ButtonClick(int button_index) override; ResolutionNotificationController* controller_; bool has_timeout_; diff --git a/ash/display/resolution_notification_controller.h b/ash/display/resolution_notification_controller.h index e4c20e8..a28e2e3 100644 --- a/ash/display/resolution_notification_controller.h +++ b/ash/display/resolution_notification_controller.h @@ -86,13 +86,13 @@ class ASH_EXPORT ResolutionNotificationController void OnTimerTick(); // gfx::DisplayObserver overrides: - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& new_display) override; + virtual void OnDisplayRemoved(const gfx::Display& old_display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; // DisplayController::Observer overrides: - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplayConfigurationChanged() override; static void SuppressTimerForTest(); diff --git a/ash/display/resolution_notification_controller_unittest.cc b/ash/display/resolution_notification_controller_unittest.cc index 995a8f5..aab58a4 100644 --- a/ash/display/resolution_notification_controller_unittest.cc +++ b/ash/display/resolution_notification_controller_unittest.cc @@ -54,7 +54,7 @@ class ResolutionNotificationControllerTest : public ash::test::AshTestBase { virtual ~ResolutionNotificationControllerTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ash::test::AshTestBase::SetUp(); ResolutionNotificationController::SuppressTimerForTest(); } diff --git a/ash/display/root_window_transformers.cc b/ash/display/root_window_transformers.cc index cba6688..de380468 100644 --- a/ash/display/root_window_transformers.cc +++ b/ash/display/root_window_transformers.cc @@ -142,14 +142,14 @@ class AshRootWindowTransformer : public RootWindowTransformer { } // aura::RootWindowTransformer overrides: - virtual gfx::Transform GetTransform() const OVERRIDE { + virtual gfx::Transform GetTransform() const override { return transform_; } - virtual gfx::Transform GetInverseTransform() const OVERRIDE { + virtual gfx::Transform GetInverseTransform() const override { return invert_transform_; } virtual gfx::Rect GetRootWindowBounds( - const gfx::Size& host_size) const OVERRIDE { + const gfx::Size& host_size) const override { gfx::Rect bounds(host_size); bounds.Inset(host_insets_); bounds = ui::ConvertRectToDIP(root_window_->layer(), bounds); @@ -168,7 +168,7 @@ class AshRootWindowTransformer : public RootWindowTransformer { return gfx::Rect(gfx::ToFlooredSize(new_bounds.size())); } - virtual gfx::Insets GetHostInsets() const OVERRIDE { + virtual gfx::Insets GetHostInsets() const override { return host_insets_; } @@ -238,19 +238,19 @@ class MirrorRootWindowTransformer : public RootWindowTransformer { } // aura::RootWindowTransformer overrides: - virtual gfx::Transform GetTransform() const OVERRIDE { + virtual gfx::Transform GetTransform() const override { return transform_; } - virtual gfx::Transform GetInverseTransform() const OVERRIDE { + virtual gfx::Transform GetInverseTransform() const override { gfx::Transform invert; CHECK(transform_.GetInverse(&invert)); return invert; } virtual gfx::Rect GetRootWindowBounds( - const gfx::Size& host_size) const OVERRIDE { + const gfx::Size& host_size) const override { return root_bounds_; } - virtual gfx::Insets GetHostInsets() const OVERRIDE { + virtual gfx::Insets GetHostInsets() const override { return insets_; } diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc index 7a7581c..e88cc1d 100644 --- a/ash/display/root_window_transformers_unittest.cc +++ b/ash/display/root_window_transformers_unittest.cc @@ -42,7 +42,7 @@ class TestEventHandler : public ui::EventHandler { scroll_y_offset_ordinal_(0.0) {} virtual ~TestEventHandler() {} - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (event->flags() & ui::EF_IS_SYNTHESIZED) return; aura::Window* target = static_cast<aura::Window*>(event->target()); @@ -51,7 +51,7 @@ class TestEventHandler : public ui::EventHandler { event->StopPropagation(); } - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { aura::Window* target = static_cast<aura::Window*>(event->target()); // Only record when the target is the background which covers // entire root window. @@ -62,7 +62,7 @@ class TestEventHandler : public ui::EventHandler { event->StopPropagation(); } - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE { + virtual void OnScrollEvent(ui::ScrollEvent* event) override { aura::Window* target = static_cast<aura::Window*>(event->target()); // Only record when the target is the background which covers // entire root window. diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc index 607784d..125ef82 100644 --- a/ash/display/screen_ash.cc +++ b/ash/display/screen_ash.cc @@ -71,47 +71,47 @@ class ScreenForShutdown : public gfx::Screen { } // gfx::Screen overrides: - virtual bool IsDIPEnabled() OVERRIDE { + virtual bool IsDIPEnabled() override { return true; } - virtual gfx::Point GetCursorScreenPoint() OVERRIDE { + virtual gfx::Point GetCursorScreenPoint() override { return gfx::Point(); } - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE { + virtual gfx::NativeWindow GetWindowUnderCursor() override { return NULL; } virtual gfx::NativeWindow GetWindowAtScreenPoint( - const gfx::Point& point) OVERRIDE { + const gfx::Point& point) override { return NULL; } - virtual int GetNumDisplays() const OVERRIDE { + virtual int GetNumDisplays() const override { return display_list_.size(); } - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE { + virtual std::vector<gfx::Display> GetAllDisplays() const override { return display_list_; } virtual gfx::Display GetDisplayNearestWindow(gfx::NativeView view) - const OVERRIDE { + const override { return primary_display_; } virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const OVERRIDE { + const gfx::Point& point) const override { return FindDisplayNearestPoint(display_list_, point); } virtual gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) - const OVERRIDE { + const override { const gfx::Display* matching = FindDisplayMatching(display_list_, match_rect); // Fallback to the primary display if there is no matching display. return matching ? *matching : GetPrimaryDisplay(); } - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE { + virtual gfx::Display GetPrimaryDisplay() const override { return primary_display_; } - virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE { + virtual void AddObserver(gfx::DisplayObserver* observer) override { NOTREACHED() << "Observer should not be added during shutdown"; } - virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE { + virtual void RemoveObserver(gfx::DisplayObserver* observer) override { } private: diff --git a/ash/display/screen_ash.h b/ash/display/screen_ash.h index c5f4b85..8b0cb2c 100644 --- a/ash/display/screen_ash.h +++ b/ash/display/screen_ash.h @@ -61,22 +61,22 @@ class ASH_EXPORT ScreenAsh : public gfx::Screen { static const gfx::Display& GetDisplayForId(int64 display_id); // gfx::Screen overrides: - virtual bool IsDIPEnabled() OVERRIDE; - virtual gfx::Point GetCursorScreenPoint() OVERRIDE; - virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE; + virtual bool IsDIPEnabled() override; + virtual gfx::Point GetCursorScreenPoint() override; + virtual gfx::NativeWindow GetWindowUnderCursor() override; virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) - OVERRIDE; - virtual int GetNumDisplays() const OVERRIDE; - virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE; + override; + virtual int GetNumDisplays() const override; + virtual std::vector<gfx::Display> GetAllDisplays() const override; virtual gfx::Display GetDisplayNearestWindow( - gfx::NativeView view) const OVERRIDE; + gfx::NativeView view) const override; virtual gfx::Display GetDisplayNearestPoint( - const gfx::Point& point) const OVERRIDE; + const gfx::Point& point) const override; virtual gfx::Display GetDisplayMatching( - const gfx::Rect& match_rect) const OVERRIDE; - virtual gfx::Display GetPrimaryDisplay() const OVERRIDE; - virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE; - virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE; + const gfx::Rect& match_rect) const override; + virtual gfx::Display GetPrimaryDisplay() const override; + virtual void AddObserver(gfx::DisplayObserver* observer) override; + virtual void RemoveObserver(gfx::DisplayObserver* observer) override; private: friend class DisplayManager; diff --git a/ash/display/screen_position_controller.h b/ash/display/screen_position_controller.h index 95271c1..e1e8690 100644 --- a/ash/display/screen_position_controller.h +++ b/ash/display/screen_position_controller.h @@ -17,14 +17,14 @@ class ScreenPositionController : public aura::client::ScreenPositionClient { // aura::client::ScreenPositionClient overrides: virtual void ConvertPointToScreen(const aura::Window* window, - gfx::Point* point) OVERRIDE; + gfx::Point* point) override; virtual void ConvertPointFromScreen(const aura::Window* window, - gfx::Point* point) OVERRIDE; + gfx::Point* point) override; virtual void ConvertHostPointToScreen(aura::Window* window, - gfx::Point* point) OVERRIDE; + gfx::Point* point) override; virtual void SetBounds(aura::Window* window, const gfx::Rect& bounds, - const gfx::Display& display) OVERRIDE; + const gfx::Display& display) override; private: DISALLOW_COPY_AND_ASSIGN(ScreenPositionController); diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc index 42150bc..676adec 100644 --- a/ash/display/screen_position_controller_unittest.cc +++ b/ash/display/screen_position_controller_unittest.cc @@ -51,7 +51,7 @@ class ScreenPositionControllerTest : public test::AshTestBase { ScreenPositionControllerTest() {} virtual ~ScreenPositionControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); window_.reset(new aura::Window(&window_delegate_)); window_->SetType(ui::wm::WINDOW_TYPE_NORMAL); @@ -60,7 +60,7 @@ class ScreenPositionControllerTest : public test::AshTestBase { window_->set_id(1); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { window_.reset(); AshTestBase::TearDown(); } diff --git a/ash/display/shared_display_edge_indicator.cc b/ash/display/shared_display_edge_indicator.cc index f94a9a5..c2ea21a 100644 --- a/ash/display/shared_display_edge_indicator.cc +++ b/ash/display/shared_display_edge_indicator.cc @@ -35,7 +35,7 @@ class IndicatorView : public views::View { } // views::Views overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->FillRect(gfx::Rect(bounds().size()), color_); } diff --git a/ash/display/shared_display_edge_indicator.h b/ash/display/shared_display_edge_indicator.h index d1900bc..b4f655f 100644 --- a/ash/display/shared_display_edge_indicator.h +++ b/ash/display/shared_display_edge_indicator.h @@ -37,7 +37,7 @@ class ASH_EXPORT SharedDisplayEdgeIndicator : public gfx::AnimationDelegate { void Hide(); // gfx::AnimationDelegate overrides: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; private: // Used to show the displays' shared edge where a window can be moved across. diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 4242264..0aa1675 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -81,42 +81,42 @@ class DragDropTrackerDelegate : public aura::WindowDelegate { virtual ~DragDropTrackerDelegate() {} // Overridden from WindowDelegate: - virtual gfx::Size GetMinimumSize() const OVERRIDE { + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); } - virtual gfx::Size GetMaximumSize() const OVERRIDE { + virtual gfx::Size GetMaximumSize() const override { return gfx::Size(); } virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE {} - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { + const gfx::Rect& new_bounds) override {} + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override { return gfx::kNullCursor; } - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { + virtual int GetNonClientComponent(const gfx::Point& point) const override { return HTCAPTION; } virtual bool ShouldDescendIntoChildForEventHandling( aura::Window* child, - const gfx::Point& location) OVERRIDE { + const gfx::Point& location) override { return true; } - virtual bool CanFocus() OVERRIDE { return true; } - virtual void OnCaptureLost() OVERRIDE { + virtual bool CanFocus() override { return true; } + virtual void OnCaptureLost() override { if (drag_drop_controller_->IsDragDropInProgress()) drag_drop_controller_->DragCancel(); } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { } - virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {} - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {} - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} - virtual bool HasHitTestMask() const OVERRIDE { + virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {} + virtual void OnWindowDestroying(aura::Window* window) override {} + virtual void OnWindowDestroyed(aura::Window* window) override {} + virtual void OnWindowTargetVisibilityChanged(bool visible) override {} + virtual bool HasHitTestMask() const override { return true; } - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE { + virtual void GetHitTestMask(gfx::Path* mask) const override { DCHECK(mask->isEmpty()); } diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index 7f20401..fba69372e 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -49,22 +49,22 @@ class ASH_EXPORT DragDropController aura::Window* source_window, const gfx::Point& root_location, int operation, - ui::DragDropTypes::DragEventSource source) OVERRIDE; + ui::DragDropTypes::DragEventSource source) override; virtual void DragUpdate(aura::Window* target, - const ui::LocatedEvent& event) OVERRIDE; + const ui::LocatedEvent& event) override; virtual void Drop(aura::Window* target, - const ui::LocatedEvent& event) OVERRIDE; - virtual void DragCancel() OVERRIDE; - virtual bool IsDragDropInProgress() OVERRIDE; + const ui::LocatedEvent& event) override; + virtual void DragCancel() override; + virtual bool IsDragDropInProgress() override; // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Overridden from aura::WindowObserver. - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroyed(aura::Window* window) override; protected: // Helper method to create a LinearAnimation object that will run the drag @@ -82,9 +82,9 @@ class ASH_EXPORT DragDropController friend class ash::test::DragDropControllerTest; // Overridden from gfx::AnimationDelegate: - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationProgressed(const gfx::Animation* animation) override; + virtual void AnimationCanceled(const gfx::Animation* animation) override; // Helper method to start drag widget flying back animation. void StartCanceledAnimation(int animation_duration_ms); diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index e71a3b8..dda878c 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -71,12 +71,12 @@ class DragTestView : public views::View { private: // View overrides: - virtual int GetDragOperations(const gfx::Point& press_pt) OVERRIDE { + virtual int GetDragOperations(const gfx::Point& press_pt) override { return ui::DragDropTypes::DRAG_COPY; } virtual void WriteDragData(const gfx::Point& p, - OSExchangeData* data) OVERRIDE { + OSExchangeData* data) override { data->SetString(base::UTF8ToUTF16("I am being dragged")); gfx::ImageSkiaRep image_rep(gfx::Size(10, 20), 1.0f); gfx::ImageSkia image_skia(image_rep); @@ -84,11 +84,11 @@ class DragTestView : public views::View { drag_utils::SetDragImageOnDataObject(image_skia, gfx::Vector2d(), data); } - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE { + virtual bool OnMousePressed(const ui::MouseEvent& event) override { return true; } - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { + virtual void OnGestureEvent(ui::GestureEvent* event) override { if (event->type() == ui::ET_GESTURE_LONG_TAP) long_tap_received_ = true; return; @@ -96,34 +96,34 @@ class DragTestView : public views::View { virtual bool GetDropFormats( int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE { + std::set<OSExchangeData::CustomFormat>* custom_formats) override { *formats = ui::OSExchangeData::STRING; return true; } - virtual bool CanDrop(const OSExchangeData& data) OVERRIDE { + virtual bool CanDrop(const OSExchangeData& data) override { return true; } - virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE { + virtual void OnDragEntered(const ui::DropTargetEvent& event) override { num_drag_enters_++; } - virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE { + virtual int OnDragUpdated(const ui::DropTargetEvent& event) override { num_drag_updates_++; return ui::DragDropTypes::DRAG_COPY; } - virtual void OnDragExited() OVERRIDE { + virtual void OnDragExited() override { num_drag_exits_++; } - virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE { + virtual int OnPerformDrop(const ui::DropTargetEvent& event) override { num_drops_++; return ui::DragDropTypes::DRAG_COPY; } - virtual void OnDragDone() OVERRIDE { + virtual void OnDragDone() override { drag_done_received_ = true; } @@ -165,7 +165,7 @@ class TestDragDropController : public DragDropController { aura::Window* source_window, const gfx::Point& location, int operation, - ui::DragDropTypes::DragEventSource source) OVERRIDE { + ui::DragDropTypes::DragEventSource source) override { drag_start_received_ = true; data.GetString(&drag_string_); return DragDropController::StartDragAndDrop( @@ -173,18 +173,18 @@ class TestDragDropController : public DragDropController { } virtual void DragUpdate(aura::Window* target, - const ui::LocatedEvent& event) OVERRIDE { + const ui::LocatedEvent& event) override { DragDropController::DragUpdate(target, event); num_drag_updates_++; } virtual void Drop(aura::Window* target, - const ui::LocatedEvent& event) OVERRIDE { + const ui::LocatedEvent& event) override { DragDropController::Drop(target, event); drop_received_ = true; } - virtual void DragCancel() OVERRIDE { + virtual void DragCancel() override { DragDropController::DragCancel(); drag_canceled_ = true; } @@ -192,11 +192,11 @@ class TestDragDropController : public DragDropController { virtual gfx::LinearAnimation* CreateCancelAnimation( int duration, int frame_rate, - gfx::AnimationDelegate* delegate) OVERRIDE { + gfx::AnimationDelegate* delegate) override { return new CompletableLinearAnimation(duration, frame_rate, delegate); } - virtual void DoDragCancel(int animation_duration_ms) OVERRIDE { + virtual void DoDragCancel(int animation_duration_ms) override { DragDropController::DoDragCancel(animation_duration_ms); drag_canceled_ = true; } @@ -222,7 +222,7 @@ class TestNativeWidgetAura : public views::NativeWidgetAura { check_if_capture_lost_ = value; } - virtual void OnCaptureLost() OVERRIDE { + virtual void OnCaptureLost() override { DCHECK(!check_if_capture_lost_); views::NativeWidgetAura::OnCaptureLost(); } @@ -292,7 +292,7 @@ class DragDropControllerTest : public AshTestBase { DragDropControllerTest() : AshTestBase() {} virtual ~DragDropControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); drag_drop_controller_.reset(new TestDragDropController); drag_drop_controller_->set_should_block_during_drag_drop(false); @@ -300,7 +300,7 @@ class DragDropControllerTest : public AshTestBase { drag_drop_controller_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { aura::client::SetDragDropClient(Shell::GetPrimaryRootWindow(), NULL); drag_drop_controller_.reset(); AshTestBase::TearDown(); @@ -970,7 +970,7 @@ namespace { class DragImageWindowObserver : public aura::WindowObserver { public: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override { window_location_on_destroying_ = window->GetBoundsInScreen().origin(); } diff --git a/ash/drag_drop/drag_drop_interactive_uitest.cc b/ash/drag_drop/drag_drop_interactive_uitest.cc index 4e99df7..f45db8c 100644 --- a/ash/drag_drop/drag_drop_interactive_uitest.cc +++ b/ash/drag_drop/drag_drop_interactive_uitest.cc @@ -28,11 +28,11 @@ class DraggableView : public views::View { virtual ~DraggableView() {} // views::View overrides: - virtual int GetDragOperations(const gfx::Point& press_pt) OVERRIDE { + virtual int GetDragOperations(const gfx::Point& press_pt) override { return ui::DragDropTypes::DRAG_MOVE; } virtual void WriteDragData(const gfx::Point& press_pt, - OSExchangeData* data)OVERRIDE { + OSExchangeData* data)override { data->SetString(base::UTF8ToUTF16("test")); } @@ -48,20 +48,20 @@ class TargetView : public views::View { // views::View overrides: virtual bool GetDropFormats( int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE { + std::set<OSExchangeData::CustomFormat>* custom_formats) override { *formats = ui::OSExchangeData::STRING; return true; } - virtual bool AreDropTypesRequired() OVERRIDE { + virtual bool AreDropTypesRequired() override { return false; } - virtual bool CanDrop(const OSExchangeData& data) OVERRIDE { + virtual bool CanDrop(const OSExchangeData& data) override { return true; } - virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE { + virtual int OnDragUpdated(const ui::DropTargetEvent& event) override { return ui::DragDropTypes::DRAG_MOVE; } - virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE { + virtual int OnPerformDrop(const ui::DropTargetEvent& event) override { dropped_ = true; return ui::DragDropTypes::DRAG_MOVE; } @@ -126,7 +126,7 @@ class DragDropTest : public test::AshTestBase { DragDropTest() {} virtual ~DragDropTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { gfx::GLSurface::InitializeOneOffForTests(); ui::RegisterPathProvider(); diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index 982fafa..76482a9 100644 --- a/ash/drag_drop/drag_drop_tracker.cc +++ b/ash/drag_drop/drag_drop_tracker.cc @@ -26,7 +26,7 @@ class CaptureWindowActivationDelegate virtual ~CaptureWindowActivationDelegate() {} // aura::client::ActivationDelegate overrides: - virtual bool ShouldActivate() const OVERRIDE { + virtual bool ShouldActivate() const override { return false; } diff --git a/ash/drag_drop/drag_drop_tracker_unittest.cc b/ash/drag_drop/drag_drop_tracker_unittest.cc index 24c5e89..66e678f 100644 --- a/ash/drag_drop/drag_drop_tracker_unittest.cc +++ b/ash/drag_drop/drag_drop_tracker_unittest.cc @@ -17,7 +17,7 @@ namespace test { class DragDropTrackerTest : public test::AshTestBase { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); } diff --git a/ash/drag_drop/drag_image_view.h b/ash/drag_drop/drag_image_view.h index fd5382e..4ba0c07 100644 --- a/ash/drag_drop/drag_image_view.h +++ b/ash/drag_drop/drag_image_view.h @@ -59,7 +59,7 @@ class DragImageView : public views::ImageView { private: // Overridden from views::ImageView. - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; scoped_ptr<views::Widget> widget_; gfx::Size widget_size_; diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index 71f68e4..7e88d47 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc @@ -48,10 +48,10 @@ class ModalWidgetDelegate : public views::WidgetDelegateView { virtual ~ModalWidgetDelegate() {} // Overridden from views::WidgetDelegate: - virtual views::View* GetContentsView() OVERRIDE { + virtual views::View* GetContentsView() override { return this; } - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; } @@ -69,7 +69,7 @@ class MoveWindowByClickEventHandler : public ui::EventHandler { private: // ui::EventHandler overrides: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (event->type() == ui::ET_MOUSE_RELEASED) { aura::Window::Windows root_windows = Shell::GetAllRootWindows(); DCHECK_LT(1u, root_windows.size()); @@ -98,7 +98,7 @@ class EventLocationRecordingEventHandler : public ui::EventHandler { private: // ui::EventHandler overrides: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (event->type() == ui::ET_MOUSE_MOVED || event->type() == ui::ET_MOUSE_DRAGGED) { location_ = event->location(); @@ -127,7 +127,7 @@ class EventLocationHandler : public ui::EventHandler { private: // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (event->type() == ui::ET_MOUSE_PRESSED) press_location_ = event->location(); else if (event->type() == ui::ET_MOUSE_RELEASED) diff --git a/ash/first_run/desktop_cleaner.cc b/ash/first_run/desktop_cleaner.cc index d388e18..6f0dfb1 100644 --- a/ash/first_run/desktop_cleaner.cc +++ b/ash/first_run/desktop_cleaner.cc @@ -57,12 +57,12 @@ class ContainerHider : public aura::WindowObserver, private: // Overriden from ui::ImplicitAnimationObserver. - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { container_->Hide(); } // Overriden from aura::WindowObserver. - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override { DCHECK(window == container_); container_ = NULL; } @@ -86,7 +86,7 @@ class NotificationBlocker : public message_center::NotificationBlocker { private: // Overriden from message_center::NotificationBlocker. virtual bool ShouldShowNotificationAsPopup( - const message_center::NotifierId& notifier_id) const OVERRIDE { + const message_center::NotifierId& notifier_id) const override { return false; } diff --git a/ash/first_run/first_run_helper_impl.h b/ash/first_run/first_run_helper_impl.h index 3993767..fbee996 100644 --- a/ash/first_run/first_run_helper_impl.h +++ b/ash/first_run/first_run_helper_impl.h @@ -21,22 +21,22 @@ class FirstRunHelperImpl : public FirstRunHelper, virtual ~FirstRunHelperImpl(); // Overriden from FirstRunHelper. - virtual views::Widget* GetOverlayWidget() OVERRIDE; - virtual void OpenAppList() OVERRIDE; - virtual void CloseAppList() OVERRIDE; - virtual gfx::Rect GetLauncherBounds() OVERRIDE; - virtual gfx::Rect GetAppListButtonBounds() OVERRIDE; - virtual gfx::Rect GetAppListBounds() OVERRIDE; - virtual void OpenTrayBubble() OVERRIDE; - virtual void CloseTrayBubble() OVERRIDE; - virtual bool IsTrayBubbleOpened() OVERRIDE; - virtual gfx::Rect GetTrayBubbleBounds() OVERRIDE; - virtual gfx::Rect GetHelpButtonBounds() OVERRIDE; + virtual views::Widget* GetOverlayWidget() override; + virtual void OpenAppList() override; + virtual void CloseAppList() override; + virtual gfx::Rect GetLauncherBounds() override; + virtual gfx::Rect GetAppListButtonBounds() override; + virtual gfx::Rect GetAppListBounds() override; + virtual void OpenTrayBubble() override; + virtual void CloseTrayBubble() override; + virtual bool IsTrayBubbleOpened() override; + virtual gfx::Rect GetTrayBubbleBounds() override; + virtual gfx::Rect GetHelpButtonBounds() override; // Overriden from OverlayEventFilter::Delegate. - virtual void Cancel() OVERRIDE; - virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual aura::Window* GetWindow() OVERRIDE; + virtual void Cancel() override; + virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) override; + virtual aura::Window* GetWindow() override; private: views::Widget* widget_; diff --git a/ash/first_run/first_run_helper_unittest.cc b/ash/first_run/first_run_helper_unittest.cc index df272aa..4552ff4 100644 --- a/ash/first_run/first_run_helper_unittest.cc +++ b/ash/first_run/first_run_helper_unittest.cc @@ -24,7 +24,7 @@ class TestModalDialogDelegate : public views::DialogDelegateView { virtual ~TestModalDialogDelegate() {} // Overridden from views::WidgetDelegate: - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; } @@ -45,7 +45,7 @@ class CountingEventHandler : public ui::EventHandler { private: // ui::EventHandler overrides. - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { ++*mouse_events_registered_; } @@ -63,7 +63,7 @@ class FirstRunHelperTest : public AshTestBase, virtual ~FirstRunHelperTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); CheckContainersAreVisible(); helper_.reset(ash::Shell::GetInstance()->CreateFirstRunHelper()); @@ -71,7 +71,7 @@ class FirstRunHelperTest : public AshTestBase, helper_->GetOverlayWidget()->Show(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { EXPECT_TRUE(helper_.get()); helper_.reset(); CheckContainersAreVisible(); @@ -106,7 +106,7 @@ class FirstRunHelperTest : public AshTestBase, private: // FirstRunHelper::Observer overrides. - virtual void OnCancelled() OVERRIDE { + virtual void OnCancelled() override { ++cancelled_times_; } diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 74569d3..8855adc 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -43,15 +43,15 @@ class PanedWidgetDelegate : public views::WidgetDelegate { } // views::WidgetDelegate. - virtual void GetAccessiblePanes(std::vector<views::View*>* panes) OVERRIDE { + virtual void GetAccessiblePanes(std::vector<views::View*>* panes) override { std::copy(accessible_panes_.begin(), accessible_panes_.end(), std::back_inserter(*panes)); } - virtual views::Widget* GetWidget() OVERRIDE { + virtual views::Widget* GetWidget() override { return widget_; }; - virtual const views::Widget* GetWidget() const OVERRIDE { + virtual const views::Widget* GetWidget() const override { return widget_; } @@ -66,7 +66,7 @@ class FocusCyclerTest : public AshTestBase { public: FocusCyclerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); focus_cycler_.reset(new FocusCycler()); @@ -74,7 +74,7 @@ class FocusCyclerTest : public AshTestBase { ASSERT_TRUE(Shelf::ForPrimaryDisplay()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (tray_) { GetStatusAreaWidgetDelegate(tray_->GetWidget())-> SetFocusCyclerForTesting(NULL); diff --git a/ash/frame/caption_buttons/frame_caption_button.h b/ash/frame/caption_buttons/frame_caption_button.h index a348e30..14efb16 100644 --- a/ash/frame/caption_buttons/frame_caption_button.h +++ b/ash/frame/caption_buttons/frame_caption_button.h @@ -50,9 +50,9 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton { void SetAlpha(int alpha); // views::View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; void set_paint_as_active(bool paint_as_active) { paint_as_active_ = paint_as_active; @@ -64,7 +64,7 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton { protected: // views::CustomButton override: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: // Returns the icon image to paint based on |paint_as_active_|. diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.h b/ash/frame/caption_buttons/frame_caption_button_container_view.h index 658df05..3b70fcb 100644 --- a/ash/frame/caption_buttons/frame_caption_button_container_view.h +++ b/ash/frame/caption_buttons/frame_caption_button_container_view.h @@ -101,13 +101,13 @@ class ASH_EXPORT FrameCaptionButtonContainerView void UpdateSizeButtonVisibility(); // views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual const char* GetClassName() const override; // Overridden from gfx::AnimationDelegate: - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationProgressed(const gfx::Animation* animation) override; private: friend class FrameCaptionButtonContainerViewTest; @@ -140,19 +140,19 @@ class ASH_EXPORT FrameCaptionButtonContainerView // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // FrameSizeButtonDelegate: - virtual bool IsMinimizeButtonVisible() const OVERRIDE; - virtual void SetButtonsToNormal(Animate animate) OVERRIDE; + virtual bool IsMinimizeButtonVisible() const override; + virtual void SetButtonsToNormal(Animate animate) override; virtual void SetButtonIcons(CaptionButtonIcon minimize_button_icon, CaptionButtonIcon close_button_icon, - Animate animate) OVERRIDE; + Animate animate) override; virtual const FrameCaptionButton* GetButtonClosestTo( - const gfx::Point& position_in_screen) const OVERRIDE; + const gfx::Point& position_in_screen) const override; virtual void SetHoveredAndPressedButtons( const FrameCaptionButton* to_hover, - const FrameCaptionButton* to_press) OVERRIDE; + const FrameCaptionButton* to_press) override; // The widget that the buttons act on. views::Widget* frame_; diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc index 682883c..04a1d09 100644 --- a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc +++ b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc @@ -24,11 +24,11 @@ class TestWidgetDelegate : public views::WidgetDelegateView { virtual ~TestWidgetDelegate() { } - virtual bool CanMaximize() const OVERRIDE { + virtual bool CanMaximize() const override { return can_maximize_; } - virtual bool CanMinimize() const OVERRIDE { + virtual bool CanMinimize() const override { return can_maximize_; } diff --git a/ash/frame/caption_buttons/frame_size_button.h b/ash/frame/caption_buttons/frame_size_button.h index f1ac605..49babd4 100644 --- a/ash/frame/caption_buttons/frame_size_button.h +++ b/ash/frame/caption_buttons/frame_size_button.h @@ -36,12 +36,12 @@ class ASH_EXPORT FrameSizeButton : public FrameCaptionButton { virtual ~FrameSizeButton(); // views::CustomButton overrides: - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual void OnMouseMoved(const ui::MouseEvent& event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; void set_delay_to_set_buttons_to_snap_mode(int delay_ms) { set_buttons_to_snap_mode_delay_ms_ = delay_ms; diff --git a/ash/frame/caption_buttons/frame_size_button_unittest.cc b/ash/frame/caption_buttons/frame_size_button_unittest.cc index 8736308..0be0b38 100644 --- a/ash/frame/caption_buttons/frame_size_button_unittest.cc +++ b/ash/frame/caption_buttons/frame_size_button_unittest.cc @@ -31,16 +31,16 @@ class TestWidgetDelegate : public views::WidgetDelegateView { 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; } @@ -50,7 +50,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView { private: // Overridden from views::View: - virtual void Layout() OVERRIDE { + virtual void Layout() override { caption_button_container_->Layout(); // Right align the caption button container. @@ -60,7 +60,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView { } 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); @@ -125,7 +125,7 @@ class FrameSizeButtonTest : public AshTestBase { } // AshTestBase overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); TestWidgetDelegate* delegate = new TestWidgetDelegate(); @@ -408,14 +408,14 @@ class FrameSizeButtonTestRTL : public FrameSizeButtonTest { 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_); } diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc index f4422fc..8cdb026 100644 --- a/ash/frame/custom_frame_view_ash.cc +++ b/ash/frame/custom_frame_view_ash.cc @@ -74,7 +74,7 @@ class CustomFrameViewAshWindowStateDelegate } private: // Overridden from ash::wm::WindowStateDelegate: - virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) OVERRIDE { + virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) override { bool enter_fullscreen = !window_state->IsFullscreen(); if (enter_fullscreen) { window_state->window()->SetProperty(aura::client::kShowStateKey, @@ -90,7 +90,7 @@ class CustomFrameViewAshWindowStateDelegate return true; } // Overridden from aura::WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override { window_state_->RemoveObserver(this); window_state_->window()->RemoveObserver(this); window_state_ = NULL; @@ -98,7 +98,7 @@ class CustomFrameViewAshWindowStateDelegate // Overridden from ash::wm::WindowStateObserver: virtual void OnPostWindowStateTypeChange( ash::wm::WindowState* window_state, - ash::wm::WindowStateType old_type) OVERRIDE { + ash::wm::WindowStateType old_type) override { if (!window_state->IsFullscreen() && !window_state->IsMinimized() && immersive_fullscreen_controller_.get() && @@ -154,13 +154,13 @@ class CustomFrameViewAsh::HeaderView void SizeConstraintsChanged(); // views::View: - virtual void Layout() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; + virtual void Layout() override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void ChildPreferredSizeChanged(views::View* child) override; // ShellObserver: - virtual void OnMaximizeModeStarted() OVERRIDE; - virtual void OnMaximizeModeEnded() OVERRIDE; + virtual void OnMaximizeModeStarted() override; + virtual void OnMaximizeModeEnded() override; FrameCaptionButtonContainerView* caption_button_container() { return caption_button_container_; @@ -172,11 +172,11 @@ class CustomFrameViewAsh::HeaderView private: // ImmersiveFullscreenController::Delegate: - virtual void OnImmersiveRevealStarted() OVERRIDE; - virtual void OnImmersiveRevealEnded() OVERRIDE; - virtual void OnImmersiveFullscreenExited() OVERRIDE; - virtual void SetVisibleFraction(double visible_fraction) OVERRIDE; - virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const OVERRIDE; + virtual void OnImmersiveRevealStarted() override; + virtual void OnImmersiveRevealEnded() override; + virtual void OnImmersiveFullscreenExited() override; + virtual void SetVisibleFraction(double visible_fraction) override; + virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override; // The widget that the caption buttons act on. views::Widget* frame_; @@ -373,12 +373,12 @@ class CustomFrameViewAsh::OverlayView : public views::View, virtual ~OverlayView(); // views::View: - virtual void Layout() OVERRIDE; + virtual void Layout() override; private: // views::ViewTargeterDelegate: virtual bool DoesIntersectRect(const views::View* target, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; HeaderView* header_view_; diff --git a/ash/frame/custom_frame_view_ash.h b/ash/frame/custom_frame_view_ash.h index 819e6fa..4abe923 100644 --- a/ash/frame/custom_frame_view_ash.h +++ b/ash/frame/custom_frame_view_ash.h @@ -42,25 +42,25 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView { ImmersiveFullscreenController* immersive_fullscreen_controller); // views::NonClientFrameView: - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; + virtual gfx::Rect GetBoundsForClientView() const override; virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE; - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; + const gfx::Rect& client_bounds) const override; + virtual int NonClientHitTest(const gfx::Point& point) override; virtual void GetWindowMask(const gfx::Size& size, - gfx::Path* window_mask) OVERRIDE; - virtual void ResetWindowControls() OVERRIDE; - virtual void UpdateWindowIcon() OVERRIDE; - virtual void UpdateWindowTitle() OVERRIDE; - virtual void SizeConstraintsChanged() OVERRIDE; + gfx::Path* window_mask) override; + virtual void ResetWindowControls() override; + virtual void UpdateWindowIcon() override; + virtual void UpdateWindowTitle() override; + virtual void SizeConstraintsChanged() override; // views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; - virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual const char* GetClassName() const override; + virtual gfx::Size GetMinimumSize() const override; + virtual gfx::Size GetMaximumSize() const override; + virtual void SchedulePaintInRect(const gfx::Rect& r) override; virtual void VisibilityChanged(views::View* starting_from, - bool is_visible) OVERRIDE; + bool is_visible) override; // Get the view of the header. views::View* GetHeaderView(); @@ -73,7 +73,7 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView { // views::NonClientFrameView: virtual bool DoesIntersectRect(const views::View* target, - const gfx::Rect& rect) const OVERRIDE; + const gfx::Rect& rect) const override; // Returns the container for the minimize/maximize/close buttons that is held // by the HeaderView. Used in testing. diff --git a/ash/frame/custom_frame_view_ash_unittest.cc b/ash/frame/custom_frame_view_ash_unittest.cc index f947692..16cab37 100644 --- a/ash/frame/custom_frame_view_ash_unittest.cc +++ b/ash/frame/custom_frame_view_ash_unittest.cc @@ -27,7 +27,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView { virtual ~TestWidgetDelegate() {} virtual views::NonClientFrameView* CreateNonClientFrameView( - views::Widget* widget) OVERRIDE { + views::Widget* widget) override { custom_frame_view_ = new CustomFrameViewAsh(widget); return custom_frame_view_; } @@ -49,26 +49,26 @@ class TestWidgetConstraintsDelegate : public TestWidgetDelegate { virtual ~TestWidgetConstraintsDelegate() {} // views::View: - virtual gfx::Size GetMinimumSize() const OVERRIDE { + virtual gfx::Size GetMinimumSize() const override { return minimum_size_; } - virtual gfx::Size GetMaximumSize() const OVERRIDE { + virtual gfx::Size GetMaximumSize() const override { return maximum_size_; } - virtual views::View* GetContentsView() OVERRIDE { + virtual views::View* GetContentsView() override { // Set this instance as the contents view so that the maximum and minimum // size constraints will be used. return this; } // views::WidgetDelegate: - virtual bool CanMaximize() const OVERRIDE { + virtual bool CanMaximize() const override { return true; } - virtual bool CanMinimize() const OVERRIDE { + virtual bool CanMinimize() const override { return true; } diff --git a/ash/frame/default_header_painter.h b/ash/frame/default_header_painter.h index c0ca2fd..579197d 100644 --- a/ash/frame/default_header_painter.h +++ b/ash/frame/default_header_painter.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "ash/frame/header_painter.h" #include "base/basictypes.h" -#include "base/compiler_specific.h" // OVERRIDE +#include "base/compiler_specific.h" // override #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkColor.h" @@ -40,13 +40,13 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter, FrameCaptionButtonContainerView* caption_button_container); // HeaderPainter overrides: - virtual int GetMinimumHeaderWidth() const OVERRIDE; - virtual void PaintHeader(gfx::Canvas* canvas, Mode mode) OVERRIDE; - virtual void LayoutHeader() OVERRIDE; - virtual int GetHeaderHeightForPainting() const OVERRIDE; - virtual void SetHeaderHeightForPainting(int height) OVERRIDE; - virtual void SchedulePaintForTitle() OVERRIDE; - virtual void UpdateLeftViewXInset(int left_view_x_inset) OVERRIDE; + virtual int GetMinimumHeaderWidth() const override; + virtual void PaintHeader(gfx::Canvas* canvas, Mode mode) override; + virtual void LayoutHeader() override; + virtual int GetHeaderHeightForPainting() const override; + virtual void SetHeaderHeightForPainting(int height) override; + virtual void SchedulePaintForTitle() override; + virtual void UpdateLeftViewXInset(int left_view_x_inset) override; // Sets the left header view for the header. Passing NULL removes the view. void UpdateLeftHeaderView(views::View* left_header_view); @@ -55,7 +55,7 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter, FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment); // gfx::AnimationDelegate override: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; // Paints highlight around the edge of the header for inactive restored // windows. diff --git a/ash/gpu_support_stub.h b/ash/gpu_support_stub.h index b1be11d..59e063b 100644 --- a/ash/gpu_support_stub.h +++ b/ash/gpu_support_stub.h @@ -19,10 +19,10 @@ class ASH_EXPORT GPUSupportStub : 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(GPUSupportStub); }; diff --git a/ash/high_contrast/high_contrast_controller.h b/ash/high_contrast/high_contrast_controller.h index 10d0b7d..8475217 100644 --- a/ash/high_contrast/high_contrast_controller.h +++ b/ash/high_contrast/high_contrast_controller.h @@ -24,7 +24,7 @@ class ASH_EXPORT HighContrastController : public ShellObserver { void SetEnabled(bool enabled); // ShellObserver: - virtual void OnRootWindowAdded(aura::Window* root_window) OVERRIDE; + virtual void OnRootWindowAdded(aura::Window* root_window) override; private: // Update high contrast mode on the passed display. diff --git a/ash/host/ash_remote_window_tree_host_win.h b/ash/host/ash_remote_window_tree_host_win.h index 63017f2d..8c97db9 100644 --- a/ash/host/ash_remote_window_tree_host_win.h +++ b/ash/host/ash_remote_window_tree_host_win.h @@ -24,19 +24,19 @@ class ASH_EXPORT AshRemoteWindowTreeHostWin virtual ~AshRemoteWindowTreeHostWin(); // AshWindowTreeHost: - virtual void ToggleFullScreen() OVERRIDE; - virtual bool ConfineCursorToRootWindow() OVERRIDE; - virtual void UnConfineCursor() OVERRIDE; + virtual void ToggleFullScreen() override; + virtual bool ConfineCursorToRootWindow() override; + virtual void UnConfineCursor() override; virtual void SetRootWindowTransformer( - scoped_ptr<RootWindowTransformer> transformer) OVERRIDE; - virtual gfx::Insets GetHostInsets() const OVERRIDE; - virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE; + scoped_ptr<RootWindowTransformer> transformer) override; + virtual gfx::Insets GetHostInsets() const override; + virtual aura::WindowTreeHost* AsWindowTreeHost() override; // WindowTreeHostWin: - virtual gfx::Transform GetRootTransform() const OVERRIDE; - virtual void SetRootTransform(const gfx::Transform& transform) OVERRIDE; - virtual gfx::Transform GetInverseRootTransform() const OVERRIDE; - virtual void UpdateRootWindowSize(const gfx::Size& host_size) OVERRIDE; + virtual gfx::Transform GetRootTransform() const override; + virtual void SetRootTransform(const gfx::Transform& transform) override; + virtual gfx::Transform GetInverseRootTransform() const override; + virtual void UpdateRootWindowSize(const gfx::Size& host_size) override; TransformerHelper transformer_helper_; diff --git a/ash/host/ash_window_tree_host_ozone.cc b/ash/host/ash_window_tree_host_ozone.cc index 6b24015..764eede 100644 --- a/ash/host/ash_window_tree_host_ozone.cc +++ b/ash/host/ash_window_tree_host_ozone.cc @@ -23,17 +23,17 @@ class AshWindowTreeHostOzone : public AshWindowTreeHost, private: // AshWindowTreeHost: - virtual void ToggleFullScreen() OVERRIDE; - virtual bool ConfineCursorToRootWindow() OVERRIDE; - virtual void UnConfineCursor() OVERRIDE; + virtual void ToggleFullScreen() override; + virtual bool ConfineCursorToRootWindow() override; + virtual void UnConfineCursor() override; virtual void SetRootWindowTransformer( - scoped_ptr<RootWindowTransformer> transformer) OVERRIDE; - virtual gfx::Insets GetHostInsets() const OVERRIDE; - virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE; - virtual void SetRootTransform(const gfx::Transform& transform) OVERRIDE; - virtual gfx::Transform GetRootTransform() const OVERRIDE; - virtual gfx::Transform GetInverseRootTransform() const OVERRIDE; - virtual void UpdateRootWindowSize(const gfx::Size& host_size) OVERRIDE; + scoped_ptr<RootWindowTransformer> transformer) override; + virtual gfx::Insets GetHostInsets() const override; + virtual aura::WindowTreeHost* AsWindowTreeHost() override; + virtual void SetRootTransform(const gfx::Transform& transform) override; + virtual gfx::Transform GetRootTransform() const override; + virtual gfx::Transform GetInverseRootTransform() const override; + virtual void UpdateRootWindowSize(const gfx::Size& host_size) override; TransformerHelper transformer_helper_; diff --git a/ash/host/ash_window_tree_host_win.cc b/ash/host/ash_window_tree_host_win.cc index aa6be93..2219914 100644 --- a/ash/host/ash_window_tree_host_win.cc +++ b/ash/host/ash_window_tree_host_win.cc @@ -32,7 +32,7 @@ class AshWindowTreeHostWin : public AshWindowTreeHost, private: // AshWindowTreeHost: - virtual void ToggleFullScreen() OVERRIDE { + virtual void ToggleFullScreen() override { gfx::Rect target_rect; if (!fullscreen_) { fullscreen_ = true; @@ -66,19 +66,19 @@ class AshWindowTreeHostWin : public AshWindowTreeHost, target_rect.height(), SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); } - virtual bool ConfineCursorToRootWindow() OVERRIDE { return false; } - virtual void UnConfineCursor() OVERRIDE { NOTIMPLEMENTED(); } + virtual bool ConfineCursorToRootWindow() override { return false; } + virtual void UnConfineCursor() override { NOTIMPLEMENTED(); } virtual void SetRootWindowTransformer( scoped_ptr<RootWindowTransformer> transformer) { transformer_helper_.SetRootWindowTransformer(transformer.Pass()); } - virtual gfx::Insets GetHostInsets() const OVERRIDE { + virtual gfx::Insets GetHostInsets() const override { return transformer_helper_.GetHostInsets(); } - virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE { return this; } + virtual aura::WindowTreeHost* AsWindowTreeHost() override { return this; } // WindowTreeHostWin: - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE { + virtual void SetBounds(const gfx::Rect& bounds) override { if (fullscreen_) { saved_window_rect_.right = saved_window_rect_.left + bounds.width(); saved_window_rect_.bottom = saved_window_rect_.top + bounds.height(); @@ -86,16 +86,16 @@ class AshWindowTreeHostWin : public AshWindowTreeHost, } WindowTreeHostWin::SetBounds(bounds); } - virtual void SetRootTransform(const gfx::Transform& transform) OVERRIDE { + virtual void SetRootTransform(const gfx::Transform& transform) override { transformer_helper_.SetTransform(transform); } gfx::Transform GetRootTransform() const { return transformer_helper_.GetTransform(); } - virtual gfx::Transform GetInverseRootTransform() const OVERRIDE { + virtual gfx::Transform GetInverseRootTransform() const override { return transformer_helper_.GetInverseTransform(); } - virtual void UpdateRootWindowSize(const gfx::Size& host_size) OVERRIDE { + virtual void UpdateRootWindowSize(const gfx::Size& host_size) override { transformer_helper_.UpdateWindowSize(host_size); } diff --git a/ash/host/ash_window_tree_host_x11.h b/ash/host/ash_window_tree_host_x11.h index 1a3335d..3fc4e2b 100644 --- a/ash/host/ash_window_tree_host_x11.h +++ b/ash/host/ash_window_tree_host_x11.h @@ -25,33 +25,33 @@ class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost, private: // AshWindowTreeHost: - virtual void ToggleFullScreen() OVERRIDE; - virtual bool ConfineCursorToRootWindow() OVERRIDE; - virtual void UnConfineCursor() OVERRIDE; + virtual void ToggleFullScreen() override; + virtual bool ConfineCursorToRootWindow() override; + virtual void UnConfineCursor() override; virtual void SetRootWindowTransformer( - scoped_ptr<RootWindowTransformer> transformer) OVERRIDE; - virtual gfx::Insets GetHostInsets() const OVERRIDE; - virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE; - virtual void UpdateDisplayID(int64 id1, int64 id2) OVERRIDE; - virtual void PrepareForShutdown() OVERRIDE; + scoped_ptr<RootWindowTransformer> transformer) override; + virtual gfx::Insets GetHostInsets() const override; + virtual aura::WindowTreeHost* AsWindowTreeHost() override; + virtual void UpdateDisplayID(int64 id1, int64 id2) override; + virtual void PrepareForShutdown() override; // aura::WindowTreehost: - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual gfx::Transform GetRootTransform() const OVERRIDE; - virtual void SetRootTransform(const gfx::Transform& transform) OVERRIDE; - virtual gfx::Transform GetInverseRootTransform() const OVERRIDE; - virtual void UpdateRootWindowSize(const gfx::Size& host_size) OVERRIDE; - virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual gfx::Transform GetRootTransform() const override; + virtual void SetRootTransform(const gfx::Transform& transform) override; + virtual gfx::Transform GetInverseRootTransform() const override; + virtual void UpdateRootWindowSize(const gfx::Size& host_size) override; + virtual void OnCursorVisibilityChangedNative(bool show) override; // aura::WindowTreeHostX11: - virtual void OnConfigureNotify() OVERRIDE; - virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual void OnConfigureNotify() override; + virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event) - OVERRIDE; + override; // EnvObserver overrides. - virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; - virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE; + virtual void OnWindowInitialized(aura::Window* window) override; + virtual void OnHostInitialized(aura::WindowTreeHost* host) override; #if defined(OS_CHROMEOS) // Set the CrOS touchpad "tap paused" property. It is used to temporarily diff --git a/ash/host/ash_window_tree_host_x11_unittest.cc b/ash/host/ash_window_tree_host_x11_unittest.cc index dad98cb..14642da 100644 --- a/ash/host/ash_window_tree_host_x11_unittest.cc +++ b/ash/host/ash_window_tree_host_x11_unittest.cc @@ -32,7 +32,7 @@ class RootWindowEventHandler : public ui::EventHandler { virtual ~RootWindowEventHandler() { target_->RemovePreTargetHandler(this); } // ui::EventHandler: - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { last_touch_id_ = event->touch_id(); last_touch_type_ = event->type(); last_touch_location_ = event->location(); @@ -59,7 +59,7 @@ namespace ash { class AshWindowTreeHostX11Test : public aura::test::AuraTestBase { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { aura::test::AuraTestBase::SetUp(); #if defined(OS_CHROMEOS) @@ -69,7 +69,7 @@ class AshWindowTreeHostX11Test : public aura::test::AuraTestBase { #endif } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { aura::test::AuraTestBase::TearDown(); #if defined(OS_CHROMEOS) diff --git a/ash/host/transformer_helper.cc b/ash/host/transformer_helper.cc index f68ffc9..ce377cf 100644 --- a/ash/host/transformer_helper.cc +++ b/ash/host/transformer_helper.cc @@ -27,9 +27,9 @@ class SimpleRootWindowTransformer : public RootWindowTransformer { : root_window_(root_window), transform_(transform) {} // RootWindowTransformer overrides: - virtual gfx::Transform GetTransform() const OVERRIDE { return transform_; } + virtual gfx::Transform GetTransform() const override { return transform_; } - virtual gfx::Transform GetInverseTransform() const OVERRIDE { + virtual gfx::Transform GetInverseTransform() const override { gfx::Transform invert; if (!transform_.GetInverse(&invert)) return transform_; @@ -37,14 +37,14 @@ class SimpleRootWindowTransformer : public RootWindowTransformer { } virtual gfx::Rect GetRootWindowBounds(const gfx::Size& host_size) const - OVERRIDE { + override { gfx::Rect bounds(host_size); gfx::RectF new_bounds(ui::ConvertRectToDIP(root_window_->layer(), bounds)); transform_.TransformRect(&new_bounds); return gfx::Rect(gfx::ToFlooredSize(new_bounds.size())); } - virtual gfx::Insets GetHostInsets() const OVERRIDE { return gfx::Insets(); } + virtual gfx::Insets GetHostInsets() const override { return gfx::Insets(); } private: virtual ~SimpleRootWindowTransformer() {} diff --git a/ash/ime/candidate_view.cc b/ash/ime/candidate_view.cc index e99167f..0cafbe1 100644 --- a/ash/ime/candidate_view.cc +++ b/ash/ime/candidate_view.cc @@ -30,7 +30,7 @@ class VerticalCandidateLabel : public views::Label { // Returns the preferred size, but guarantees that the width has at // least kMinCandidateLabelWidth pixels. - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { gfx::Size size = Label::GetPreferredSize(); size.SetToMax(gfx::Size(kMinCandidateLabelWidth, 0)); size.SetToMin(gfx::Size(kMaxCandidateLabelWidth, size.height())); diff --git a/ash/ime/candidate_view.h b/ash/ime/candidate_view.h index 546f640..f800a40 100644 --- a/ash/ime/candidate_view.h +++ b/ash/ime/candidate_view.h @@ -40,12 +40,12 @@ class ASH_EXPORT CandidateView : public views::CustomButton { FRIEND_TEST_ALL_PREFIXES(CandidateWindowViewTest, ShortcutSettingTest); // Overridden from views::CustomButton: - virtual void StateChanged() OVERRIDE; + virtual void StateChanged() override; // Overridden from View: - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; // The orientation of the candidate view. ui::CandidateWindow::Orientation orientation_; diff --git a/ash/ime/candidate_view_unittest.cc b/ash/ime/candidate_view_unittest.cc index 92d14d2..a7396eb 100644 --- a/ash/ime/candidate_view_unittest.cc +++ b/ash/ime/candidate_view_unittest.cc @@ -32,7 +32,7 @@ class CandidateViewTest : public views::ViewsTestBase, CandidateViewTest() : widget_(NULL), last_pressed_(NULL) {} virtual ~CandidateViewTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { views::ViewsTestBase::SetUp(); views::Widget::InitParams init_params(CreateParams( @@ -61,7 +61,7 @@ class CandidateViewTest : public views::ViewsTestBase, native_window->GetRootWindow(), native_window)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { widget_->Close(); views::ViewsTestBase::TearDown(); @@ -101,7 +101,7 @@ class CandidateViewTest : public views::ViewsTestBase, private: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE { + const ui::Event& event) override { last_pressed_ = sender; } diff --git a/ash/ime/candidate_window_view.cc b/ash/ime/candidate_window_view.cc index 7cd7107..af71647 100644 --- a/ash/ime/candidate_window_view.cc +++ b/ash/ime/candidate_window_view.cc @@ -42,7 +42,7 @@ class CandidateWindowBorder : public views::BubbleBorder { private: // Overridden from views::BubbleBorder: virtual gfx::Rect GetBounds(const gfx::Rect& anchor_rect, - const gfx::Size& content_size) const OVERRIDE { + const gfx::Size& content_size) const override { gfx::Rect bounds(content_size); bounds.set_origin(gfx::Point( anchor_rect.x() - offset_, @@ -62,7 +62,7 @@ class CandidateWindowBorder : public views::BubbleBorder { return bounds; } - virtual gfx::Insets GetInsets() const OVERRIDE { + virtual gfx::Insets GetInsets() const override { return gfx::Insets(); } @@ -130,7 +130,7 @@ class InformationTextArea : public views::View { } protected: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { gfx::Size size = views::View::GetPreferredSize(); size.SetToMax(gfx::Size(min_width_, 0)); return size; diff --git a/ash/ime/candidate_window_view.h b/ash/ime/candidate_window_view.h index ee2c510..4cbc5b7 100644 --- a/ash/ime/candidate_window_view.h +++ b/ash/ime/candidate_window_view.h @@ -75,7 +75,7 @@ class ASH_EXPORT CandidateWindowView : public views::BubbleDelegateView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; void SelectCandidateAt(int index_in_page); void UpdateVisibility(); diff --git a/ash/ime/infolist_window.cc b/ash/ime/infolist_window.cc index f529948..3467b87 100644 --- a/ash/ime/infolist_window.cc +++ b/ash/ime/infolist_window.cc @@ -44,8 +44,8 @@ class InfolistBorder : public views::BubbleBorder { // views::BubbleBorder implementation. virtual gfx::Rect GetBounds(const gfx::Rect& anchor_rect, - const gfx::Size& contents_size) const OVERRIDE; - virtual gfx::Insets GetInsets() const OVERRIDE; + const gfx::Size& contents_size) const override; + virtual gfx::Insets GetInsets() const override; private: DISALLOW_COPY_AND_ASSIGN(InfolistBorder); @@ -94,7 +94,7 @@ class InfolistEntryView : public views::View { private: // views::View implementation. - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; void UpdateBackground(); diff --git a/ash/ime/infolist_window.h b/ash/ime/infolist_window.h index 921c87b..345c1a1 100644 --- a/ash/ime/infolist_window.h +++ b/ash/ime/infolist_window.h @@ -42,7 +42,7 @@ class ASH_EXPORT InfolistWindow : public views::BubbleDelegateView { private: // views::WidgetDelegate implementation. - virtual void WindowClosing() OVERRIDE; + virtual void WindowClosing() override; // The list of visible entries. Owned by views hierarchy. std::vector<InfolistEntryView*> entry_views_; diff --git a/ash/ime/input_method_menu_manager_unittest.cc b/ash/ime/input_method_menu_manager_unittest.cc index ba92001..e843cf3 100644 --- a/ash/ime/input_method_menu_manager_unittest.cc +++ b/ash/ime/input_method_menu_manager_unittest.cc @@ -22,7 +22,7 @@ class MockObserver : public InputMethodMenuManager::Observer { // Called when the list of menu items is changed. virtual void InputMethodMenuItemChanged( - InputMethodMenuManager* manager) OVERRIDE { + InputMethodMenuManager* manager) override { input_method_menu_item_changed_count_++; } int input_method_menu_item_changed_count_; @@ -33,12 +33,12 @@ class InputMethodMenuManagerStatefulTest : public testing::Test{ InputMethodMenuManagerStatefulTest() : observer_(new MockObserver()) {} virtual ~InputMethodMenuManagerStatefulTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { menu_manager_ = InputMethodMenuManager::GetInstance(); menu_manager_->AddObserver(observer_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { menu_manager_->RemoveObserver(observer_.get()); } diff --git a/ash/ime/mode_indicator_view.cc b/ash/ime/mode_indicator_view.cc index e0c6f2f..9c16b56 100644 --- a/ash/ime/mode_indicator_view.cc +++ b/ash/ime/mode_indicator_view.cc @@ -32,7 +32,7 @@ class ModeIndicatorFrameView : public views::BubbleFrameView { private: // views::BubbleFrameView overrides: - virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) OVERRIDE { + virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) override { return gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint( rect.CenterPoint()).bounds(); } diff --git a/ash/ime/mode_indicator_view.h b/ash/ime/mode_indicator_view.h index aae64ef..b38997b 100644 --- a/ash/ime/mode_indicator_view.h +++ b/ash/ime/mode_indicator_view.h @@ -31,15 +31,15 @@ class ASH_EXPORT ModeIndicatorView : public views::BubbleDelegateView { void ShowAndFadeOut(); // views::BubbleDelegateView override: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; protected: // views::BubbleDelegateView override: - virtual void Init() OVERRIDE; + virtual void Init() override; // views::WidgetDelegateView overrides: virtual views::NonClientFrameView* CreateNonClientFrameView( - views::Widget* widget) OVERRIDE; + views::Widget* widget) override; private: gfx::Rect cursor_bounds_; diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate.cc b/ash/keyboard_overlay/keyboard_overlay_delegate.cc index 391fa61..84daf8d 100644 --- a/ash/keyboard_overlay/keyboard_overlay_delegate.cc +++ b/ash/keyboard_overlay/keyboard_overlay_delegate.cc @@ -36,7 +36,7 @@ class PaintMessageHandler virtual ~PaintMessageHandler() {} // WebUIMessageHandler implementation. - virtual void RegisterMessages() OVERRIDE; + virtual void RegisterMessages() override; private: void DidPaint(const base::ListValue* args); diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate.h b/ash/keyboard_overlay/keyboard_overlay_delegate.h index 91d7ddd..d9f8cf2 100644 --- a/ash/keyboard_overlay/keyboard_overlay_delegate.h +++ b/ash/keyboard_overlay/keyboard_overlay_delegate.h @@ -29,7 +29,7 @@ class ASH_WITH_CONTENT_EXPORT KeyboardOverlayDelegate views::Widget* Show(views::WebDialogView* view); // Overridden from ui::WebDialogDelegate: - virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; + virtual void GetDialogSize(gfx::Size* size) const override; private: FRIEND_TEST_ALL_PREFIXES(KeyboardOverlayDelegateTest, ShowAndClose); @@ -37,18 +37,18 @@ class ASH_WITH_CONTENT_EXPORT KeyboardOverlayDelegate virtual ~KeyboardOverlayDelegate(); // Overridden from ui::WebDialogDelegate: - virtual ui::ModalType GetDialogModalType() const OVERRIDE; - virtual base::string16 GetDialogTitle() const OVERRIDE; - virtual GURL GetDialogContentURL() const OVERRIDE; + virtual ui::ModalType GetDialogModalType() const override; + virtual base::string16 GetDialogTitle() const override; + virtual GURL GetDialogContentURL() const override; virtual void GetWebUIMessageHandlers( - std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; - virtual std::string GetDialogArgs() const OVERRIDE; - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const override; + virtual std::string GetDialogArgs() const override; + virtual void OnDialogClosed(const std::string& json_retval) override; virtual void OnCloseContents(content::WebContents* source, - bool* out_close_dialog) OVERRIDE; - virtual bool ShouldShowDialogTitle() const OVERRIDE; + bool* out_close_dialog) override; + virtual bool ShouldShowDialogTitle() const override; virtual bool HandleContextMenu( - const content::ContextMenuParams& params) OVERRIDE; + const content::ContextMenuParams& params) override; // The dialog title. base::string16 title_; diff --git a/ash/keyboard_overlay/keyboard_overlay_view.h b/ash/keyboard_overlay/keyboard_overlay_view.h index 2fb0a59..52045b5 100644 --- a/ash/keyboard_overlay/keyboard_overlay_view.h +++ b/ash/keyboard_overlay/keyboard_overlay_view.h @@ -41,9 +41,9 @@ class ASH_WITH_CONTENT_EXPORT KeyboardOverlayView virtual ~KeyboardOverlayView(); // Overridden from ash::OverlayEventFilter::Delegate: - virtual void Cancel() OVERRIDE; - virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual aura::Window* GetWindow() OVERRIDE; + virtual void Cancel() override; + virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) override; + virtual aura::Window* GetWindow() override; // Shows the keyboard overlay. static void ShowDialog(content::BrowserContext* context, @@ -55,7 +55,7 @@ class ASH_WITH_CONTENT_EXPORT KeyboardOverlayView FRIEND_TEST_ALL_PREFIXES(KeyboardOverlayViewTest, NoRedundantCancelingKeys); // Overridden from views::WidgetDelegate: - virtual void WindowClosing() OVERRIDE; + virtual void WindowClosing() override; static void GetCancelingKeysForTesting( std::vector<KeyEventData>* canceling_keys); diff --git a/ash/keyboard_uma_event_filter.h b/ash/keyboard_uma_event_filter.h index 85ea4c6..0928e7f 100644 --- a/ash/keyboard_uma_event_filter.h +++ b/ash/keyboard_uma_event_filter.h @@ -20,7 +20,7 @@ class KeyboardUMAEventFilter : public ui::EventHandler { virtual ~KeyboardUMAEventFilter(); // ui::EventHandler overrides: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; private: // The timestamp of the last character keystroke. diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index e5119a9..a649f30 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -69,31 +69,31 @@ class MagnificationControllerImpl : virtual public MagnificationController, virtual ~MagnificationControllerImpl(); // MagnificationController overrides: - virtual void SetEnabled(bool enabled) OVERRIDE; - virtual bool IsEnabled() const OVERRIDE; - virtual void SetScale(float scale, bool animate) OVERRIDE; - virtual float GetScale() const OVERRIDE { return scale_; } - virtual void MoveWindow(int x, int y, bool animate) OVERRIDE; - virtual void MoveWindow(const gfx::Point& point, bool animate) OVERRIDE; - virtual gfx::Point GetWindowPosition() const OVERRIDE { + virtual void SetEnabled(bool enabled) override; + virtual bool IsEnabled() const override; + virtual void SetScale(float scale, bool animate) override; + virtual float GetScale() const override { return scale_; } + virtual void MoveWindow(int x, int y, bool animate) override; + virtual void MoveWindow(const gfx::Point& point, bool animate) override; + virtual gfx::Point GetWindowPosition() const override { return gfx::ToFlooredPoint(origin_); } - virtual void SetScrollDirection(ScrollDirection direction) OVERRIDE; + virtual void SetScrollDirection(ScrollDirection direction) override; // For test - virtual gfx::Point GetPointOfInterestForTesting() OVERRIDE { + virtual gfx::Point GetPointOfInterestForTesting() override { return point_of_interest_; } private: // ui::ImplicitAnimationObserver overrides: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; // aura::WindowObserver overrides: - virtual void OnWindowDestroying(aura::Window* root_window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* root_window) override; virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; // Redraws the magnification window with the given origin position and the // given scale. Returns true if the window is changed; otherwise, false. @@ -140,9 +140,9 @@ class MagnificationControllerImpl : virtual public MagnificationController, void ValidateScale(float* scale); // ui::EventHandler overrides: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; // Target root window. This must not be NULL. aura::Window* root_window_; diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc index 45ffce6..ca63aeb 100644 --- a/ash/magnifier/magnification_controller_unittest.cc +++ b/ash/magnifier/magnification_controller_unittest.cc @@ -29,7 +29,7 @@ class MagnificationControllerTest: public test::AshTestBase { MagnificationControllerTest() {} virtual ~MagnificationControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); UpdateDisplay(base::StringPrintf("%dx%d", kRootWidth, kRootHeight)); @@ -44,7 +44,7 @@ class MagnificationControllerTest: public test::AshTestBase { #endif } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { AshTestBase::TearDown(); } diff --git a/ash/magnifier/partial_magnification_controller.h b/ash/magnifier/partial_magnification_controller.h index eaecd12..f78f52b 100644 --- a/ash/magnifier/partial_magnification_controller.h +++ b/ash/magnifier/partial_magnification_controller.h @@ -63,13 +63,13 @@ class PartialMagnificationController void RemoveZoomWidgetObservers(); // ui::EventHandler overrides: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; // Overridden from WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; // Overridden from WidgetObserver: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; // True if the magnified window is in motion of zooming or un-zooming effect. // Otherwise, false. diff --git a/ash/popup_message.cc b/ash/popup_message.cc index 4696e81..14aad63 100644 --- a/ash/popup_message.cc +++ b/ash/popup_message.cc @@ -54,7 +54,7 @@ class PopupMessage::MessageBubble : public views::BubbleDelegateView { private: // views::View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; // Each component (width/height) can force a size override for that component // if not 0. diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 89bb31ea..a8ba722 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -216,47 +216,47 @@ class EmptyWindowDelegate : public aura::WindowDelegate { virtual ~EmptyWindowDelegate() {} // aura::WindowDelegate overrides: - virtual gfx::Size GetMinimumSize() const OVERRIDE { + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); } - virtual gfx::Size GetMaximumSize() const OVERRIDE { + virtual gfx::Size GetMaximumSize() const override { return gfx::Size(); } virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { } - virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { + virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override { return gfx::kNullCursor; } virtual int GetNonClientComponent( - const gfx::Point& point) const OVERRIDE { + const gfx::Point& point) const override { return HTNOWHERE; } virtual bool ShouldDescendIntoChildForEventHandling( aura::Window* child, - const gfx::Point& location) OVERRIDE { + const gfx::Point& location) override { return false; } - virtual bool CanFocus() OVERRIDE { + virtual bool CanFocus() override { return false; } - virtual void OnCaptureLost() OVERRIDE { + virtual void OnCaptureLost() override { } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { } virtual void OnDeviceScaleFactorChanged( - float device_scale_factor) OVERRIDE { + float device_scale_factor) override { } - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {} - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override {} + virtual void OnWindowDestroyed(aura::Window* window) override { delete this; } - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE { + virtual void OnWindowTargetVisibilityChanged(bool visible) override { } - virtual bool HasHitTestMask() const OVERRIDE { + virtual bool HasHitTestMask() const override { return false; } - virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} + virtual void GetHitTestMask(gfx::Path* mask) const override {} private: DISALLOW_COPY_AND_ASSIGN(EmptyWindowDelegate); diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index bb047e6..0b79b20 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -267,8 +267,8 @@ class ASH_EXPORT RootWindowController : public ShellObserver { void DisableTouchHudProjection(); // Overridden from ShellObserver. - virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE; - virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE; + virtual void OnLoginStateChanged(user::LoginStatus status) override; + virtual void OnTouchHudProjectionToggled(bool enabled) override; scoped_ptr<AshWindowTreeHost> ash_host_; RootWindowLayoutManager* root_window_layout_; diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index 339be89..4d7a086 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc @@ -51,11 +51,11 @@ class TestDelegate : public views::WidgetDelegateView { virtual ~TestDelegate() {} // Overridden from views::WidgetDelegate: - virtual views::View* GetContentsView() OVERRIDE { + virtual views::View* GetContentsView() override { return this; } - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual ui::ModalType GetModalType() const override { return system_modal_ ? ui::MODAL_TYPE_SYSTEM : ui::MODAL_TYPE_NONE; } @@ -78,13 +78,13 @@ class DeleteOnBlurDelegate : public aura::test::TestWindowDelegate, private: // aura::test::TestWindowDelegate overrides: - virtual bool CanFocus() OVERRIDE { + virtual bool CanFocus() override { return true; } // aura::client::FocusChangeObserver implementation: virtual void OnWindowFocused(aura::Window* gained_focus, - aura::Window* lost_focus) OVERRIDE { + aura::Window* lost_focus) override { if (window_ == lost_focus) delete window_; } @@ -538,7 +538,7 @@ class DestroyedWindowObserver : public aura::WindowObserver { bool destroyed() const { return destroyed_; } // WindowObserver overrides: - virtual void OnWindowDestroying(Window* window) OVERRIDE { + virtual void OnWindowDestroying(Window* window) override { destroyed_ = true; Shutdown(); } @@ -617,7 +617,7 @@ class VirtualKeyboardRootWindowControllerTest VirtualKeyboardRootWindowControllerTest() {}; virtual ~VirtualKeyboardRootWindowControllerTest() {}; - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitch( keyboard::switches::kEnableVirtualKeyboard); test::AshTestBase::SetUp(); @@ -634,7 +634,7 @@ class MockTextInputClient : public ui::DummyTextInputClient { MockTextInputClient() : ui::DummyTextInputClient(ui::TEXT_INPUT_TYPE_TEXT) {} - virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE { + virtual void EnsureCaretInRect(const gfx::Rect& rect) override { visible_rect_ = rect; } @@ -653,7 +653,7 @@ class TargetHitTestEventHandler : public ui::test::TestEventHandler { TargetHitTestEventHandler() {} // ui::test::TestEventHandler overrides. - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { if (event->type() == ui::ET_MOUSE_PRESSED) ui::test::TestEventHandler::OnMouseEvent(event); event->StopPropagation(); diff --git a/ash/rotator/screen_rotation.h b/ash/rotator/screen_rotation.h index 66caaf6..500f6c3 100644 --- a/ash/rotator/screen_rotation.h +++ b/ash/rotator/screen_rotation.h @@ -39,11 +39,11 @@ class ASH_EXPORT ScreenRotation : public ui::LayerAnimationElement { void InitTransform(ui::Layer* layer); // Implementation of ui::LayerAnimationDelegate - virtual void OnStart(ui::LayerAnimationDelegate* delegate) OVERRIDE; + virtual void OnStart(ui::LayerAnimationDelegate* delegate) override; virtual bool OnProgress(double t, - ui::LayerAnimationDelegate* delegate) OVERRIDE; - virtual void OnGetTarget(TargetValue* target) const OVERRIDE; - virtual void OnAbort(ui::LayerAnimationDelegate* delegate) OVERRIDE; + ui::LayerAnimationDelegate* delegate) override; + virtual void OnGetTarget(TargetValue* target) const override; + virtual void OnAbort(ui::LayerAnimationDelegate* delegate) override; scoped_ptr<ui::InterpolatedTransform> interpolated_transform_; diff --git a/ash/screensaver/screensaver_view.h b/ash/screensaver/screensaver_view.h index 1a01aa9..2a5bf6e 100644 --- a/ash/screensaver/screensaver_view.h +++ b/ash/screensaver/screensaver_view.h @@ -50,10 +50,10 @@ class ScreensaverView : public views::WidgetDelegateView, virtual ~ScreensaverView(); // views::WidgetDelegate overrides. - virtual views::View* GetContentsView() OVERRIDE; + virtual views::View* GetContentsView() override; // content::WebContentsObserver overrides. - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; + virtual void RenderProcessGone(base::TerminationStatus status) override; void Show(); void Close(); diff --git a/ash/screensaver/screensaver_view_unittest.cc b/ash/screensaver/screensaver_view_unittest.cc index 2809025..4fb096c 100644 --- a/ash/screensaver/screensaver_view_unittest.cc +++ b/ash/screensaver/screensaver_view_unittest.cc @@ -23,7 +23,7 @@ class ScreensaverViewTest : public ash::test::AshTestBase { virtual ~ScreensaverViewTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); RunAllPendingInMessageLoop(); } diff --git a/ash/shelf/app_list_button.h b/ash/shelf/app_list_button.h index 9fc27c5..97dafb6 100644 --- a/ash/shelf/app_list_button.h +++ b/ash/shelf/app_list_button.h @@ -28,18 +28,18 @@ class AppListButton : public views::ImageButton { protected: // views::ImageButton overrides: - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseMoved(const ui::MouseEvent& event) override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; // ui::EventHandler overrides: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: // Toggles the active state for painting the background and schedules a paint. diff --git a/ash/shelf/app_list_shelf_item_delegate.h b/ash/shelf/app_list_shelf_item_delegate.h index 2642730..f40d2c6 100644 --- a/ash/shelf/app_list_shelf_item_delegate.h +++ b/ash/shelf/app_list_shelf_item_delegate.h @@ -19,13 +19,13 @@ class AppListShelfItemDelegate : public ShelfItemDelegate { virtual ~AppListShelfItemDelegate(); // ShelfItemDelegate: - virtual bool ItemSelected(const ui::Event& event) OVERRIDE; - virtual base::string16 GetTitle() OVERRIDE; - virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE; - virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE; - virtual bool IsDraggable() OVERRIDE; - virtual bool ShouldShowTooltip() OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool ItemSelected(const ui::Event& event) override; + virtual base::string16 GetTitle() override; + virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override; + virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) override; + virtual bool IsDraggable() override; + virtual bool ShouldShowTooltip() override; + virtual void Close() override; private: DISALLOW_COPY_AND_ASSIGN(AppListShelfItemDelegate); diff --git a/ash/shelf/background_animator.h b/ash/shelf/background_animator.h index 37be3be..ec5f6f3 100644 --- a/ash/shelf/background_animator.h +++ b/ash/shelf/background_animator.h @@ -48,7 +48,7 @@ class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate { int alpha() const { return alpha_; } // gfx::AnimationDelegate overrides: - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; private: BackgroundAnimatorDelegate* delegate_; diff --git a/ash/shelf/overflow_bubble.h b/ash/shelf/overflow_bubble.h index 7c3109c..c36339c 100644 --- a/ash/shelf/overflow_bubble.h +++ b/ash/shelf/overflow_bubble.h @@ -47,11 +47,11 @@ class OverflowBubble : public ui::EventHandler, void ProcessPressedEvent(ui::LocatedEvent* event); // Overridden from ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; // Overridden from views::WidgetObserver: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; OverflowBubbleView* bubble_; // Owned by views hierarchy. views::View* anchor_; // Owned by ShelfView. diff --git a/ash/shelf/overflow_bubble_view.h b/ash/shelf/overflow_bubble_view.h index 4348a2d..9d928eb 100644 --- a/ash/shelf/overflow_bubble_view.h +++ b/ash/shelf/overflow_bubble_view.h @@ -28,7 +28,7 @@ class ASH_EXPORT OverflowBubbleView : public views::BubbleDelegateView { void InitOverflowBubble(views::View* anchor, ShelfView* shelf_view); // views::BubbleDelegateView overrides: - virtual gfx::Rect GetBubbleBounds() OVERRIDE; + virtual gfx::Rect GetBubbleBounds() override; private: friend class test::OverflowBubbleViewTestAPI; @@ -44,13 +44,13 @@ class ASH_EXPORT OverflowBubbleView : public views::BubbleDelegateView { void ScrollByYOffset(int y_offset); // views::View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; + virtual void ChildPreferredSizeChanged(views::View* child) override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; // ui::EventHandler overrides: - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; ShelfLayoutManager* GetShelfLayoutManager() const; diff --git a/ash/shelf/overflow_button.h b/ash/shelf/overflow_button.h index aca781d..2dd79f2 100644 --- a/ash/shelf/overflow_button.h +++ b/ash/shelf/overflow_button.h @@ -25,7 +25,7 @@ class OverflowButton : public views::CustomButton { void PaintBackground(gfx::Canvas* canvas, int alpha); // views::View overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; // Left and right images are rotations of bottom_image and are // owned by the overflow button. diff --git a/ash/shelf/shelf_alignment_menu.h b/ash/shelf/shelf_alignment_menu.h index e7acce28..f14475a 100644 --- a/ash/shelf/shelf_alignment_menu.h +++ b/ash/shelf/shelf_alignment_menu.h @@ -23,12 +23,12 @@ class ASH_EXPORT ShelfAlignmentMenu : public ui::SimpleMenuModel, virtual ~ShelfAlignmentMenu(); // ui::SimpleMenuModel::Delegate overrides: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; private: enum MenuItem { diff --git a/ash/shelf/shelf_bezel_event_filter.h b/ash/shelf/shelf_bezel_event_filter.h index 4bded4a..6eb830a 100644 --- a/ash/shelf/shelf_bezel_event_filter.h +++ b/ash/shelf/shelf_bezel_event_filter.h @@ -20,7 +20,7 @@ class ShelfBezelEventFilter : public ui::EventHandler { virtual ~ShelfBezelEventFilter(); // Overridden from ui::EventHandler: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: bool IsShelfOnBezel(const gfx::Rect& screen, diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc index 1aba1cc..98e6ec7 100644 --- a/ash/shelf/shelf_button.cc +++ b/ash/shelf/shelf_button.cc @@ -89,7 +89,7 @@ class ShelfButtonAnimation : public gfx::AnimationDelegate { } // gfx::AnimationDelegate - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationProgressed(const gfx::Animation* animation) override { if (animation != &animation_) return; if (!animation_.is_animating()) @@ -126,7 +126,7 @@ class ShelfButton::BarView : public views::ImageView, } // views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { if (show_attention_) { int alpha = ShelfButtonAnimation::GetInstance()->GetAlpha(); canvas->SaveLayerAlpha(alpha); @@ -138,7 +138,7 @@ class ShelfButton::BarView : public views::ImageView, } // ShelfButtonAnimation::Observer - virtual void AnimationProgressed() OVERRIDE { + virtual void AnimationProgressed() override { UpdateBounds(); SchedulePaint(); } diff --git a/ash/shelf/shelf_button.h b/ash/shelf/shelf_button.h index d72c630..03baae6 100644 --- a/ash/shelf/shelf_button.h +++ b/ash/shelf/shelf_button.h @@ -63,10 +63,10 @@ class ASH_EXPORT ShelfButton : public views::CustomButton { // Overrides to views::CustomButton: virtual void ShowContextMenu(const gfx::Point& p, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; // View override - needed by unit test. - virtual void OnMouseCaptureLost() OVERRIDE; + virtual void OnMouseCaptureLost() override; protected: ShelfButton(views::ButtonListener* listener, @@ -93,22 +93,22 @@ class ASH_EXPORT ShelfButton : public views::CustomButton { }; // View overrides: - virtual const char* GetClassName() const OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual const char* GetClassName() const override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual void OnMouseMoved(const ui::MouseEvent& event) override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void Layout() override; + virtual void ChildPreferredSizeChanged(views::View* child) override; + virtual void OnFocus() override; + virtual void OnBlur() override; + virtual void OnPaint(gfx::Canvas* canvas) override; // ui::EventHandler overrides: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Sets the icon image with a shadow. void SetShadowedImage(const gfx::ImageSkia& bitmap); diff --git a/ash/shelf/shelf_item_delegate_manager.h b/ash/shelf/shelf_item_delegate_manager.h index ef11f68..c03b835 100644 --- a/ash/shelf/shelf_item_delegate_manager.h +++ b/ash/shelf/shelf_item_delegate_manager.h @@ -39,12 +39,12 @@ class ASH_EXPORT ShelfItemDelegateManager : public ShelfModelObserver { ShelfItemDelegate* GetShelfItemDelegate(ShelfID id); // ShelfModelObserver overrides: - virtual void ShelfItemAdded(int model_index) OVERRIDE; - virtual void ShelfItemRemoved(int index, ShelfID id) OVERRIDE; - virtual void ShelfItemMoved(int start_index, int targetindex) OVERRIDE; + virtual void ShelfItemAdded(int model_index) override; + virtual void ShelfItemRemoved(int index, ShelfID id) override; + virtual void ShelfItemMoved(int start_index, int targetindex) override; virtual void ShelfItemChanged(int index, - const ShelfItem& old_item) OVERRIDE; - virtual void ShelfStatusChanged() OVERRIDE; + const ShelfItem& old_item) override; + virtual void ShelfStatusChanged() override; private: friend class test::ShelfItemDelegateManagerTestAPI; diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 887c6fc..f7652d8 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -109,8 +109,8 @@ class ShelfLayoutManager::AutoHideEventFilter : public ui::EventHandler { bool in_mouse_drag() const { return in_mouse_drag_; } // Overridden from ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: ShelfLayoutManager* shelf_; @@ -166,7 +166,7 @@ class ShelfLayoutManager::UpdateShelfObserver shelf_ = NULL; } - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { if (shelf_) shelf_->UpdateShelfBackground(BACKGROUND_CHANGE_ANIMATE); delete this; diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h index 1150340..320b4e5 100644 --- a/ash/shelf/shelf_layout_manager.h +++ b/ash/shelf/shelf_layout_manager.h @@ -165,23 +165,23 @@ class ASH_EXPORT ShelfLayoutManager void SetAnimationDurationOverride(int duration_override_in_ms); // Overridden from SnapLayoutManager: - virtual void OnWindowResized() OVERRIDE; + virtual void OnWindowResized() override; virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; // Overridden from ash::ShellObserver: - virtual void OnLockStateChanged(bool locked) OVERRIDE; + virtual void OnLockStateChanged(bool locked) override; // Overriden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; // Overridden from ash::LockStateObserver: - virtual void OnLockStateEvent(LockStateObserver::EventType event) OVERRIDE; + virtual void OnLockStateEvent(LockStateObserver::EventType event) override; // Overridden from ash::SessionStateObserver: virtual void SessionStateChanged( - SessionStateDelegate::SessionState state) OVERRIDE; + SessionStateDelegate::SessionState state) override; // TODO(harrym|oshima): These templates will be moved to // new Shelf class. @@ -317,12 +317,12 @@ class ASH_EXPORT ShelfLayoutManager int GetWorkAreaSize(const State& state, int size) const; // Overridden from keyboard::KeyboardControllerObserver: - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE; + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; // Overridden from DockedWindowLayoutManagerObserver: virtual void OnDockBoundsChanging( const gfx::Rect& dock_bounds, - DockedWindowLayoutManagerObserver::Reason reason) OVERRIDE; + DockedWindowLayoutManagerObserver::Reason reason) override; // The RootWindow is cached so that we don't invoke Shell::GetInstance() from // our destructor. We avoid that as at the time we're deleted Shell is being diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index 03640c0..7091afb 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -107,7 +107,7 @@ class ShelfAnimationWaiter : views::WidgetObserver { // views::WidgetObserver override. virtual void OnWidgetBoundsChanged(views::Widget* widget, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { if (done_waiting_) return; @@ -242,7 +242,7 @@ class ShelfLayoutObserverTest : public ShelfLayoutManagerObserver { private: virtual void OnAutoHideStateChanged( - ShelfAutoHideState new_state) OVERRIDE { + ShelfAutoHideState new_state) override { changed_auto_hide_state_ = true; } @@ -261,7 +261,7 @@ class TestItem : public SystemTrayItem { detailed_view_(NULL), notification_view_(NULL) {} - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateTrayView(user::LoginStatus status) override { tray_view_ = new views::View; // Add a label so it has non-zero width. tray_view_->SetLayoutManager(new views::FillLayout); @@ -269,14 +269,14 @@ class TestItem : public SystemTrayItem { return tray_view_; } - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateDefaultView(user::LoginStatus status) override { default_view_ = new views::View; default_view_->SetLayoutManager(new views::FillLayout); default_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Default"))); return default_view_; } - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateDetailedView(user::LoginStatus status) override { detailed_view_ = new views::View; detailed_view_->SetLayoutManager(new views::FillLayout); detailed_view_->AddChildView( @@ -285,29 +285,29 @@ class TestItem : public SystemTrayItem { } virtual views::View* CreateNotificationView( - user::LoginStatus status) OVERRIDE { + user::LoginStatus status) override { notification_view_ = new views::View; return notification_view_; } - virtual void DestroyTrayView() OVERRIDE { + virtual void DestroyTrayView() override { tray_view_ = NULL; } - virtual void DestroyDefaultView() OVERRIDE { + virtual void DestroyDefaultView() override { default_view_ = NULL; } - virtual void DestroyDetailedView() OVERRIDE { + virtual void DestroyDetailedView() override { detailed_view_ = NULL; } - virtual void DestroyNotificationView() OVERRIDE { + virtual void DestroyNotificationView() override { notification_view_ = NULL; } virtual void UpdateAfterLoginStatusChange( - user::LoginStatus status) OVERRIDE {} + user::LoginStatus status) override {} views::View* tray_view() const { return tray_view_; } views::View* default_view() const { return default_view_; } @@ -365,7 +365,7 @@ class ShelfLayoutManagerTest : public ash::test::AshTestBase { } // Overridden from AshTestBase: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitch( ash::switches::kAshEnableTrayDragging); test::AshTestBase::SetUp(); diff --git a/ash/shelf/shelf_model_unittest.cc b/ash/shelf/shelf_model_unittest.cc index 817f201..d430bfb 100644 --- a/ash/shelf/shelf_model_unittest.cc +++ b/ash/shelf/shelf_model_unittest.cc @@ -40,20 +40,20 @@ class TestShelfModelObserver : public ShelfModelObserver { } // ShelfModelObserver overrides: - virtual void ShelfItemAdded(int index) OVERRIDE { + virtual void ShelfItemAdded(int index) override { added_count_++; } - virtual void ShelfItemRemoved(int index, ShelfID id) OVERRIDE { + virtual void ShelfItemRemoved(int index, ShelfID id) override { removed_count_++; } virtual void ShelfItemChanged(int index, - const ShelfItem& old_item) OVERRIDE { + const ShelfItem& old_item) override { changed_count_++; } - virtual void ShelfItemMoved(int start_index, int target_index) OVERRIDE { + virtual void ShelfItemMoved(int start_index, int target_index) override { moved_count_++; } - virtual void ShelfStatusChanged() OVERRIDE { + virtual void ShelfStatusChanged() override { } private: diff --git a/ash/shelf/shelf_navigator_unittest.cc b/ash/shelf/shelf_navigator_unittest.cc index 0033da7..5f6b6a9 100644 --- a/ash/shelf/shelf_navigator_unittest.cc +++ b/ash/shelf/shelf_navigator_unittest.cc @@ -21,7 +21,7 @@ class ShelfNavigatorTest : public testing::Test { ShelfNavigatorTest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { model_.reset(new ShelfModel); // Add APP_LIST for test. diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc index 4ba6165..db38cb5 100644 --- a/ash/shelf/shelf_tooltip_manager.cc +++ b/ash/shelf/shelf_tooltip_manager.cc @@ -57,10 +57,10 @@ class ShelfTooltipManager::ShelfTooltipBubble private: // views::WidgetDelegate overrides: - virtual void WindowClosing() OVERRIDE; + virtual void WindowClosing() override; // views::View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; ShelfTooltipManager* host_; views::Label* label_; diff --git a/ash/shelf/shelf_tooltip_manager.h b/ash/shelf/shelf_tooltip_manager.h index d7ca088..96c7259 100644 --- a/ash/shelf/shelf_tooltip_manager.h +++ b/ash/shelf/shelf_tooltip_manager.h @@ -78,16 +78,16 @@ class ASH_EXPORT ShelfTooltipManager : public ui::EventHandler, protected: // ui::EventHandler overrides: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual void OnCancelMode(ui::CancelModeEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; + virtual void OnCancelMode(ui::CancelModeEvent* event) override; // ShelfLayoutManagerObserver overrides: - virtual void WillDeleteShelf() OVERRIDE; + virtual void WillDeleteShelf() override; virtual void WillChangeVisibilityState( - ShelfVisibilityState new_state) OVERRIDE; - virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) OVERRIDE; + ShelfVisibilityState new_state) override; + virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; private: class ShelfTooltipBubble; diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc index bafe29c..6312fda 100644 --- a/ash/shelf/shelf_tooltip_manager_unittest.cc +++ b/ash/shelf/shelf_tooltip_manager_unittest.cc @@ -40,7 +40,7 @@ class ShelfTooltipManagerTest : public AshTestBase { ShelfTooltipManagerTest() {} virtual ~ShelfTooltipManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); RootWindowController* controller = Shell::GetPrimaryRootWindowController(); tooltip_manager_.reset(new ShelfTooltipManager( @@ -48,7 +48,7 @@ class ShelfTooltipManagerTest : public AshTestBase { ShelfTestAPI(controller->shelf()->shelf()).shelf_view())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { tooltip_manager_.reset(); AshTestBase::TearDown(); } diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc index 01380bc..7490f98 100644 --- a/ash/shelf/shelf_unittest.cc +++ b/ash/shelf/shelf_unittest.cc @@ -54,7 +54,7 @@ class ShelfTest : public ash::test::AshTestBase { test_.reset(new ash::test::ShelfViewTestAPI(shelf_view_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test::AshTestBase::TearDown(); } diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index 42545c7..c58efc9 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -141,20 +141,20 @@ class ShelfMenuModelAdapter : public views::MenuModelAdapter { explicit ShelfMenuModelAdapter(ShelfMenuModel* menu_model); // views::MenuModelAdapter: - virtual const gfx::FontList* GetLabelFontList(int command_id) const OVERRIDE; - virtual bool IsCommandEnabled(int id) const OVERRIDE; + virtual const gfx::FontList* GetLabelFontList(int command_id) const override; + virtual bool IsCommandEnabled(int id) const override; virtual void GetHorizontalIconMargins(int id, int icon_size, int* left_margin, - int* right_margin) const OVERRIDE; + int* right_margin) const override; virtual bool GetForegroundColor(int command_id, bool is_hovered, - SkColor* override_color) const OVERRIDE; + SkColor* override_color) const override; virtual bool GetBackgroundColor(int command_id, bool is_hovered, - SkColor* override_color) const OVERRIDE; - virtual int GetMaxWidthForMenu(views::MenuItemView* menu) OVERRIDE; - virtual bool ShouldReserveSpaceForSubmenuIndicator() const OVERRIDE; + SkColor* override_color) const override; + virtual int GetMaxWidthForMenu(views::MenuItemView* menu) override; + virtual bool ShouldReserveSpaceForSubmenuIndicator() const override; private: ShelfMenuModel* menu_model_; @@ -234,7 +234,7 @@ class ShelfFocusSearch : public views::FocusSearch { Direction direction, bool check_starting_view, views::FocusTraversable** focus_traversable, - View** focus_traversable_view) OVERRIDE { + View** focus_traversable_view) override { int index = view_model_->GetIndexOfView(starting_view); if (index == -1) return view_model_->view_at(0); @@ -265,15 +265,15 @@ class FadeInAnimationDelegate : public gfx::AnimationDelegate { virtual ~FadeInAnimationDelegate() {} // AnimationDelegate overrides: - virtual void AnimationProgressed(const Animation* animation) OVERRIDE { + virtual void AnimationProgressed(const Animation* animation) override { view_->layer()->SetOpacity(animation->GetCurrentValue()); view_->layer()->ScheduleDraw(); } - virtual void AnimationEnded(const Animation* animation) OVERRIDE { + virtual void AnimationEnded(const Animation* animation) override { view_->layer()->SetOpacity(1.0f); view_->layer()->ScheduleDraw(); } - virtual void AnimationCanceled(const Animation* animation) OVERRIDE { + virtual void AnimationCanceled(const Animation* animation) override { view_->layer()->SetOpacity(1.0f); view_->layer()->ScheduleDraw(); } @@ -321,14 +321,14 @@ class ShelfView::FadeOutAnimationDelegate : public gfx::AnimationDelegate { virtual ~FadeOutAnimationDelegate() {} // AnimationDelegate overrides: - virtual void AnimationProgressed(const Animation* animation) OVERRIDE { + virtual void AnimationProgressed(const Animation* animation) override { view_->layer()->SetOpacity(1 - animation->GetCurrentValue()); view_->layer()->ScheduleDraw(); } - virtual void AnimationEnded(const Animation* animation) OVERRIDE { + virtual void AnimationEnded(const Animation* animation) override { shelf_view_->OnFadeOutAnimationEnded(); } - virtual void AnimationCanceled(const Animation* animation) OVERRIDE { + virtual void AnimationCanceled(const Animation* animation) override { } private: @@ -350,10 +350,10 @@ class ShelfView::StartFadeAnimationDelegate : public gfx::AnimationDelegate { virtual ~StartFadeAnimationDelegate() {} // AnimationDelegate overrides: - virtual void AnimationEnded(const Animation* animation) OVERRIDE { + virtual void AnimationEnded(const Animation* animation) override { shelf_view_->FadeIn(view_); } - virtual void AnimationCanceled(const Animation* animation) OVERRIDE { + virtual void AnimationCanceled(const Animation* animation) override { view_->layer()->SetOpacity(1.0f); } diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h index 39b3857..04f5326 100644 --- a/ash/shelf/shelf_view.h +++ b/ash/shelf/shelf_view.h @@ -112,9 +112,9 @@ class ASH_EXPORT ShelfView : public views::View, gfx::Rect GetVisibleItemsBoundsInScreen(); // Overridden from FocusTraversable: - virtual views::FocusSearch* GetFocusSearch() OVERRIDE; - virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; - virtual View* GetFocusTraversableParentView() OVERRIDE; + virtual views::FocusSearch* GetFocusSearch() override; + virtual FocusTraversable* GetFocusTraversableParent() override; + virtual View* GetFocusTraversableParentView() override; // Overridden from app_list::ApplicationDragAndDropHost: virtual void CreateDragIconProxy( @@ -122,15 +122,15 @@ class ASH_EXPORT ShelfView : public views::View, const gfx::ImageSkia& icon, views::View* replaced_view, const gfx::Vector2d& cursor_offset_from_center, - float scale_factor) OVERRIDE; + float scale_factor) override; virtual void UpdateDragIconProxy( - const gfx::Point& location_in_screen_coordinates) OVERRIDE; - virtual void DestroyDragIconProxy() OVERRIDE; + const gfx::Point& location_in_screen_coordinates) override; + virtual void DestroyDragIconProxy() override; virtual bool StartDrag( const std::string& app_id, - const gfx::Point& location_in_screen_coordinates) OVERRIDE; - virtual bool Drag(const gfx::Point& location_in_screen_coordinates) OVERRIDE; - virtual void EndDrag(bool cancel) OVERRIDE; + const gfx::Point& location_in_screen_coordinates) override; + virtual bool Drag(const gfx::Point& location_in_screen_coordinates) override; + virtual void EndDrag(bool cancel) override; // Return the view model for test purposes. const views::ViewModel* view_model_for_test() const { @@ -245,40 +245,40 @@ class ASH_EXPORT ShelfView : public views::View, void UpdateOverflowRange(ShelfView* overflow_view) const; // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; - virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; + virtual FocusTraversable* GetPaneFocusTraversable() override; + virtual void GetAccessibleState(ui::AXViewState* state) override; // Overridden from ui::EventHandler: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Overridden from ShelfModelObserver: - virtual void ShelfItemAdded(int model_index) OVERRIDE; - virtual void ShelfItemRemoved(int model_index, ShelfID id) OVERRIDE; + virtual void ShelfItemAdded(int model_index) override; + virtual void ShelfItemRemoved(int model_index, ShelfID id) override; virtual void ShelfItemChanged(int model_index, - const ShelfItem& old_item) OVERRIDE; - virtual void ShelfItemMoved(int start_index, int target_index) OVERRIDE; - virtual void ShelfStatusChanged() OVERRIDE; + const ShelfItem& old_item) override; + virtual void ShelfItemMoved(int start_index, int target_index) override; + virtual void ShelfStatusChanged() override; // Overridden from ShelfButtonHost: virtual void PointerPressedOnButton(views::View* view, Pointer pointer, - const ui::LocatedEvent& event) OVERRIDE; + const ui::LocatedEvent& event) override; virtual void PointerDraggedOnButton(views::View* view, Pointer pointer, - const ui::LocatedEvent& event) OVERRIDE; + const ui::LocatedEvent& event) override; virtual void PointerReleasedOnButton(views::View* view, Pointer pointer, - bool canceled) OVERRIDE; - virtual void MouseMovedOverButton(views::View* view) OVERRIDE; - virtual void MouseEnteredButton(views::View* view) OVERRIDE; - virtual void MouseExitedButton(views::View* view) OVERRIDE; - virtual base::string16 GetAccessibleName(const views::View* view) OVERRIDE; + bool canceled) override; + virtual void MouseMovedOverButton(views::View* view) override; + virtual void MouseEnteredButton(views::View* view) override; + virtual void MouseExitedButton(views::View* view) override; + virtual base::string16 GetAccessibleName(const views::View* view) override; // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Show the list of all running items for this |item|. It will return true // when the menu was shown and false if there were no possible items to @@ -292,7 +292,7 @@ class ASH_EXPORT ShelfView : public views::View, // Overridden from views::ContextMenuController: virtual void ShowContextMenuForView(views::View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; // Show either a context or normal click menu of given |menu_model|. // If |context_menu| is set, the displayed menu is a context menu and not @@ -306,8 +306,8 @@ class ASH_EXPORT ShelfView : public views::View, // Overridden from views::BoundsAnimatorObserver: virtual void OnBoundsAnimatorProgressed( - views::BoundsAnimator* animator) OVERRIDE; - virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) OVERRIDE; + views::BoundsAnimator* animator) override; + virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) override; // Returns false if the click which closed the previous menu is the click // which triggered this event. diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index 4757a66d..c06b072 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc @@ -69,7 +69,7 @@ class TestShelfIconObserver : public ShelfIconObserver { } // ShelfIconObserver implementation. - virtual void OnShelfIconPositionsChanged() OVERRIDE { + virtual void OnShelfIconPositionsChanged() override { change_notified_ = true; } @@ -88,7 +88,7 @@ class ShelfViewIconObserverTest : public AshTestBase { ShelfViewIconObserverTest() {} virtual ~ShelfViewIconObserverTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); Shelf* shelf = Shelf::ForPrimaryDisplay(); observer_.reset(new TestShelfIconObserver(shelf)); @@ -98,7 +98,7 @@ class ShelfViewIconObserverTest : public AshTestBase { shelf_view_test_->SetAnimationDuration(1); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { observer_.reset(); AshTestBase::TearDown(); } @@ -138,7 +138,7 @@ class ShelfItemSelectionTracker : public TestShelfItemDelegate { } // TestShelfItemDelegate: - virtual bool ItemSelected(const ui::Event& event) OVERRIDE { + virtual bool ItemSelected(const ui::Event& event) override { selected_ = true; return false; } @@ -236,37 +236,37 @@ class TestShelfDelegateForShelfView : public ShelfDelegate { virtual ~TestShelfDelegateForShelfView() {} // ShelfDelegate overrides: - virtual void OnShelfCreated(Shelf* shelf) OVERRIDE {} + virtual void OnShelfCreated(Shelf* shelf) override {} - virtual void OnShelfDestroyed(Shelf* shelf) OVERRIDE {} + virtual void OnShelfDestroyed(Shelf* shelf) override {} - virtual ShelfID GetShelfIDForAppID(const std::string& app_id) OVERRIDE { + virtual ShelfID GetShelfIDForAppID(const std::string& app_id) override { ShelfID id = 0; EXPECT_TRUE(base::StringToInt(app_id, &id)); return id; } - virtual const std::string& GetAppIDForShelfID(ShelfID id) OVERRIDE { + virtual const std::string& GetAppIDForShelfID(ShelfID id) override { // Use |app_id_| member variable because returning a reference to local // variable is not allowed. app_id_ = base::IntToString(id); return app_id_; } - virtual void PinAppWithID(const std::string& app_id) OVERRIDE { + virtual void PinAppWithID(const std::string& app_id) override { } - virtual bool IsAppPinned(const std::string& app_id) OVERRIDE { + virtual bool IsAppPinned(const std::string& app_id) override { // Returns true for ShelfViewTest.OverflowBubbleSize. To test ripping off in // that test, an item is already pinned state. return true; } - virtual bool CanPin() const OVERRIDE { + virtual bool CanPin() const override { return true; } - virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE { + virtual void UnpinAppWithID(const std::string& app_id) override { ShelfID id = 0; EXPECT_TRUE(base::StringToInt(app_id, &id)); ASSERT_GT(id, 0); @@ -295,7 +295,7 @@ class ShelfViewTest : public AshTestBase { item_manager_(NULL) {} virtual ~ShelfViewTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableTouchFeedback); AshTestBase::SetUp(); @@ -317,7 +317,7 @@ class ShelfViewTest : public AshTestBase { AddBrowserShortcut(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test_api_.reset(); AshTestBase::TearDown(); } @@ -663,11 +663,11 @@ class ShelfViewTextDirectionTest ShelfViewTextDirectionTest() : text_direction_change_(GetParam()) {} virtual ~ShelfViewTextDirectionTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ShelfViewTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ShelfViewTest::TearDown(); } diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index 2d89253..f3b56e9 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -67,21 +67,21 @@ class DimmerView : public views::View, void ForceUndimming(bool force); // views::WidgetDelegate overrides: - virtual views::Widget* GetWidget() OVERRIDE { + virtual views::Widget* GetWidget() override { return View::GetWidget(); } - virtual const views::Widget* GetWidget() const OVERRIDE { + virtual const views::Widget* GetWidget() const override { return View::GetWidget(); } // ash::BackgroundAnimatorDelegate overrides: - virtual void UpdateBackground(int alpha) OVERRIDE { + virtual void UpdateBackground(int alpha) override { alpha_ = alpha; SchedulePaint(); } // views::View overrides: - virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaintBackground(gfx::Canvas* canvas) override; // A function to test the current alpha used. int get_dimming_alpha_for_test() { return alpha_; } @@ -94,8 +94,8 @@ class DimmerView : public views::View, virtual ~DimmerEventFilter(); // Overridden from ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; private: // The owning class. @@ -274,12 +274,12 @@ class ShelfWindowTargeter : public wm::EasyResizeWindowTargeter, } // ash::ShelfLayoutManagerObserver: - virtual void WillDeleteShelf() OVERRIDE { + virtual void WillDeleteShelf() override { shelf_ = NULL; } virtual void WillChangeVisibilityState( - ash::ShelfVisibilityState new_state) OVERRIDE { + ash::ShelfVisibilityState new_state) override { gfx::Insets mouse_insets; gfx::Insets touch_insets; if (new_state == ash::SHELF_VISIBLE) { @@ -334,21 +334,21 @@ class ShelfWidget::DelegateView : public views::WidgetDelegate, void SetParentLayer(ui::Layer* layer); // views::View overrides: - virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaintBackground(gfx::Canvas* canvas) override; // views::WidgetDelegateView overrides: - virtual views::Widget* GetWidget() OVERRIDE { + virtual views::Widget* GetWidget() override { return View::GetWidget(); } - virtual const views::Widget* GetWidget() const OVERRIDE { + virtual const views::Widget* GetWidget() const override { return View::GetWidget(); } - virtual bool CanActivate() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void ReorderChildLayers(ui::Layer* parent_layer) OVERRIDE; + virtual bool CanActivate() const override; + virtual void Layout() override; + virtual void ReorderChildLayers(ui::Layer* parent_layer) override; // This will be called when the parent local bounds change. - virtual void OnBoundsChanged(const gfx::Rect& old_bounds) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& old_bounds) override; // aura::WindowObserver overrides: // This will be called when the shelf itself changes its absolute position. @@ -357,10 +357,10 @@ class ShelfWidget::DelegateView : public views::WidgetDelegate, // that this gets also triggered when the shelf only moves. virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; // BackgroundAnimatorDelegate overrides: - virtual void UpdateBackground(int alpha) OVERRIDE; + virtual void UpdateBackground(int alpha) override; // Force the shelf to be presented in an undimmed state. void ForceUndimming(bool force); diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h index 97cf7ff..3ffb305 100644 --- a/ash/shelf/shelf_widget.h +++ b/ash/shelf/shelf_widget.h @@ -82,7 +82,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget, // Overridden from views::WidgetObserver: virtual void OnWidgetActivationChanged( - views::Widget* widget, bool active) OVERRIDE; + views::Widget* widget, bool active) override; // A function to test the current alpha used by the dimming bar. If there is // no dimmer active, the function will return -1. @@ -96,7 +96,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget, void DisableDimmingAnimationsForTest(); // ShelfLayoutManagerObserver overrides: - virtual void WillDeleteShelf() OVERRIDE; + virtual void WillDeleteShelf() override; private: class DelegateView; diff --git a/ash/shelf/shelf_window_watcher.h b/ash/shelf/shelf_window_watcher.h index da16e54..4a9cd04 100644 --- a/ash/shelf/shelf_window_watcher.h +++ b/ash/shelf/shelf_window_watcher.h @@ -47,7 +47,7 @@ class ShelfWindowWatcher : public aura::client::ActivationChangeObserver, private: // aura::WindowObserver overrides: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; // Owned by Shell. ShelfWindowWatcher* window_watcher_; @@ -65,8 +65,8 @@ class ShelfWindowWatcher : public aura::client::ActivationChangeObserver, private: // aura::WindowObserver overrides: virtual void OnWindowParentChanged(aura::Window* window, - aura::Window* parent) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + aura::Window* parent) override; + virtual void OnWindowDestroyed(aura::Window* window) override; // Owned by Shell. ShelfWindowWatcher* window_watcher_; @@ -104,21 +104,21 @@ class ShelfWindowWatcher : public aura::client::ActivationChangeObserver, // aura::client::ActivationChangeObserver overrides: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; // aura::WindowObserver overrides: - virtual void OnWindowAdded(aura::Window* window) OVERRIDE; - virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowAdded(aura::Window* window) override; + virtual void OnWillRemoveWindow(aura::Window* window) override; + virtual void OnWindowDestroying(aura::Window* window) override; virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; + intptr_t old) override; // gfx::DisplayObserver overrides: - virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& display) override; + virtual void OnDisplayRemoved(const gfx::Display& old_display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; // Owned by Shell. ShelfModel* model_; diff --git a/ash/shelf/shelf_window_watcher_item_delegate.h b/ash/shelf/shelf_window_watcher_item_delegate.h index 9de8f6f..b39a70b 100644 --- a/ash/shelf/shelf_window_watcher_item_delegate.h +++ b/ash/shelf/shelf_window_watcher_item_delegate.h @@ -25,13 +25,13 @@ class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate { private: // ShelfItemDelegate overrides: - virtual bool ItemSelected(const ui::Event& event) OVERRIDE; - virtual base::string16 GetTitle() OVERRIDE; - virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE; - virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE; - virtual bool IsDraggable() OVERRIDE; - virtual bool ShouldShowTooltip() OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool ItemSelected(const ui::Event& event) override; + virtual base::string16 GetTitle() override; + virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override; + virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) override; + virtual bool IsDraggable() override; + virtual bool ShouldShowTooltip() override; + virtual void Close() override; // Stores a Window associated with this item. Not owned. aura::Window* window_; diff --git a/ash/shelf/shelf_window_watcher_unittest.cc b/ash/shelf/shelf_window_watcher_unittest.cc index 588db3b..c5d1b72 100644 --- a/ash/shelf/shelf_window_watcher_unittest.cc +++ b/ash/shelf/shelf_window_watcher_unittest.cc @@ -27,12 +27,12 @@ class ShelfWindowWatcherTest : public test::AshTestBase { ShelfWindowWatcherTest() : model_(NULL) {} virtual ~ShelfWindowWatcherTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); model_ = test::ShellTestApi(Shell::GetInstance()).shelf_model(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { model_ = NULL; test::AshTestBase::TearDown(); } diff --git a/ash/shell.cc b/ash/shell.cc index bf6f5a4d..7395446 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -160,7 +160,7 @@ class AshVisibilityController : public ::wm::VisibilityController { // Overridden from ::wm::VisibilityController: virtual bool CallAnimateOnChildWindowVisibilityChanged( aura::Window* window, - bool visible) OVERRIDE { + bool visible) override { return AnimateOnChildWindowVisibilityChanged(window, visible); } diff --git a/ash/shell.h b/ash/shell.h index a807c6b..9e6e046 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -600,18 +600,18 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, void InitRootWindow(aura::Window* root_window); // ash::SystemModalContainerEventFilterDelegate overrides: - virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE; + virtual bool CanWindowReceiveEvents(aura::Window* window) override; // Overridden from ui::EventTarget: - virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; - virtual EventTarget* GetParentTarget() OVERRIDE; - virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; - virtual ui::EventTargeter* GetEventTargeter() OVERRIDE; - virtual void OnEvent(ui::Event* event) OVERRIDE; + virtual bool CanAcceptEvent(const ui::Event& event) override; + virtual EventTarget* GetParentTarget() override; + virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; + virtual ui::EventTargeter* GetEventTargeter() override; + virtual void OnEvent(ui::Event* event) override; // Overridden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; static Shell* instance_; diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index 1c00f2b..2f725e2 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -138,7 +138,7 @@ class WindowTypeShelfItem : public app_list::AppListItem { } // AppListItem - virtual void Activate(int event_flags) OVERRIDE { + virtual void Activate(int event_flags) override { ActivateItem(type_, event_flags); } @@ -235,37 +235,37 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { } // Overridden from app_list::AppListViewDelegate: - virtual bool ForceNativeDesktop() const OVERRIDE { + virtual bool ForceNativeDesktop() const override { return false; } - virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE { + virtual void SetProfileByPath(const base::FilePath& profile_path) override { // Nothing needs to be done. } - virtual const Users& GetUsers() const OVERRIDE { + virtual const Users& GetUsers() const override { return users_; } - virtual bool ShouldCenterWindow() const OVERRIDE { + virtual bool ShouldCenterWindow() const override { return false; } - virtual app_list::AppListModel* GetModel() OVERRIDE { return model_.get(); } + virtual app_list::AppListModel* GetModel() override { return model_.get(); } - virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE { + virtual app_list::SpeechUIModel* GetSpeechUI() override { return &speech_ui_; } virtual void GetShortcutPathForApp( const std::string& app_id, - const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE { + const base::Callback<void(const base::FilePath&)>& callback) override { callback.Run(base::FilePath()); } virtual void OpenSearchResult(app_list::SearchResult* result, bool auto_launch, - int event_flags) OVERRIDE { + int event_flags) override { const ExampleSearchResult* example_result = static_cast<const ExampleSearchResult*>(result); WindowTypeShelfItem::ActivateItem(example_result->type(), event_flags); @@ -273,18 +273,18 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { virtual void InvokeSearchResultAction(app_list::SearchResult* result, int action_index, - int event_flags) OVERRIDE { + int event_flags) override { NOTIMPLEMENTED(); } - virtual base::TimeDelta GetAutoLaunchTimeout() OVERRIDE { + virtual base::TimeDelta GetAutoLaunchTimeout() override { return base::TimeDelta(); } - virtual void AutoLaunchCanceled() OVERRIDE { + virtual void AutoLaunchCanceled() override { } - virtual void StartSearch() OVERRIDE { + virtual void StartSearch() override { base::string16 query; base::TrimWhitespace(model_->search_box()->text(), base::TRIM_ALL, &query); query = base::i18n::ToLower(query); @@ -306,58 +306,58 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { } } - virtual void StopSearch() OVERRIDE { + virtual void StopSearch() override { // Nothing needs to be done. } - virtual void ViewInitialized() OVERRIDE { + virtual void ViewInitialized() override { // Nothing needs to be done. } - virtual void Dismiss() OVERRIDE { + virtual void Dismiss() override { DCHECK(ash::Shell::HasInstance()); Shell::GetInstance()->DismissAppList(); } - virtual void ViewClosing() OVERRIDE { + virtual void ViewClosing() override { // Nothing needs to be done. } - virtual gfx::ImageSkia GetWindowIcon() OVERRIDE { + virtual gfx::ImageSkia GetWindowIcon() override { return gfx::ImageSkia(); } - virtual void OpenSettings() OVERRIDE { + virtual void OpenSettings() override { // Nothing needs to be done. } - virtual void OpenHelp() OVERRIDE { + virtual void OpenHelp() override { // Nothing needs to be done. } - virtual void OpenFeedback() OVERRIDE { + virtual void OpenFeedback() override { // Nothing needs to be done. } - virtual void ToggleSpeechRecognition() OVERRIDE { + virtual void ToggleSpeechRecognition() override { NOTIMPLEMENTED(); } virtual void ShowForProfileByPath( - const base::FilePath& profile_path) OVERRIDE { + const base::FilePath& profile_path) override { // Nothing needs to be done. } - virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE { + virtual views::View* CreateStartPageWebView(const gfx::Size& size) override { return NULL; } virtual std::vector<views::View*> CreateCustomPageWebViews( - const gfx::Size& size) OVERRIDE { + const gfx::Size& size) override { return std::vector<views::View*>(); } - virtual bool IsSpeechRecognitionEnabled() OVERRIDE { + virtual bool IsSpeechRecognitionEnabled() override { return false; } diff --git a/ash/shell/bubble.cc b/ash/shell/bubble.cc index cc8dc79..00e80e6 100644 --- a/ash/shell/bubble.cc +++ b/ash/shell/bubble.cc @@ -24,7 +24,7 @@ class ExampleBubbleDelegateView : public views::BubbleDelegateView { : BubbleDelegateView(config.anchor_view, config.arrow), label_(config.label) {} - virtual void Init() OVERRIDE { + virtual void Init() override { SetLayoutManager(new views::FillLayout()); views::Label* label = new views::Label(label_); AddChildView(label); diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 6cdc114..c41c030 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -55,12 +55,12 @@ class ShellViewsDelegate : public views::TestViewsDelegate { // Overridden from views::TestViewsDelegate: virtual views::NonClientFrameView* CreateDefaultNonClientFrameView( - views::Widget* widget) OVERRIDE { + views::Widget* widget) override { return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget); } virtual void OnBeforeWidgetInit( views::Widget::InitParams* params, - views::internal::NativeWidgetDelegate* delegate) OVERRIDE { + views::internal::NativeWidgetDelegate* delegate) override { if (params->opacity == views::Widget::InitParams::INFER_OPACITY) params->opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; diff --git a/ash/shell/content_client/shell_browser_main_parts.h b/ash/shell/content_client/shell_browser_main_parts.h index 0e07cbf..757c818 100644 --- a/ash/shell/content_client/shell_browser_main_parts.h +++ b/ash/shell/content_client/shell_browser_main_parts.h @@ -39,12 +39,12 @@ class ShellBrowserMainParts : public content::BrowserMainParts { virtual ~ShellBrowserMainParts(); // Overridden from content::BrowserMainParts: - virtual void PreMainMessageLoopStart() OVERRIDE; - virtual void PostMainMessageLoopStart() OVERRIDE; - virtual void ToolkitInitialized() OVERRIDE; - virtual void PreMainMessageLoopRun() OVERRIDE; - virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; - virtual void PostMainMessageLoopRun() OVERRIDE; + virtual void PreMainMessageLoopStart() override; + virtual void PostMainMessageLoopStart() override; + virtual void ToolkitInitialized() override; + virtual void PreMainMessageLoopRun() override; + virtual bool MainMessageLoopRun(int* result_code) override; + virtual void PostMainMessageLoopRun() override; content::ShellBrowserContext* browser_context() { return browser_context_.get(); diff --git a/ash/shell/content_client/shell_content_browser_client.h b/ash/shell/content_client/shell_content_browser_client.h index abde217..324b6ae 100644 --- a/ash/shell/content_client/shell_content_browser_client.h +++ b/ash/shell/content_client/shell_content_browser_client.h @@ -28,11 +28,11 @@ class ShellContentBrowserClient : public content::ContentBrowserClient { // Overridden from content::ContentBrowserClient: virtual content::BrowserMainParts* CreateBrowserMainParts( - const content::MainFunctionParams& parameters) OVERRIDE; + const content::MainFunctionParams& parameters) override; virtual net::URLRequestContextGetter* CreateRequestContext( content::BrowserContext* browser_context, content::ProtocolHandlerMap* protocol_handlers, - content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; + content::URLRequestInterceptorScopedVector request_interceptors) override; content::ShellBrowserContext* browser_context(); diff --git a/ash/shell/content_client/shell_main_delegate.h b/ash/shell/content_client/shell_main_delegate.h index 2ac0051..b506a1b 100644 --- a/ash/shell/content_client/shell_main_delegate.h +++ b/ash/shell/content_client/shell_main_delegate.h @@ -26,9 +26,9 @@ class ShellMainDelegate : public content::ContentMainDelegate { ShellMainDelegate(); virtual ~ShellMainDelegate(); - virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; - virtual void PreSandboxStartup() OVERRIDE; - virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; + virtual bool BasicStartupComplete(int* exit_code) override; + virtual void PreSandboxStartup() override; + virtual content::ContentBrowserClient* CreateContentBrowserClient() override; private: void InitializeResourceBundle(); diff --git a/ash/shell/context_menu.h b/ash/shell/context_menu.h index 32421ca..53dc75d 100644 --- a/ash/shell/context_menu.h +++ b/ash/shell/context_menu.h @@ -25,12 +25,12 @@ class ContextMenu : public ui::SimpleMenuModel, virtual ~ContextMenu(); // ui::SimpleMenuModel::Delegate overrides: - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; private: enum MenuItem { diff --git a/ash/shell/keyboard_controller_proxy_stub.h b/ash/shell/keyboard_controller_proxy_stub.h index a00b6fe..aedfd41 100644 --- a/ash/shell/keyboard_controller_proxy_stub.h +++ b/ash/shell/keyboard_controller_proxy_stub.h @@ -20,18 +20,18 @@ class KeyboardControllerProxyStub : public keyboard::KeyboardControllerProxy { KeyboardControllerProxyStub(); virtual ~KeyboardControllerProxyStub(); - virtual bool HasKeyboardWindow() const OVERRIDE; - virtual aura::Window* GetKeyboardWindow() OVERRIDE; + virtual bool HasKeyboardWindow() const override; + virtual aura::Window* GetKeyboardWindow() override; private: // Overridden from keyboard::KeyboardControllerProxy: - virtual content::BrowserContext* GetBrowserContext() OVERRIDE; - virtual ui::InputMethod* GetInputMethod() OVERRIDE; + virtual content::BrowserContext* GetBrowserContext() override; + virtual ui::InputMethod* GetInputMethod() override; virtual void RequestAudioInput(content::WebContents* web_contents, const content::MediaStreamRequest& request, - const content::MediaResponseCallback& callback) OVERRIDE; - virtual void LoadSystemKeyboard() OVERRIDE; - virtual void ReloadKeyboardIfNeeded() OVERRIDE; + const content::MediaResponseCallback& callback) override; + virtual void LoadSystemKeyboard() override; + virtual void ReloadKeyboardIfNeeded() override; aura::test::TestWindowDelegate delegate_; scoped_ptr<aura::Window> keyboard_; diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc index ed2e75d..6125f40 100644 --- a/ash/shell/lock_view.cc +++ b/ash/shell/lock_view.cc @@ -35,13 +35,13 @@ class LockView : public views::WidgetDelegateView, virtual ~LockView() {} // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(500, 400); } private: // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->FillRect(GetLocalBounds(), SK_ColorYELLOW); base::string16 text = base::ASCIIToUTF16("LOCKED!"); int string_width = gfx::GetStringWidth(text, font_list_); @@ -50,7 +50,7 @@ class LockView : public views::WidgetDelegateView, (height() - font_list_.GetHeight()) / 2, string_width, font_list_.GetHeight())); } - virtual void Layout() OVERRIDE { + virtual void Layout() override { gfx::Rect bounds = GetLocalBounds(); gfx::Size ps = unlock_button_->GetPreferredSize(); bounds.set_y(bounds.bottom() - ps.height() - 5); @@ -59,19 +59,19 @@ class LockView : public views::WidgetDelegateView, unlock_button_->SetBoundsRect(bounds); } virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE { + const ViewHierarchyChangedDetails& details) override { if (details.is_add && details.child == this) unlock_button_->RequestFocus(); } // Overridden from views::WidgetDelegateView: - virtual void WindowClosing() OVERRIDE { + virtual void WindowClosing() override { Shell::GetInstance()->session_state_delegate()->UnlockScreen(); } // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE { + const ui::Event& event) override { DCHECK(sender == unlock_button_); GetWidget()->Close(); } diff --git a/ash/shell/panel_window.h b/ash/shell/panel_window.h index cee7946..ffa765c 100644 --- a/ash/shell/panel_window.h +++ b/ash/shell/panel_window.h @@ -33,17 +33,17 @@ class PanelWindow : public views::WidgetDelegateView { private: // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; // Overridden from views::WidgetDelegate: - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual View* GetContentsView() OVERRIDE; - virtual bool CanResize() const OVERRIDE; - virtual bool CanMaximize() const OVERRIDE; - virtual bool CanMinimize() const OVERRIDE; + virtual base::string16 GetWindowTitle() const override; + virtual View* GetContentsView() override; + virtual bool CanResize() const override; + virtual bool CanMaximize() const override; + virtual bool CanMinimize() const override; virtual views::NonClientFrameView* CreateNonClientFrameView( - views::Widget* widget) OVERRIDE; + views::Widget* widget) override; std::string name_; views::Widget::InitParams params_; diff --git a/ash/shell/shelf_delegate_impl.h b/ash/shell/shelf_delegate_impl.h index cb78836..f9a0640 100644 --- a/ash/shell/shelf_delegate_impl.h +++ b/ash/shell/shelf_delegate_impl.h @@ -25,14 +25,14 @@ class ShelfDelegateImpl : public ShelfDelegate { void set_watcher(WindowWatcher* watcher) { watcher_ = watcher; } // ShelfDelegate overrides: - virtual void OnShelfCreated(Shelf* shelf) OVERRIDE; - virtual void OnShelfDestroyed(Shelf* shelf) OVERRIDE; - virtual ShelfID GetShelfIDForAppID(const std::string& app_id) OVERRIDE; - virtual const std::string& GetAppIDForShelfID(ShelfID id) OVERRIDE; - virtual void PinAppWithID(const std::string& app_id) OVERRIDE; - virtual bool IsAppPinned(const std::string& app_id) OVERRIDE; - virtual bool CanPin() const OVERRIDE; - virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE; + virtual void OnShelfCreated(Shelf* shelf) override; + virtual void OnShelfDestroyed(Shelf* shelf) override; + virtual ShelfID GetShelfIDForAppID(const std::string& app_id) override; + virtual const std::string& GetAppIDForShelfID(ShelfID id) override; + virtual void PinAppWithID(const std::string& app_id) override; + virtual bool IsAppPinned(const std::string& app_id) override; + virtual bool CanPin() const override; + virtual void UnpinAppWithID(const std::string& app_id) override; private: // Used to update Launcher. Owned by main. diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index fb8f605..828e01e 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -36,19 +36,19 @@ class NewWindowDelegateImpl : public NewWindowDelegate { virtual ~NewWindowDelegateImpl() {} // NewWindowDelegate: - virtual void NewTab() OVERRIDE {} - virtual void NewWindow(bool incognito) OVERRIDE { + virtual void NewTab() override {} + virtual void NewWindow(bool incognito) override { ash::shell::ToplevelWindow::CreateParams create_params; create_params.can_resize = true; create_params.can_maximize = true; ash::shell::ToplevelWindow::CreateToplevelWindow(create_params); } - virtual void OpenFileManager() OVERRIDE {} - virtual void OpenCrosh() OVERRIDE {} - virtual void RestoreTab() OVERRIDE {} - virtual void ShowKeyboardOverlay() OVERRIDE {} - virtual void ShowTaskManager() OVERRIDE {} - virtual void OpenFeedbackPage() OVERRIDE {} + virtual void OpenFileManager() override {} + virtual void OpenCrosh() override {} + virtual void RestoreTab() override {} + virtual void ShowKeyboardOverlay() override {} + virtual void ShowTaskManager() override {} + virtual void OpenFeedbackPage() override {} private: DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl); @@ -60,11 +60,11 @@ class MediaDelegateImpl : public MediaDelegate { virtual ~MediaDelegateImpl() {} // MediaDelegate: - virtual void HandleMediaNextTrack() OVERRIDE {} - virtual void HandleMediaPlayPause() OVERRIDE {} - virtual void HandleMediaPrevTrack() OVERRIDE {} + virtual void HandleMediaNextTrack() override {} + virtual void HandleMediaPlayPause() override {} + virtual void HandleMediaPrevTrack() override {} virtual MediaCaptureState GetMediaCaptureState( - content::BrowserContext* context) OVERRIDE { + content::BrowserContext* context) override { return MEDIA_CAPTURE_VIDEO; } @@ -81,61 +81,61 @@ class SessionStateDelegateImpl : public SessionStateDelegate { // SessionStateDelegate: virtual content::BrowserContext* GetBrowserContextByIndex( - MultiProfileIndex index) OVERRIDE { + MultiProfileIndex index) override { return Shell::GetInstance()->delegate()->GetActiveBrowserContext(); } virtual content::BrowserContext* GetBrowserContextForWindow( - aura::Window* window) OVERRIDE { + aura::Window* window) override { return Shell::GetInstance()->delegate()->GetActiveBrowserContext(); } - virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE { return 3; } - virtual int NumberOfLoggedInUsers() const OVERRIDE { + virtual int GetMaximumNumberOfLoggedInUsers() const override { return 3; } + virtual int NumberOfLoggedInUsers() const override { // ash_shell has 2 users. return 2; } - virtual bool IsActiveUserSessionStarted() const OVERRIDE { return true; } - virtual bool CanLockScreen() const OVERRIDE { return true; } - virtual bool IsScreenLocked() const OVERRIDE { return screen_locked_; } - virtual bool ShouldLockScreenBeforeSuspending() const OVERRIDE { + virtual bool IsActiveUserSessionStarted() const override { return true; } + virtual bool CanLockScreen() const override { return true; } + virtual bool IsScreenLocked() const override { return screen_locked_; } + virtual bool ShouldLockScreenBeforeSuspending() const override { return false; } - virtual void LockScreen() OVERRIDE { + virtual void LockScreen() override { shell::CreateLockScreen(); screen_locked_ = true; Shell::GetInstance()->UpdateShelfVisibility(); } - virtual void UnlockScreen() OVERRIDE { + virtual void UnlockScreen() override { screen_locked_ = false; Shell::GetInstance()->UpdateShelfVisibility(); } - virtual bool IsUserSessionBlocked() const OVERRIDE { + virtual bool IsUserSessionBlocked() const override { return !IsActiveUserSessionStarted() || IsScreenLocked(); } - virtual SessionState GetSessionState() const OVERRIDE { + virtual SessionState GetSessionState() const override { // Assume that if session is not active we're at login. return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE : SESSION_STATE_LOGIN_PRIMARY; } virtual const user_manager::UserInfo* GetUserInfo( - MultiProfileIndex index) const OVERRIDE { + MultiProfileIndex index) const override { return user_info_.get(); } virtual const user_manager::UserInfo* GetUserInfo( - content::BrowserContext* context) const OVERRIDE { + content::BrowserContext* context) const override { return user_info_.get(); } - virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE { + virtual bool ShouldShowAvatar(aura::Window* window) const override { return !user_info_->GetImage().isNull(); } - virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE {} - virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE {} - virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const OVERRIDE { + virtual void SwitchActiveUser(const std::string& user_id) override {} + virtual void CycleActiveUser(CycleUser cycle_user) override {} + virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const override { return true; } virtual void AddSessionStateObserver( - ash::SessionStateObserver* observer) OVERRIDE {} + ash::SessionStateObserver* observer) override {} virtual void RemoveSessionStateObserver( - ash::SessionStateObserver* observer) OVERRIDE {} + ash::SessionStateObserver* observer) override {} private: bool screen_locked_; diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index a995328..b10ef10 100644 --- a/ash/shell/shell_delegate_impl.h +++ b/ash/shell/shell_delegate_impl.h @@ -34,36 +34,36 @@ class ShellDelegateImpl : public ash::ShellDelegate { browser_context_ = browser_context; } - virtual bool IsFirstRunAfterBoot() const OVERRIDE; - virtual bool IsIncognitoAllowed() const OVERRIDE; - virtual bool IsMultiProfilesEnabled() const OVERRIDE; - virtual bool IsRunningInForcedAppMode() const OVERRIDE; - virtual bool IsMultiAccountEnabled() const OVERRIDE; - virtual void PreInit() OVERRIDE; - virtual void PreShutdown() OVERRIDE; - virtual void Exit() OVERRIDE; + virtual bool IsFirstRunAfterBoot() const override; + virtual bool IsIncognitoAllowed() const override; + virtual bool IsMultiProfilesEnabled() const override; + virtual bool IsRunningInForcedAppMode() const override; + virtual bool IsMultiAccountEnabled() const override; + virtual void PreInit() override; + virtual void PreShutdown() override; + virtual void Exit() override; virtual keyboard::KeyboardControllerProxy* - CreateKeyboardControllerProxy() OVERRIDE; - virtual void VirtualKeyboardActivated(bool activated) OVERRIDE; + CreateKeyboardControllerProxy() override; + virtual void VirtualKeyboardActivated(bool activated) override; virtual void AddVirtualKeyboardStateObserver( - VirtualKeyboardStateObserver* observer) OVERRIDE; + VirtualKeyboardStateObserver* observer) override; virtual void RemoveVirtualKeyboardStateObserver( - VirtualKeyboardStateObserver* observer) OVERRIDE; - virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE; - virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE; - virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE; - virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; - virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; - virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; - virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; - virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; - virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE; + VirtualKeyboardStateObserver* observer) override; + virtual content::BrowserContext* GetActiveBrowserContext() override; + virtual app_list::AppListViewDelegate* GetAppListViewDelegate() override; + virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; + virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; + virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; + virtual ash::SessionStateDelegate* CreateSessionStateDelegate() override; + virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; + virtual ash::NewWindowDelegate* CreateNewWindowDelegate() override; + virtual ash::MediaDelegate* CreateMediaDelegate() override; virtual ui::MenuModel* CreateContextMenu( aura::Window* root_window, ash::ShelfItemDelegate* item_delegate, - ash::ShelfItem* item) OVERRIDE; - virtual GPUSupport* CreateGPUSupport() OVERRIDE; - virtual base::string16 GetProductName() const OVERRIDE; + ash::ShelfItem* item) override; + virtual GPUSupport* CreateGPUSupport() override; + virtual base::string16 GetProductName() const override; private: // Used to update Launcher. Owned by main. diff --git a/ash/shell/toplevel_window.h b/ash/shell/toplevel_window.h index db19d1e..ad515ba 100644 --- a/ash/shell/toplevel_window.h +++ b/ash/shell/toplevel_window.h @@ -30,21 +30,21 @@ class ToplevelWindow : public views::WidgetDelegateView { virtual ~ToplevelWindow(); // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; // Overridden from views::WidgetDelegate: - virtual base::string16 GetWindowTitle() const OVERRIDE; + virtual base::string16 GetWindowTitle() const override; virtual void SaveWindowPlacement( const gfx::Rect& bounds, - ui::WindowShowState show_state) OVERRIDE; + ui::WindowShowState show_state) override; virtual bool GetSavedWindowPlacement( const views::Widget* widget, gfx::Rect* bounds, - ui::WindowShowState* show_state) const OVERRIDE; - virtual View* GetContentsView() OVERRIDE; - virtual bool CanResize() const OVERRIDE; - virtual bool CanMaximize() const OVERRIDE; - virtual bool CanMinimize() const OVERRIDE; + ui::WindowShowState* show_state) const override; + virtual View* GetContentsView() override; + virtual bool CanResize() const override; + virtual bool CanMaximize() const override; + virtual bool CanMinimize() const override; const CreateParams params_; diff --git a/ash/shell/widgets.cc b/ash/shell/widgets.cc index 09b192a..4304414 100644 --- a/ash/shell/widgets.cc +++ b/ash/shell/widgets.cc @@ -30,14 +30,14 @@ class WidgetsWindow : public views::WidgetDelegateView { virtual ~WidgetsWindow(); // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; // Overridden from views::WidgetDelegate: - virtual views::View* GetContentsView() OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual bool CanResize() const OVERRIDE; + virtual views::View* GetContentsView() override; + virtual base::string16 GetWindowTitle() const override; + virtual bool CanResize() const override; private: views::LabelButton* button_; diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index cbd2db3..a08c06e 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -73,13 +73,13 @@ class ModalWindow : public views::WidgetDelegateView, } // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->FillRect(GetLocalBounds(), color_); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(200, 200); } - virtual void Layout() OVERRIDE { + virtual void Layout() override { gfx::Size open_ps = open_button_->GetPreferredSize(); gfx::Rect local_bounds = GetLocalBounds(); open_button_->SetBounds( @@ -88,22 +88,22 @@ class ModalWindow : public views::WidgetDelegateView, } // 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 base::string16 GetWindowTitle() const OVERRIDE { + virtual base::string16 GetWindowTitle() const override { return base::ASCIIToUTF16("Modal Window"); } - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual ui::ModalType GetModalType() const override { return modal_type_; } // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE { + const ui::Event& event) override { DCHECK(sender == open_button_); OpenModalWindow(GetWidget()->GetNativeView(), modal_type_); } @@ -145,24 +145,24 @@ class NonModalTransient : public views::WidgetDelegateView { } // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->FillRect(GetLocalBounds(), color_); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(250, 250); } // 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 base::string16 GetWindowTitle() const OVERRIDE { + virtual base::string16 GetWindowTitle() const override { return base::ASCIIToUTF16("Non-Modal Transient"); } - virtual void DeleteDelegate() OVERRIDE { + virtual void DeleteDelegate() override { if (GetWidget() == non_modal_transient_) non_modal_transient_ = NULL; diff --git a/ash/shell/window_type_launcher.h b/ash/shell/window_type_launcher.h index 8cd389c..da6575a 100644 --- a/ash/shell/window_type_launcher.h +++ b/ash/shell/window_type_launcher.h @@ -37,27 +37,27 @@ class WindowTypeLauncher : public views::WidgetDelegateView, }; // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; // Overridden from views::WidgetDelegate: - virtual views::View* GetContentsView() OVERRIDE; - virtual bool CanResize() const OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual bool CanMaximize() const OVERRIDE; - virtual bool CanMinimize() const OVERRIDE; + virtual views::View* GetContentsView() override; + virtual bool CanResize() const override; + virtual base::string16 GetWindowTitle() const override; + virtual bool CanMaximize() const override; + virtual bool CanMinimize() const override; // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from views::MenuDelegate: - virtual void ExecuteCommand(int id, int event_flags) OVERRIDE; + virtual void ExecuteCommand(int id, int event_flags) override; // Override from views::ContextMenuController: virtual void ShowContextMenuForView(views::View* source, const gfx::Point& point, - ui::MenuSourceType source_type) OVERRIDE; + ui::MenuSourceType source_type) override; views::LabelButton* create_button_; views::LabelButton* create_persistant_button_; diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index d7bc726..f56cf78 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc @@ -28,11 +28,11 @@ class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver { virtual ~WorkspaceWindowWatcher() { } - virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE { + virtual void OnWindowAdded(aura::Window* new_window) override { new_window->AddObserver(watcher_); } - virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE { + virtual void OnWillRemoveWindow(aura::Window* window) override { DCHECK(window->children().empty()); window->RemoveObserver(watcher_); } diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h index 50cd9e4..1aa9125 100644 --- a/ash/shell/window_watcher.h +++ b/ash/shell/window_watcher.h @@ -34,14 +34,14 @@ class WindowWatcher : public aura::WindowObserver, aura::Window* GetWindowByID(ash::ShelfID id); // aura::WindowObserver overrides: - virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE; - virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; + virtual void OnWindowAdded(aura::Window* new_window) override; + virtual void OnWillRemoveWindow(aura::Window* window) override; // gfx::DisplayObserver overrides: - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& new_display) override; + virtual void OnDisplayRemoved(const gfx::Display& old_display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; private: class WorkspaceWindowWatcher; diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h index 44542f6..1da99d7 100644 --- a/ash/shell/window_watcher_shelf_item_delegate.h +++ b/ash/shell/window_watcher_shelf_item_delegate.h @@ -22,13 +22,13 @@ class WindowWatcherShelfItemDelegate : public ShelfItemDelegate { virtual ~WindowWatcherShelfItemDelegate(); // ShelfItemDelegate: - virtual bool ItemSelected(const ui::Event& event) OVERRIDE; - virtual base::string16 GetTitle() OVERRIDE; - virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE; - virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE; - virtual bool IsDraggable() OVERRIDE; - virtual bool ShouldShowTooltip() OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool ItemSelected(const ui::Event& event) override; + virtual base::string16 GetTitle() override; + virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override; + virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) override; + virtual bool IsDraggable() override; + virtual bool ShouldShowTooltip() override; + virtual void Close() override; private: ShelfID id_; diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 98983d9..160d295 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -95,16 +95,16 @@ class ModalWindow : public views::WidgetDelegateView { virtual ~ModalWindow() {} // 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 base::string16 GetWindowTitle() const OVERRIDE { + virtual base::string16 GetWindowTitle() const override { return base::ASCIIToUTF16("Modal Window"); } - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; } @@ -117,21 +117,21 @@ class SimpleMenuDelegate : public ui::SimpleMenuModel::Delegate { SimpleMenuDelegate() {} virtual ~SimpleMenuDelegate() {} - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE { + virtual bool IsCommandIdChecked(int command_id) const override { return false; } - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE { + virtual bool IsCommandIdEnabled(int command_id) const override { return true; } virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE { + ui::Accelerator* accelerator) override { return false; } - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE { + virtual void ExecuteCommand(int command_id, int event_flags) override { } private: @@ -279,7 +279,7 @@ class TestModalDialogDelegate : public views::DialogDelegateView { TestModalDialogDelegate() {} // Overridden from views::WidgetDelegate: - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; } }; diff --git a/ash/snap_to_pixel_layout_manager.h b/ash/snap_to_pixel_layout_manager.h index c3be66f..21abe8e 100644 --- a/ash/snap_to_pixel_layout_manager.h +++ b/ash/snap_to_pixel_layout_manager.h @@ -20,14 +20,14 @@ class ASH_EXPORT SnapToPixelLayoutManager : public aura::LayoutManager { protected: // Overridden from aura::LayoutManager: - virtual void OnWindowResized() OVERRIDE; - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE; + virtual void OnWindowResized() override; + virtual void OnWindowAddedToLayout(aura::Window* child) override; + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override; + virtual void OnWindowRemovedFromLayout(aura::Window* child) override; virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visibile) OVERRIDE; + bool visibile) override; virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; private: DISALLOW_COPY_AND_ASSIGN(SnapToPixelLayoutManager); diff --git a/ash/sticky_keys/sticky_keys_overlay.cc b/ash/sticky_keys/sticky_keys_overlay.cc index 5b239f7..9edbec3 100644 --- a/ash/sticky_keys/sticky_keys_overlay.cc +++ b/ash/sticky_keys/sticky_keys_overlay.cc @@ -108,7 +108,7 @@ class StickyKeysOverlayView : public views::WidgetDelegateView { virtual ~StickyKeysOverlayView(); // views::WidgetDelegateView overrides: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; void SetKeyState(ui::EventFlags modifier, StickyKeyState state); diff --git a/ash/sticky_keys/sticky_keys_overlay.h b/ash/sticky_keys/sticky_keys_overlay.h index e60d074..34ea266c 100644 --- a/ash/sticky_keys/sticky_keys_overlay.h +++ b/ash/sticky_keys/sticky_keys_overlay.h @@ -57,11 +57,11 @@ class ASH_EXPORT StickyKeysOverlay : public ui::LayerAnimationObserver { // gfx::LayerAnimationObserver overrides: virtual void OnLayerAnimationEnded( - ui::LayerAnimationSequence* sequence) OVERRIDE; + ui::LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* sequence) OVERRIDE; + ui::LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* sequence) OVERRIDE; + ui::LayerAnimationSequence* sequence) override; bool is_visible_; scoped_ptr<views::Widget> overlay_widget_; diff --git a/ash/sticky_keys/sticky_keys_unittest.cc b/ash/sticky_keys/sticky_keys_unittest.cc index 6505b65..feb56ad 100644 --- a/ash/sticky_keys/sticky_keys_unittest.cc +++ b/ash/sticky_keys/sticky_keys_unittest.cc @@ -34,7 +34,7 @@ class StickyKeysTest : public test::AshTestBase { : target_(NULL), root_window_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); // |target_| owned by root window of shell. It is still safe to delete @@ -45,7 +45,7 @@ class StickyKeysTest : public test::AshTestBase { ui::SetUpTouchPadForTest(kTouchPadDeviceId); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test::AshTestBase::TearDown(); } diff --git a/ash/system/audio/tray_audio.h b/ash/system/audio/tray_audio.h index 1d0d5e1..9aa22d5 100644 --- a/ash/system/audio/tray_audio.h +++ b/ash/system/audio/tray_audio.h @@ -42,28 +42,28 @@ class TrayAudio : public TrayImageItem, private: // Overridden from TrayImageItem. - virtual bool GetInitialVisibility() OVERRIDE; + virtual bool GetInitialVisibility() override; // Overridden from SystemTrayItem. - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual bool ShouldHideArrow() const OVERRIDE; - virtual bool ShouldShowShelf() const OVERRIDE; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual bool ShouldHideArrow() const override; + virtual bool ShouldShowShelf() const override; // Overridden from AudioObserver. - virtual void OnOutputVolumeChanged() OVERRIDE; - virtual void OnOutputMuteChanged() OVERRIDE; - virtual void OnAudioNodesChanged() OVERRIDE; - virtual void OnActiveOutputNodeChanged() OVERRIDE; - virtual void OnActiveInputNodeChanged() OVERRIDE; + virtual void OnOutputVolumeChanged() override; + virtual void OnOutputMuteChanged() override; + virtual void OnAudioNodesChanged() override; + virtual void OnActiveOutputNodeChanged() override; + virtual void OnActiveInputNodeChanged() override; // Overridden from gfx::DisplayObserver. - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& new_display) override; + virtual void OnDisplayRemoved(const gfx::Display& old_display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t changed_metrics) OVERRIDE; + uint32_t changed_metrics) override; void ChangeInternalSpeakerChannelMode(); diff --git a/ash/system/audio/volume_view.cc b/ash/system/audio/volume_view.cc index 2ae9f2e..821fb11 100644 --- a/ash/system/audio/volume_view.cc +++ b/ash/system/audio/volume_view.cc @@ -72,7 +72,7 @@ class VolumeButton : public views::ToggleImageButton { private: // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { gfx::Size size = views::ToggleImageButton::GetPreferredSize(); size.set_height(kTrayPopupItemHeight); return size; @@ -118,12 +118,12 @@ class BarSeparator : public views::View { virtual ~BarSeparator() {} // Overriden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(kBarSeparatorWidth, kBarSeparatorHeight); } private: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->FillRect(gfx::Rect(width() / 2, 0, 1, height()), kButtonStrokeColor); } diff --git a/ash/system/audio/volume_view.h b/ash/system/audio/volume_view.h index 167ef45..d0fbb73 100644 --- a/ash/system/audio/volume_view.h +++ b/ash/system/audio/volume_view.h @@ -50,20 +50,20 @@ class VolumeView : public ActionableView, void HandleVolumeDown(float percent); // Overridden from views::View. - virtual void Layout() OVERRIDE; + virtual void Layout() override; // Overridden from views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from views::SliderListener. virtual void SliderValueChanged(views::Slider* sender, float value, float old_value, - views::SliderChangeReason reason) OVERRIDE; + views::SliderChangeReason reason) override; // Overriden from ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; SystemTrayItem* owner_; system::TrayAudioDelegate* audio_delegate_; diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc index 091f24b..933d9f3 100644 --- a/ash/system/bluetooth/tray_bluetooth.cc +++ b/ash/system/bluetooth/tray_bluetooth.cc @@ -357,7 +357,7 @@ class BluetoothDetailedView : public TrayDetailsView, } // Overridden from ViewClickListener. - virtual void OnViewClicked(views::View* sender) OVERRIDE { + virtual void OnViewClicked(views::View* sender) override { ash::SystemTrayDelegate* delegate = ash::Shell::GetInstance()->system_tray_delegate(); if (sender == footer()->content()) { @@ -387,7 +387,7 @@ class BluetoothDetailedView : public TrayDetailsView, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE { + const ui::Event& event) override { ash::SystemTrayDelegate* delegate = ash::Shell::GetInstance()->system_tray_delegate(); if (sender == toggle_bluetooth_) diff --git a/ash/system/bluetooth/tray_bluetooth.h b/ash/system/bluetooth/tray_bluetooth.h index 1330c3c..8193c01 100644 --- a/ash/system/bluetooth/tray_bluetooth.h +++ b/ash/system/bluetooth/tray_bluetooth.h @@ -22,17 +22,17 @@ class TrayBluetooth : public SystemTrayItem, private: // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; // Overridden from BluetoothObserver. - virtual void OnBluetoothRefresh() OVERRIDE; - virtual void OnBluetoothDiscoveringChanged() OVERRIDE; + virtual void OnBluetoothRefresh() override; + virtual void OnBluetoothDiscoveringChanged() override; tray::BluetoothDefaultView* default_; tray::BluetoothDetailedView* detailed_; diff --git a/ash/system/chromeos/audio/audio_detailed_view.h b/ash/system/chromeos/audio/audio_detailed_view.h index fc836b3..9995fe7 100644 --- a/ash/system/chromeos/audio/audio_detailed_view.h +++ b/ash/system/chromeos/audio/audio_detailed_view.h @@ -44,7 +44,7 @@ class AudioDetailedView : public TrayDetailsView, void UpdateAudioDevices(); // Overridden from ViewClickListener. - virtual void OnViewClicked(views::View* sender) OVERRIDE; + virtual void OnViewClicked(views::View* sender) override; user::LoginStatus login_; diff --git a/ash/system/chromeos/audio/tray_audio_chromeos.h b/ash/system/chromeos/audio/tray_audio_chromeos.h index c5cb9ea..a41ce50 100644 --- a/ash/system/chromeos/audio/tray_audio_chromeos.h +++ b/ash/system/chromeos/audio/tray_audio_chromeos.h @@ -21,12 +21,12 @@ class ASH_EXPORT TrayAudioChromeOs : public TrayAudio { protected: // Overridden from TrayAudio - virtual void Update() OVERRIDE; + virtual void Update() override; private: // Overridden from SystemTrayItem. - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyDetailedView() override; tray::AudioDetailedView* audio_detail_view_; diff --git a/ash/system/chromeos/audio/tray_audio_delegate_chromeos.h b/ash/system/chromeos/audio/tray_audio_delegate_chromeos.h index 99760e8..24067d6 100644 --- a/ash/system/chromeos/audio/tray_audio_delegate_chromeos.h +++ b/ash/system/chromeos/audio/tray_audio_delegate_chromeos.h @@ -17,15 +17,15 @@ class ASH_EXPORT TrayAudioDelegateChromeOs : public TrayAudioDelegate { virtual ~TrayAudioDelegateChromeOs() {} // Overridden from TrayAudioDelegate. - virtual void AdjustOutputVolumeToAudibleLevel() OVERRIDE; - virtual int GetOutputDefaultVolumeMuteLevel() OVERRIDE; - virtual int GetOutputVolumeLevel() OVERRIDE; - virtual int GetActiveOutputDeviceIconId() OVERRIDE; - virtual bool HasAlternativeSources() OVERRIDE; - virtual bool IsOutputAudioMuted() OVERRIDE; - virtual void SetOutputAudioIsMuted(bool is_muted) OVERRIDE; - virtual void SetOutputVolumeLevel(int level) OVERRIDE; - virtual void SetInternalSpeakerChannelMode(AudioChannelMode mode) OVERRIDE; + virtual void AdjustOutputVolumeToAudibleLevel() override; + virtual int GetOutputDefaultVolumeMuteLevel() override; + virtual int GetOutputVolumeLevel() override; + virtual int GetActiveOutputDeviceIconId() override; + virtual bool HasAlternativeSources() override; + virtual bool IsOutputAudioMuted() override; + virtual void SetOutputAudioIsMuted(bool is_muted) override; + virtual void SetOutputVolumeLevel(int level) override; + virtual void SetInternalSpeakerChannelMode(AudioChannelMode mode) override; }; } // namespace system diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc index d6b38f4..e64bc77 100644 --- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc +++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc @@ -58,12 +58,12 @@ class BluetoothPairingNotificationDelegate virtual ~BluetoothPairingNotificationDelegate(); // message_center::NotificationDelegate overrides. - virtual void Display() OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual bool HasClickedListener() OVERRIDE; - virtual void Click() OVERRIDE; - virtual void ButtonClick(int button_index) OVERRIDE; + virtual void Display() override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual bool HasClickedListener() override; + virtual void Click() override; + virtual void ButtonClick(int button_index) override; private: // Buttons that appear in notifications. diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h index e44b281..bc3c19f 100644 --- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h +++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h @@ -31,26 +31,26 @@ class ASH_EXPORT BluetoothNotificationController // device::BluetoothAdapter::Observer override. virtual void AdapterDiscoverableChanged(device::BluetoothAdapter* adapter, - bool discoverable) OVERRIDE; + bool discoverable) override; virtual void DeviceAdded(device::BluetoothAdapter* adapter, - device::BluetoothDevice* device) OVERRIDE; + device::BluetoothDevice* device) override; virtual void DeviceChanged(device::BluetoothAdapter* adapter, - device::BluetoothDevice* device) OVERRIDE; + device::BluetoothDevice* device) override; virtual void DeviceRemoved(device::BluetoothAdapter* adapter, - device::BluetoothDevice* device) OVERRIDE; + device::BluetoothDevice* device) override; // device::BluetoothDevice::PairingDelegate override. - virtual void RequestPinCode(device::BluetoothDevice* device) OVERRIDE; - virtual void RequestPasskey(device::BluetoothDevice* device) OVERRIDE; + virtual void RequestPinCode(device::BluetoothDevice* device) override; + virtual void RequestPasskey(device::BluetoothDevice* device) override; virtual void DisplayPinCode(device::BluetoothDevice* device, - const std::string& pincode) OVERRIDE; + const std::string& pincode) override; virtual void DisplayPasskey(device::BluetoothDevice* device, - uint32 passkey) OVERRIDE; + uint32 passkey) override; virtual void KeysEntered(device::BluetoothDevice* device, - uint32 entered) OVERRIDE; + uint32 entered) override; virtual void ConfirmPasskey(device::BluetoothDevice* device, - uint32 passkey) OVERRIDE; - virtual void AuthorizePairing(device::BluetoothDevice* device) OVERRIDE; + uint32 passkey) override; + virtual void AuthorizePairing(device::BluetoothDevice* device) override; private: // Internal method called by BluetoothAdapterFactory to provide the adapter diff --git a/ash/system/chromeos/brightness/brightness_controller_chromeos.h b/ash/system/chromeos/brightness/brightness_controller_chromeos.h index 111daf3..6dcc802 100644 --- a/ash/system/chromeos/brightness/brightness_controller_chromeos.h +++ b/ash/system/chromeos/brightness/brightness_controller_chromeos.h @@ -23,11 +23,11 @@ class ASH_EXPORT BrightnessControllerChromeos // Overridden from ash::BrightnessControlDelegate: virtual bool HandleBrightnessDown( - const ui::Accelerator& accelerator) OVERRIDE; - virtual bool HandleBrightnessUp(const ui::Accelerator& accelerator) OVERRIDE; - virtual void SetBrightnessPercent(double percent, bool gradual) OVERRIDE; + const ui::Accelerator& accelerator) override; + virtual bool HandleBrightnessUp(const ui::Accelerator& accelerator) 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; private: DISALLOW_COPY_AND_ASSIGN(BrightnessControllerChromeos); diff --git a/ash/system/chromeos/brightness/tray_brightness.cc b/ash/system/chromeos/brightness/tray_brightness.cc index 5c804e8..56cd41d 100644 --- a/ash/system/chromeos/brightness/tray_brightness.cc +++ b/ash/system/chromeos/brightness/tray_brightness.cc @@ -61,22 +61,22 @@ class BrightnessView : public ShellObserver, void SetBrightnessPercent(double percent); // ShellObserver: - virtual void OnMaximizeModeStarted() OVERRIDE; - virtual void OnMaximizeModeEnded() OVERRIDE; + virtual void OnMaximizeModeStarted() override; + virtual void OnMaximizeModeEnded() override; private: // views::View: - virtual void OnBoundsChanged(const gfx::Rect& old_bounds) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& old_bounds) override; // views:SliderListener: virtual void SliderValueChanged(views::Slider* sender, float value, float old_value, - views::SliderChangeReason reason) OVERRIDE; + views::SliderChangeReason reason) override; // views:SliderListener: - virtual void SliderDragStarted(views::Slider* slider) OVERRIDE; - virtual void SliderDragEnded(views::Slider* slider) OVERRIDE; + virtual void SliderDragStarted(views::Slider* slider) override; + virtual void SliderDragEnded(views::Slider* slider) override; views::Slider* slider_; diff --git a/ash/system/chromeos/brightness/tray_brightness.h b/ash/system/chromeos/brightness/tray_brightness.h index 1c0d10d..f0e20c9 100644 --- a/ash/system/chromeos/brightness/tray_brightness.h +++ b/ash/system/chromeos/brightness/tray_brightness.h @@ -35,18 +35,18 @@ class ASH_EXPORT TrayBrightness void HandleInitialBrightness(double percent); // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; - virtual bool ShouldHideArrow() const OVERRIDE; - virtual bool ShouldShowShelf() const OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; + virtual bool ShouldHideArrow() const override; + virtual bool ShouldShowShelf() const override; // Overriden from PowerManagerClient::Observer. - virtual void BrightnessChanged(int level, bool user_initiated) OVERRIDE; + virtual void BrightnessChanged(int level, bool user_initiated) override; void HandleBrightnessChanged(double percent, bool user_initiated); diff --git a/ash/system/chromeos/enterprise/tray_enterprise.h b/ash/system/chromeos/enterprise/tray_enterprise.h index ed41a7f..fe3dcd7 100644 --- a/ash/system/chromeos/enterprise/tray_enterprise.h +++ b/ash/system/chromeos/enterprise/tray_enterprise.h @@ -29,14 +29,14 @@ class TrayEnterprise : public SystemTrayItem, void UpdateEnterpriseMessage(); // Overridden from SystemTrayItem. - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual void DestroyDefaultView() override; // Overridden from EnterpriseDomainObserver. - virtual void OnEnterpriseDomainChanged() OVERRIDE; + virtual void OnEnterpriseDomainChanged() override; // Overridden from ViewClickListener. - virtual void OnViewClicked(views::View* sender) OVERRIDE; + virtual void OnViewClicked(views::View* sender) override; private: LabelTrayView* tray_view_; diff --git a/ash/system/chromeos/keyboard_brightness_controller.h b/ash/system/chromeos/keyboard_brightness_controller.h index 1afc94b..f4d44e8 100644 --- a/ash/system/chromeos/keyboard_brightness_controller.h +++ b/ash/system/chromeos/keyboard_brightness_controller.h @@ -23,9 +23,9 @@ class ASH_EXPORT KeyboardBrightnessController private: // Overridden from KeyboardBrightnessControlDelegate: virtual bool HandleKeyboardBrightnessDown( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; virtual bool HandleKeyboardBrightnessUp( - const ui::Accelerator& accelerator) OVERRIDE; + const ui::Accelerator& accelerator) override; DISALLOW_COPY_AND_ASSIGN(KeyboardBrightnessController); }; diff --git a/ash/system/chromeos/multi_user/user_switch_util.cc b/ash/system/chromeos/multi_user/user_switch_util.cc index b6668f9..486966b 100644 --- a/ash/system/chromeos/multi_user/user_switch_util.cc +++ b/ash/system/chromeos/multi_user/user_switch_util.cc @@ -37,17 +37,17 @@ class DesktopCastingWarningView : public views::DialogDelegateView { static void ShowDialog(const base::Callback<void()> on_accept); // views::DialogDelegate overrides. - virtual bool Accept() OVERRIDE; + virtual bool Accept() override; virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const OVERRIDE; - virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; - virtual int GetDefaultDialogButton() const OVERRIDE; + ui::DialogButton button) const override; + virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override; + virtual int GetDefaultDialogButton() const override; // views::WidgetDelegate overrides. - virtual ui::ModalType GetModalType() const OVERRIDE; + virtual ui::ModalType GetModalType() const override; // views::View overrides. - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; private: void InitDialog(); diff --git a/ash/system/chromeos/multi_user/user_switch_util_unittest.cc b/ash/system/chromeos/multi_user/user_switch_util_unittest.cc index 16eb032..becf95f 100644 --- a/ash/system/chromeos/multi_user/user_switch_util_unittest.cc +++ b/ash/system/chromeos/multi_user/user_switch_util_unittest.cc @@ -26,7 +26,7 @@ class TrySwitchingUserTest : public ash::test::AshTestBase { switch_callback_hit_count_(0) {} virtual ~TrySwitchingUserTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); TrayItemView::DisableAnimationsForTest(); SystemTray* system_tray = Shell::GetInstance()->GetPrimarySystemTray(); diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.h b/ash/system/chromeos/network/network_state_list_detailed_view.h index acf331b..4400bec 100644 --- a/ash/system/chromeos/network/network_state_list_detailed_view.h +++ b/ash/system/chromeos/network/network_state_list_detailed_view.h @@ -49,20 +49,20 @@ class NetworkStateListDetailedView virtual ~NetworkStateListDetailedView(); // Overridden from NetworkDetailedView: - virtual void Init() OVERRIDE; - virtual DetailedViewType GetViewType() const OVERRIDE; - virtual void ManagerChanged() OVERRIDE; - virtual void NetworkListChanged() OVERRIDE; + virtual void Init() override; + virtual DetailedViewType GetViewType() const override; + virtual void ManagerChanged() override; + virtual void NetworkListChanged() override; virtual void NetworkServiceChanged( - const chromeos::NetworkState* network) OVERRIDE; + const chromeos::NetworkState* network) override; protected: // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from ViewClickListener. - virtual void OnViewClicked(views::View* sender) OVERRIDE; + virtual void OnViewClicked(views::View* sender) override; private: class InfoBubble; @@ -101,13 +101,13 @@ class NetworkStateListDetailedView // ui::NetworkListDelegate: virtual views::View* CreateViewForNetwork( - const ui::NetworkInfo& info) OVERRIDE; - virtual bool IsViewHovered(views::View* view) OVERRIDE; - virtual chromeos::NetworkTypePattern GetNetworkTypePattern() const OVERRIDE; + const ui::NetworkInfo& info) override; + virtual bool IsViewHovered(views::View* view) override; + virtual chromeos::NetworkTypePattern GetNetworkTypePattern() const override; virtual void UpdateViewForNetwork(views::View* view, - const ui::NetworkInfo& info) OVERRIDE; - virtual views::Label* CreateInfoLabel() OVERRIDE; - virtual void RelayoutScrollList() OVERRIDE; + const ui::NetworkInfo& info) override; + virtual views::Label* CreateInfoLabel() override; + virtual void RelayoutScrollList() override; // Type of list (all networks or vpn) ListType list_type_; diff --git a/ash/system/chromeos/network/network_state_notifier.h b/ash/system/chromeos/network/network_state_notifier.h index feca206..8bac210 100644 --- a/ash/system/chromeos/network/network_state_notifier.h +++ b/ash/system/chromeos/network/network_state_notifier.h @@ -40,9 +40,9 @@ class ASH_EXPORT NetworkStateNotifier : // NetworkStateHandlerObserver virtual void DefaultNetworkChanged( - const chromeos::NetworkState* network) OVERRIDE; + const chromeos::NetworkState* network) override; virtual void NetworkPropertiesUpdated( - const chromeos::NetworkState* network) OVERRIDE; + const chromeos::NetworkState* network) override; // Show a connection error notification. If |error_name| matches an error // defined in NetworkConnectionHandler for connect, configure, or activation diff --git a/ash/system/chromeos/network/network_state_notifier_unittest.cc b/ash/system/chromeos/network/network_state_notifier_unittest.cc index 5cfa1fe..78299f0 100644 --- a/ash/system/chromeos/network/network_state_notifier_unittest.cc +++ b/ash/system/chromeos/network/network_state_notifier_unittest.cc @@ -40,7 +40,7 @@ class NetworkStateNotifierTest : public AshTestBase { NetworkStateNotifierTest() {} virtual ~NetworkStateNotifierTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { DBusThreadManager::Initialize(); chromeos::LoginState::Initialize(); SetupDefaultShillState(); @@ -49,7 +49,7 @@ class NetworkStateNotifierTest : public AshTestBase { AshTestBase::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { AshTestBase::TearDown(); chromeos::LoginState::Shutdown(); chromeos::NetworkHandler::Shutdown(); diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc index 1c0363d..a5c5570 100644 --- a/ash/system/chromeos/network/tray_network.cc +++ b/ash/system/chromeos/network/tray_network.cc @@ -62,7 +62,7 @@ class NetworkTrayView : public TrayItemView, ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); } - virtual const char* GetClassName() const OVERRIDE { + virtual const char* GetClassName() const override { return "NetworkTrayView"; } @@ -101,13 +101,13 @@ class NetworkTrayView : public TrayItemView, } // views::View override. - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE { + virtual void GetAccessibleState(ui::AXViewState* state) override { state->name = connection_status_string_; state->role = ui::AX_ROLE_BUTTON; } // ui::network_icon::AnimationObserver - virtual void NetworkIconChanged() OVERRIDE { + virtual void NetworkIconChanged() override { UpdateNetworkStateHandlerIcon(); } @@ -170,7 +170,7 @@ class NetworkDefaultView : public TrayItemMore, } // ui::network_icon::AnimationObserver - virtual void NetworkIconChanged() OVERRIDE { + virtual void NetworkIconChanged() override { Update(); } @@ -204,27 +204,27 @@ class NetworkWifiDetailedView : public NetworkDetailedView { // Overridden from NetworkDetailedView: - virtual void Init() OVERRIDE { + virtual void Init() override { } - virtual NetworkDetailedView::DetailedViewType GetViewType() const OVERRIDE { + virtual NetworkDetailedView::DetailedViewType GetViewType() const override { return NetworkDetailedView::WIFI_VIEW; } - virtual void ManagerChanged() OVERRIDE { + virtual void ManagerChanged() override { Update(); } - virtual void NetworkListChanged() OVERRIDE { + virtual void NetworkListChanged() override { Update(); } virtual void NetworkServiceChanged( - const chromeos::NetworkState* network) OVERRIDE { + const chromeos::NetworkState* network) override { } private: - virtual void Layout() OVERRIDE { + virtual void Layout() override { // Center both views vertically. views::View::Layout(); image_view_->SetY( diff --git a/ash/system/chromeos/network/tray_network.h b/ash/system/chromeos/network/tray_network.h index ef9d37b..407b64e 100644 --- a/ash/system/chromeos/network/tray_network.h +++ b/ash/system/chromeos/network/tray_network.h @@ -36,27 +36,27 @@ class TrayNetwork : public SystemTrayItem, tray::NetworkDetailedView* detailed() { return detailed_; } // SystemTrayItem - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; virtual void UpdateAfterShelfAlignmentChange( - ShelfAlignment alignment) OVERRIDE; + ShelfAlignment alignment) override; // NetworkObserver - virtual void RequestToggleWifi() OVERRIDE; + virtual void RequestToggleWifi() override; // NetworkPortalDetectorObserver virtual void OnCaptivePortalDetected( - const std::string& service_path) OVERRIDE; + const std::string& service_path) override; // TrayNetworkStateObserver::Delegate - virtual void NetworkStateChanged(bool list_changed) OVERRIDE; + virtual void NetworkStateChanged(bool list_changed) override; virtual void NetworkServiceChanged( - const chromeos::NetworkState* network) OVERRIDE; + const chromeos::NetworkState* network) override; private: tray::NetworkTrayView* tray_; diff --git a/ash/system/chromeos/network/tray_network_state_observer.h b/ash/system/chromeos/network/tray_network_state_observer.h index 12a60e3..f062a6b 100644 --- a/ash/system/chromeos/network/tray_network_state_observer.h +++ b/ash/system/chromeos/network/tray_network_state_observer.h @@ -33,14 +33,14 @@ class TrayNetworkStateObserver : public chromeos::NetworkStateHandlerObserver { virtual ~TrayNetworkStateObserver(); // NetworkStateHandlerObserver overrides. - virtual void NetworkListChanged() OVERRIDE; - virtual void DeviceListChanged() OVERRIDE; + virtual void NetworkListChanged() override; + virtual void DeviceListChanged() override; virtual void DefaultNetworkChanged( - const chromeos::NetworkState* network) OVERRIDE; + const chromeos::NetworkState* network) override; virtual void NetworkConnectionStateChanged( - const chromeos::NetworkState* network) OVERRIDE; + const chromeos::NetworkState* network) override; virtual void NetworkPropertiesUpdated( - const chromeos::NetworkState* network) OVERRIDE; + const chromeos::NetworkState* network) override; private: Delegate* delegate_; diff --git a/ash/system/chromeos/network/tray_sms.cc b/ash/system/chromeos/network/tray_sms.cc index 86295eb..a6b782e 100644 --- a/ash/system/chromeos/network/tray_sms.cc +++ b/ash/system/chromeos/network/tray_sms.cc @@ -115,7 +115,7 @@ class TraySms::SmsMessageView : public views::View, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE { + const ui::Event& event) override { owner_->RemoveMessage(index_); owner_->Update(false); } @@ -200,7 +200,7 @@ class TraySms::SmsDetailedView : public TrayDetailsView, } // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { gfx::Size preferred_size = TrayDetailsView::GetPreferredSize(); if (preferred_size.height() < kMessageListMinHeight) preferred_size.set_height(kMessageListMinHeight); @@ -232,7 +232,7 @@ class TraySms::SmsDetailedView : public TrayDetailsView, } // Overridden from ViewClickListener. - virtual void OnViewClicked(views::View* sender) OVERRIDE { + virtual void OnViewClicked(views::View* sender) override { if (sender == footer()->content()) TransitionToDefaultView(); } @@ -263,11 +263,11 @@ class TraySms::SmsNotificationView : public TrayNotificationView { } // Overridden from TrayNotificationView: - virtual void OnClose() OVERRIDE { + virtual void OnClose() override { tray_sms()->RemoveMessage(message_index_); } - virtual void OnClickAction() OVERRIDE { + virtual void OnClickAction() override { owner()->PopupDetailedView(0, true); } diff --git a/ash/system/chromeos/network/tray_sms.h b/ash/system/chromeos/network/tray_sms.h index 9796acf..75bcead 100644 --- a/ash/system/chromeos/network/tray_sms.h +++ b/ash/system/chromeos/network/tray_sms.h @@ -20,16 +20,16 @@ class TraySms : public SystemTrayItem, virtual ~TraySms(); // Overridden from SystemTrayItem. - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; virtual views::View* CreateNotificationView( - user::LoginStatus status) OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void DestroyNotificationView() OVERRIDE; + user::LoginStatus status) override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void DestroyNotificationView() override; // Overridden from chromeos::NetworkSmsHandler::Observer. - virtual void MessageReceived(const base::DictionaryValue& message) OVERRIDE; + virtual void MessageReceived(const base::DictionaryValue& message) override; protected: class SmsDefaultView; diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc index 01547ae1..545a5ba 100644 --- a/ash/system/chromeos/network/tray_vpn.cc +++ b/ash/system/chromeos/network/tray_vpn.cc @@ -67,7 +67,7 @@ class VpnDefaultView : public TrayItemMore, } // ui::network_icon::AnimationObserver - virtual void NetworkIconChanged() OVERRIDE { + virtual void NetworkIconChanged() override { Update(); } diff --git a/ash/system/chromeos/network/tray_vpn.h b/ash/system/chromeos/network/tray_vpn.h index 601d842..74d7aaa 100644 --- a/ash/system/chromeos/network/tray_vpn.h +++ b/ash/system/chromeos/network/tray_vpn.h @@ -25,20 +25,20 @@ class TrayVPN : public SystemTrayItem, virtual ~TrayVPN(); // SystemTrayItem - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; virtual void UpdateAfterShelfAlignmentChange( - ShelfAlignment alignment) OVERRIDE; + ShelfAlignment alignment) override; // TrayNetworkStateObserver::Delegate - virtual void NetworkStateChanged(bool list_changed) OVERRIDE; + virtual void NetworkStateChanged(bool list_changed) override; virtual void NetworkServiceChanged( - const chromeos::NetworkState* network) OVERRIDE; + const chromeos::NetworkState* network) override; private: tray::VpnDefaultView* default_; diff --git a/ash/system/chromeos/power/power_event_observer.h b/ash/system/chromeos/power/power_event_observer.h index 46b6eb9..bc6562f 100644 --- a/ash/system/chromeos/power/power_event_observer.h +++ b/ash/system/chromeos/power/power_event_observer.h @@ -24,13 +24,13 @@ class ASH_EXPORT PowerEventObserver virtual ~PowerEventObserver(); // chromeos::PowerManagerClient::Observer overrides: - virtual void BrightnessChanged(int level, bool user_initiated) OVERRIDE; - virtual void SuspendImminent() OVERRIDE; - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + virtual void BrightnessChanged(int level, bool user_initiated) override; + virtual void SuspendImminent() override; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; // chromeos::SessionManagerClient::Observer overrides. - virtual void ScreenIsLocked() OVERRIDE; - virtual void ScreenIsUnlocked() OVERRIDE; + virtual void ScreenIsLocked() override; + virtual void ScreenIsUnlocked() override; // Is the screen currently locked? bool screen_locked_; diff --git a/ash/system/chromeos/power/power_event_observer_unittest.cc b/ash/system/chromeos/power/power_event_observer_unittest.cc index 30cd2e9..a0d7d03 100644 --- a/ash/system/chromeos/power/power_event_observer_unittest.cc +++ b/ash/system/chromeos/power/power_event_observer_unittest.cc @@ -18,12 +18,12 @@ class PowerEventObserverTest : public test::AshTestBase { virtual ~PowerEventObserverTest() {} // test::AshTestBase::SetUp() overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); observer_.reset(new PowerEventObserver()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { observer_.reset(); test::AshTestBase::TearDown(); } diff --git a/ash/system/chromeos/power/power_status.h b/ash/system/chromeos/power/power_status.h index 236e05c..b871ce2 100644 --- a/ash/system/chromeos/power/power_status.h +++ b/ash/system/chromeos/power/power_status.h @@ -141,7 +141,7 @@ class ASH_EXPORT PowerStatus : public chromeos::PowerManagerClient::Observer { private: // Overriden from PowerManagerClient::Observer. virtual void PowerChanged( - const power_manager::PowerSupplyProperties& proto) OVERRIDE; + const power_manager::PowerSupplyProperties& proto) override; ObserverList<Observer> observers_; diff --git a/ash/system/chromeos/power/power_status_unittest.cc b/ash/system/chromeos/power/power_status_unittest.cc index e5bee7e..b63c67a 100644 --- a/ash/system/chromeos/power/power_status_unittest.cc +++ b/ash/system/chromeos/power/power_status_unittest.cc @@ -21,7 +21,7 @@ class TestObserver : public PowerStatus::Observer { int power_changed_count() const { return power_changed_count_; } // PowerStatus::Observer overrides: - virtual void OnPowerStatusChanged() OVERRIDE { ++power_changed_count_; } + virtual void OnPowerStatusChanged() override { ++power_changed_count_; } private: int power_changed_count_; @@ -36,7 +36,7 @@ class PowerStatusTest : public testing::Test { PowerStatusTest() : power_status_(NULL) {} virtual ~PowerStatusTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { chromeos::DBusThreadManager::Initialize(); PowerStatus::Initialize(); power_status_ = PowerStatus::Get(); @@ -44,7 +44,7 @@ class PowerStatusTest : public testing::Test { power_status_->AddObserver(test_observer_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { power_status_->RemoveObserver(test_observer_.get()); test_observer_.reset(); PowerStatus::Shutdown(); diff --git a/ash/system/chromeos/power/power_status_view.h b/ash/system/chromeos/power/power_status_view.h index 2d1a72b..667476d 100644 --- a/ash/system/chromeos/power/power_status_view.h +++ b/ash/system/chromeos/power/power_status_view.h @@ -28,12 +28,12 @@ class ASH_EXPORT PowerStatusView : public views::View, virtual ~PowerStatusView(); // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void Layout() override; // Overridden from PowerStatus::Observer. - virtual void OnPowerStatusChanged() OVERRIDE; + virtual void OnPowerStatusChanged() override; private: friend class PowerStatusDefaultViewTest; @@ -45,7 +45,7 @@ class ASH_EXPORT PowerStatusView : public views::View, void UpdateTextForNotificationView(); // Overridden from views::View. - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(views::View* child) override; // Layout default view UI items on the right side of system tray pop up item // if true; otherwise, layout the UI items on the left side. diff --git a/ash/system/chromeos/power/power_status_view_unittest.cc b/ash/system/chromeos/power/power_status_view_unittest.cc index 5cf4332..7c30cf0 100644 --- a/ash/system/chromeos/power/power_status_view_unittest.cc +++ b/ash/system/chromeos/power/power_status_view_unittest.cc @@ -22,12 +22,12 @@ class PowerStatusViewTest : public test::AshTestBase { virtual ~PowerStatusViewTest() {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); view_.reset(new PowerStatusView(GetViewType(), false)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { view_.reset(); test::AshTestBase::TearDown(); } @@ -53,7 +53,7 @@ class PowerStatusDefaultViewTest : public PowerStatusViewTest { virtual ~PowerStatusDefaultViewTest() {} protected: - virtual PowerStatusView::ViewType GetViewType() OVERRIDE { + virtual PowerStatusView::ViewType GetViewType() override { return PowerStatusView::VIEW_DEFAULT; } @@ -79,7 +79,7 @@ class PowerStatusNotificationViewTest : public PowerStatusViewTest { virtual ~PowerStatusNotificationViewTest() {} protected: - virtual PowerStatusView::ViewType GetViewType() OVERRIDE { + virtual PowerStatusView::ViewType GetViewType() override { return PowerStatusView::VIEW_NOTIFICATION; } diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc index e4f094f4..dca60c4 100644 --- a/ash/system/chromeos/power/tray_power.cc +++ b/ash/system/chromeos/power/tray_power.cc @@ -59,7 +59,7 @@ class PowerTrayView : public views::ImageView { } // Overriden from views::View. - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE { + virtual void GetAccessibleState(ui::AXViewState* state) override { state->name = accessible_name_; state->role = ui::AX_ROLE_BUTTON; } diff --git a/ash/system/chromeos/power/tray_power.h b/ash/system/chromeos/power/tray_power.h index 3bd0b20..a0623fc 100644 --- a/ash/system/chromeos/power/tray_power.h +++ b/ash/system/chromeos/power/tray_power.h @@ -68,19 +68,19 @@ class ASH_EXPORT TrayPower : public SystemTrayItem, }; // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; virtual views::View* CreateNotificationView( - user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyNotificationView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyNotificationView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; virtual void UpdateAfterShelfAlignmentChange( - ShelfAlignment alignment) OVERRIDE; + ShelfAlignment alignment) override; // Overridden from PowerStatus::Observer. - virtual void OnPowerStatusChanged() OVERRIDE; + virtual void OnPowerStatusChanged() override; // Show a notification that a low-power USB charger has been connected. // Returns true if a notification was shown or explicitly hidden. diff --git a/ash/system/chromeos/power/tray_power_unittest.cc b/ash/system/chromeos/power/tray_power_unittest.cc index 6be2dfc..3678eec 100644 --- a/ash/system/chromeos/power/tray_power_unittest.cc +++ b/ash/system/chromeos/power/tray_power_unittest.cc @@ -24,11 +24,11 @@ class MockMessageCenter : public message_center::FakeMessageCenter { int remove_count() const { return remove_count_; } // message_center::FakeMessageCenter overrides: - virtual void AddNotification(scoped_ptr<Notification> notification) OVERRIDE { + virtual void AddNotification(scoped_ptr<Notification> notification) override { add_count_++; } virtual void RemoveNotification(const std::string& id, bool by_user) - OVERRIDE { + override { remove_count_++; } @@ -52,13 +52,13 @@ class TrayPowerTest : public test::AshTestBase { TrayPower* tray_power() { return tray_power_.get(); } // test::AshTestBase::SetUp() overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); message_center_.reset(new MockMessageCenter()); tray_power_.reset(new TrayPower(NULL, message_center_.get())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { tray_power_.reset(); message_center_.reset(); test::AshTestBase::TearDown(); diff --git a/ash/system/chromeos/power/video_activity_notifier.h b/ash/system/chromeos/power/video_activity_notifier.h index 8c2dc41..3116160 100644 --- a/ash/system/chromeos/power/video_activity_notifier.h +++ b/ash/system/chromeos/power/video_activity_notifier.h @@ -20,10 +20,10 @@ class VideoActivityNotifier : public VideoDetectorObserver, virtual ~VideoActivityNotifier(); // VideoDetectorObserver implementation. - virtual void OnVideoDetected(bool is_fullscreen) OVERRIDE; + virtual void OnVideoDetected(bool is_fullscreen) override; // ShellObserver implementation. - virtual void OnLockStateChanged(bool locked) OVERRIDE; + virtual void OnLockStateChanged(bool locked) override; private: VideoDetector* detector_; // not owned diff --git a/ash/system/chromeos/rotation/tray_rotation_lock.cc b/ash/system/chromeos/rotation/tray_rotation_lock.cc index 35cc017..36c2929 100644 --- a/ash/system/chromeos/rotation/tray_rotation_lock.cc +++ b/ash/system/chromeos/rotation/tray_rotation_lock.cc @@ -29,11 +29,11 @@ class RotationLockDefaultView : public TrayItemMore, virtual ~RotationLockDefaultView(); // ActionableView: - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; // ShellObserver: - virtual void OnMaximizeModeStarted() OVERRIDE; - virtual void OnMaximizeModeEnded() OVERRIDE; + virtual void OnMaximizeModeStarted() override; + virtual void OnMaximizeModeEnded() override; private: void UpdateImage(); diff --git a/ash/system/chromeos/rotation/tray_rotation_lock.h b/ash/system/chromeos/rotation/tray_rotation_lock.h index 2a134d0..f4f4fde 100644 --- a/ash/system/chromeos/rotation/tray_rotation_lock.h +++ b/ash/system/chromeos/rotation/tray_rotation_lock.h @@ -28,18 +28,18 @@ class ASH_EXPORT TrayRotationLock : public TrayImageItem, virtual ~TrayRotationLock(); // MaximizeModeController::Observer: - virtual void OnRotationLockChanged(bool rotation_locked) OVERRIDE; + virtual void OnRotationLockChanged(bool rotation_locked) override; // SystemTrayItem: - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; // ShellObserver: - virtual void OnMaximizeModeStarted() OVERRIDE; - virtual void OnMaximizeModeEnded() OVERRIDE; + virtual void OnMaximizeModeStarted() override; + virtual void OnMaximizeModeEnded() override; protected: // TrayImageItem: - virtual bool GetInitialVisibility() OVERRIDE; + virtual bool GetInitialVisibility() override; private: friend class TrayRotationLockTest; diff --git a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc index 7a53f9d..47a703b 100644 --- a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc +++ b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc @@ -53,8 +53,8 @@ class TrayRotationLockTest : public test::AshTestBase { void TearDownViews(); // test::AshTestBase: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; private: scoped_ptr<TrayRotationLock> tray_; diff --git a/ash/system/chromeos/screen_security/screen_capture_tray_item.h b/ash/system/chromeos/screen_security/screen_capture_tray_item.h index 5285ab2..8143464 100644 --- a/ash/system/chromeos/screen_security/screen_capture_tray_item.h +++ b/ash/system/chromeos/screen_security/screen_capture_tray_item.h @@ -22,18 +22,18 @@ class ASH_EXPORT ScreenCaptureTrayItem : public ScreenTrayItem, private: // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; // Overridden from ScreenTrayItem. - virtual void CreateOrUpdateNotification() OVERRIDE; - virtual std::string GetNotificationId() OVERRIDE; + virtual void CreateOrUpdateNotification() override; + virtual std::string GetNotificationId() override; // Overridden from ScreenCaptureObserver. virtual void OnScreenCaptureStart( const base::Closure& stop_callback, - const base::string16& screen_capture_status) OVERRIDE; - virtual void OnScreenCaptureStop() OVERRIDE; + const base::string16& screen_capture_status) override; + virtual void OnScreenCaptureStop() override; base::string16 screen_capture_status_; diff --git a/ash/system/chromeos/screen_security/screen_share_tray_item.h b/ash/system/chromeos/screen_security/screen_share_tray_item.h index d8d8f1e..d860e6b 100644 --- a/ash/system/chromeos/screen_security/screen_share_tray_item.h +++ b/ash/system/chromeos/screen_security/screen_share_tray_item.h @@ -22,18 +22,18 @@ class ASH_EXPORT ScreenShareTrayItem : public ScreenTrayItem, private: // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; // Overridden from ScreenTrayItem. - virtual void CreateOrUpdateNotification() OVERRIDE; - virtual std::string GetNotificationId() OVERRIDE; + virtual void CreateOrUpdateNotification() override; + virtual std::string GetNotificationId() override; // Overridden from ScreenShareObserver. virtual void OnScreenShareStart( const base::Closure& stop_callback, - const base::string16& helper_name) OVERRIDE; - virtual void OnScreenShareStop() OVERRIDE; + const base::string16& helper_name) override; + virtual void OnScreenShareStop() override; base::string16 helper_name_; diff --git a/ash/system/chromeos/screen_security/screen_tray_item.h b/ash/system/chromeos/screen_security/screen_tray_item.h index 9e5880d..1cf9a68 100644 --- a/ash/system/chromeos/screen_security/screen_tray_item.h +++ b/ash/system/chromeos/screen_security/screen_tray_item.h @@ -47,11 +47,11 @@ class ScreenStatusView : public views::View, virtual ~ScreenStatusView(); // Overridden from views::View. - virtual void Layout() OVERRIDE; + virtual void Layout() override; // Overridden from views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; void CreateItems(); void Update(); @@ -73,11 +73,11 @@ class ScreenNotificationDelegate : public message_center::NotificationDelegate { explicit ScreenNotificationDelegate(ScreenTrayItem* screen_tray); // message_center::NotificationDelegate overrides: - virtual void Display() OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual void Click() OVERRIDE; - virtual void ButtonClick(int button_index) OVERRIDE; + virtual void Display() override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual void Click() override; + virtual void ButtonClick(int button_index) override; protected: virtual ~ScreenNotificationDelegate(); @@ -123,12 +123,12 @@ class ASH_EXPORT ScreenTrayItem : public SystemTrayItem { virtual std::string GetNotificationId() = 0; // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE = 0; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE = 0; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override = 0; + virtual views::View* CreateDefaultView(user::LoginStatus status) override = 0; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; virtual void UpdateAfterShelfAlignmentChange( - ShelfAlignment alignment) OVERRIDE; + ShelfAlignment alignment) override; private: tray::ScreenTrayView* tray_view_; diff --git a/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc b/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc index 1566ba8..77b2a44 100644 --- a/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc +++ b/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc @@ -53,7 +53,7 @@ class ScreenTrayItemTest : public ash::test::AshTestBase { int stop_callback_hit_count() const { return stop_callback_hit_count_; } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); TrayItemView::DisableAnimationsForTest(); } @@ -83,7 +83,7 @@ class ScreenCaptureTest : public ScreenTrayItemTest { ScreenCaptureTest() {} virtual ~ScreenCaptureTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ScreenTrayItemTest::SetUp(); // This tray item is owned by its parent system tray view and will // be deleted automatically when its parent is destroyed in AshTestBase. @@ -100,7 +100,7 @@ class ScreenShareTest : public ScreenTrayItemTest { ScreenShareTest() {} virtual ~ScreenShareTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ScreenTrayItemTest::SetUp(); // This tray item is owned by its parent system tray view and will // be deleted automatically when its parent is destroyed in AshTestBase. diff --git a/ash/system/chromeos/session/last_window_closed_logout_reminder.h b/ash/system/chromeos/session/last_window_closed_logout_reminder.h index 5914225..78e8572 100644 --- a/ash/system/chromeos/session/last_window_closed_logout_reminder.h +++ b/ash/system/chromeos/session/last_window_closed_logout_reminder.h @@ -18,7 +18,7 @@ class LastWindowClosedLogoutReminder : public LastWindowClosedObserver { LastWindowClosedLogoutReminder(); virtual ~LastWindowClosedLogoutReminder(); - virtual void OnLastWindowClosed() OVERRIDE; + virtual void OnLastWindowClosed() override; private: DISALLOW_COPY_AND_ASSIGN(LastWindowClosedLogoutReminder); diff --git a/ash/system/chromeos/session/logout_button_tray.h b/ash/system/chromeos/session/logout_button_tray.h index 8c40c2a..f581bea 100644 --- a/ash/system/chromeos/session/logout_button_tray.h +++ b/ash/system/chromeos/session/logout_button_tray.h @@ -31,19 +31,19 @@ class ASH_EXPORT LogoutButtonTray : public TrayBackgroundView, virtual ~LogoutButtonTray(); // TrayBackgroundView: - virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; - virtual base::string16 GetAccessibleNameForTray() OVERRIDE; + virtual void SetShelfAlignment(ShelfAlignment alignment) override; + virtual base::string16 GetAccessibleNameForTray() override; virtual void HideBubbleWithView( - const views::TrayBubbleView* bubble_view) OVERRIDE; - virtual bool ClickedOutsideBubble() OVERRIDE; + const views::TrayBubbleView* bubble_view) override; + virtual bool ClickedOutsideBubble() override; // LogoutButtonObserver: - virtual void OnShowLogoutButtonInTrayChanged(bool show) OVERRIDE; - virtual void OnLogoutDialogDurationChanged(base::TimeDelta duration) OVERRIDE; + virtual void OnShowLogoutButtonInTrayChanged(bool show) override; + virtual void OnLogoutDialogDurationChanged(base::TimeDelta duration) override; // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; void UpdateAfterLoginStatusChange(user::LoginStatus login_status); diff --git a/ash/system/chromeos/session/logout_confirmation_controller.h b/ash/system/chromeos/session/logout_confirmation_controller.h index ee3aa20..e244069 100644 --- a/ash/system/chromeos/session/logout_confirmation_controller.h +++ b/ash/system/chromeos/session/logout_confirmation_controller.h @@ -43,7 +43,7 @@ class ASH_EXPORT LogoutConfirmationController : public ShellObserver { void SetClockForTesting(scoped_ptr<base::TickClock> clock); // ShellObserver: - virtual void OnLockStateChanged(bool locked) OVERRIDE; + virtual void OnLockStateChanged(bool locked) override; // Called by the |dialog_| when the user confirms logout. void OnLogoutConfirmed(); diff --git a/ash/system/chromeos/session/logout_confirmation_controller_unittest.cc b/ash/system/chromeos/session/logout_confirmation_controller_unittest.cc index cefb128..fb9d379 100644 --- a/ash/system/chromeos/session/logout_confirmation_controller_unittest.cc +++ b/ash/system/chromeos/session/logout_confirmation_controller_unittest.cc @@ -29,14 +29,14 @@ class MockTimeSingleThreadTaskRunner : public base::SingleThreadTaskRunner { MockTimeSingleThreadTaskRunner(); // base::SingleThreadTaskRunner: - virtual bool RunsTasksOnCurrentThread() const OVERRIDE; + virtual bool RunsTasksOnCurrentThread() const override; virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; virtual bool PostNonNestableDelayedTask( const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; const base::TimeTicks& GetCurrentTime() const; @@ -70,7 +70,7 @@ class MockClock : public base::TickClock { virtual ~MockClock(); // base::TickClock: - virtual base::TimeTicks NowTicks() OVERRIDE; + virtual base::TimeTicks NowTicks() override; private: scoped_refptr<MockTimeSingleThreadTaskRunner> task_runner_; diff --git a/ash/system/chromeos/session/logout_confirmation_dialog.h b/ash/system/chromeos/session/logout_confirmation_dialog.h index 91e45366..d98644e 100644 --- a/ash/system/chromeos/session/logout_confirmation_dialog.h +++ b/ash/system/chromeos/session/logout_confirmation_dialog.h @@ -31,13 +31,13 @@ class LogoutConfirmationDialog : public views::DialogDelegateView { void Update(base::TimeTicks logout_time); // views::DialogDelegateView: - virtual bool Accept() OVERRIDE; - virtual ui::ModalType GetModalType() const OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; + virtual bool Accept() override; + virtual ui::ModalType GetModalType() const override; + virtual base::string16 GetWindowTitle() const override; virtual base::string16 GetDialogButtonLabel(ui::DialogButton button) const - OVERRIDE; - virtual void OnClosed() OVERRIDE; - virtual void DeleteDelegate() OVERRIDE; + override; + virtual void OnClosed() override; + virtual void DeleteDelegate() override; private: void UpdateLabel(); diff --git a/ash/system/chromeos/session/tray_session_length_limit.h b/ash/system/chromeos/session/tray_session_length_limit.h index 7cefedb..219ea81 100644 --- a/ash/system/chromeos/session/tray_session_length_limit.h +++ b/ash/system/chromeos/session/tray_session_length_limit.h @@ -35,12 +35,12 @@ public: virtual ~TraySessionLengthLimit(); // SystemTrayItem: - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual void DestroyDefaultView() override; // SessionLengthLimitObserver: - virtual void OnSessionStartTimeChanged() OVERRIDE; - virtual void OnSessionLengthLimitChanged() OVERRIDE; + virtual void OnSessionStartTimeChanged() override; + virtual void OnSessionLengthLimitChanged() override; private: friend class test::TraySessionLengthLimitTest; diff --git a/ash/system/chromeos/session/tray_session_length_limit_unittest.cc b/ash/system/chromeos/session/tray_session_length_limit_unittest.cc index 363177e..c6e5687 100644 --- a/ash/system/chromeos/session/tray_session_length_limit_unittest.cc +++ b/ash/system/chromeos/session/tray_session_length_limit_unittest.cc @@ -22,7 +22,7 @@ class TraySessionLengthLimitTest : public AshTestBase { TraySessionLengthLimitTest() {} virtual ~TraySessionLengthLimitTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); SystemTray* system_tray = Shell::GetPrimaryRootWindowController()->GetSystemTray(); @@ -30,7 +30,7 @@ class TraySessionLengthLimitTest : public AshTestBase { system_tray->AddTrayItem(tray_session_length_limit_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { AshTestBase::TearDown(); } diff --git a/ash/system/chromeos/settings/tray_settings.cc b/ash/system/chromeos/settings/tray_settings.cc index d88d04b..8b4c6c9 100644 --- a/ash/system/chromeos/settings/tray_settings.cc +++ b/ash/system/chromeos/settings/tray_settings.cc @@ -76,7 +76,7 @@ class SettingsDefaultView : public ActionableView, } // Overridden from ash::ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE { + virtual bool PerformAction(const ui::Event& event) override { bool userAddingRunning = ash::Shell::GetInstance() ->session_state_delegate() ->IsInSecondaryLoginScreen(); @@ -90,7 +90,7 @@ class SettingsDefaultView : public ActionableView, } // Overridden from views::View. - virtual void Layout() OVERRIDE { + virtual void Layout() override { views::View::Layout(); if (label_ && power_status_view_) { @@ -105,13 +105,13 @@ class SettingsDefaultView : public ActionableView, } // Overridden from views::View. - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE { + virtual void ChildPreferredSizeChanged(views::View* child) override { views::View::ChildPreferredSizeChanged(child); Layout(); } // Overridden from PowerStatus::Observer. - virtual void OnPowerStatusChanged() OVERRIDE { + virtual void OnPowerStatusChanged() override { if (!PowerStatus::Get()->IsBatteryPresent()) return; diff --git a/ash/system/chromeos/settings/tray_settings.h b/ash/system/chromeos/settings/tray_settings.h index bd5e6d9..d54d9e5 100644 --- a/ash/system/chromeos/settings/tray_settings.h +++ b/ash/system/chromeos/settings/tray_settings.h @@ -19,13 +19,13 @@ class TraySettings : public SystemTrayItem { private: // Overridden from SystemTrayItem - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; tray::SettingsDefaultView* default_view_; diff --git a/ash/system/chromeos/supervised/tray_supervised_user.h b/ash/system/chromeos/supervised/tray_supervised_user.h index 5d07d25..f19b752 100644 --- a/ash/system/chromeos/supervised/tray_supervised_user.h +++ b/ash/system/chromeos/supervised/tray_supervised_user.h @@ -25,12 +25,12 @@ class ASH_EXPORT TraySupervisedUser : public SystemTrayItem, void UpdateMessage(); // Overridden from SystemTrayItem. - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual void DestroyDefaultView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; // Overridden from ViewClickListener. - virtual void OnViewClicked(views::View* sender) OVERRIDE; + virtual void OnViewClicked(views::View* sender) override; private: friend class TraySupervisedUserTest; diff --git a/ash/system/chromeos/supervised/tray_supervised_user_unittest.cc b/ash/system/chromeos/supervised/tray_supervised_user_unittest.cc index cc65056..3988ce8 100644 --- a/ash/system/chromeos/supervised/tray_supervised_user_unittest.cc +++ b/ash/system/chromeos/supervised/tray_supervised_user_unittest.cc @@ -45,8 +45,8 @@ class TraySupervisedUserInitialTest : public TraySupervisedUserTest { TraySupervisedUserInitialTest() {} virtual ~TraySupervisedUserInitialTest() {} - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; private: DISALLOW_COPY_AND_ASSIGN(TraySupervisedUserInitialTest); diff --git a/ash/system/chromeos/system_clock_observer.h b/ash/system/chromeos/system_clock_observer.h index 5d4c4d6..c596090 100644 --- a/ash/system/chromeos/system_clock_observer.h +++ b/ash/system/chromeos/system_clock_observer.h @@ -18,11 +18,11 @@ class SystemClockObserver virtual ~SystemClockObserver(); // chromeos::SystemClockClient::Observer - virtual void SystemClockUpdated() OVERRIDE; - virtual void SystemClockCanSetTimeChanged(bool can_set_time) OVERRIDE; + virtual void SystemClockUpdated() override; + virtual void SystemClockCanSetTimeChanged(bool can_set_time) override; // chromeos::system::TimezoneSettings::Observer - virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE; + virtual void TimezoneChanged(const icu::TimeZone& timezone) override; bool can_set_time() { return can_set_time_; } diff --git a/ash/system/chromeos/tray_caps_lock.cc b/ash/system/chromeos/tray_caps_lock.cc index 2a1d732..0a29fcd 100644 --- a/ash/system/chromeos/tray_caps_lock.cc +++ b/ash/system/chromeos/tray_caps_lock.cc @@ -90,7 +90,7 @@ class CapsLockDefaultView : public ActionableView { private: // Overridden from views::View: - virtual void Layout() OVERRIDE { + virtual void Layout() override { views::View::Layout(); // Align the shortcut text with the right end @@ -103,13 +103,13 @@ class CapsLockDefaultView : public ActionableView { text_size.height())); } - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE { + virtual void GetAccessibleState(ui::AXViewState* state) override { state->role = ui::AX_ROLE_BUTTON; state->name = text_label_->text(); } // Overridden from ActionableView: - virtual bool PerformAction(const ui::Event& event) OVERRIDE { + virtual bool PerformAction(const ui::Event& event) override { chromeos::input_method::ImeKeyboard* keyboard = chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard(); if (keyboard) { diff --git a/ash/system/chromeos/tray_caps_lock.h b/ash/system/chromeos/tray_caps_lock.h index 0343126..67cafcd 100644 --- a/ash/system/chromeos/tray_caps_lock.h +++ b/ash/system/chromeos/tray_caps_lock.h @@ -25,14 +25,14 @@ class TrayCapsLock : public TrayImageItem, private: // Overriden from chromeos::input_method::ImeKeyboard::Observer: - virtual void OnCapsLockChanged(bool enabled) OVERRIDE; + virtual void OnCapsLockChanged(bool enabled) override; // Overridden from TrayImageItem. - virtual bool GetInitialVisibility() OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; + virtual bool GetInitialVisibility() override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; CapsLockDefaultView* default_; views::View* detailed_; diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc index a02e0c8..fc6facf 100644 --- a/ash/system/chromeos/tray_display.cc +++ b/ash/system/chromeos/tray_display.cc @@ -170,7 +170,7 @@ class DisplayView : public ActionableView { // Overridden from views::View. virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const OVERRIDE { + base::string16* tooltip) const override { base::string16 tray_message = GetTrayDisplayMessage(NULL); base::string16 display_message = GetAllDisplayInfo(); if (tray_message.empty() && display_message.empty()) @@ -269,12 +269,12 @@ class DisplayView : public ActionableView { } // Overridden from ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE { + virtual bool PerformAction(const ui::Event& event) override { OpenSettings(); return true; } - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE { + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override { int label_max_width = bounds().width() - kTrayPopupPaddingHorizontal * 2 - kTrayPopupPaddingBetweenItems - image_->GetPreferredSize().width(); label_->SizeToFit(label_max_width); diff --git a/ash/system/chromeos/tray_display.h b/ash/system/chromeos/tray_display.h index fc01ba2..4655620 100644 --- a/ash/system/chromeos/tray_display.h +++ b/ash/system/chromeos/tray_display.h @@ -28,7 +28,7 @@ class ASH_EXPORT TrayDisplay : public SystemTrayItem, virtual ~TrayDisplay(); // Overridden from DisplayControllerObserver: - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplayConfigurationChanged() override; private: friend class TrayDisplayTest; @@ -57,8 +57,8 @@ class ASH_EXPORT TrayDisplay : public SystemTrayItem, const base::string16& additional_message); // Overridden from SystemTrayItem. - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual void DestroyDefaultView() override; // Test accessors. base::string16 GetDefaultViewMessage() const; diff --git a/ash/system/chromeos/tray_display_unittest.cc b/ash/system/chromeos/tray_display_unittest.cc index 1e22f9d..199fb21 100644 --- a/ash/system/chromeos/tray_display_unittest.cc +++ b/ash/system/chromeos/tray_display_unittest.cc @@ -76,7 +76,7 @@ class TrayDisplayTest : public ash::test::AshTestBase { TrayDisplayTest(); virtual ~TrayDisplayTest(); - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; protected: SystemTray* tray() { return tray_; } diff --git a/ash/system/chromeos/tray_tracing.cc b/ash/system/chromeos/tray_tracing.cc index c885e07..279bea9 100644 --- a/ash/system/chromeos/tray_tracing.cc +++ b/ash/system/chromeos/tray_tracing.cc @@ -47,7 +47,7 @@ class DefaultTracingView : public ActionableView { private: // Overridden from ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE { + virtual bool PerformAction(const ui::Event& event) override { Shell::GetInstance()->system_tray_delegate()->ShowChromeSlow(); return true; } diff --git a/ash/system/chromeos/tray_tracing.h b/ash/system/chromeos/tray_tracing.h index 683b326..c1dce92 100644 --- a/ash/system/chromeos/tray_tracing.h +++ b/ash/system/chromeos/tray_tracing.h @@ -35,14 +35,14 @@ class TrayTracing : public TrayImageItem, void SetTrayIconVisible(bool visible); // Overridden from TrayImageItem. - virtual bool GetInitialVisibility() OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; + virtual bool GetInitialVisibility() override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; // Overridden from TracingObserver. - virtual void OnTracingModeChanged(bool value) OVERRIDE; + virtual void OnTracingModeChanged(bool value) override; views::View* default_; diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h index 8f0e2bb..fc70ede 100644 --- a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h +++ b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h @@ -26,20 +26,20 @@ class VirtualKeyboardTray : public TrayBackgroundView, virtual ~VirtualKeyboardTray(); // TrayBackgroundView: - virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; - virtual base::string16 GetAccessibleNameForTray() OVERRIDE; + virtual void SetShelfAlignment(ShelfAlignment alignment) override; + virtual base::string16 GetAccessibleNameForTray() override; virtual void HideBubbleWithView( - const views::TrayBubbleView* bubble_view) OVERRIDE; - virtual bool ClickedOutsideBubble() OVERRIDE; - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + const views::TrayBubbleView* bubble_view) override; + virtual bool ClickedOutsideBubble() override; + virtual bool PerformAction(const ui::Event& event) override; // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // AccessibilityObserver: virtual void OnAccessibilityModeChanged( - AccessibilityNotificationVisibility notify) OVERRIDE; + AccessibilityNotificationVisibility notify) override; private: views::ImageButton* button_; // Not owned. diff --git a/ash/system/date/date_default_view.h b/ash/system/date/date_default_view.h index 2b80b02..fce0174 100644 --- a/ash/system/date/date_default_view.h +++ b/ash/system/date/date_default_view.h @@ -33,7 +33,7 @@ class ASH_EXPORT DateDefaultView : public views::View, private: // Overridden from views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; TrayPopupHeaderButton* help_; TrayPopupHeaderButton* shutdown_; diff --git a/ash/system/date/date_view.h b/ash/system/date/date_view.h index 1f4377a..bfec10c 100644 --- a/ash/system/date/date_view.h +++ b/ash/system/date/date_view.h @@ -40,8 +40,8 @@ class ASH_EXPORT BaseDateTimeView : public ActionableView { virtual void UpdateTextInternal(const base::Time& now) = 0; // Overridden from views::View. - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; - virtual void OnLocaleChanged() OVERRIDE; + virtual void ChildPreferredSizeChanged(views::View* child) override; + virtual void OnLocaleChanged() override; // Invokes UpdateText() when the displayed time should change. base::OneShotTimer<BaseDateTimeView> timer_; @@ -67,14 +67,14 @@ class ASH_EXPORT DateView : public BaseDateTimeView { private: // Overridden from BaseDateTimeView. - virtual void UpdateTextInternal(const base::Time& now) OVERRIDE; + virtual void UpdateTextInternal(const base::Time& now) override; // Overridden from ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; // Overridden from views::View. - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; views::Label* date_label_; @@ -105,13 +105,13 @@ class ASH_EXPORT TimeView : public BaseDateTimeView { friend class TimeViewTest; // Overridden from BaseDateTimeView. - virtual void UpdateTextInternal(const base::Time& now) OVERRIDE; + virtual void UpdateTextInternal(const base::Time& now) override; // Overridden from ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; // Overridden from views::View. - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; void SetBorderFromLayout(TrayDate::ClockLayout clock_layout); void SetupLabels(); diff --git a/ash/system/date/tray_date.h b/ash/system/date/tray_date.h index c84e86e..c8a3782 100644 --- a/ash/system/date/tray_date.h +++ b/ash/system/date/tray_date.h @@ -49,21 +49,21 @@ class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver { private: // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; virtual void UpdateAfterShelfAlignmentChange( - ShelfAlignment alignment) OVERRIDE; + ShelfAlignment alignment) override; // Overridden from ClockObserver. - virtual void OnDateFormatChanged() OVERRIDE; - virtual void OnSystemClockTimeUpdated() OVERRIDE; - virtual void OnSystemClockCanSetTimeChanged(bool can_set_time) OVERRIDE; - virtual void Refresh() OVERRIDE; + virtual void OnDateFormatChanged() override; + virtual void OnSystemClockTimeUpdated() override; + virtual void OnSystemClockCanSetTimeChanged(bool can_set_time) override; + virtual void Refresh() override; void SetupLabelForTimeTray(views::Label* label); diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc index 0ffa769..df00c23 100644 --- a/ash/system/ime/tray_ime.cc +++ b/ash/system/ime/tray_ime.cc @@ -53,7 +53,7 @@ class SelectableHoverHighlightView : public HoverHighlightView { protected: // Overridden from views::View. - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE { + virtual void GetAccessibleState(ui::AXViewState* state) override { HoverHighlightView::GetAccessibleState(state); state->role = ui::AX_ROLE_CHECK_BOX; if (selected_) @@ -168,7 +168,7 @@ class IMEDetailedView : public TrayDetailsView, } // Overridden from ViewClickListener. - virtual void OnViewClicked(views::View* sender) OVERRIDE { + virtual void OnViewClicked(views::View* sender) override { SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); if (sender == footer()->content()) { TransitionToDefaultView(); diff --git a/ash/system/ime/tray_ime.h b/ash/system/ime/tray_ime.h index 0f46192..587bb76 100644 --- a/ash/system/ime/tray_ime.h +++ b/ash/system/ime/tray_ime.h @@ -33,18 +33,18 @@ class TrayIME : public SystemTrayItem, void UpdateTrayLabel(const IMEInfo& info, size_t count); // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; virtual void UpdateAfterShelfAlignmentChange( - ShelfAlignment alignment) OVERRIDE; + ShelfAlignment alignment) override; // Overridden from IMEObserver. - virtual void OnIMERefresh() OVERRIDE; + virtual void OnIMERefresh() override; TrayItemView* tray_label_; tray::IMEDefaultView* default_; diff --git a/ash/system/locale/locale_notification_controller.cc b/ash/system/locale/locale_notification_controller.cc index 281b735..656ddb4 100644 --- a/ash/system/locale/locale_notification_controller.cc +++ b/ash/system/locale/locale_notification_controller.cc @@ -32,12 +32,12 @@ class LocaleNotificationDelegate : public message_center::NotificationDelegate { virtual ~LocaleNotificationDelegate(); // message_center::NotificationDelegate overrides: - virtual void Display() OVERRIDE; - virtual void Error() OVERRIDE; - virtual void Close(bool by_user) OVERRIDE; - virtual bool HasClickedListener() OVERRIDE; - virtual void Click() OVERRIDE; - virtual void ButtonClick(int button_index) OVERRIDE; + virtual void Display() override; + virtual void Error() override; + virtual void Close(bool by_user) override; + virtual bool HasClickedListener() override; + virtual void Click() override; + virtual void ButtonClick(int button_index) override; private: LocaleObserver::Delegate* delegate_; diff --git a/ash/system/locale/locale_notification_controller.h b/ash/system/locale/locale_notification_controller.h index 6ec3aef..67edfba 100644 --- a/ash/system/locale/locale_notification_controller.h +++ b/ash/system/locale/locale_notification_controller.h @@ -24,7 +24,7 @@ class LocaleNotificationController : public LocaleObserver { virtual void OnLocaleChanged(LocaleObserver::Delegate* delegate, const std::string& cur_locale, const std::string& from_locale, - const std::string& to_locale) OVERRIDE; + const std::string& to_locale) override; LocaleObserver::Delegate* delegate_; std::string cur_locale_; diff --git a/ash/system/overview/overview_button_tray.h b/ash/system/overview/overview_button_tray.h index 32feb0c..5511bdc 100644 --- a/ash/system/overview/overview_button_tray.h +++ b/ash/system/overview/overview_button_tray.h @@ -31,18 +31,18 @@ class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView, virtual void UpdateAfterLoginStatusChange(user::LoginStatus status); // ActionableView: - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; // ShellObserver: - virtual void OnMaximizeModeStarted() OVERRIDE; - virtual void OnMaximizeModeEnded() OVERRIDE; + virtual void OnMaximizeModeStarted() override; + virtual void OnMaximizeModeEnded() override; // TrayBackgroundView: - virtual bool ClickedOutsideBubble() OVERRIDE; - virtual base::string16 GetAccessibleNameForTray() OVERRIDE; + virtual bool ClickedOutsideBubble() override; + virtual base::string16 GetAccessibleNameForTray() override; virtual void HideBubbleWithView( - const views::TrayBubbleView* bubble_view) OVERRIDE; - virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; + const views::TrayBubbleView* bubble_view) override; + virtual void SetShelfAlignment(ShelfAlignment alignment) override; private: friend class OverviewButtonTrayTest; diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h index e7e12cc..4f74330 100644 --- a/ash/system/status_area_widget.h +++ b/ash/system/status_area_widget.h @@ -72,7 +72,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget { void SchedulePaint(); // Overridden from views::Widget: - virtual void OnNativeWidgetActivationChanged(bool active) OVERRIDE; + virtual void OnNativeWidgetActivationChanged(bool active) override; private: void AddSystemTray(); diff --git a/ash/system/status_area_widget_delegate.h b/ash/system/status_area_widget_delegate.h index 8dd3202..1a1107c 100644 --- a/ash/system/status_area_widget_delegate.h +++ b/ash/system/status_area_widget_delegate.h @@ -33,23 +33,23 @@ class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView, void set_alignment(ShelfAlignment alignment) { alignment_ = alignment; } // Overridden from views::AccessiblePaneView. - virtual View* GetDefaultFocusableChild() OVERRIDE; + virtual View* GetDefaultFocusableChild() override; // Overridden from views::View: - virtual views::Widget* GetWidget() OVERRIDE; - virtual const views::Widget* GetWidget() const OVERRIDE; + virtual views::Widget* GetWidget() override; + virtual const views::Widget* GetWidget() const override; // Overridden from ui::EventHandler: - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // views::WidgetDelegate overrides: - virtual bool CanActivate() const OVERRIDE; - virtual void DeleteDelegate() OVERRIDE; + virtual bool CanActivate() const override; + virtual void DeleteDelegate() override; protected: // Overridden from views::View: - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; - virtual void ChildVisibilityChanged(views::View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(views::View* child) override; + virtual void ChildVisibilityChanged(views::View* child) override; private: void UpdateWidgetSize(); diff --git a/ash/system/tray/actionable_view.h b/ash/system/tray/actionable_view.h index c5ccbe3..1621be5 100644 --- a/ash/system/tray/actionable_view.h +++ b/ash/system/tray/actionable_view.h @@ -41,18 +41,18 @@ class ASH_EXPORT ActionableView : public views::View { virtual bool PerformAction(const ui::Event& event) = 0; // Overridden from views::View. - virtual const char* GetClassName() const OVERRIDE; - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual const char* GetClassName() const override; + virtual bool OnKeyPressed(const ui::KeyEvent& event) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; + virtual void OnBlur() override; // Overridden from ui::EventHandler. - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: base::string16 accessible_name_; diff --git a/ash/system/tray/default_system_tray_delegate.cc b/ash/system/tray/default_system_tray_delegate.cc index fda4807..1d99fb9 100644 --- a/ash/system/tray/default_system_tray_delegate.cc +++ b/ash/system/tray/default_system_tray_delegate.cc @@ -21,13 +21,13 @@ class DefaultVolumnControlDelegate : public VolumeControlDelegate { DefaultVolumnControlDelegate() {} virtual ~DefaultVolumnControlDelegate() {} - virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) OVERRIDE { + virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) override { return true; } - virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE { + virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) override { return true; } - virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE { + virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) override { return true; } diff --git a/ash/system/tray/default_system_tray_delegate.h b/ash/system/tray/default_system_tray_delegate.h index 359dca4..a1a5367 100644 --- a/ash/system/tray/default_system_tray_delegate.h +++ b/ash/system/tray/default_system_tray_delegate.h @@ -18,77 +18,77 @@ class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate { virtual ~DefaultSystemTrayDelegate(); // Overridden from SystemTrayDelegate: - virtual void Initialize() OVERRIDE; - virtual void Shutdown() OVERRIDE; - virtual bool GetTrayVisibilityOnStartup() OVERRIDE; - virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE; - virtual void ChangeProfilePicture() OVERRIDE; - virtual const std::string GetEnterpriseDomain() const OVERRIDE; - virtual const base::string16 GetEnterpriseMessage() const OVERRIDE; - virtual const std::string GetSupervisedUserManager() const OVERRIDE; + virtual void Initialize() override; + virtual void Shutdown() override; + virtual bool GetTrayVisibilityOnStartup() override; + virtual user::LoginStatus GetUserLoginStatus() const override; + virtual void ChangeProfilePicture() override; + virtual const std::string GetEnterpriseDomain() const override; + virtual const base::string16 GetEnterpriseMessage() const override; + virtual const std::string GetSupervisedUserManager() const override; virtual const base::string16 GetSupervisedUserManagerName() const - OVERRIDE; - virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE; - virtual bool IsUserSupervised() const OVERRIDE; - virtual bool SystemShouldUpgrade() const OVERRIDE; - virtual base::HourClockType GetHourClockType() const OVERRIDE; - virtual void ShowSettings() OVERRIDE; - virtual bool ShouldShowSettings() OVERRIDE; - virtual void ShowDateSettings() OVERRIDE; - virtual void ShowSetTimeDialog() OVERRIDE; - virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE; - virtual void ShowBluetoothSettings() OVERRIDE; - virtual void ShowDisplaySettings() OVERRIDE; - virtual void ShowChromeSlow() OVERRIDE; - virtual bool ShouldShowDisplayNotification() OVERRIDE; - virtual void ShowIMESettings() OVERRIDE; - virtual void ShowHelp() OVERRIDE; - virtual void ShowAccessibilityHelp() OVERRIDE; - virtual void ShowAccessibilitySettings() OVERRIDE; - virtual void ShowPublicAccountInfo() OVERRIDE; - virtual void ShowEnterpriseInfo() OVERRIDE; - virtual void ShowSupervisedUserInfo() OVERRIDE; - virtual void ShowUserLogin() OVERRIDE; - virtual bool ShowSpringChargerReplacementDialog() OVERRIDE; - virtual bool IsSpringChargerReplacementDialogVisible() OVERRIDE; - virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE; - virtual void ShutDown() OVERRIDE; - virtual void SignOut() OVERRIDE; - virtual void RequestLockScreen() OVERRIDE; - virtual void RequestRestartForUpdate() OVERRIDE; - virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) OVERRIDE; - virtual void BluetoothStartDiscovering() OVERRIDE; - virtual void BluetoothStopDiscovering() OVERRIDE; - virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE; - virtual void GetCurrentIME(IMEInfo* info) OVERRIDE; - virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE; - virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE; - virtual void SwitchIME(const std::string& ime_id) OVERRIDE; - virtual void ActivateIMEProperty(const std::string& key) OVERRIDE; - virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE; - virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE; - virtual void ManageBluetoothDevices() OVERRIDE; - virtual void ToggleBluetooth() OVERRIDE; - virtual bool IsBluetoothDiscovering() OVERRIDE; - virtual void ShowMobileSimDialog() OVERRIDE; - virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE; - virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE; - virtual bool GetBluetoothAvailable() OVERRIDE; - virtual bool GetBluetoothEnabled() OVERRIDE; - virtual bool GetBluetoothDiscovering() OVERRIDE; - virtual void ChangeProxySettings() OVERRIDE; - virtual VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE; + override; + virtual const base::string16 GetSupervisedUserMessage() const override; + virtual bool IsUserSupervised() const override; + virtual bool SystemShouldUpgrade() const override; + virtual base::HourClockType GetHourClockType() const override; + virtual void ShowSettings() override; + virtual bool ShouldShowSettings() override; + virtual void ShowDateSettings() override; + virtual void ShowSetTimeDialog() override; + virtual void ShowNetworkSettings(const std::string& service_path) override; + virtual void ShowBluetoothSettings() override; + virtual void ShowDisplaySettings() override; + virtual void ShowChromeSlow() override; + virtual bool ShouldShowDisplayNotification() override; + virtual void ShowIMESettings() override; + virtual void ShowHelp() override; + virtual void ShowAccessibilityHelp() override; + virtual void ShowAccessibilitySettings() override; + virtual void ShowPublicAccountInfo() override; + virtual void ShowEnterpriseInfo() override; + virtual void ShowSupervisedUserInfo() override; + virtual void ShowUserLogin() override; + virtual bool ShowSpringChargerReplacementDialog() override; + virtual bool IsSpringChargerReplacementDialogVisible() override; + virtual bool HasUserConfirmedSafeSpringCharger() override; + virtual void ShutDown() override; + virtual void SignOut() override; + virtual void RequestLockScreen() override; + virtual void RequestRestartForUpdate() override; + virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) override; + virtual void BluetoothStartDiscovering() override; + virtual void BluetoothStopDiscovering() override; + virtual void ConnectToBluetoothDevice(const std::string& address) override; + virtual void GetCurrentIME(IMEInfo* info) override; + virtual void GetAvailableIMEList(IMEInfoList* list) override; + virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) override; + virtual void SwitchIME(const std::string& ime_id) override; + virtual void ActivateIMEProperty(const std::string& key) override; + virtual void ShowNetworkConfigure(const std::string& network_id) override; + virtual bool EnrollNetwork(const std::string& network_id) override; + virtual void ManageBluetoothDevices() override; + virtual void ToggleBluetooth() override; + virtual bool IsBluetoothDiscovering() override; + virtual void ShowMobileSimDialog() override; + virtual void ShowMobileSetupDialog(const std::string& service_path) override; + virtual void ShowOtherNetworkDialog(const std::string& type) override; + virtual bool GetBluetoothAvailable() override; + virtual bool GetBluetoothEnabled() override; + virtual bool GetBluetoothDiscovering() override; + virtual void ChangeProxySettings() override; + virtual VolumeControlDelegate* GetVolumeControlDelegate() const override; virtual void SetVolumeControlDelegate( - scoped_ptr<VolumeControlDelegate> delegate) OVERRIDE; + scoped_ptr<VolumeControlDelegate> delegate) override; virtual bool GetSessionStartTime( - base::TimeTicks* session_start_time) OVERRIDE; + base::TimeTicks* session_start_time) override; virtual bool GetSessionLengthLimit( - base::TimeDelta* session_length_limit) OVERRIDE; - virtual int GetSystemTrayMenuWidth() OVERRIDE; - virtual void ActiveUserWasChanged() OVERRIDE; - virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE; + base::TimeDelta* session_length_limit) override; + virtual int GetSystemTrayMenuWidth() override; + virtual void ActiveUserWasChanged() override; + virtual bool IsSearchKeyMappedToCapsLock() override; virtual tray::UserAccountsDelegate* GetUserAccountsDelegate( - const std::string& user_id) OVERRIDE; + const std::string& user_id) override; private: bool bluetooth_enabled_; diff --git a/ash/system/tray/fixed_sized_image_view.h b/ash/system/tray/fixed_sized_image_view.h index bcffd3a..7a45961 100644 --- a/ash/system/tray/fixed_sized_image_view.h +++ b/ash/system/tray/fixed_sized_image_view.h @@ -20,7 +20,7 @@ class FixedSizedImageView : public views::ImageView { virtual ~FixedSizedImageView(); private: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; int width_; int height_; diff --git a/ash/system/tray/fixed_sized_scroll_view.h b/ash/system/tray/fixed_sized_scroll_view.h index f3bf525f..522aab4 100644 --- a/ash/system/tray/fixed_sized_scroll_view.h +++ b/ash/system/tray/fixed_sized_scroll_view.h @@ -26,12 +26,12 @@ class FixedSizedScrollView : public views::ScrollView { void set_fixed_size(const gfx::Size& size) { fixed_size_ = size; } // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; protected: // Overridden from views::View: - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override; private: gfx::Size fixed_size_; diff --git a/ash/system/tray/hover_highlight_view.h b/ash/system/tray/hover_highlight_view.h index 47d15cf..6df822f 100644 --- a/ash/system/tray/hover_highlight_view.h +++ b/ash/system/tray/hover_highlight_view.h @@ -61,20 +61,20 @@ class HoverHighlightView : public ActionableView { protected: // Overridden from views::View. - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) override; private: // Overridden from ActionableView: - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void OnEnabledChanged() OVERRIDE; - virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void OnEnabledChanged() override; + virtual void OnPaintBackground(gfx::Canvas* canvas) override; + virtual void OnFocus() override; ViewClickListener* listener_; views::Label* text_label_; diff --git a/ash/system/tray/media_security/multi_profile_media_tray_item.cc b/ash/system/tray/media_security/multi_profile_media_tray_item.cc index 7826fb7..a6abc2e 100644 --- a/ash/system/tray/media_security/multi_profile_media_tray_item.cc +++ b/ash/system/tray/media_security/multi_profile_media_tray_item.cc @@ -41,7 +41,7 @@ class MultiProfileMediaTrayView : public TrayItemView, } // MediaCaptureObserver: - virtual void OnMediaCaptureChanged() OVERRIDE { + virtual void OnMediaCaptureChanged() override { MediaDelegate* media_delegate = Shell::GetInstance()->media_delegate(); SessionStateDelegate* session_state_delegate = Shell::GetInstance()->session_state_delegate(); diff --git a/ash/system/tray/media_security/multi_profile_media_tray_item.h b/ash/system/tray/media_security/multi_profile_media_tray_item.h index 038bf8d..f7b09f8 100644 --- a/ash/system/tray/media_security/multi_profile_media_tray_item.h +++ b/ash/system/tray/media_security/multi_profile_media_tray_item.h @@ -21,8 +21,8 @@ class ASH_EXPORT MultiProfileMediaTrayItem : public SystemTrayItem { virtual ~MultiProfileMediaTrayItem(); // SystemTrayItem: - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; private: tray::MultiProfileMediaTrayView* tray_view_; diff --git a/ash/system/tray/special_popup_row.h b/ash/system/tray/special_popup_row.h index 1cf8a84..767179f 100644 --- a/ash/system/tray/special_popup_row.h +++ b/ash/system/tray/special_popup_row.h @@ -35,9 +35,9 @@ class SpecialPopupRow : public views::View { private: // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void Layout() override; views::View* content_; views::View* button_container_; diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h index 301ef13..957e9ab 100644 --- a/ash/system/tray/system_tray.h +++ b/ash/system/tray/system_tray.h @@ -123,24 +123,24 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, bool CloseNotificationBubbleForTest() const; // Overridden from TrayBackgroundView. - virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; - virtual void AnchorUpdated() OVERRIDE; - virtual base::string16 GetAccessibleNameForTray() OVERRIDE; - virtual void BubbleResized(const views::TrayBubbleView* bubble_view) OVERRIDE; + virtual void SetShelfAlignment(ShelfAlignment alignment) override; + virtual void AnchorUpdated() override; + virtual base::string16 GetAccessibleNameForTray() override; + virtual void BubbleResized(const views::TrayBubbleView* bubble_view) override; virtual void HideBubbleWithView( - const views::TrayBubbleView* bubble_view) OVERRIDE; - virtual bool ClickedOutsideBubble() OVERRIDE; + const views::TrayBubbleView* bubble_view) override; + virtual bool ClickedOutsideBubble() override; // Overridden from message_center::TrayBubbleView::Delegate. - virtual void BubbleViewDestroyed() OVERRIDE; - virtual void OnMouseEnteredView() OVERRIDE; - virtual void OnMouseExitedView() OVERRIDE; - virtual base::string16 GetAccessibleNameForBubble() OVERRIDE; + virtual void BubbleViewDestroyed() override; + virtual void OnMouseEnteredView() override; + virtual void OnMouseExitedView() override; + virtual base::string16 GetAccessibleNameForBubble() override; virtual gfx::Rect GetAnchorRect( views::Widget* anchor_widget, AnchorType anchor_type, - AnchorAlignment anchor_alignment) const OVERRIDE; - virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE; + AnchorAlignment anchor_alignment) const override; + virtual void HideBubble(const views::TrayBubbleView* bubble_view) override; ScreenTrayItem* GetScreenShareItem() { return screen_share_tray_item_; } ScreenTrayItem* GetScreenCaptureItem() { return screen_capture_tray_item_; } @@ -202,7 +202,7 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, const ScopedVector<SystemTrayItem>& items() const { return items_; } // Overridden from ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; // Owned items. ScopedVector<SystemTrayItem> items_; diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc index cea360b..97500df 100644 --- a/ash/system/tray/system_tray_bubble.cc +++ b/ash/system/tray/system_tray_bubble.cc @@ -66,28 +66,28 @@ class TrayPopupItemContainer : public views::View { private: // Overridden from views::View. - virtual void ChildVisibilityChanged(View* child) OVERRIDE { + virtual void ChildVisibilityChanged(View* child) override { if (visible() == child->visible()) return; SetVisible(child->visible()); PreferredSizeChanged(); } - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE { + virtual void ChildPreferredSizeChanged(View* child) override { PreferredSizeChanged(); } - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE { + virtual void OnMouseEntered(const ui::MouseEvent& event) override { hover_ = true; SchedulePaint(); } - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE { + virtual void OnMouseExited(const ui::MouseEvent& event) override { hover_ = false; SchedulePaint(); } - virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaintBackground(gfx::Canvas* canvas) override { if (child_count() == 0) return; @@ -115,7 +115,7 @@ class AnimationObserverDeleteLayer : public ui::ImplicitAnimationObserver { virtual ~AnimationObserverDeleteLayer() { } - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, this); } diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc index 74c7c02..f06b648 100644 --- a/ash/system/tray/system_tray_unittest.cc +++ b/ash/system/tray/system_tray_unittest.cc @@ -48,7 +48,7 @@ class TestItem : public SystemTrayItem { public: TestItem() : SystemTrayItem(GetSystemTray()), tray_view_(NULL) {} - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateTrayView(user::LoginStatus status) override { tray_view_ = new views::View; // Add a label so it has non-zero width. tray_view_->SetLayoutManager(new views::FillLayout); @@ -56,14 +56,14 @@ class TestItem : public SystemTrayItem { return tray_view_; } - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateDefaultView(user::LoginStatus status) override { default_view_ = new views::View; default_view_->SetLayoutManager(new views::FillLayout); default_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Default"))); return default_view_; } - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateDetailedView(user::LoginStatus status) override { detailed_view_ = new views::View; detailed_view_->SetLayoutManager(new views::FillLayout); detailed_view_->AddChildView( @@ -72,29 +72,29 @@ class TestItem : public SystemTrayItem { } virtual views::View* CreateNotificationView( - user::LoginStatus status) OVERRIDE { + user::LoginStatus status) override { notification_view_ = new views::View; return notification_view_; } - virtual void DestroyTrayView() OVERRIDE { + virtual void DestroyTrayView() override { tray_view_ = NULL; } - virtual void DestroyDefaultView() OVERRIDE { + virtual void DestroyDefaultView() override { default_view_ = NULL; } - virtual void DestroyDetailedView() OVERRIDE { + virtual void DestroyDetailedView() override { detailed_view_ = NULL; } - virtual void DestroyNotificationView() OVERRIDE { + virtual void DestroyNotificationView() override { notification_view_ = NULL; } virtual void UpdateAfterLoginStatusChange( - user::LoginStatus status) OVERRIDE { + user::LoginStatus status) override { } views::View* tray_view() const { return tray_view_; } @@ -115,29 +115,29 @@ class TestNoViewItem : public SystemTrayItem { public: TestNoViewItem() : SystemTrayItem(GetSystemTray()) {} - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateTrayView(user::LoginStatus status) override { return NULL; } - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateDefaultView(user::LoginStatus status) override { return NULL; } - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateDetailedView(user::LoginStatus status) override { return NULL; } virtual views::View* CreateNotificationView( - user::LoginStatus status) OVERRIDE { + user::LoginStatus status) override { return NULL; } - virtual void DestroyTrayView() OVERRIDE {} - virtual void DestroyDefaultView() OVERRIDE {} - virtual void DestroyDetailedView() OVERRIDE {} - virtual void DestroyNotificationView() OVERRIDE {} + virtual void DestroyTrayView() override {} + virtual void DestroyDefaultView() override {} + virtual void DestroyDetailedView() override {} + virtual void DestroyNotificationView() override {} virtual void UpdateAfterLoginStatusChange( - user::LoginStatus status) OVERRIDE { + user::LoginStatus status) override { } }; @@ -146,8 +146,8 @@ class ModalWidgetDelegate : public views::WidgetDelegateView { ModalWidgetDelegate() {} virtual ~ModalWidgetDelegate() {} - virtual views::View* GetContentsView() OVERRIDE { return this; } - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual views::View* GetContentsView() override { return this; } + virtual ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; } diff --git a/ash/system/tray/throbber_view.h b/ash/system/tray/throbber_view.h index c3dadcd..022ce01 100644 --- a/ash/system/tray/throbber_view.h +++ b/ash/system/tray/throbber_view.h @@ -21,7 +21,7 @@ class SystemTrayThrobber : public views::SmoothedThrobber { // Overriden from views::View. virtual bool GetTooltipText( - const gfx::Point& p, base::string16* tooltip) const OVERRIDE; + const gfx::Point& p, base::string16* tooltip) const override; private: // The current tooltip text. @@ -41,10 +41,10 @@ class ThrobberView : public views::View { void SetTooltipText(const base::string16& tooltip_text); // Overriden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; virtual bool GetTooltipText( - const gfx::Point& p, base::string16* tooltip) const OVERRIDE; + const gfx::Point& p, base::string16* tooltip) const override; private: // Schedules animation for starting/stopping throbber. diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index acebd44..623d257 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc @@ -72,12 +72,12 @@ class TrayBackgroundView::TrayWidgetObserver : public views::WidgetObserver { } virtual void OnWidgetBoundsChanged(views::Widget* widget, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { host_->AnchorUpdated(); } virtual void OnWidgetVisibilityChanged(views::Widget* widget, - bool visible) OVERRIDE { + bool visible) override { host_->AnchorUpdated(); } @@ -163,7 +163,7 @@ class TrayBackground : public views::Background { } // Overridden from views::Background. - virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE { + virtual void Paint(gfx::Canvas* canvas, views::View* view) const override { int orientation = kImageHorizontal; ShelfWidget* shelf_widget = GetShelfWidget(); if (shelf_widget && diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h index 610cfaf..08337fd 100644 --- a/ash/system/tray/tray_background_view.h +++ b/ash/system/tray/tray_background_view.h @@ -41,14 +41,14 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, void set_size(const gfx::Size& size) { size_ = size; } // views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; protected: // views::View: - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; - virtual void ChildVisibilityChanged(View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(views::View* child) override; + virtual void ChildVisibilityChanged(View* child) override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; private: void UpdateLayout(); @@ -66,21 +66,21 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, virtual void Initialize(); // views::View: - virtual void SetVisible(bool visible) OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; - virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; + virtual void SetVisible(bool visible) override; + virtual const char* GetClassName() const override; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void ChildPreferredSizeChanged(views::View* child) override; + virtual void GetAccessibleState(ui::AXViewState* state) override; + virtual void AboutToRequestFocusFromTabTraversal(bool reverse) override; // ActionableView: - virtual bool PerformAction(const ui::Event& event) OVERRIDE; - virtual gfx::Rect GetFocusBounds() OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; + virtual gfx::Rect GetFocusBounds() override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // BackgroundAnimatorDelegate: - virtual void UpdateBackground(int alpha) OVERRIDE; + virtual void UpdateBackground(int alpha) override; // Called whenever the shelf alignment changes. virtual void SetShelfAlignment(ShelfAlignment alignment); @@ -157,7 +157,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, void SetTrayBorder(); // ui::ImplicitAnimationObserver: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; // Applies transformations to the |layer()| to animate the view when // SetVisible(false) is called. diff --git a/ash/system/tray/tray_bar_button_with_title.cc b/ash/system/tray/tray_bar_button_with_title.cc index e8b8f53..212a7c9 100644 --- a/ash/system/tray/tray_bar_button_with_title.cc +++ b/ash/system/tray/tray_bar_button_with_title.cc @@ -40,7 +40,7 @@ class TrayBarButtonWithTitle::TrayBarButton : public views::View { virtual ~TrayBarButton() {} // Overriden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { painter_->Paint(canvas, size()); } diff --git a/ash/system/tray/tray_bar_button_with_title.h b/ash/system/tray/tray_bar_button_with_title.h index 3ad4f84..088cfab 100644 --- a/ash/system/tray/tray_bar_button_with_title.h +++ b/ash/system/tray/tray_bar_button_with_title.h @@ -31,8 +31,8 @@ class TrayBarButtonWithTitle : public views::CustomButton { class TrayBarButton; // Overridden from views::CustomButton: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void Layout() override; TrayBarButton* image_; views::Label* title_; diff --git a/ash/system/tray/tray_bubble_wrapper.h b/ash/system/tray/tray_bubble_wrapper.h index 102e07e..e38276c 100644 --- a/ash/system/tray/tray_bubble_wrapper.h +++ b/ash/system/tray/tray_bubble_wrapper.h @@ -26,9 +26,9 @@ class TrayBubbleWrapper : public views::WidgetObserver { virtual ~TrayBubbleWrapper(); // views::WidgetObserver overrides: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; virtual void OnWidgetBoundsChanged(views::Widget* widget, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; const TrayBackgroundView* tray() const { return tray_; } TrayBackgroundView* tray() { return tray_; } diff --git a/ash/system/tray/tray_details_view.cc b/ash/system/tray/tray_details_view.cc index 2c1fe17..faa9513 100644 --- a/ash/system/tray/tray_details_view.cc +++ b/ash/system/tray/tray_details_view.cc @@ -24,10 +24,10 @@ class ScrollSeparator : public views::View { private: // Overriden from views::View. - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->FillRect(gfx::Rect(0, height() / 2, width(), 1), kBorderLightColor); } - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(1, kTrayPopupScrollSeparatorHeight); } @@ -43,18 +43,18 @@ class ScrollBorder : public views::Border { private: // Overridden from views::Border. - virtual void Paint(const views::View& view, gfx::Canvas* canvas) OVERRIDE { + virtual void Paint(const views::View& view, gfx::Canvas* canvas) override { if (!visible_) return; canvas->FillRect(gfx::Rect(0, view.height() - 1, view.width(), 1), kBorderLightColor); } - virtual gfx::Insets GetInsets() const OVERRIDE { + virtual gfx::Insets GetInsets() const override { return gfx::Insets(0, 0, 1, 0); } - virtual gfx::Size GetMinimumSize() const OVERRIDE { + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(0, 1); } diff --git a/ash/system/tray/tray_details_view.h b/ash/system/tray/tray_details_view.h index 6193594..06870ec 100644 --- a/ash/system/tray/tray_details_view.h +++ b/ash/system/tray/tray_details_view.h @@ -50,8 +50,8 @@ class ASH_EXPORT TrayDetailsView : public views::View { protected: // Overridden from views::View. - virtual void Layout() OVERRIDE; - virtual void OnPaintBorder(gfx::Canvas* canvas) OVERRIDE; + virtual void Layout() override; + virtual void OnPaintBorder(gfx::Canvas* canvas) override; private: SystemTrayItem* owner_; diff --git a/ash/system/tray/tray_details_view_unittest.cc b/ash/system/tray/tray_details_view_unittest.cc index 50c89c0..32c859a 100644 --- a/ash/system/tray/tray_details_view_unittest.cc +++ b/ash/system/tray/tray_details_view_unittest.cc @@ -43,7 +43,7 @@ class TestDetailsView : public TrayDetailsView, public ViewClickListener { } // Overridden from ViewClickListener: - virtual void OnViewClicked(views::View* sender) OVERRIDE {} + virtual void OnViewClicked(views::View* sender) override {} private: DISALLOW_COPY_AND_ASSIGN(TestDetailsView); @@ -55,26 +55,26 @@ class TestItem : public SystemTrayItem { TestItem() : SystemTrayItem(GetSystemTray()), tray_view_(NULL) {} // Overridden from SystemTrayItem: - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateTrayView(user::LoginStatus status) override { tray_view_ = new views::View; return tray_view_; } - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateDefaultView(user::LoginStatus status) override { default_view_ = new views::View; default_view_->SetFocusable(true); return default_view_; } - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateDetailedView(user::LoginStatus status) override { detailed_view_ = new TestDetailsView(this); return detailed_view_; } - virtual void DestroyTrayView() OVERRIDE { + virtual void DestroyTrayView() override { tray_view_ = NULL; } - virtual void DestroyDefaultView() OVERRIDE { + virtual void DestroyDefaultView() override { default_view_ = NULL; } - virtual void DestroyDetailedView() OVERRIDE { + virtual void DestroyDetailedView() override { detailed_view_ = NULL; } diff --git a/ash/system/tray/tray_empty.cc b/ash/system/tray/tray_empty.cc index bd2b7a1..04ca207 100644 --- a/ash/system/tray/tray_empty.cc +++ b/ash/system/tray/tray_empty.cc @@ -17,7 +17,7 @@ class EmptyBackground : public views::Background { virtual ~EmptyBackground() {} private: - virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE { + virtual void Paint(gfx::Canvas* canvas, views::View* view) const override { } DISALLOW_COPY_AND_ASSIGN(EmptyBackground); diff --git a/ash/system/tray/tray_empty.h b/ash/system/tray/tray_empty.h index c4be08c..3c5640d 100644 --- a/ash/system/tray/tray_empty.h +++ b/ash/system/tray/tray_empty.h @@ -16,13 +16,13 @@ class TrayEmpty : public SystemTrayItem { private: // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; DISALLOW_COPY_AND_ASSIGN(TrayEmpty); }; diff --git a/ash/system/tray/tray_event_filter.h b/ash/system/tray/tray_event_filter.h index e77e00f..f633109 100644 --- a/ash/system/tray/tray_event_filter.h +++ b/ash/system/tray/tray_event_filter.h @@ -29,8 +29,8 @@ class TrayEventFilter : public ui::EventHandler { void RemoveWrapper(TrayBubbleWrapper* wrapper); // Overridden from ui::EventHandler. - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; private: // Returns true if the event is handled. diff --git a/ash/system/tray/tray_image_item.h b/ash/system/tray/tray_image_item.h index 6fad95f..a3f9d9d 100644 --- a/ash/system/tray/tray_image_item.h +++ b/ash/system/tray/tray_image_item.h @@ -28,15 +28,15 @@ class TrayImageItem : public SystemTrayItem { virtual bool GetInitialVisibility() = 0; // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; virtual void UpdateAfterShelfAlignmentChange( - ShelfAlignment alignment) OVERRIDE; + ShelfAlignment alignment) override; private: // Set the alignment of the image depending on the shelf alignment. diff --git a/ash/system/tray/tray_item_more.h b/ash/system/tray/tray_item_more.h index e61f5de..32592b5 100644 --- a/ash/system/tray/tray_item_more.h +++ b/ash/system/tray/tray_item_more.h @@ -38,11 +38,11 @@ class TrayItemMore : public ActionableView { private: // Overridden from ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; // Overridden from views::View. - virtual void Layout() OVERRIDE; - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; + virtual void Layout() override; + virtual void GetAccessibleState(ui::AXViewState* state) override; SystemTrayItem* owner_; // True if |more_| should be shown. diff --git a/ash/system/tray/tray_item_view.h b/ash/system/tray/tray_item_view.h index 37e239f..421c652 100644 --- a/ash/system/tray/tray_item_view.h +++ b/ash/system/tray/tray_item_view.h @@ -41,9 +41,9 @@ class ASH_EXPORT TrayItemView : public views::View, views::ImageView* image_view() const { return image_view_; } // Overridden from views::View. - virtual void SetVisible(bool visible) OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; + virtual void SetVisible(bool visible) override; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; protected: // Makes sure the widget relayouts after the size/visibility of the view @@ -61,12 +61,12 @@ class ASH_EXPORT TrayItemView : public views::View, private: // Overridden from views::View. - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; + virtual void ChildPreferredSizeChanged(View* child) override; // Overridden from gfx::AnimationDelegate. - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const gfx::Animation* animation) override; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationCanceled(const gfx::Animation* animation) override; SystemTrayItem* owner_; scoped_ptr<gfx::SlideAnimation> animation_; diff --git a/ash/system/tray/tray_notification_view.h b/ash/system/tray/tray_notification_view.h index 28c2236..8cccf19 100644 --- a/ash/system/tray/tray_notification_view.h +++ b/ash/system/tray/tray_notification_view.h @@ -56,13 +56,13 @@ class TrayNotificationView : public views::SlideOutView, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from views::View. - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; // Overridden from ui::EventHandler. - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnGestureEvent(ui::GestureEvent* event) override; protected: // Called when the close button is pressed. Does nothing by default. @@ -71,7 +71,7 @@ class TrayNotificationView : public views::SlideOutView, virtual void OnClickAction(); // Overridden from views::SlideOutView. - virtual void OnSlideOut() OVERRIDE; + virtual void OnSlideOut() override; SystemTrayItem* owner() { return owner_; } diff --git a/ash/system/tray/tray_popup_header_button.h b/ash/system/tray/tray_popup_header_button.h index 41a7627..e6e4c57 100644 --- a/ash/system/tray/tray_popup_header_button.h +++ b/ash/system/tray/tray_popup_header_button.h @@ -28,12 +28,12 @@ class ASH_EXPORT TrayPopupHeaderButton : public views::ToggleImageButton { private: // Overridden from views::View: - virtual const char* GetClassName() const OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaintBorder(gfx::Canvas* canvas) OVERRIDE; + virtual const char* GetClassName() const override; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaintBorder(gfx::Canvas* canvas) override; // Overridden from views::CustomButton: - virtual void StateChanged() OVERRIDE; + virtual void StateChanged() override; DISALLOW_COPY_AND_ASSIGN(TrayPopupHeaderButton); }; diff --git a/ash/system/tray/tray_popup_label_button_border.h b/ash/system/tray/tray_popup_label_button_border.h index 8207d89..18a30fb 100644 --- a/ash/system/tray/tray_popup_label_button_border.h +++ b/ash/system/tray/tray_popup_label_button_border.h @@ -19,7 +19,7 @@ class TrayPopupLabelButtonBorder : public views::LabelButtonBorder { virtual ~TrayPopupLabelButtonBorder(); // views::LabelButtonBorder: - virtual void Paint(const views::View& view, gfx::Canvas* canvas) OVERRIDE; + virtual void Paint(const views::View& view, gfx::Canvas* canvas) override; private: DISALLOW_COPY_AND_ASSIGN(TrayPopupLabelButtonBorder); diff --git a/ash/system/tray_accessibility.h b/ash/system/tray_accessibility.h index b2bc648..d9b6206 100644 --- a/ash/system/tray_accessibility.h +++ b/ash/system/tray_accessibility.h @@ -76,10 +76,10 @@ class AccessibilityDetailedView : public TrayDetailsView, gfx::Font::FontStyle style, bool checked); // Overridden from ViewClickListener. - virtual void OnViewClicked(views::View* sender) OVERRIDE; + virtual void OnViewClicked(views::View* sender) override; // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; views::View* spoken_feedback_view_; views::View* high_contrast_view_; @@ -115,16 +115,16 @@ class TrayAccessibility : public TrayImageItem, tray::AccessibilityDetailedView* CreateDetailedMenu(); // Overridden from TrayImageItem. - virtual bool GetInitialVisibility() OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual bool GetInitialVisibility() override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; // Overridden from AccessibilityObserver. virtual void OnAccessibilityModeChanged( - AccessibilityNotificationVisibility notify) OVERRIDE; + AccessibilityNotificationVisibility notify) override; views::View* default_; tray::AccessibilityPopupView* detailed_popup_; diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc index 79a3ad6..4de9d1b 100644 --- a/ash/system/tray_update.cc +++ b/ash/system/tray_update.cc @@ -84,7 +84,7 @@ class UpdateView : public ash::ActionableView { private: // Overridden from ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE { + virtual bool PerformAction(const ui::Event& event) override { ash::Shell::GetInstance()-> system_tray_delegate()->RequestRestartForUpdate(); return true; @@ -131,7 +131,7 @@ class UpdateNagger : public ui::LayerAnimationObserver { // Overridden from ui::LayerAnimationObserver. virtual void OnLayerAnimationEnded( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { // TODO(oshima): Find out if the updator will be shown on non // primary display. if (Shell::GetPrimaryRootWindowController()->shelf()->IsVisible()) @@ -141,10 +141,10 @@ class UpdateNagger : public ui::LayerAnimationObserver { } virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* sequence) OVERRIDE {} + ui::LayerAnimationSequence* sequence) override {} virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* sequence) OVERRIDE {} + ui::LayerAnimationSequence* sequence) override {} SystemTrayItem* owner_; base::OneShotTimer<UpdateNagger> timer_; diff --git a/ash/system/tray_update.h b/ash/system/tray_update.h index d6212c0..e9fcba9 100644 --- a/ash/system/tray_update.h +++ b/ash/system/tray_update.h @@ -27,13 +27,13 @@ class TrayUpdate : public TrayImageItem, private: // Overridden from TrayImageItem. - virtual bool GetInitialVisibility() OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; + virtual bool GetInitialVisibility() override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyDetailedView() override; // Overridden from UpdateObserver. - virtual void OnUpdateRecommended(UpdateSeverity severity) OVERRIDE; + virtual void OnUpdateRecommended(UpdateSeverity severity) override; // Used to nag the user in case the tray has been hidden too long with an // unseen update notification. diff --git a/ash/system/user/accounts_detailed_view.h b/ash/system/user/accounts_detailed_view.h index 24dbd89..533a2c6 100644 --- a/ash/system/user/accounts_detailed_view.h +++ b/ash/system/user/accounts_detailed_view.h @@ -35,14 +35,14 @@ class AccountsDetailedView : public TrayDetailsView, private: // Overridden from ViewClickListener. - virtual void OnViewClicked(views::View* sender) OVERRIDE; + virtual void OnViewClicked(views::View* sender) override; // Overridden from views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from ash::tray::UserAccountsDelegate::Observer. - virtual void AccountListChanged() OVERRIDE; + virtual void AccountListChanged() override; void AddHeader(user::LoginStatus login_status); void AddAccountList(); diff --git a/ash/system/user/button_from_view.h b/ash/system/user/button_from_view.h index 23a632b..e941c1e 100644 --- a/ash/system/user/button_from_view.h +++ b/ash/system/user/button_from_view.h @@ -31,11 +31,11 @@ class ButtonFromView : public views::CustomButton { void ForceBorderVisible(bool show); // Overridden from views::View - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void OnFocus() OVERRIDE; - virtual void OnBlur() OVERRIDE; + virtual void OnMouseEntered(const ui::MouseEvent& event) override; + virtual void OnMouseExited(const ui::MouseEvent& event) override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual void OnFocus() override; + virtual void OnBlur() override; // Check if the item is hovered. bool is_hovered_for_test() { return button_hovered_; } diff --git a/ash/system/user/rounded_image_view.h b/ash/system/user/rounded_image_view.h index 895043d..d76c8d3 100644 --- a/ash/system/user/rounded_image_view.h +++ b/ash/system/user/rounded_image_view.h @@ -34,8 +34,8 @@ class RoundedImageView : public views::View { private: // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; gfx::ImageSkia image_; gfx::ImageSkia resized_; diff --git a/ash/system/user/tray_user.h b/ash/system/user/tray_user.h index 1e0aa281..54dd974 100644 --- a/ash/system/user/tray_user.h +++ b/ash/system/user/tray_user.h @@ -61,19 +61,19 @@ class ASH_EXPORT TrayUser : public SystemTrayItem, private: // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE; - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE; - virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override; + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override; + virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; virtual void UpdateAfterShelfAlignmentChange( - ShelfAlignment alignment) OVERRIDE; + ShelfAlignment alignment) override; // Overridden from UserObserver. - virtual void OnUserUpdate() OVERRIDE; - virtual void OnUserAddedToSession() OVERRIDE; + virtual void OnUserUpdate() override; + virtual void OnUserAddedToSession() override; void UpdateAvatarImage(user::LoginStatus status); diff --git a/ash/system/user/tray_user_separator.h b/ash/system/user/tray_user_separator.h index 003e4cd..18153f7 100644 --- a/ash/system/user/tray_user_separator.h +++ b/ash/system/user/tray_user_separator.h @@ -23,16 +23,16 @@ class ASH_EXPORT TrayUserSeparator : public SystemTrayItem { private: // Overridden from SystemTrayItem. - virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; - virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; - virtual void DestroyTrayView() OVERRIDE {} - virtual void DestroyDefaultView() OVERRIDE; - virtual void DestroyDetailedView() OVERRIDE {} + virtual views::View* CreateTrayView(user::LoginStatus status) override; + virtual views::View* CreateDefaultView(user::LoginStatus status) override; + virtual views::View* CreateDetailedView(user::LoginStatus status) override; + virtual void DestroyTrayView() override {} + virtual void DestroyDefaultView() override; + virtual void DestroyDetailedView() override {} virtual void UpdateAfterLoginStatusChange( - user::LoginStatus status) OVERRIDE {} + user::LoginStatus status) override {} virtual void UpdateAfterShelfAlignmentChange( - ShelfAlignment alignment) OVERRIDE {} + ShelfAlignment alignment) override {} // True if the separator gets shown. bool separator_shown_; diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc index 4868861..141d78f 100644 --- a/ash/system/user/tray_user_unittest.cc +++ b/ash/system/user/tray_user_unittest.cc @@ -28,7 +28,7 @@ class TrayUserTest : public ash::test::AshTestBase { TrayUserTest(); // testing::Test: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; // This has to be called prior to first use with the proper configuration. void InitializeParameters(int users_logged_in, bool multiprofile); diff --git a/ash/system/user/user_card_view.cc b/ash/system/user/user_card_view.cc index 5f46e2a..5a240d8 100644 --- a/ash/system/user/user_card_view.cc +++ b/ash/system/user/user_card_view.cc @@ -80,7 +80,7 @@ class MediaIndicator : public views::View, public MediaCaptureObserver { } // MediaCaptureObserver: - virtual void OnMediaCaptureChanged() OVERRIDE { + virtual void OnMediaCaptureChanged() override { Shell* shell = Shell::GetInstance(); content::BrowserContext* context = shell->session_state_delegate()->GetBrowserContextByIndex(index_); @@ -130,12 +130,12 @@ class PublicAccountUserDetails : public views::View, private: // Overridden from views::View. - virtual void Layout() OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void Layout() override; + virtual gfx::Size GetPreferredSize() const override; + virtual void OnPaint(gfx::Canvas* canvas) override; // Overridden from views::LinkListener. - virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; + virtual void LinkClicked(views::Link* source, int event_flags) override; // Calculate a preferred size that ensures the label text and the following // link do not wrap over more than three lines in total for aesthetic reasons diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc index 408a86d..03b7b54 100644 --- a/ash/system/user/user_view.cc +++ b/ash/system/user/user_view.cc @@ -96,7 +96,7 @@ class LogoutButton : public TrayPopupLabelButton { private: virtual void Paint(gfx::Canvas* canvas, - const views::CullSet& cull_set) OVERRIDE { + const views::CullSet& cull_set) override { // Just skip paint if this button used as a placeholder. if (!placeholder_) TrayPopupLabelButton::Paint(canvas, cull_set); @@ -114,7 +114,7 @@ class UserViewMouseWatcherHost : public views::MouseWatcherHost { // Implementation of MouseWatcherHost. virtual bool Contains(const gfx::Point& screen_point, - views::MouseWatcherHost::MouseEventType type) OVERRIDE { + views::MouseWatcherHost::MouseEventType type) override { return screen_area_.Contains(screen_point); } @@ -137,7 +137,7 @@ class AddUserView : public views::View { private: // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; // Create the additional client content for this item. void AddContent(); diff --git a/ash/system/user/user_view.h b/ash/system/user/user_view.h index d46bdd3..750b8f3 100644 --- a/ash/system/user/user_view.h +++ b/ash/system/user/user_view.h @@ -45,26 +45,26 @@ class UserView : public views::View, virtual ~UserView(); // Overridden from MouseWatcherListener: - virtual void MouseMovedOutOfHost() OVERRIDE; + virtual void MouseMovedOutOfHost() override; TrayUser::TestState GetStateForTest() const; gfx::Rect GetBoundsInScreenOfUserButtonForTest(); private: // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual int GetHeightForWidth(int width) const OVERRIDE; - virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() const override; + virtual int GetHeightForWidth(int width) const override; + virtual void Layout() override; // Overridden from views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from views::FocusChangeListener: virtual void OnWillChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; virtual void OnDidChangeFocus(View* focused_before, - View* focused_now) OVERRIDE; + View* focused_now) override; void AddLogoutButton(user::LoginStatus login); void AddUserCard(user::LoginStatus login); diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.h b/ash/system/web_notification/ash_popup_alignment_delegate.h index 1a03e2d..365675b 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate.h +++ b/ash/system/web_notification/ash_popup_alignment_delegate.h @@ -47,12 +47,12 @@ class ASH_EXPORT AshPopupAlignmentDelegate void SetSystemTrayHeight(int height); // Overridden from message_center::PopupAlignmentDelegate: - virtual int GetToastOriginX(const gfx::Rect& toast_bounds) const OVERRIDE; - virtual int GetBaseLine() const OVERRIDE; - virtual int GetWorkAreaBottom() const OVERRIDE; - virtual bool IsTopDown() const OVERRIDE; - virtual bool IsFromLeft() const OVERRIDE; - virtual void RecomputeAlignment(const gfx::Display& display) OVERRIDE; + virtual int GetToastOriginX(const gfx::Rect& toast_bounds) const override; + virtual int GetBaseLine() const override; + virtual int GetWorkAreaBottom() const override; + virtual bool IsTopDown() const override; + virtual bool IsFromLeft() const override; + virtual void RecomputeAlignment(const gfx::Display& display) override; private: friend class AshPopupAlignmentDelegateTest; @@ -67,16 +67,16 @@ class ASH_EXPORT AshPopupAlignmentDelegate void UpdateShelf(); // Overridden from ShellObserver: - virtual void OnDisplayWorkAreaInsetsChanged() OVERRIDE; + virtual void OnDisplayWorkAreaInsetsChanged() override; // Overridden from ShelfLayoutManagerObserver: - virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) OVERRIDE; + virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; // Overridden from gfx::DisplayObserver: - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& new_display) override; + virtual void OnDisplayRemoved(const gfx::Display& old_display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; int64_t display_id_; gfx::Screen* screen_; diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 27e73b7..cc68ce3 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -142,11 +142,11 @@ class WebNotificationButton : public views::CustomButton { protected: // Overridden from views::ImageButton: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(kShelfItemHeight, kShelfItemHeight); } - virtual int GetHeightForWidth(int width) const OVERRIDE { + virtual int GetHeightForWidth(int width) const override { return GetPreferredSize().height(); } diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h index d552191..e0d62ab 100644 --- a/ash/system/web_notification/web_notification_tray.h +++ b/ash/system/web_notification/web_notification_tray.h @@ -75,48 +75,48 @@ class ASH_EXPORT WebNotificationTray void UpdateAfterLoginStatusChange(user::LoginStatus login_status); // Overridden from TrayBackgroundView. - virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; - virtual void AnchorUpdated() OVERRIDE; - virtual base::string16 GetAccessibleNameForTray() OVERRIDE; + virtual void SetShelfAlignment(ShelfAlignment alignment) override; + virtual void AnchorUpdated() override; + virtual base::string16 GetAccessibleNameForTray() override; virtual void HideBubbleWithView( - const views::TrayBubbleView* bubble_view) OVERRIDE; - virtual bool ClickedOutsideBubble() OVERRIDE; + const views::TrayBubbleView* bubble_view) override; + virtual bool ClickedOutsideBubble() override; // Overridden from ActionableView. - virtual bool PerformAction(const ui::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) override; // Overridden from views::TrayBubbleView::Delegate. - virtual void BubbleViewDestroyed() OVERRIDE; - virtual void OnMouseEnteredView() OVERRIDE; - virtual void OnMouseExitedView() OVERRIDE; - virtual base::string16 GetAccessibleNameForBubble() OVERRIDE; + virtual void BubbleViewDestroyed() override; + virtual void OnMouseEnteredView() override; + virtual void OnMouseExitedView() override; + virtual base::string16 GetAccessibleNameForBubble() override; virtual gfx::Rect GetAnchorRect( views::Widget* anchor_widget, AnchorType anchor_type, - AnchorAlignment anchor_alignment) const OVERRIDE; - virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE; + AnchorAlignment anchor_alignment) const override; + virtual void HideBubble(const views::TrayBubbleView* bubble_view) override; // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from MessageCenterTrayDelegate. - virtual void OnMessageCenterTrayChanged() OVERRIDE; - virtual bool ShowMessageCenter() OVERRIDE; - virtual void HideMessageCenter() OVERRIDE; - virtual bool ShowPopups() OVERRIDE; - virtual void HidePopups() OVERRIDE; - virtual bool ShowNotifierSettings() OVERRIDE; - virtual bool IsContextMenuEnabled() const OVERRIDE; - virtual message_center::MessageCenterTray* GetMessageCenterTray() OVERRIDE; + virtual void OnMessageCenterTrayChanged() override; + virtual bool ShowMessageCenter() override; + virtual void HideMessageCenter() override; + virtual bool ShowPopups() override; + virtual void HidePopups() override; + virtual bool ShowNotifierSettings() override; + virtual bool IsContextMenuEnabled() const override; + virtual message_center::MessageCenterTray* GetMessageCenterTray() override; // Overridden from SimpleMenuModel::Delegate. - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool IsCommandIdChecked(int command_id) const override; + virtual bool IsCommandIdEnabled(int command_id) const override; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) OVERRIDE; - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; + ui::Accelerator* accelerator) override; + virtual void ExecuteCommand(int command_id, int event_flags) override; message_center::MessageCenter* message_center() const; diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index 02f0d7f..5fa5661 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc @@ -72,7 +72,7 @@ class TestItem : public SystemTrayItem { public: TestItem() : SystemTrayItem(GetSystemTray()) {} - virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE { + virtual views::View* CreateDefaultView(user::LoginStatus status) override { views::View* default_view = new views::View; default_view->SetLayoutManager(new views::FillLayout); default_view->AddChildView(new views::Label(base::UTF8ToUTF16("Default"))); @@ -80,7 +80,7 @@ class TestItem : public SystemTrayItem { } virtual views::View* CreateNotificationView( - user::LoginStatus status) OVERRIDE { + user::LoginStatus status) override { return new views::View; } @@ -95,13 +95,13 @@ class WebNotificationTrayTest : public test::AshTestBase { WebNotificationTrayTest() {} virtual ~WebNotificationTrayTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableTouchFeedback); test::AshTestBase::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { GetMessageCenter()->RemoveAllNotifications(false); test::AshTestBase::TearDown(); } diff --git a/ash/system/win/audio/tray_audio_delegate_win.h b/ash/system/win/audio/tray_audio_delegate_win.h index f63f7b7..a299b7d 100644 --- a/ash/system/win/audio/tray_audio_delegate_win.h +++ b/ash/system/win/audio/tray_audio_delegate_win.h @@ -21,15 +21,15 @@ class ASH_EXPORT TrayAudioDelegateWin : public TrayAudioDelegate { virtual ~TrayAudioDelegateWin() {} // Overridden from TrayAudioDelegate. - virtual void AdjustOutputVolumeToAudibleLevel() OVERRIDE; - virtual int GetOutputDefaultVolumeMuteLevel() OVERRIDE; - virtual int GetOutputVolumeLevel() OVERRIDE; - virtual int GetActiveOutputDeviceIconId() OVERRIDE; - virtual bool HasAlternativeSources() OVERRIDE; - virtual bool IsOutputAudioMuted() OVERRIDE; - virtual void SetOutputAudioIsMuted(bool is_muted) OVERRIDE; - virtual void SetOutputVolumeLevel(int level) OVERRIDE; - virtual void SetInternalSpeakerChannelMode(AudioChannelMode mode) OVERRIDE; + virtual void AdjustOutputVolumeToAudibleLevel() override; + virtual int GetOutputDefaultVolumeMuteLevel() override; + virtual int GetOutputVolumeLevel() override; + virtual int GetActiveOutputDeviceIconId() override; + virtual bool HasAlternativeSources() override; + virtual bool IsOutputAudioMuted() override; + virtual void SetOutputAudioIsMuted(bool is_muted) override; + virtual void SetOutputVolumeLevel(int level) override; + virtual void SetInternalSpeakerChannelMode(AudioChannelMode mode) override; private: base::win::ScopedComPtr<ISimpleAudioVolume> CreateDefaultVolumeControl(); diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index e6ddbcf..50d18b7 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -63,7 +63,7 @@ class AshEventGeneratorDelegate // aura::test::EventGeneratorDelegateAura overrides: virtual aura::WindowTreeHost* GetHostAt( - const gfx::Point& point_in_screen) const OVERRIDE { + const gfx::Point& point_in_screen) const override { gfx::Screen* screen = Shell::GetScreen(); gfx::Display display = screen->GetDisplayNearestPoint(point_in_screen); return Shell::GetInstance()->display_controller()-> @@ -71,7 +71,7 @@ class AshEventGeneratorDelegate } virtual aura::client::ScreenPositionClient* GetScreenPositionClient( - const aura::Window* window) const OVERRIDE { + const aura::Window* window) const override { return aura::client::GetScreenPositionClient(window->GetRootWindow()); } diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h index ac667b7..6b5b057 100644 --- a/ash/test/ash_test_base.h +++ b/ash/test/ash_test_base.h @@ -53,8 +53,8 @@ class AshTestBase : public testing::Test { virtual ~AshTestBase(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; // Update the display configuration as given in |display_specs|. // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details. diff --git a/ash/test/ash_test_helper_unittest.cc b/ash/test/ash_test_helper_unittest.cc index f5eae60..7f8b1fa 100644 --- a/ash/test/ash_test_helper_unittest.cc +++ b/ash/test/ash_test_helper_unittest.cc @@ -19,13 +19,13 @@ class AshTestHelperTest : public testing::Test { AshTestHelperTest() {} virtual ~AshTestHelperTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { testing::Test::SetUp(); ash_test_helper_.reset(new ash::test::AshTestHelper(&message_loop_)); ash_test_helper_->SetUp(true); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ash_test_helper_->TearDown(); testing::Test::TearDown(); } diff --git a/ash/test/ash_test_views_delegate.h b/ash/test/ash_test_views_delegate.h index 6fd8bd4..9d711ecb 100644 --- a/ash/test/ash_test_views_delegate.h +++ b/ash/test/ash_test_views_delegate.h @@ -21,10 +21,10 @@ class AshTestViewsDelegate : public views::TestViewsDelegate { // Overriden from TestViewsDelegate. virtual content::WebContents* CreateWebContents( content::BrowserContext* browser_context, - content::SiteInstance* site_instance) OVERRIDE; + content::SiteInstance* site_instance) override; virtual void OnBeforeWidgetInit( views::Widget::InitParams* params, - views::internal::NativeWidgetDelegate* delegate) OVERRIDE; + views::internal::NativeWidgetDelegate* delegate) override; private: DISALLOW_COPY_AND_ASSIGN(AshTestViewsDelegate); diff --git a/ash/test/child_modal_window.cc b/ash/test/child_modal_window.cc index 793b1bf..3e8896a 100644 --- a/ash/test/child_modal_window.cc +++ b/ash/test/child_modal_window.cc @@ -62,14 +62,14 @@ class ChildModalWindow : public views::WidgetDelegateView { private: // Overridden from View: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Size GetPreferredSize() const OVERRIDE; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual gfx::Size GetPreferredSize() const override; // Overridden from WidgetDelegate: - virtual View* GetContentsView() OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual bool CanResize() const OVERRIDE; - virtual ui::ModalType GetModalType() const OVERRIDE; + virtual View* GetContentsView() override; + virtual base::string16 GetWindowTitle() const override; + virtual bool CanResize() const override; + virtual ui::ModalType GetModalType() const override; DISALLOW_COPY_AND_ASSIGN(ChildModalWindow); }; diff --git a/ash/test/child_modal_window.h b/ash/test/child_modal_window.h index ed8553a..5521b4f 100644 --- a/ash/test/child_modal_window.h +++ b/ash/test/child_modal_window.h @@ -37,22 +37,22 @@ class ChildModalParent : public views::WidgetDelegateView, views::Widget* CreateChild(); // Overridden from views::WidgetDelegate: - virtual View* GetContentsView() OVERRIDE; - virtual base::string16 GetWindowTitle() const OVERRIDE; - virtual bool CanResize() const OVERRIDE; - virtual void DeleteDelegate() OVERRIDE; + virtual View* GetContentsView() override; + virtual base::string16 GetWindowTitle() const override; + virtual bool CanResize() const override; + virtual void DeleteDelegate() override; // Overridden from views::View: - virtual void Layout() OVERRIDE; + virtual void Layout() override; virtual void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) OVERRIDE; + const ViewHierarchyChangedDetails& details) override; // Overridden from ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // Overridden from WidgetObserver: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; // The button to toggle showing and hiding the child window. The child window // does not block input to this button. diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc index b55690f..b33b749 100644 --- a/ash/test/shelf_view_test_api.cc +++ b/ash/test/shelf_view_test_api.cc @@ -23,8 +23,8 @@ class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { // views::BoundsAnimatorObserver overrides: virtual void OnBoundsAnimatorProgressed( - views::BoundsAnimator* animator) OVERRIDE {} - virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) OVERRIDE { + views::BoundsAnimator* animator) override {} + virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) override { base::MessageLoop::current()->Quit(); } diff --git a/ash/test/test_activation_delegate.h b/ash/test/test_activation_delegate.h index b60354e..7d242c5 100644 --- a/ash/test/test_activation_delegate.h +++ b/ash/test/test_activation_delegate.h @@ -40,12 +40,12 @@ class TestActivationDelegate : public aura::client::ActivationDelegate, } // Overridden from aura::client::ActivationDelegate: - virtual bool ShouldActivate() const OVERRIDE; + virtual bool ShouldActivate() const override; private: // Overridden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; aura::Window* window_; bool window_was_active_; diff --git a/ash/test/test_lock_state_controller_delegate.h b/ash/test/test_lock_state_controller_delegate.h index 1e1892c..39b04aa 100644 --- a/ash/test/test_lock_state_controller_delegate.h +++ b/ash/test/test_lock_state_controller_delegate.h @@ -21,8 +21,8 @@ class TestLockStateControllerDelegate : public LockStateControllerDelegate { int num_shutdown_requests() const { return num_shutdown_requests_; } // LockStateControllerDelegate implementation. - virtual void RequestLockScreen() OVERRIDE; - virtual void RequestShutdown() OVERRIDE; + virtual void RequestLockScreen() override; + virtual void RequestShutdown() override; private: int num_lock_requests_; diff --git a/ash/test/test_metro_viewer_process_host.h b/ash/test/test_metro_viewer_process_host.h index cf7dcd0..95709aec 100644 --- a/ash/test/test_metro_viewer_process_host.h +++ b/ash/test/test_metro_viewer_process_host.h @@ -26,13 +26,13 @@ class TestMetroViewerProcessHost : public win8::MetroViewerProcessHost { private: // win8::MetroViewerProcessHost implementation - virtual void OnChannelError() OVERRIDE; + virtual void OnChannelError() override; virtual void OnSetTargetSurface(gfx::NativeViewId target_surface, - float device_scale) OVERRIDE; - virtual void OnOpenURL(const base::string16& url) OVERRIDE; + float device_scale) override; + virtual void OnOpenURL(const base::string16& url) override; virtual void OnHandleSearchRequest( - const base::string16& search_string) OVERRIDE; - virtual void OnWindowSizeChanged(uint32 width, uint32 height) OVERRIDE; + const base::string16& search_string) override; + virtual void OnWindowSizeChanged(uint32 width, uint32 height) override; bool closed_unexpectedly_; diff --git a/ash/test/test_overlay_delegate.h b/ash/test/test_overlay_delegate.h index d43903f..150374a 100644 --- a/ash/test/test_overlay_delegate.h +++ b/ash/test/test_overlay_delegate.h @@ -19,9 +19,9 @@ class TestOverlayDelegate : public OverlayEventFilter::Delegate { private: // Overridden from OverlayEventFilter::Delegate: - virtual void Cancel() OVERRIDE; - virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual aura::Window* GetWindow() OVERRIDE; + virtual void Cancel() override; + virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) override; + virtual aura::Window* GetWindow() override; int cancel_count_; diff --git a/ash/test/test_screenshot_delegate.h b/ash/test/test_screenshot_delegate.h index 74c5725..ad8ec98 100644 --- a/ash/test/test_screenshot_delegate.h +++ b/ash/test/test_screenshot_delegate.h @@ -19,10 +19,10 @@ class TestScreenshotDelegate : public ScreenshotDelegate { virtual ~TestScreenshotDelegate(); // Overridden from ScreenshotDelegate: - virtual void HandleTakeScreenshotForAllRootWindows() OVERRIDE; + virtual void HandleTakeScreenshotForAllRootWindows() override; virtual void HandleTakePartialScreenshot( - aura::Window* window, const gfx::Rect& rect) OVERRIDE; - virtual bool CanTakeScreenshot() OVERRIDE; + aura::Window* window, const gfx::Rect& rect) override; + virtual bool CanTakeScreenshot() override; int handle_take_screenshot_count() const { return handle_take_screenshot_count_; diff --git a/ash/test/test_session_state_animator.cc b/ash/test/test_session_state_animator.cc index b1d5b47..2cb6a5c 100644 --- a/ash/test/test_session_state_animator.cc +++ b/ash/test/test_session_state_animator.cc @@ -63,7 +63,7 @@ class TestSessionStateAnimator::AnimationSequence // ash::SessionStateAnimator::AnimationSequence: virtual void StartAnimation(int container_mask, AnimationType type, - AnimationSpeed speed) OVERRIDE { + AnimationSpeed speed) override { animator_->StartAnimationInSequence(container_mask, type, speed, this); } diff --git a/ash/test/test_session_state_animator.h b/ash/test/test_session_state_animator.h index d308010..ccb33455 100644 --- a/ash/test/test_session_state_animator.h +++ b/ash/test/test_session_state_animator.h @@ -66,17 +66,17 @@ class TestSessionStateAnimator : public SessionStateAnimator { // ash::SessionStateAnimator: virtual void StartAnimation(int container_mask, AnimationType type, - AnimationSpeed speed) OVERRIDE; + AnimationSpeed speed) override; virtual void StartAnimationWithCallback( int container_mask, AnimationType type, AnimationSpeed speed, - base::Closure callback) OVERRIDE; + base::Closure callback) override; virtual AnimationSequence* BeginAnimationSequence( - base::Closure callback) OVERRIDE; - virtual bool IsBackgroundHidden() const OVERRIDE; - virtual void ShowBackground() OVERRIDE; - virtual void HideBackground() OVERRIDE; + base::Closure callback) override; + virtual bool IsBackgroundHidden() const override; + virtual void ShowBackground() override; + virtual void HideBackground() override; private: class AnimationSequence; diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc index eac5576..c583763 100644 --- a/ash/test/test_session_state_delegate.cc +++ b/ash/test/test_session_state_delegate.cc @@ -38,21 +38,21 @@ class MockUserInfo : public user_manager::UserInfo { user_image_ = user_image; } - virtual base::string16 GetDisplayName() const OVERRIDE { + virtual base::string16 GetDisplayName() const override { return base::UTF8ToUTF16("Über tray Über tray Über tray Über tray"); } - virtual base::string16 GetGivenName() const OVERRIDE { + virtual base::string16 GetGivenName() const override { return base::UTF8ToUTF16("Über Über Über Über"); } - virtual std::string GetEmail() const OVERRIDE { return email_; } + virtual std::string GetEmail() const override { return email_; } - virtual std::string GetUserID() const OVERRIDE { + virtual std::string GetUserID() const override { return GetUserIDFromEmail(GetEmail()); } - virtual const gfx::ImageSkia& GetImage() const OVERRIDE { + virtual const gfx::ImageSkia& GetImage() const override { return user_image_; } diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h index c508299..11d7ce2 100644 --- a/ash/test/test_session_state_delegate.h +++ b/ash/test/test_session_state_delegate.h @@ -28,31 +28,31 @@ class TestSessionStateDelegate : public SessionStateDelegate { // SessionStateDelegate: virtual content::BrowserContext* GetBrowserContextByIndex( - MultiProfileIndex index) OVERRIDE; + MultiProfileIndex index) override; virtual content::BrowserContext* GetBrowserContextForWindow( - aura::Window* window) OVERRIDE; - virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE; - virtual int NumberOfLoggedInUsers() const OVERRIDE; - virtual bool IsActiveUserSessionStarted() const OVERRIDE; - virtual bool CanLockScreen() const OVERRIDE; - virtual bool IsScreenLocked() const OVERRIDE; - virtual bool ShouldLockScreenBeforeSuspending() const OVERRIDE; - virtual void LockScreen() OVERRIDE; - virtual void UnlockScreen() OVERRIDE; - virtual bool IsUserSessionBlocked() const OVERRIDE; - virtual SessionState GetSessionState() const OVERRIDE; + aura::Window* window) override; + virtual int GetMaximumNumberOfLoggedInUsers() const override; + virtual int NumberOfLoggedInUsers() const override; + virtual bool IsActiveUserSessionStarted() const override; + virtual bool CanLockScreen() const override; + virtual bool IsScreenLocked() const override; + virtual bool ShouldLockScreenBeforeSuspending() const override; + virtual void LockScreen() override; + virtual void UnlockScreen() override; + virtual bool IsUserSessionBlocked() const override; + virtual SessionState GetSessionState() const override; virtual const user_manager::UserInfo* GetUserInfo( - ash::MultiProfileIndex index) const OVERRIDE; + ash::MultiProfileIndex index) const override; virtual const user_manager::UserInfo* GetUserInfo( - content::BrowserContext* context) const OVERRIDE; - virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE; - virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE; - virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE; - virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ShouldShowAvatar(aura::Window* window) const override; + virtual void SwitchActiveUser(const std::string& user_id) override; + virtual void CycleActiveUser(CycleUser cycle_user) override; + virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const override; virtual void AddSessionStateObserver( - ash::SessionStateObserver* observer) OVERRIDE; + ash::SessionStateObserver* observer) override; virtual void RemoveSessionStateObserver( - ash::SessionStateObserver* observer) OVERRIDE; + ash::SessionStateObserver* observer) override; // TODO(oshima): Use state machine instead of using boolean variables. diff --git a/ash/test/test_shelf_delegate.h b/ash/test/test_shelf_delegate.h index 78fe5e5..738c227 100644 --- a/ash/test/test_shelf_delegate.h +++ b/ash/test/test_shelf_delegate.h @@ -32,19 +32,19 @@ class TestShelfDelegate : public ShelfDelegate, public aura::WindowObserver { static TestShelfDelegate* instance() { return instance_; } // WindowObserver implementation - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; virtual void OnWindowHierarchyChanging( - const HierarchyChangeParams& params) OVERRIDE; + const HierarchyChangeParams& params) override; // ShelfDelegate implementation. - virtual void OnShelfCreated(Shelf* shelf) OVERRIDE; - virtual void OnShelfDestroyed(Shelf* shelf) OVERRIDE; - virtual ShelfID GetShelfIDForAppID(const std::string& app_id) OVERRIDE; - virtual const std::string& GetAppIDForShelfID(ShelfID id) OVERRIDE; - virtual void PinAppWithID(const std::string& app_id) OVERRIDE; - virtual bool CanPin() const OVERRIDE; - virtual bool IsAppPinned(const std::string& app_id) OVERRIDE; - virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE; + virtual void OnShelfCreated(Shelf* shelf) override; + virtual void OnShelfDestroyed(Shelf* shelf) override; + virtual ShelfID GetShelfIDForAppID(const std::string& app_id) override; + virtual const std::string& GetAppIDForShelfID(ShelfID id) override; + virtual void PinAppWithID(const std::string& app_id) override; + virtual bool CanPin() const override; + virtual bool IsAppPinned(const std::string& app_id) override; + virtual void UnpinAppWithID(const std::string& app_id) override; private: static TestShelfDelegate* instance_; diff --git a/ash/test/test_shelf_item_delegate.h b/ash/test/test_shelf_item_delegate.h index fcff772..71f25d5 100644 --- a/ash/test/test_shelf_item_delegate.h +++ b/ash/test/test_shelf_item_delegate.h @@ -23,13 +23,13 @@ class TestShelfItemDelegate : public ShelfItemDelegate { virtual ~TestShelfItemDelegate(); // ShelfItemDelegate: - virtual bool ItemSelected(const ui::Event& event) OVERRIDE; - virtual base::string16 GetTitle() OVERRIDE; - virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE; - virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE; - virtual bool IsDraggable() OVERRIDE; - virtual bool ShouldShowTooltip() OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool ItemSelected(const ui::Event& event) override; + virtual base::string16 GetTitle() override; + virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override; + virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) override; + virtual bool IsDraggable() override; + virtual bool ShouldShowTooltip() override; + virtual void Close() override; private: aura::Window* window_; diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 1d95188..d8f39d6 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -42,14 +42,14 @@ class NewWindowDelegateImpl : public NewWindowDelegate { private: // NewWindowDelegate: - virtual void NewTab() OVERRIDE {} - virtual void NewWindow(bool incognito) OVERRIDE {} - virtual void OpenFileManager() OVERRIDE {} - virtual void OpenCrosh() OVERRIDE {} - virtual void RestoreTab() OVERRIDE {} - virtual void ShowKeyboardOverlay() OVERRIDE {} - virtual void ShowTaskManager() OVERRIDE {} - virtual void OpenFeedbackPage() OVERRIDE {} + virtual void NewTab() override {} + virtual void NewWindow(bool incognito) override {} + virtual void OpenFileManager() override {} + virtual void OpenCrosh() override {} + virtual void RestoreTab() override {} + virtual void ShowKeyboardOverlay() override {} + virtual void ShowTaskManager() override {} + virtual void OpenFeedbackPage() override {} DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl); }; @@ -63,11 +63,11 @@ class MediaDelegateImpl : public MediaDelegate { private: // MediaDelegate: - virtual void HandleMediaNextTrack() OVERRIDE {} - virtual void HandleMediaPlayPause() OVERRIDE {} - virtual void HandleMediaPrevTrack() OVERRIDE {} + virtual void HandleMediaNextTrack() override {} + virtual void HandleMediaPlayPause() override {} + virtual void HandleMediaPrevTrack() override {} virtual MediaCaptureState GetMediaCaptureState( - content::BrowserContext* context) OVERRIDE { + content::BrowserContext* context) override { return state_; } diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 4cb369d..38c1772 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -32,36 +32,36 @@ class TestShellDelegate : public ShellDelegate { } // Overridden from ShellDelegate: - virtual bool IsFirstRunAfterBoot() const OVERRIDE; - virtual bool IsIncognitoAllowed() const OVERRIDE; - virtual bool IsMultiProfilesEnabled() const OVERRIDE; - virtual bool IsRunningInForcedAppMode() const OVERRIDE; - virtual bool IsMultiAccountEnabled() const OVERRIDE; - virtual void PreInit() OVERRIDE; - virtual void PreShutdown() OVERRIDE; - virtual void Exit() OVERRIDE; + virtual bool IsFirstRunAfterBoot() const override; + virtual bool IsIncognitoAllowed() const override; + virtual bool IsMultiProfilesEnabled() const override; + virtual bool IsRunningInForcedAppMode() const override; + virtual bool IsMultiAccountEnabled() const override; + virtual void PreInit() override; + virtual void PreShutdown() override; + virtual void Exit() override; virtual keyboard::KeyboardControllerProxy* - CreateKeyboardControllerProxy() OVERRIDE; - virtual void VirtualKeyboardActivated(bool activated) OVERRIDE; + CreateKeyboardControllerProxy() override; + virtual void VirtualKeyboardActivated(bool activated) override; virtual void AddVirtualKeyboardStateObserver( - VirtualKeyboardStateObserver* observer) OVERRIDE; + VirtualKeyboardStateObserver* observer) override; virtual void RemoveVirtualKeyboardStateObserver( - VirtualKeyboardStateObserver* observer) OVERRIDE; - virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE; - virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE; - virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE; - virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; - virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; - virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; - virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; - virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; - virtual MediaDelegate* CreateMediaDelegate() OVERRIDE; + VirtualKeyboardStateObserver* observer) override; + virtual content::BrowserContext* GetActiveBrowserContext() override; + virtual app_list::AppListViewDelegate* GetAppListViewDelegate() override; + virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; + virtual SystemTrayDelegate* CreateSystemTrayDelegate() override; + virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() override; + virtual SessionStateDelegate* CreateSessionStateDelegate() override; + virtual AccessibilityDelegate* CreateAccessibilityDelegate() override; + virtual NewWindowDelegate* CreateNewWindowDelegate() override; + virtual MediaDelegate* CreateMediaDelegate() override; virtual ui::MenuModel* CreateContextMenu( aura::Window* root, ash::ShelfItemDelegate* item_delegate, - ash::ShelfItem* item) OVERRIDE; - virtual GPUSupport* CreateGPUSupport() OVERRIDE; - virtual base::string16 GetProductName() const OVERRIDE; + ash::ShelfItem* item) override; + virtual GPUSupport* CreateGPUSupport() override; + virtual base::string16 GetProductName() const override; int num_exit_requests() const { return num_exit_requests_; } diff --git a/ash/test/test_suite.h b/ash/test/test_suite.h index d89ecb3..e2e39b1 100644 --- a/ash/test/test_suite.h +++ b/ash/test/test_suite.h @@ -22,8 +22,8 @@ class AuraShellTestSuite : public base::TestSuite { protected: // base::TestSuite: - virtual void Initialize() OVERRIDE; - virtual void Shutdown() OVERRIDE; + virtual void Initialize() override; + virtual void Shutdown() override; private: #if defined(OS_WIN) diff --git a/ash/test/test_system_tray_delegate.h b/ash/test/test_system_tray_delegate.h index 1a64ac1..5453093 100644 --- a/ash/test/test_system_tray_delegate.h +++ b/ash/test/test_system_tray_delegate.h @@ -42,15 +42,15 @@ class TestSystemTrayDelegate : public DefaultSystemTrayDelegate { void ClearSessionLengthLimit(); // Overridden from SystemTrayDelegate: - virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE; - virtual bool IsUserSupervised() const OVERRIDE; - virtual bool ShouldShowDisplayNotification() OVERRIDE; + virtual user::LoginStatus GetUserLoginStatus() const override; + virtual bool IsUserSupervised() const override; + virtual bool ShouldShowDisplayNotification() override; virtual bool GetSessionStartTime( - base::TimeTicks* session_start_time) OVERRIDE; + base::TimeTicks* session_start_time) override; virtual bool GetSessionLengthLimit( - base::TimeDelta* session_length_limit) OVERRIDE; - virtual void ShutDown() OVERRIDE; - virtual void SignOut() OVERRIDE; + base::TimeDelta* session_length_limit) override; + virtual void ShutDown() override; + virtual void SignOut() override; private: bool should_show_display_notification_; diff --git a/ash/test/test_user_wallpaper_delegate.h b/ash/test/test_user_wallpaper_delegate.h index aa92861..dc813bc 100644 --- a/ash/test/test_user_wallpaper_delegate.h +++ b/ash/test/test_user_wallpaper_delegate.h @@ -22,7 +22,7 @@ class TestUserWallpaperDelegate : public DefaultUserWallpaperDelegate { } // DefaultUserWallpaperDelegate overrides: - virtual void UpdateWallpaper(bool clear_cache) OVERRIDE; + virtual void UpdateWallpaper(bool clear_cache) override; // Returns and clears |update_wallpaper_count_|. int GetUpdateWallpaperCountAndReset(); diff --git a/ash/test/test_volume_control_delegate.h b/ash/test/test_volume_control_delegate.h index 85b3e5d..751e04e 100644 --- a/ash/test/test_volume_control_delegate.h +++ b/ash/test/test_volume_control_delegate.h @@ -35,9 +35,9 @@ class TestVolumeControlDelegate : public ash::VolumeControlDelegate { } // ash::VolumeControlDelegate: - virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) OVERRIDE; - virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE; - virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE; + virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) override; + virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) override; + virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) override; private: // Keeps track of the return value that should be used for the methods diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc index cbdeddb..e80d66c 100644 --- a/ash/test/ui_controls_factory_ash.cc +++ b/ash/test/ui_controls_factory_ash.cc @@ -63,7 +63,7 @@ class UIControlsAsh : public UIControlsAura { bool control, bool shift, bool alt, - bool command) OVERRIDE { + bool command) override { return SendKeyPressNotifyWhenDone( window, key, control, shift, alt, command, base::Closure()); } @@ -75,7 +75,7 @@ class UIControlsAsh : public UIControlsAura { bool shift, bool alt, bool command, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { aura::Window* root = window ? window->GetRootWindow() : ash::Shell::GetTargetRootWindow(); UIControlsAura* ui_controls = GetUIControlsForRootWindow(root); @@ -83,7 +83,7 @@ class UIControlsAsh : public UIControlsAura { window, key, control, shift, alt, command, closure); } - virtual bool SendMouseMove(long x, long y) OVERRIDE { + virtual bool SendMouseMove(long x, long y) override { gfx::Point p(x, y); UIControlsAura* ui_controls = GetUIControlsAt(p); return ui_controls && ui_controls->SendMouseMove(p.x(), p.y()); @@ -92,35 +92,35 @@ class UIControlsAsh : public UIControlsAura { virtual bool SendMouseMoveNotifyWhenDone( long x, long y, - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { gfx::Point p(x, y); UIControlsAura* ui_controls = GetUIControlsAt(p); return ui_controls && ui_controls->SendMouseMoveNotifyWhenDone(p.x(), p.y(), closure); } - virtual bool SendMouseEvents(MouseButton type, int state) OVERRIDE { + virtual bool SendMouseEvents(MouseButton type, int state) override { gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint()); UIControlsAura* ui_controls = GetUIControlsAt(p); return ui_controls && ui_controls->SendMouseEvents(type, state); } virtual bool SendMouseEventsNotifyWhenDone( - MouseButton type, int state, const base::Closure& closure) OVERRIDE { + MouseButton type, int state, const base::Closure& closure) override { gfx::Point p(aura::Env::GetInstance()->last_mouse_location()); UIControlsAura* ui_controls = GetUIControlsAt(p); return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone( type, state, closure); } - virtual bool SendMouseClick(MouseButton type) OVERRIDE { + virtual bool SendMouseClick(MouseButton type) override { gfx::Point p(ash::Shell::GetScreen()->GetCursorScreenPoint()); UIControlsAura* ui_controls = GetUIControlsAt(p); return ui_controls && ui_controls->SendMouseClick(type); } virtual void RunClosureAfterAllPendingUIEvents( - const base::Closure& closure) OVERRIDE { + const base::Closure& closure) override { UIControlsAura* ui_controls = GetUIControlsForRootWindow( ash::Shell::GetTargetRootWindow()); if (ui_controls) diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index 9591c58..54b6271 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -76,7 +76,7 @@ class TooltipControllerTest : public AshTestBase { TooltipControllerTest() {} virtual ~TooltipControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); helper_.reset(new TooltipControllerTestHelper(GetController())); } diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc index 4c1dd17..b714edf 100644 --- a/ash/touch/touch_hud_debug.cc +++ b/ash/touch/touch_hud_debug.cc @@ -308,7 +308,7 @@ class TouchHudCanvas : public views::View { } // Overridden from views::View. - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { for (int i = 0; i < kMaxPaths; ++i) { if (paths_[i].countPoints() == 0) continue; diff --git a/ash/touch/touch_hud_debug.h b/ash/touch/touch_hud_debug.h index 12ba64a..9409243 100644 --- a/ash/touch/touch_hud_debug.h +++ b/ash/touch/touch_hud_debug.h @@ -49,7 +49,7 @@ class ASH_EXPORT TouchHudDebug : public TouchObserverHUD { Mode mode() const { return mode_; } // Overriden from TouchObserverHUD. - virtual void Clear() OVERRIDE; + virtual void Clear() override; private: virtual ~TouchHudDebug(); @@ -59,13 +59,13 @@ class ASH_EXPORT TouchHudDebug : public TouchObserverHUD { void UpdateTouchPointLabel(int index); // Overriden from TouchObserverHUD. - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnTouchEvent(ui::TouchEvent* event) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; virtual void SetHudForRootWindowController( - RootWindowController* controller) OVERRIDE; + RootWindowController* controller) override; virtual void UnsetHudForRootWindowController( - RootWindowController* controller) OVERRIDE; + RootWindowController* controller) override; static const int kMaxTouchPoints = 32; diff --git a/ash/touch/touch_hud_projection.cc b/ash/touch/touch_hud_projection.cc index 8b5a260..990345e 100644 --- a/ash/touch/touch_hud_projection.cc +++ b/ash/touch/touch_hud_projection.cc @@ -78,7 +78,7 @@ class TouchPointView : public views::View, } // Overridden from views::View. - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { int alpha = kProjectionAlpha; if (fadeout_) alpha = static_cast<int>(fadeout_->CurrentValueBetween(alpha, 0)); @@ -100,22 +100,22 @@ class TouchPointView : public views::View, } // Overridden from gfx::AnimationDelegate. - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationEnded(const gfx::Animation* animation) override { DCHECK_EQ(fadeout_.get(), animation); delete this; } - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationProgressed(const gfx::Animation* animation) override { DCHECK_EQ(fadeout_.get(), animation); SchedulePaint(); } - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE { + virtual void AnimationCanceled(const gfx::Animation* animation) override { AnimationEnded(animation); } // Overridden from views::WidgetObserver. - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(views::Widget* widget) override { if (fadeout_) fadeout_->Stop(); else diff --git a/ash/touch/touch_hud_projection.h b/ash/touch/touch_hud_projection.h index 8e30749..cde756d 100644 --- a/ash/touch/touch_hud_projection.h +++ b/ash/touch/touch_hud_projection.h @@ -19,7 +19,7 @@ class TouchHudProjection : public TouchObserverHUD { explicit TouchHudProjection(aura::Window* initial_root); // Overriden from TouchObserverHUD. - virtual void Clear() OVERRIDE; + virtual void Clear() override; private: friend class TouchHudProjectionTest; @@ -27,11 +27,11 @@ class TouchHudProjection : public TouchObserverHUD { virtual ~TouchHudProjection(); // Overriden from TouchObserverHUD. - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnTouchEvent(ui::TouchEvent* event) override; virtual void SetHudForRootWindowController( - RootWindowController* controller) OVERRIDE; + RootWindowController* controller) override; virtual void UnsetHudForRootWindowController( - RootWindowController* controller) OVERRIDE; + RootWindowController* controller) override; std::map<int, TouchPointView*> points_; diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h index 816fb98..329d7dc 100644 --- a/ash/touch/touch_observer_hud.h +++ b/ash/touch/touch_observer_hud.h @@ -53,27 +53,27 @@ class ASH_EXPORT TouchObserverHUD : public ui::EventHandler, views::Widget* widget() { return widget_; } // Overriden from ui::EventHandler. - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnTouchEvent(ui::TouchEvent* event) override; // Overridden from views::WidgetObserver. - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; // Overridden from gfx::DisplayObserver. - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& new_display) override; + virtual void OnDisplayRemoved(const gfx::Display& old_display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; #if defined(OS_CHROMEOS) // Overriden from ui::DisplayConfigurator::Observer. virtual void OnDisplayModeChanged( - const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE; + const ui::DisplayConfigurator::DisplayStateList& outputs) override; #endif // defined(OS_CHROMEOS) // Overriden form DisplayController::Observer. - virtual void OnDisplaysInitialized() OVERRIDE; - virtual void OnDisplayConfigurationChanging() OVERRIDE; - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplaysInitialized() override; + virtual void OnDisplayConfigurationChanging() override; + virtual void OnDisplayConfigurationChanged() override; private: friend class TouchHudTestBase; diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc index d5c7e2a..77bfa3c 100644 --- a/ash/touch/touch_observer_hud_unittest.cc +++ b/ash/touch/touch_observer_hud_unittest.cc @@ -26,7 +26,7 @@ class TouchHudTestBase : public test::AshTestBase { TouchHudTestBase() {} virtual ~TouchHudTestBase() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); // Initialize display infos. They should be initialized after Ash @@ -214,7 +214,7 @@ class TouchHudDebugTest : public TouchHudTestBase { TouchHudDebugTest() {} virtual ~TouchHudDebugTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Add ash-touch-hud flag to enable debug touch HUD. This flag should be set // before Ash environment is set up, i.e., before TouchHudTestBase::SetUp(). CommandLine::ForCurrentProcess()->AppendSwitch( diff --git a/ash/touch/touch_transformer_controller.h b/ash/touch/touch_transformer_controller.h index 8512186..c99cffe 100644 --- a/ash/touch/touch_transformer_controller.h +++ b/ash/touch/touch_transformer_controller.h @@ -24,8 +24,8 @@ class ASH_EXPORT TouchTransformerController void UpdateTouchTransformer() const; // DisplayController::Observer: - virtual void OnDisplaysInitialized() OVERRIDE; - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplaysInitialized() override; + virtual void OnDisplayConfigurationChanged() override; private: FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, diff --git a/ash/touch/touchscreen_util_unittest.cc b/ash/touch/touchscreen_util_unittest.cc index ac9f4a0..fd88fc1 100644 --- a/ash/touch/touchscreen_util_unittest.cc +++ b/ash/touch/touchscreen_util_unittest.cc @@ -15,7 +15,7 @@ class TouchscreenUtilTest : public testing::Test { TouchscreenUtilTest() {} virtual ~TouchscreenUtilTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Internal display will always match to internal touchscreen. If internal // touchscreen can't be detected, it is then associated to a touch screen // with matching size. @@ -54,7 +54,7 @@ class TouchscreenUtilTest : public testing::Test { } } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { displays_.clear(); } diff --git a/ash/virtual_keyboard_controller.h b/ash/virtual_keyboard_controller.h index 47ef475..ebbc0fd 100644 --- a/ash/virtual_keyboard_controller.h +++ b/ash/virtual_keyboard_controller.h @@ -17,8 +17,8 @@ class ASH_EXPORT VirtualKeyboardController : public ShellObserver { virtual ~VirtualKeyboardController(); // ShellObserver: - virtual void OnMaximizeModeStarted() OVERRIDE; - virtual void OnMaximizeModeEnded() OVERRIDE; + virtual void OnMaximizeModeStarted() override; + virtual void OnMaximizeModeEnded() override; private: DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardController); diff --git a/ash/wm/always_on_top_controller.h b/ash/wm/always_on_top_controller.h index fda496a..c813ea2 100644 --- a/ash/wm/always_on_top_controller.h +++ b/ash/wm/always_on_top_controller.h @@ -32,12 +32,12 @@ class AlwaysOnTopController : public aura::WindowObserver { private: // Overridden from aura::WindowObserver: - virtual void OnWindowAdded(aura::Window* child) OVERRIDE; - virtual void OnWillRemoveWindow(aura::Window* child) OVERRIDE; + virtual void OnWindowAdded(aura::Window* child) override; + virtual void OnWillRemoveWindow(aura::Window* child) override; virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + intptr_t old) override; + virtual void OnWindowDestroyed(aura::Window* window) override; aura::Window* always_on_top_container_; diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h index 65c4896..d772dd5 100644 --- a/ash/wm/app_list_controller.h +++ b/ash/wm/app_list_controller.h @@ -92,38 +92,38 @@ class AppListController : public ui::EventHandler, void UpdateBounds(); // ui::EventHandler overrides: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // aura::client::FocusChangeObserver overrides: virtual void OnWindowFocused(aura::Window* gained_focus, - aura::Window* lost_focus) OVERRIDE; + aura::Window* lost_focus) override; // aura::WindowObserver overrides: virtual void OnWindowBoundsChanged(aura::Window* root, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; // ui::ImplicitAnimationObserver overrides: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; // views::WidgetObserver overrides: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; // KeyboardControllerObserver overrides: - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE; + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; // ShellObserver overrides: - virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE; + virtual void OnShelfAlignmentChanged(aura::Window* root_window) override; // ShelfIconObserver overrides: - virtual void OnShelfIconPositionsChanged() OVERRIDE; + virtual void OnShelfIconPositionsChanged() override; // app_list::PaginationModelObserver overrides: - virtual void TotalPagesChanged() OVERRIDE; - virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE; - virtual void TransitionStarted() OVERRIDE; - virtual void TransitionChanged() OVERRIDE; + virtual void TotalPagesChanged() override; + virtual void SelectedPageChanged(int old_selected, int new_selected) override; + virtual void TransitionStarted() override; + virtual void TransitionChanged() override; // Whether we should show or hide app list widget. bool is_visible_; diff --git a/ash/wm/app_list_controller_unittest.cc b/ash/wm/app_list_controller_unittest.cc index 7691567..a1ae844 100644 --- a/ash/wm/app_list_controller_unittest.cc +++ b/ash/wm/app_list_controller_unittest.cc @@ -30,7 +30,7 @@ class AppListControllerTest : public test::AshTestBase, public: AppListControllerTest(); virtual ~AppListControllerTest(); - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; bool IsCentered() const; }; diff --git a/ash/wm/ash_focus_rules.h b/ash/wm/ash_focus_rules.h index b5774a2..e4198fa 100644 --- a/ash/wm/ash_focus_rules.h +++ b/ash/wm/ash_focus_rules.h @@ -20,12 +20,12 @@ class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules { private: // Overridden from ::wm::BaseFocusRules: - virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE; + virtual bool SupportsChildActivation(aura::Window* window) const override; virtual bool IsWindowConsideredVisibleForActivation( - aura::Window* window) const OVERRIDE; - virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; + aura::Window* window) const override; + virtual bool CanActivateWindow(aura::Window* window) const override; virtual aura::Window* GetNextActivatableWindow( - aura::Window* ignore) const OVERRIDE; + aura::Window* ignore) const override; aura::Window* GetTopmostWindowToActivateForContainerIndex( int index, diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/ash_native_cursor_manager.h index 290b701..0ab9964 100644 --- a/ash/wm/ash_native_cursor_manager.h +++ b/ash/wm/ash_native_cursor_manager.h @@ -47,19 +47,19 @@ class ASH_EXPORT AshNativeCursorManager // Overridden from ::wm::NativeCursorManager: virtual void SetDisplay( const gfx::Display& display, - ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + ::wm::NativeCursorManagerDelegate* delegate) override; virtual void SetCursor( gfx::NativeCursor cursor, - ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + ::wm::NativeCursorManagerDelegate* delegate) override; virtual void SetVisibility( bool visible, - ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + ::wm::NativeCursorManagerDelegate* delegate) override; virtual void SetCursorSet( ui::CursorSetType cursor_set, - ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + ::wm::NativeCursorManagerDelegate* delegate) override; virtual void SetMouseEventsEnabled( bool enabled, - ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE; + ::wm::NativeCursorManagerDelegate* delegate) override; // The cursor location where the cursor was disabled. gfx::Point disabled_cursor_location_; diff --git a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc index eb0e20a..1c71079 100644 --- a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc +++ b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc @@ -30,7 +30,7 @@ class AshNativeCursorManagerTest : public test::AshTestBase { AshNativeCursorManagerTest() {} virtual ~AshNativeCursorManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { gfx::GLSurface::InitializeOneOffForTests(); ui::RegisterPathProvider(); diff --git a/ash/wm/ash_native_cursor_manager_unittest.cc b/ash/wm/ash_native_cursor_manager_unittest.cc index 0e68e09..c7ec657 100644 --- a/ash/wm/ash_native_cursor_manager_unittest.cc +++ b/ash/wm/ash_native_cursor_manager_unittest.cc @@ -44,7 +44,7 @@ class MouseEventLocationDelegate : public aura::test::TestWindowDelegate { return p; } - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { mouse_event_location_ = event->location(); event->SetHandled(); } diff --git a/ash/wm/boot_splash_screen_chromeos.cc b/ash/wm/boot_splash_screen_chromeos.cc index f13ce5e..c140acd 100644 --- a/ash/wm/boot_splash_screen_chromeos.cc +++ b/ash/wm/boot_splash_screen_chromeos.cc @@ -26,7 +26,7 @@ class BootSplashScreen::CopyHostContentLayerDelegate virtual ~CopyHostContentLayerDelegate() {} // ui::LayerDelegate overrides: - virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaintLayer(gfx::Canvas* canvas) override { // It'd be safer to copy the area to a canvas in the constructor and then // copy from that canvas to this one here, but this appears to work (i.e. we // only call this before we draw our first frame) and it saves us an extra @@ -44,11 +44,11 @@ class BootSplashScreen::CopyHostContentLayerDelegate } 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(); } diff --git a/ash/wm/cursor_manager_chromeos.h b/ash/wm/cursor_manager_chromeos.h index 70cfa1e..ea81e54 100644 --- a/ash/wm/cursor_manager_chromeos.h +++ b/ash/wm/cursor_manager_chromeos.h @@ -33,7 +33,7 @@ class ASH_EXPORT CursorManager : public ::wm::CursorManager { // aura::client::CursorClient: virtual bool ShouldHideCursorOnKeyEvent( - const ui::KeyEvent& event) const OVERRIDE; + const ui::KeyEvent& event) const override; private: DISALLOW_COPY_AND_ASSIGN(CursorManager); }; diff --git a/ash/wm/default_state.h b/ash/wm/default_state.h index ccee0f88..a09f0a5 100644 --- a/ash/wm/default_state.h +++ b/ash/wm/default_state.h @@ -20,11 +20,11 @@ class DefaultState : public WindowState::State { // WindowState::State overrides: virtual void OnWMEvent(WindowState* window_state, - const WMEvent* event) OVERRIDE; - virtual WindowStateType GetType() const OVERRIDE; + const WMEvent* event) override; + virtual WindowStateType GetType() const override; virtual void AttachState(WindowState* window_state, - WindowState::State* previous_state) OVERRIDE; - virtual void DetachState(WindowState* window_state) OVERRIDE; + WindowState::State* previous_state) override; + virtual void DetachState(WindowState* window_state) override; private: // Process state dependent events, such as TOGGLE_MAXIMIZED, diff --git a/ash/wm/default_window_resizer.h b/ash/wm/default_window_resizer.h index 40d2355..49c7017 100644 --- a/ash/wm/default_window_resizer.h +++ b/ash/wm/default_window_resizer.h @@ -29,9 +29,9 @@ class ASH_EXPORT DefaultWindowResizer : public WindowResizer { } // WindowResizer: - virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE; - virtual void CompleteDrag() OVERRIDE; - virtual void RevertDrag() OVERRIDE; + virtual void Drag(const gfx::Point& location, int event_flags) override; + virtual void CompleteDrag() override; + virtual void RevertDrag() override; private: explicit DefaultWindowResizer(wm::WindowState* window_state); diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index 14ccaa3..552ba75 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -87,12 +87,12 @@ class DockedBackgroundWidget : public views::Widget, } // views::Widget: - virtual void OnNativeWidgetVisibilityChanged(bool visible) OVERRIDE { + virtual void OnNativeWidgetVisibilityChanged(bool visible) override { views::Widget::OnNativeWidgetVisibilityChanged(visible); UpdateBackground(); } - virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) override { const gfx::ImageSkia& shelf_background( alignment_ == DOCKED_ALIGNMENT_LEFT ? shelf_background_left_ : shelf_background_right_); @@ -127,7 +127,7 @@ class DockedBackgroundWidget : public views::Widget, } // BackgroundAnimatorDelegate: - virtual void UpdateBackground(int alpha) OVERRIDE { + virtual void UpdateBackground(int alpha) override { alpha_ = alpha; SchedulePaintInRect(gfx::Rect(GetWindowBoundsInScreen().size())); } @@ -382,7 +382,7 @@ class DockedWindowLayoutManager::ShelfWindowObserver : public WindowObserver { // aura::WindowObserver: virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { shelf_bounds_in_screen_ = ScreenUtil::ConvertRectToScreen( window->parent(), new_bounds); docked_layout_manager_->OnShelfBoundsChanged(); diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h index 51b302e..c1603ec 100644 --- a/ash/wm/dock/docked_window_layout_manager.h +++ b/ash/wm/dock/docked_window_layout_manager.h @@ -135,42 +135,42 @@ class ASH_EXPORT DockedWindowLayoutManager void OnShelfBoundsChanged(); // SnapLayoutManager: - virtual void OnWindowResized() OVERRIDE; - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {} - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE; + virtual void OnWindowResized() override; + virtual void OnWindowAddedToLayout(aura::Window* child) override; + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {} + virtual void OnWindowRemovedFromLayout(aura::Window* child) override; virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visibile) OVERRIDE; + bool visibile) override; virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; // ash::ShellObserver: - virtual void OnDisplayWorkAreaInsetsChanged() OVERRIDE; + virtual void OnDisplayWorkAreaInsetsChanged() override; virtual void OnFullscreenStateChanged(bool is_fullscreen, - aura::Window* root_window) OVERRIDE; - virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE; + aura::Window* root_window) override; + virtual void OnShelfAlignmentChanged(aura::Window* root_window) override; // ShelfLayoutManagerObserver: virtual void OnBackgroundUpdated( ShelfBackgroundType background_type, - BackgroundAnimatorChangeType change_type) OVERRIDE; + BackgroundAnimatorChangeType change_type) override; // wm::WindowStateObserver: virtual void OnPreWindowStateTypeChange( wm::WindowState* window_state, - wm::WindowStateType old_type) OVERRIDE; + wm::WindowStateType old_type) override; // aura::WindowObserver: virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; virtual void OnWindowVisibilityChanging(aura::Window* window, - bool visible) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + bool visible) override; + virtual void OnWindowDestroying(aura::Window* window) override; // aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; private: class ShelfWindowObserver; @@ -247,7 +247,7 @@ class ASH_EXPORT DockedWindowLayoutManager // keyboard::KeyboardControllerObserver: virtual void OnKeyboardBoundsChanging( - const gfx::Rect& keyboard_bounds) OVERRIDE; + const gfx::Rect& keyboard_bounds) override; // Parent window associated with this layout manager. aura::Window* dock_container_; diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc index a8054a3..d986739 100644 --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc @@ -44,7 +44,7 @@ class DockedWindowLayoutManagerTest DockedWindowLayoutManagerTest() : window_type_(GetParam()) {} virtual ~DockedWindowLayoutManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); UpdateDisplay("600x600"); ASSERT_TRUE(test::TestShelfDelegate::instance()); diff --git a/ash/wm/dock/docked_window_resizer.h b/ash/wm/dock/docked_window_resizer.h index da62e2a..3f45d89 100644 --- a/ash/wm/dock/docked_window_resizer.h +++ b/ash/wm/dock/docked_window_resizer.h @@ -36,9 +36,9 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer { wm::WindowState* window_state); // WindowResizer: - virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE; - virtual void CompleteDrag() OVERRIDE; - virtual void RevertDrag() OVERRIDE; + virtual void Drag(const gfx::Point& location, int event_flags) override; + virtual void CompleteDrag() override; + virtual void RevertDrag() override; private: // Creates DockWindowResizer that adds the ability to attach / detach diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index acb54ff..62876047 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc @@ -45,14 +45,14 @@ class DockedWindowResizerTest DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {} virtual ~DockedWindowResizerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); UpdateDisplay("600x400"); test::ShellTestApi test_api(Shell::GetInstance()); model_ = test_api.shelf_model(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { AshTestBase::TearDown(); } diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h index a837b81..a4f4b30 100644 --- a/ash/wm/drag_window_resizer.h +++ b/ash/wm/drag_window_resizer.h @@ -28,9 +28,9 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer { wm::WindowState* window_state); // WindowResizer: - virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE; - virtual void CompleteDrag() OVERRIDE; - virtual void RevertDrag() OVERRIDE; + virtual void Drag(const gfx::Point& location, int event_flags) override; + virtual void CompleteDrag() override; + virtual void RevertDrag() override; private: FRIEND_TEST_ALL_PREFIXES(DragWindowResizerTest, DragWindowController); diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc index 09e1c7a..1d1288a 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc @@ -38,7 +38,7 @@ class DragWindowResizerTest : public test::AshTestBase { DragWindowResizerTest() {} virtual ~DragWindowResizerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); UpdateDisplay(base::StringPrintf("800x%d", kRootHeight)); @@ -87,7 +87,7 @@ class DragWindowResizerTest : public test::AshTestBase { ParentWindowInPrimaryRootWindow(panel_window_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { window_.reset(); always_on_top_window_.reset(); system_modal_window_.reset(); diff --git a/ash/wm/event_client_impl.h b/ash/wm/event_client_impl.h index da243f9..5f65272 100644 --- a/ash/wm/event_client_impl.h +++ b/ash/wm/event_client_impl.h @@ -20,8 +20,8 @@ class EventClientImpl : public aura::client::EventClient { private: // Overridden from aura::client::EventClient: virtual bool CanProcessEventsWithinSubtree( - const aura::Window* window) const OVERRIDE; - virtual ui::EventTarget* GetToplevelEventTarget() OVERRIDE; + const aura::Window* window) const override; + virtual ui::EventTarget* GetToplevelEventTarget() override; DISALLOW_COPY_AND_ASSIGN(EventClientImpl); }; diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc index 3fced37..0d6a815 100644 --- a/ash/wm/gestures/long_press_affordance_handler.cc +++ b/ash/wm/gestures/long_press_affordance_handler.cc @@ -187,12 +187,12 @@ class LongPressAffordanceHandler::LongPressAffordanceView private: // Overridden from views::View. - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(2 * (kAffordanceOuterRadius + kAffordanceGlowWidth), 2 * (kAffordanceOuterRadius + kAffordanceGlowWidth)); } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { gfx::Point center(GetPreferredSize().width() / 2, GetPreferredSize().height() / 2); canvas->Save(); diff --git a/ash/wm/gestures/long_press_affordance_handler.h b/ash/wm/gestures/long_press_affordance_handler.h index 3826588..01a9c09 100644 --- a/ash/wm/gestures/long_press_affordance_handler.h +++ b/ash/wm/gestures/long_press_affordance_handler.h @@ -52,11 +52,11 @@ class LongPressAffordanceHandler : public gfx::LinearAnimation, void SetTapDownTarget(aura::Window* target); // Overridden from gfx::LinearAnimation. - virtual void AnimateToState(double state) OVERRIDE; - virtual void AnimationStopped() OVERRIDE; + virtual void AnimateToState(double state) override; + virtual void AnimationStopped() override; // Overridden from aura::WindowObserver. - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; scoped_ptr<LongPressAffordanceView> view_; gfx::Point tap_down_location_; diff --git a/ash/wm/gestures/tray_gesture_handler.h b/ash/wm/gestures/tray_gesture_handler.h index 424fc57..68ecf95 100644 --- a/ash/wm/gestures/tray_gesture_handler.h +++ b/ash/wm/gestures/tray_gesture_handler.h @@ -30,7 +30,7 @@ class TrayGestureHandler : public views::WidgetObserver { void CompleteGestureDrag(const ui::GestureEvent& event); private: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; // The widget for the tray-bubble. views::Widget* widget_; diff --git a/ash/wm/immersive_fullscreen_controller.cc b/ash/wm/immersive_fullscreen_controller.cc index 52268de..172d572 100644 --- a/ash/wm/immersive_fullscreen_controller.cc +++ b/ash/wm/immersive_fullscreen_controller.cc @@ -144,8 +144,8 @@ class ImmersiveFullscreenController::BubbleManager // aura::WindowObserver overrides: virtual void OnWindowVisibilityChanged(aura::Window* window, - bool visible) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + bool visible) override; + virtual void OnWindowDestroying(aura::Window* window) override; ImmersiveFullscreenController* controller_; diff --git a/ash/wm/immersive_fullscreen_controller.h b/ash/wm/immersive_fullscreen_controller.h index 4f0b20b..47f2610f 100644 --- a/ash/wm/immersive_fullscreen_controller.h +++ b/ash/wm/immersive_fullscreen_controller.h @@ -126,34 +126,34 @@ class ASH_EXPORT ImmersiveFullscreenController void SetupForTest(); // ui::EventHandler overrides: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // views::FocusChangeObserver overrides: virtual void OnWillChangeFocus(views::View* focused_before, - views::View* focused_now) OVERRIDE; + views::View* focused_now) override; virtual void OnDidChangeFocus(views::View* focused_before, - views::View* focused_now) OVERRIDE; + views::View* focused_now) override; // views::WidgetObserver overrides: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; + virtual void OnWidgetDestroying(views::Widget* widget) override; virtual void OnWidgetActivationChanged(views::Widget* widget, - bool active) OVERRIDE; + bool active) override; // gfx::AnimationDelegate overrides: - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; + virtual void AnimationEnded(const gfx::Animation* animation) override; + virtual void AnimationProgressed(const gfx::Animation* animation) override; // ::wm::TransientWindowObserver overrides: virtual void OnTransientChildAdded(aura::Window* window, - aura::Window* transient) OVERRIDE; + aura::Window* transient) override; virtual void OnTransientChildRemoved(aura::Window* window, - aura::Window* transient) OVERRIDE; + aura::Window* transient) override; // ash::ImmersiveRevealedLock::Delegate overrides: - virtual void LockRevealedState(AnimateReveal animate_reveal) OVERRIDE; - virtual void UnlockRevealedState() OVERRIDE; + virtual void LockRevealedState(AnimateReveal animate_reveal) override; + virtual void UnlockRevealedState() override; private: friend class ImmersiveFullscreenControllerTest; diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc index 5257b4a..6295e94 100644 --- a/ash/wm/immersive_fullscreen_controller_unittest.cc +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc @@ -42,21 +42,21 @@ class MockImmersiveFullscreenControllerDelegate virtual ~MockImmersiveFullscreenControllerDelegate() {} // ImmersiveFullscreenController::Delegate overrides: - virtual void OnImmersiveRevealStarted() OVERRIDE { + virtual void OnImmersiveRevealStarted() override { enabled_ = true; visible_fraction_ = 0; } - virtual void OnImmersiveRevealEnded() OVERRIDE { + virtual void OnImmersiveRevealEnded() override { visible_fraction_ = 0; } - virtual void OnImmersiveFullscreenExited() OVERRIDE { + virtual void OnImmersiveFullscreenExited() override { enabled_ = false; visible_fraction_ = 1; } - virtual void SetVisibleFraction(double visible_fraction) OVERRIDE { + virtual void SetVisibleFraction(double visible_fraction) override { visible_fraction_ = visible_fraction; } - virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const OVERRIDE { + virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override { std::vector<gfx::Rect> bounds_in_screen; bounds_in_screen.push_back(top_container_view_->GetBoundsInScreen()); return bounds_in_screen; @@ -84,7 +84,7 @@ class ConsumeEventHandler : public ui::test::TestEventHandler { virtual ~ConsumeEventHandler() {} private: - virtual void OnEvent(ui::Event* event) OVERRIDE { + virtual void OnEvent(ui::Event* event) override { ui::test::TestEventHandler::OnEvent(event); if (event->cancelable()) event->SetHandled(); @@ -142,7 +142,7 @@ class ImmersiveFullscreenControllerTest : public ash::test::AshTestBase { } // ash::test::AshTestBase overrides: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ash::test::AshTestBase::SetUp(); widget_ = new views::Widget(); diff --git a/ash/wm/lock_layout_manager.h b/ash/wm/lock_layout_manager.h index bdc8c01..88e72fa 100644 --- a/ash/wm/lock_layout_manager.h +++ b/ash/wm/lock_layout_manager.h @@ -54,32 +54,32 @@ class ASH_EXPORT LockLayoutManager virtual ~LockLayoutManager(); // Overridden from aura::LayoutManager: - virtual void OnWindowResized() OVERRIDE; - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE; + virtual void OnWindowResized() override; + virtual void OnWindowAddedToLayout(aura::Window* child) override; + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override; + virtual void OnWindowRemovedFromLayout(aura::Window* child) override; virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visibile) OVERRIDE; + bool visibile) override; virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; // Overriden from aura::WindowObserver: virtual void OnWindowHierarchyChanged( - const WindowObserver::HierarchyChangeParams& params) OVERRIDE; + const WindowObserver::HierarchyChangeParams& params) override; virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; - virtual void OnWindowStackingChanged(aura::Window* window) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + intptr_t old) override; + virtual void OnWindowStackingChanged(aura::Window* window) override; + virtual void OnWindowDestroying(aura::Window* window) override; virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; // VirtualKeyboardStateObserver overrides: - virtual void OnVirtualKeyboardStateChanged(bool activated) OVERRIDE; + virtual void OnVirtualKeyboardStateChanged(bool activated) override; // keyboard::KeyboardControllerObserver overrides: - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE; + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; private: // Adjusts the bounds of all managed windows when the display area changes. diff --git a/ash/wm/lock_layout_manager_unittest.cc b/ash/wm/lock_layout_manager_unittest.cc index b680ba2..e1ed134 100644 --- a/ash/wm/lock_layout_manager_unittest.cc +++ b/ash/wm/lock_layout_manager_unittest.cc @@ -36,19 +36,19 @@ class LoginTestWidgetDelegate : public views::WidgetDelegate { virtual ~LoginTestWidgetDelegate() {} // Overridden from WidgetDelegate: - virtual void DeleteDelegate() OVERRIDE { + virtual void DeleteDelegate() override { delete this; } - virtual views::Widget* GetWidget() OVERRIDE { + virtual views::Widget* GetWidget() override { return widget_; } - virtual const views::Widget* GetWidget() const OVERRIDE { + virtual const views::Widget* GetWidget() const override { return widget_; } - virtual bool CanActivate() const OVERRIDE { + virtual bool CanActivate() const override { return true; } - virtual bool ShouldAdvanceFocusToTopLevelWidget() const OVERRIDE { + virtual bool ShouldAdvanceFocusToTopLevelWidget() const override { return true; } @@ -62,7 +62,7 @@ class LoginTestWidgetDelegate : public views::WidgetDelegate { class LockLayoutManagerTest : public AshTestBase { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Allow a virtual keyboard (and initialize it per default). CommandLine::ForCurrentProcess()->AppendSwitch( keyboard::switches::kEnableVirtualKeyboard); @@ -71,7 +71,7 @@ class LockLayoutManagerTest : public AshTestBase { keyboard::KeyboardController::GetInstance()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { Shell::GetPrimaryRootWindowController()->DeactivateKeyboard( keyboard::KeyboardController::GetInstance()); AshTestBase::TearDown(); diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h index ca16688..5db14eb 100644 --- a/ash/wm/lock_state_controller.h +++ b/ash/wm/lock_state_controller.h @@ -200,12 +200,12 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver, void SetLockScreenDisplayedCallback(const base::Closure& callback); // aura::WindowTreeHostObserver override: - virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) OVERRIDE; + virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) override; // ShellObserver overrides: - virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE; - virtual void OnAppTerminating() OVERRIDE; - virtual void OnLockStateChanged(bool locked) OVERRIDE; + virtual void OnLoginStateChanged(user::LoginStatus status) override; + virtual void OnAppTerminating() override; + virtual void OnLockStateChanged(bool locked) override; void set_animator_for_test(SessionStateAnimator* animator) { animator_.reset(animator); diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc index cca575f..f7b2f89 100644 --- a/ash/wm/lock_state_controller_unittest.cc +++ b/ash/wm/lock_state_controller_unittest.cc @@ -50,7 +50,7 @@ class LockStateControllerTest : public AshTestBase { } virtual ~LockStateControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); scoped_ptr<LockStateControllerDelegate> lock_state_controller_delegate( diff --git a/ash/wm/lock_window_state.h b/ash/wm/lock_window_state.h index 921ecf9..c17faf7 100644 --- a/ash/wm/lock_window_state.h +++ b/ash/wm/lock_window_state.h @@ -22,11 +22,11 @@ class LockWindowState : public wm::WindowState::State { // WindowState::State overrides: virtual void OnWMEvent(wm::WindowState* window_state, - const wm::WMEvent* event) OVERRIDE; - virtual wm::WindowStateType GetType() const OVERRIDE; + const wm::WMEvent* event) override; + virtual wm::WindowStateType GetType() const override; virtual void AttachState(wm::WindowState* window_state, - wm::WindowState::State* previous_state) OVERRIDE; - virtual void DetachState(wm::WindowState* window_state) OVERRIDE; + wm::WindowState::State* previous_state) override; + virtual void DetachState(wm::WindowState* window_state) override; // Creates new LockWindowState instance and attaches it to |window|. static wm::WindowState* SetLockWindowState(aura::Window* window); diff --git a/ash/wm/maximize_mode/maximize_mode_controller.h b/ash/wm/maximize_mode/maximize_mode_controller.h index d8fe9ca..f96cfd2 100644 --- a/ash/wm/maximize_mode/maximize_mode_controller.h +++ b/ash/wm/maximize_mode/maximize_mode_controller.h @@ -110,22 +110,22 @@ class ASH_EXPORT MaximizeModeController // AccelerometerObserver: virtual void OnAccelerometerUpdated( - const ui::AccelerometerUpdate& update) OVERRIDE; + const ui::AccelerometerUpdate& update) override; // ShellObserver: - virtual void OnAppTerminating() OVERRIDE; - virtual void OnMaximizeModeStarted() OVERRIDE; - virtual void OnMaximizeModeEnded() OVERRIDE; + virtual void OnAppTerminating() override; + virtual void OnMaximizeModeStarted() override; + virtual void OnMaximizeModeEnded() override; // DisplayController::Observer: - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplayConfigurationChanged() override; #if defined(OS_CHROMEOS) // PowerManagerClient::Observer: virtual void LidEventReceived(bool open, - const base::TimeTicks& time) OVERRIDE; - virtual void SuspendImminent() OVERRIDE; - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + const base::TimeTicks& time) override; + virtual void SuspendImminent() override; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; #endif // OS_CHROMEOS private: diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc index 72e17af..faa8f59 100644 --- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc +++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc @@ -53,7 +53,7 @@ class MaximizeModeControllerTest : public test::AshTestBase { MaximizeModeControllerTest() {} virtual ~MaximizeModeControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); Shell::GetInstance()->accelerometer_controller()->RemoveObserver( maximize_mode_controller()); @@ -64,7 +64,7 @@ class MaximizeModeControllerTest : public test::AshTestBase { SetFirstDisplayAsInternalDisplay(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { Shell::GetInstance()->accelerometer_controller()->AddObserver( maximize_mode_controller()); test::AshTestBase::TearDown(); diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.h b/ash/wm/maximize_mode/maximize_mode_window_manager.h index 423537f..dd8c91f 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.h +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.h @@ -52,24 +52,24 @@ class ASH_EXPORT MaximizeModeWindowManager : public aura::WindowObserver, void WindowStateDestroyed(aura::Window* window); // ShellObserver overrides: - virtual void OnOverviewModeStarting() OVERRIDE; - virtual void OnOverviewModeEnding() OVERRIDE; + virtual void OnOverviewModeStarting() override; + virtual void OnOverviewModeEnding() override; // Overridden from WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; - virtual void OnWindowAdded(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; + virtual void OnWindowAdded(aura::Window* window) override; virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; // gfx::DisplayObserver overrides: - virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& display) override; + virtual void OnDisplayRemoved(const gfx::Display& display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; // ui::EventHandler override: - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnTouchEvent(ui::TouchEvent* event) override; protected: friend class MaximizeModeController; diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.h b/ash/wm/maximize_mode/maximize_mode_window_state.h index f82593c..19344b1 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_state.h +++ b/ash/wm/maximize_mode/maximize_mode_window_state.h @@ -37,12 +37,12 @@ class MaximizeModeWindowState : public wm::WindowState::State { // WindowState::State overrides: virtual void OnWMEvent(wm::WindowState* window_state, - const wm::WMEvent* event) OVERRIDE; + const wm::WMEvent* event) override; - virtual wm::WindowStateType GetType() const OVERRIDE; + virtual wm::WindowStateType GetType() const override; virtual void AttachState(wm::WindowState* window_state, - wm::WindowState::State* previous_state) OVERRIDE; - virtual void DetachState(wm::WindowState* window_state) OVERRIDE; + wm::WindowState::State* previous_state) override; + virtual void DetachState(wm::WindowState* window_state) override; private: // Updates the window to |new_state_type| and resulting bounds: diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h index 6f0d34f..acde87f 100644 --- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h +++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h @@ -25,8 +25,8 @@ class ScopedDisableInternalMouseAndKeyboardX11 virtual ~ScopedDisableInternalMouseAndKeyboardX11(); // ui::PlatformEventObserver: - virtual void WillProcessEvent(const ui::PlatformEvent& event) OVERRIDE; - virtual void DidProcessEvent(const ui::PlatformEvent& event) OVERRIDE; + virtual void WillProcessEvent(const ui::PlatformEvent& event) override; + virtual void DidProcessEvent(const ui::PlatformEvent& event) override; private: int touchpad_device_id_; int keyboard_device_id_; diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.h b/ash/wm/maximize_mode/workspace_backdrop_delegate.h index 0242644..1a682cf 100644 --- a/ash/wm/maximize_mode/workspace_backdrop_delegate.h +++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.h @@ -37,18 +37,18 @@ class ASH_EXPORT WorkspaceBackdropDelegate // WindowObserver overrides: virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; // WorkspaceLayoutManagerDelegate overrides: - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE; + virtual void OnWindowAddedToLayout(aura::Window* child) override; + virtual void OnWindowRemovedFromLayout(aura::Window* child) override; virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visible) OVERRIDE; - virtual void OnWindowStackingChanged(aura::Window* window) OVERRIDE; + bool visible) override; + virtual void OnWindowStackingChanged(aura::Window* window) override; virtual void OnPostWindowStateTypeChange( wm::WindowState* window_state, - wm::WindowStateType old_type) OVERRIDE; - virtual void OnDisplayWorkAreaInsetsChanged() OVERRIDE; + wm::WindowStateType old_type) override; + virtual void OnDisplayWorkAreaInsetsChanged() override; private: // Restack the backdrop relatively to the other windows in the container. diff --git a/ash/wm/mru_window_tracker.h b/ash/wm/mru_window_tracker.h index 78a42c3..ff70166 100644 --- a/ash/wm/mru_window_tracker.h +++ b/ash/wm/mru_window_tracker.h @@ -62,10 +62,10 @@ class ASH_EXPORT MruWindowTracker // Overridden from aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; // Overridden from WindowObserver: - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroyed(aura::Window* window) override; // List of windows that have been activated in containers that we cycle // through, sorted by most recently used. diff --git a/ash/wm/overlay_event_filter.h b/ash/wm/overlay_event_filter.h index c462153..bcffbe9 100644 --- a/ash/wm/overlay_event_filter.h +++ b/ash/wm/overlay_event_filter.h @@ -55,12 +55,12 @@ class ASH_EXPORT OverlayEventFilter : public ui::EventHandler, bool IsActive(); // ui::EventHandler overrides: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; // ShellObserver overrides: - virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE; - virtual void OnAppTerminating() OVERRIDE; - virtual void OnLockStateChanged(bool locked) OVERRIDE; + virtual void OnLoginStateChanged(user::LoginStatus status) override; + virtual void OnAppTerminating() override; + virtual void OnLockStateChanged(bool locked) override; private: FRIEND_TEST_ALL_PREFIXES(PartialScreenshotViewTest, DontStartOverOverlay); diff --git a/ash/wm/overview/scoped_window_copy.cc b/ash/wm/overview/scoped_window_copy.cc index f32c84d..a68928b 100644 --- a/ash/wm/overview/scoped_window_copy.cc +++ b/ash/wm/overview/scoped_window_copy.cc @@ -91,11 +91,11 @@ class CleanupWidgetAfterAnimationObserver : public ui::LayerAnimationObserver { // ui::LayerAnimationObserver: virtual void OnLayerAnimationEnded( - ui::LayerAnimationSequence* sequence) OVERRIDE; + ui::LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* sequence) OVERRIDE; + ui::LayerAnimationSequence* sequence) override; virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* sequence) OVERRIDE; + ui::LayerAnimationSequence* sequence) override; private: virtual ~CleanupWidgetAfterAnimationObserver(); diff --git a/ash/wm/overview/transparent_activate_window_button.h b/ash/wm/overview/transparent_activate_window_button.h index 7c7179c..1b376f1 100644 --- a/ash/wm/overview/transparent_activate_window_button.h +++ b/ash/wm/overview/transparent_activate_window_button.h @@ -26,7 +26,7 @@ class TransparentActivateWindowButton : public views::ButtonListener { // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; private: // The transparent window event handler widget itself. diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc index e8751b8..4796f84 100644 --- a/ash/wm/overview/window_grid.cc +++ b/ash/wm/overview/window_grid.cc @@ -41,7 +41,7 @@ class CleanupWidgetAfterAnimationObserver virtual ~CleanupWidgetAfterAnimationObserver(); // ui::ImplicitAnimationObserver: - virtual void OnImplicitAnimationsCompleted() OVERRIDE; + virtual void OnImplicitAnimationsCompleted() override; private: scoped_ptr<views::Widget> widget_; diff --git a/ash/wm/overview/window_grid.h b/ash/wm/overview/window_grid.h index 1abea8f..57e32d1 100644 --- a/ash/wm/overview/window_grid.h +++ b/ash/wm/overview/window_grid.h @@ -93,11 +93,11 @@ class ASH_EXPORT WindowGrid : public aura::WindowObserver { } // aura::WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; // TODO(flackr): Handle window bounds changed in WindowSelectorItem. virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; private: friend class WindowSelectorTest; diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index d1aba53..c2b99d1 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc @@ -121,7 +121,7 @@ class RoundedContainerView : public views::View { virtual ~RoundedContainerView() {} - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { views::View::OnPaint(canvas); SkScalar radius = SkIntToScalar(corner_radius_); diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h index 678313c..765b359 100644 --- a/ash/wm/overview/window_selector.h +++ b/ash/wm/overview/window_selector.h @@ -77,27 +77,27 @@ class ASH_EXPORT WindowSelector void OnGridEmpty(WindowGrid* grid); // gfx::DisplayObserver: - virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; - virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE; + virtual void OnDisplayAdded(const gfx::Display& display) override; + virtual void OnDisplayRemoved(const gfx::Display& display) override; virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE; + uint32_t metrics) override; // aura::WindowObserver: - virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowAdded(aura::Window* new_window) override; + virtual void OnWindowDestroying(aura::Window* window) override; // aura::client::ActivationChangeObserver: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; virtual void OnAttemptToReactivateWindow( aura::Window* request_active, - aura::Window* actual_active) OVERRIDE; + aura::Window* actual_active) override; // views::TextfieldController: virtual void ContentsChanged(views::Textfield* sender, - const base::string16& new_contents) OVERRIDE; + const base::string16& new_contents) override; virtual bool HandleKeyEvent(views::Textfield* sender, - const ui::KeyEvent& key_event) OVERRIDE; + const ui::KeyEvent& key_event) override; private: friend class WindowSelectorTest; diff --git a/ash/wm/overview/window_selector_controller.h b/ash/wm/overview/window_selector_controller.h index 09872c3..04d0863 100644 --- a/ash/wm/overview/window_selector_controller.h +++ b/ash/wm/overview/window_selector_controller.h @@ -45,7 +45,7 @@ class ASH_EXPORT WindowSelectorController bool IsSelecting(); // WindowSelectorDelegate: - virtual void OnSelectionEnded() OVERRIDE; + virtual void OnSelectionEnded() override; private: friend class WindowSelectorTest; diff --git a/ash/wm/overview/window_selector_item.h b/ash/wm/overview/window_selector_item.h index 279aed8..f1435d6 100644 --- a/ash/wm/overview/window_selector_item.h +++ b/ash/wm/overview/window_selector_item.h @@ -89,10 +89,10 @@ class WindowSelectorItem : public views::ButtonListener, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + const ui::Event& event) override; // aura::WindowObserver: - virtual void OnWindowTitleChanged(aura::Window* window) OVERRIDE; + virtual void OnWindowTitleChanged(aura::Window* window) override; protected: // Sets the bounds of this selector's items to |target_bounds| in diff --git a/ash/wm/overview/window_selector_panels.cc b/ash/wm/overview/window_selector_panels.cc index d3c6920..89f8fe6 100644 --- a/ash/wm/overview/window_selector_panels.cc +++ b/ash/wm/overview/window_selector_panels.cc @@ -30,12 +30,12 @@ class ScopedTransformPanelWindow : public ScopedTransformOverviewWindow { virtual ~ScopedTransformPanelWindow(); // ScopedTransformOverviewWindow overrides: - virtual void PrepareForOverview() OVERRIDE; + virtual void PrepareForOverview() override; virtual void SetTransform( aura::Window* root_window, const gfx::Transform& transform, - bool animate) OVERRIDE; + bool animate) override; private: // Returns the panel window bounds after the transformation. diff --git a/ash/wm/overview/window_selector_panels.h b/ash/wm/overview/window_selector_panels.h index 0e22a37..6af19e7 100644 --- a/ash/wm/overview/window_selector_panels.h +++ b/ash/wm/overview/window_selector_panels.h @@ -28,18 +28,18 @@ class WindowSelectorPanels : public WindowSelectorItem { void AddWindow(aura::Window* window); // WindowSelectorItem: - virtual aura::Window* GetRootWindow() OVERRIDE; - virtual bool HasSelectableWindow(const aura::Window* window) OVERRIDE; - virtual bool Contains(const aura::Window* target) OVERRIDE; - virtual void RestoreWindowOnExit(aura::Window* window) OVERRIDE; - virtual aura::Window* SelectionWindow() OVERRIDE; - virtual void RemoveWindow(const aura::Window* window) OVERRIDE; - virtual bool empty() const OVERRIDE; - virtual void PrepareForOverview() OVERRIDE; + virtual aura::Window* GetRootWindow() override; + virtual bool HasSelectableWindow(const aura::Window* window) override; + virtual bool Contains(const aura::Window* target) override; + virtual void RestoreWindowOnExit(aura::Window* window) override; + virtual aura::Window* SelectionWindow() override; + virtual void RemoveWindow(const aura::Window* window) override; + virtual bool empty() const override; + virtual void PrepareForOverview() override; virtual void SetItemBounds(aura::Window* root_window, const gfx::Rect& target_bounds, - bool animate) OVERRIDE; - virtual void SetOpacity(float opacity) OVERRIDE; + bool animate) override; + virtual void SetOpacity(float opacity) override; private: typedef ScopedVector<ScopedTransformOverviewWindow> WindowList; diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index 8159469..a892c45 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc @@ -56,7 +56,7 @@ namespace { class NonActivatableActivationDelegate : public aura::client::ActivationDelegate { public: - virtual bool ShouldActivate() const OVERRIDE { + virtual bool ShouldActivate() const override { return false; } }; @@ -75,7 +75,7 @@ class WindowSelectorTest : public test::AshTestBase { WindowSelectorTest() {} virtual ~WindowSelectorTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); ASSERT_TRUE(test::TestShelfDelegate::instance()); diff --git a/ash/wm/overview/window_selector_window.h b/ash/wm/overview/window_selector_window.h index 5d58085..4fca437 100644 --- a/ash/wm/overview/window_selector_window.h +++ b/ash/wm/overview/window_selector_window.h @@ -28,18 +28,18 @@ class WindowSelectorWindow : public WindowSelectorItem { virtual ~WindowSelectorWindow(); // WindowSelectorItem: - virtual aura::Window* GetRootWindow() OVERRIDE; - virtual bool HasSelectableWindow(const aura::Window* window) OVERRIDE; - virtual bool Contains(const aura::Window* target) OVERRIDE; - virtual void RestoreWindowOnExit(aura::Window* window) OVERRIDE; - virtual aura::Window* SelectionWindow() OVERRIDE; - virtual void RemoveWindow(const aura::Window* window) OVERRIDE; - virtual bool empty() const OVERRIDE; - virtual void PrepareForOverview() OVERRIDE; + virtual aura::Window* GetRootWindow() override; + virtual bool HasSelectableWindow(const aura::Window* window) override; + virtual bool Contains(const aura::Window* target) override; + virtual void RestoreWindowOnExit(aura::Window* window) override; + virtual aura::Window* SelectionWindow() override; + virtual void RemoveWindow(const aura::Window* window) override; + virtual bool empty() const override; + virtual void PrepareForOverview() override; virtual void SetItemBounds(aura::Window* root_window, const gfx::Rect& target_bounds, - bool animate) OVERRIDE; - virtual void SetOpacity(float opacity) OVERRIDE; + bool animate) override; + virtual void SetOpacity(float opacity) override; private: // The window with a scoped transform represented by this selector item. diff --git a/ash/wm/panels/attached_panel_window_targeter.h b/ash/wm/panels/attached_panel_window_targeter.h index d5e8196..0dfc129 100644 --- a/ash/wm/panels/attached_panel_window_targeter.h +++ b/ash/wm/panels/attached_panel_window_targeter.h @@ -25,8 +25,8 @@ class AttachedPanelWindowTargeter : public ::wm::EasyResizeWindowTargeter, virtual ~AttachedPanelWindowTargeter(); // ShellObserver: - virtual void OnShelfCreatedForRootWindow(aura::Window* root_window) OVERRIDE; - virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE; + virtual void OnShelfCreatedForRootWindow(aura::Window* root_window) override; + virtual void OnShelfAlignmentChanged(aura::Window* root_window) override; private: void UpdateTouchExtend(aura::Window* root_window); diff --git a/ash/wm/panels/panel_frame_view.h b/ash/wm/panels/panel_frame_view.h index 3c8938c..d4fe66c 100644 --- a/ash/wm/panels/panel_frame_view.h +++ b/ash/wm/panels/panel_frame_view.h @@ -32,7 +32,7 @@ class ASH_EXPORT PanelFrameView : public views::NonClientFrameView { virtual ~PanelFrameView(); // Overridden from views::View: - virtual const char* GetClassName() const OVERRIDE; + virtual const char* GetClassName() const override; private: void InitHeaderPainter(); @@ -41,21 +41,21 @@ class ASH_EXPORT PanelFrameView : public views::NonClientFrameView { int NonClientTopBorderHeight() const; // Overridden from views::NonClientFrameView: - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; + virtual gfx::Rect GetBoundsForClientView() const override; virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE; - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; + const gfx::Rect& client_bounds) const override; + virtual int NonClientHitTest(const gfx::Point& point) override; virtual void GetWindowMask(const gfx::Size& size, - gfx::Path* window_mask) OVERRIDE; - virtual void ResetWindowControls() OVERRIDE; - virtual void UpdateWindowIcon() OVERRIDE; - virtual void UpdateWindowTitle() OVERRIDE; - virtual void SizeConstraintsChanged() OVERRIDE; + gfx::Path* window_mask) override; + virtual void ResetWindowControls() override; + virtual void UpdateWindowIcon() override; + virtual void UpdateWindowTitle() override; + virtual void SizeConstraintsChanged() override; // Overridden from views::View: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual void Layout() OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetMinimumSize() const override; + virtual void Layout() override; + virtual void OnPaint(gfx::Canvas* canvas) override; // Child View class describing the panel's title bar behavior // and buttons, owned by the view hierarchy diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index bf69c2c..cda8845 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -63,7 +63,7 @@ class CalloutWidgetBackground : public views::Background { CalloutWidgetBackground() : alignment_(SHELF_ALIGNMENT_BOTTOM) { } - virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE { + virtual void Paint(gfx::Canvas* canvas, views::View* view) const override { SkPath path; switch (alignment_) { case SHELF_ALIGNMENT_BOTTOM: diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h index 494d2c2..c3ad998 100644 --- a/ash/wm/panels/panel_layout_manager.h +++ b/ash/wm/panels/panel_layout_manager.h @@ -82,41 +82,41 @@ class ASH_EXPORT PanelLayoutManager void SetShelf(Shelf* shelf); // Overridden from aura::LayoutManager: - virtual void OnWindowResized() OVERRIDE; - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE; + virtual void OnWindowResized() override; + virtual void OnWindowAddedToLayout(aura::Window* child) override; + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override; + virtual void OnWindowRemovedFromLayout(aura::Window* child) override; virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visibile) OVERRIDE; + bool visibile) override; virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; // Overridden from ShelfIconObserver - virtual void OnShelfIconPositionsChanged() OVERRIDE; + virtual void OnShelfIconPositionsChanged() override; // Overridden from ShellObserver - virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE; + virtual void OnShelfAlignmentChanged(aura::Window* root_window) override; // Overridden from aura::WindowObserver virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; + intptr_t old) override; // Overridden from ash::wm::WindowStateObserver virtual void OnPostWindowStateTypeChange( wm::WindowState* window_state, - wm::WindowStateType old_type) OVERRIDE; + wm::WindowStateType old_type) override; // Overridden from aura::client::ActivationChangeObserver virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; // Overridden from DisplayController::Observer - virtual void OnDisplayConfigurationChanged() OVERRIDE; + virtual void OnDisplayConfigurationChanged() override; // Overridden from ShelfLayoutManagerObserver virtual void WillChangeVisibilityState( - ShelfVisibilityState new_state) OVERRIDE; + ShelfVisibilityState new_state) override; private: friend class PanelLayoutManagerTest; @@ -164,7 +164,7 @@ class ASH_EXPORT PanelLayoutManager // Overridden from keyboard::KeyboardControllerObserver: virtual void OnKeyboardBoundsChanging( - const gfx::Rect& keyboard_bounds) OVERRIDE; + const gfx::Rect& keyboard_bounds) override; // Parent window associated with this layout manager. aura::Window* panel_container_; diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index 1489972..f540d4f 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc @@ -48,7 +48,7 @@ class PanelLayoutManagerTest : public test::AshTestBase { PanelLayoutManagerTest() {} virtual ~PanelLayoutManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); ASSERT_TRUE(test::TestShelfDelegate::instance()); @@ -278,7 +278,7 @@ class PanelLayoutManagerTextDirectionTest PanelLayoutManagerTextDirectionTest() : is_rtl_(GetParam()) {} virtual ~PanelLayoutManagerTextDirectionTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { original_locale = l10n_util::GetApplicationLocale(std::string()); if (is_rtl_) base::i18n::SetICUDefaultLocale("he"); @@ -286,7 +286,7 @@ class PanelLayoutManagerTextDirectionTest ASSERT_EQ(is_rtl_, base::i18n::IsRTL()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (is_rtl_) base::i18n::SetICUDefaultLocale(original_locale); PanelLayoutManagerTest::TearDown(); diff --git a/ash/wm/panels/panel_window_event_handler.h b/ash/wm/panels/panel_window_event_handler.h index 35e63aa..fdd8cdd 100644 --- a/ash/wm/panels/panel_window_event_handler.h +++ b/ash/wm/panels/panel_window_event_handler.h @@ -17,8 +17,8 @@ class PanelWindowEventHandler : public ui::EventHandler { virtual ~PanelWindowEventHandler(); // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: DISALLOW_COPY_AND_ASSIGN(PanelWindowEventHandler); diff --git a/ash/wm/panels/panel_window_resizer.h b/ash/wm/panels/panel_window_resizer.h index 4f087b8..c07cf19 100644 --- a/ash/wm/panels/panel_window_resizer.h +++ b/ash/wm/panels/panel_window_resizer.h @@ -30,9 +30,9 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer { wm::WindowState* window_state); // WindowResizer: - virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE; - virtual void CompleteDrag() OVERRIDE; - virtual void RevertDrag() OVERRIDE; + virtual void Drag(const gfx::Point& location, int event_flags) override; + virtual void CompleteDrag() override; + virtual void RevertDrag() override; private: // Creates PanelWindowResizer that adds the ability to attach / detach panel diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index 2832d68..83854ce 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -37,7 +37,7 @@ class PanelWindowResizerTest : public test::AshTestBase { PanelWindowResizerTest() {} virtual ~PanelWindowResizerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); UpdateDisplay("600x400"); test::ShellTestApi test_api(Shell::GetInstance()); @@ -45,7 +45,7 @@ class PanelWindowResizerTest : public test::AshTestBase { shelf_delegate_ = test::TestShelfDelegate::instance(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { AshTestBase::TearDown(); } @@ -191,7 +191,7 @@ class PanelWindowResizerTextDirectionTest PanelWindowResizerTextDirectionTest() : is_rtl_(GetParam()) {} virtual ~PanelWindowResizerTextDirectionTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { original_locale = l10n_util::GetApplicationLocale(std::string()); if (is_rtl_) base::i18n::SetICUDefaultLocale("he"); @@ -199,7 +199,7 @@ class PanelWindowResizerTextDirectionTest ASSERT_EQ(is_rtl_, base::i18n::IsRTL()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (is_rtl_) base::i18n::SetICUDefaultLocale(original_locale); PanelWindowResizerTest::TearDown(); diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc index b18c9fb..789ea1e 100644 --- a/ash/wm/partial_screenshot_view.cc +++ b/ash/wm/partial_screenshot_view.cc @@ -39,7 +39,7 @@ class PartialScreenshotView::OverlayDelegate } // Overridden from OverlayEventFilter::Delegate: - virtual void Cancel() OVERRIDE { + virtual void Cancel() override { // Make sure the mouse_warp_mode allows warping. It can be stopped by a // partial screenshot view. MouseCursorEventFilter* mouse_cursor_filter = @@ -50,18 +50,18 @@ class PartialScreenshotView::OverlayDelegate widgets_[i]->Close(); } - virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) OVERRIDE { + virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) override { return event->key_code() == ui::VKEY_ESCAPE; } - virtual aura::Window* GetWindow() OVERRIDE { + virtual aura::Window* GetWindow() override { // Just returns NULL because this class does not handle key events in // OverlayEventFilter, except for cancel keys. return NULL; } // Overridden from views::WidgetObserver: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(views::Widget* widget) override { widget->RemoveObserver(this); widgets_.erase(std::remove(widgets_.begin(), widgets_.end(), widget)); if (widgets_.empty()) diff --git a/ash/wm/partial_screenshot_view.h b/ash/wm/partial_screenshot_view.h index 8d799e3..01fda53 100644 --- a/ash/wm/partial_screenshot_view.h +++ b/ash/wm/partial_screenshot_view.h @@ -48,14 +48,14 @@ class ASH_EXPORT PartialScreenshotView : public views::WidgetDelegateView { void OnSelectionFinished(); // Overridden from views::View: - virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; - virtual void OnMouseCaptureLost() OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override; + virtual void OnPaint(gfx::Canvas* canvas) override; + virtual bool OnMousePressed(const ui::MouseEvent& event) override; + virtual bool OnMouseDragged(const ui::MouseEvent& event) override; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; + virtual void OnMouseReleased(const ui::MouseEvent& event) override; + virtual void OnMouseCaptureLost() override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; bool is_dragging_; gfx::Point start_position_; diff --git a/ash/wm/partial_screenshot_view_unittest.cc b/ash/wm/partial_screenshot_view_unittest.cc index 26e27e3..267ec8c 100644 --- a/ash/wm/partial_screenshot_view_unittest.cc +++ b/ash/wm/partial_screenshot_view_unittest.cc @@ -40,7 +40,7 @@ class PartialScreenshotViewTest : public test::AshTestBase, private: // views::WidgetObserver: - virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE { + virtual void OnWidgetDestroying(views::Widget* widget) override { if (view_ && view_->GetWidget() == widget) view_ = NULL; widget->RemoveObserver(this); diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h index 6511a5f..0578657 100644 --- a/ash/wm/power_button_controller.h +++ b/ash/wm/power_button_controller.h @@ -64,12 +64,12 @@ class ASH_EXPORT PowerButtonController : ui::EventHandler void OnLockButtonEvent(bool down, const base::TimeTicks& timestamp); // ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; #if defined(OS_CHROMEOS) // Overriden from ui::DisplayConfigurator::Observer: virtual void OnDisplayModeChanged( - const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE; + const ui::DisplayConfigurator::DisplayStateList& outputs) override; #endif private: diff --git a/ash/wm/resize_handle_window_targeter.h b/ash/wm/resize_handle_window_targeter.h index 65c18fb..4b0d0b6 100644 --- a/ash/wm/resize_handle_window_targeter.h +++ b/ash/wm/resize_handle_window_targeter.h @@ -31,17 +31,17 @@ class ResizeHandleWindowTargeter : public wm::WindowStateObserver, // wm::WindowStateObserver: virtual void OnPostWindowStateTypeChange( wm::WindowState* window_state, - wm::WindowStateType old_type) OVERRIDE; + wm::WindowStateType old_type) override; // aura::WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; // aura::WindowTargeter: virtual ui::EventTarget* FindTargetForLocatedEvent( ui::EventTarget* root, - ui::LocatedEvent* event) OVERRIDE; + ui::LocatedEvent* event) override; virtual bool SubtreeShouldBeExploredForEvent( ui::EventTarget* target, - const ui::LocatedEvent& event) OVERRIDE; + const ui::LocatedEvent& event) override; // The targeter does not take ownership of |window_| or // |immersive_controller_|. diff --git a/ash/wm/resize_shadow_and_cursor_unittest.cc b/ash/wm/resize_shadow_and_cursor_unittest.cc index b6fd5e6..285cbf9 100644 --- a/ash/wm/resize_shadow_and_cursor_unittest.cc +++ b/ash/wm/resize_shadow_and_cursor_unittest.cc @@ -30,17 +30,17 @@ class TestWidgetDelegate : public views::WidgetDelegateView { virtual ~TestWidgetDelegate() {} // views::WidgetDelegateView overrides: - 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; } virtual views::NonClientFrameView* CreateNonClientFrameView( - views::Widget* widget) OVERRIDE { + views::Widget* widget) override { return new ash::CustomFrameViewAsh(widget); } @@ -58,7 +58,7 @@ class ResizeShadowAndCursorTest : public AshTestBase { virtual ~ResizeShadowAndCursorTest() {} // AshTestBase override: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); views::Widget* widget(views::Widget::CreateWindowWithContextAndBounds( diff --git a/ash/wm/resize_shadow_controller.h b/ash/wm/resize_shadow_controller.h index 2bd3f12..10c3db8 100644 --- a/ash/wm/resize_shadow_controller.h +++ b/ash/wm/resize_shadow_controller.h @@ -39,8 +39,8 @@ class ASH_EXPORT ResizeShadowController : public aura::WindowObserver { virtual void OnWindowBoundsChanged( aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + const gfx::Rect& new_bounds) override; + virtual void OnWindowDestroyed(aura::Window* window) override; private: typedef std::map<aura::Window*, linked_ptr<ResizeShadow> > WindowShadowMap; diff --git a/ash/wm/root_window_layout_manager.h b/ash/wm/root_window_layout_manager.h index d9fd297..a56ad2a 100644 --- a/ash/wm/root_window_layout_manager.h +++ b/ash/wm/root_window_layout_manager.h @@ -34,14 +34,14 @@ class RootWindowLayoutManager : public aura::LayoutManager { virtual ~RootWindowLayoutManager(); // Overridden from aura::LayoutManager: - virtual void OnWindowResized() OVERRIDE; - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE; + virtual void OnWindowResized() override; + virtual void OnWindowAddedToLayout(aura::Window* child) override; + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override; + virtual void OnWindowRemovedFromLayout(aura::Window* child) override; virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visible) OVERRIDE; + bool visible) override; virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; private: aura::Window* owner_; diff --git a/ash/wm/screen_dimmer.h b/ash/wm/screen_dimmer.h index 1d6e205..489b933 100644 --- a/ash/wm/screen_dimmer.h +++ b/ash/wm/screen_dimmer.h @@ -47,7 +47,7 @@ class ASH_EXPORT ScreenDimmer : public aura::WindowObserver { // aura::WindowObserver overrides: virtual void OnWindowBoundsChanged(aura::Window* root_window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; private: friend class TestApi; diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index 2ea4e96..91ecf4e 100644 --- a/ash/wm/screen_dimmer_unittest.cc +++ b/ash/wm/screen_dimmer_unittest.cc @@ -20,7 +20,7 @@ class ScreenDimmerTest : public AshTestBase { ScreenDimmerTest() : dimmer_(NULL) {} virtual ~ScreenDimmerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); dimmer_ = Shell::GetPrimaryRootWindowController()->screen_dimmer(); test_api_.reset(new ScreenDimmer::TestApi(dimmer_)); diff --git a/ash/wm/session_state_animator_impl.cc b/ash/wm/session_state_animator_impl.cc index 4fb0d7b..274b5e4 100644 --- a/ash/wm/session_state_animator_impl.cc +++ b/ash/wm/session_state_animator_impl.cc @@ -301,21 +301,21 @@ class CallbackAnimationObserver : public ui::LayerAnimationObserver { private: // Overridden from ui::LayerAnimationObserver: virtual void OnLayerAnimationEnded(ui::LayerAnimationSequence* seq) - OVERRIDE { + override { // Drop foreground once animation is over. callback_.Run(); delete this; } virtual void OnLayerAnimationAborted(ui::LayerAnimationSequence* seq) - OVERRIDE { + override { // Drop foreground once animation is over. callback_.Run(); delete this; } virtual void OnLayerAnimationScheduled(ui::LayerAnimationSequence* seq) - OVERRIDE {} + override {} base::Closure callback_; @@ -421,7 +421,7 @@ class SessionStateAnimatorImpl::AnimationSequence virtual void StartAnimation( int container_mask, SessionStateAnimator::AnimationType type, - SessionStateAnimator::AnimationSpeed speed) OVERRIDE { + SessionStateAnimator::AnimationSpeed speed) override { animator_->StartAnimationInSequence(container_mask, type, speed, this); } @@ -430,24 +430,24 @@ class SessionStateAnimatorImpl::AnimationSequence // ui::LayerAnimationObserver: virtual void OnLayerAnimationEnded( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { sequences_completed_++; if (sequences_completed_ == sequences_attached_) OnAnimationCompleted(); } virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { sequences_completed_++; if (sequences_completed_ == sequences_attached_) OnAnimationAborted(); } virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* sequence) OVERRIDE {} + ui::LayerAnimationSequence* sequence) override {} virtual void OnAttachedToSequence( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { LayerAnimationObserver::OnAttachedToSequence(sequence); sequences_attached_++; } diff --git a/ash/wm/session_state_animator_impl.h b/ash/wm/session_state_animator_impl.h index bad7103..d4792aa 100644 --- a/ash/wm/session_state_animator_impl.h +++ b/ash/wm/session_state_animator_impl.h @@ -52,17 +52,17 @@ class ASH_EXPORT SessionStateAnimatorImpl : public SessionStateAnimator { // ash::SessionStateAnimator: virtual void StartAnimation(int container_mask, AnimationType type, - AnimationSpeed speed) OVERRIDE; + AnimationSpeed speed) override; virtual void StartAnimationWithCallback( int container_mask, AnimationType type, AnimationSpeed speed, - base::Closure callback) OVERRIDE; + base::Closure callback) override; virtual AnimationSequence* BeginAnimationSequence( - base::Closure callback) OVERRIDE; - virtual bool IsBackgroundHidden() const OVERRIDE; - virtual void ShowBackground() OVERRIDE; - virtual void HideBackground() OVERRIDE; + base::Closure callback) override; + virtual bool IsBackgroundHidden() const override; + virtual void ShowBackground() override; + virtual void HideBackground() override; private: class AnimationSequence; diff --git a/ash/wm/stacking_controller.h b/ash/wm/stacking_controller.h index 8c76aeb..1e4642f 100644 --- a/ash/wm/stacking_controller.h +++ b/ash/wm/stacking_controller.h @@ -22,7 +22,7 @@ class ASH_EXPORT StackingController : public aura::client::WindowTreeClient { // Overridden from aura::client::WindowTreeClient: virtual aura::Window* GetDefaultParent(aura::Window* context, aura::Window* window, - const gfx::Rect& bounds) OVERRIDE; + const gfx::Rect& bounds) override; private: // Returns corresponding system modal container for a modal window. diff --git a/ash/wm/status_area_layout_manager.h b/ash/wm/status_area_layout_manager.h index 73e81e6..eabcb55 100644 --- a/ash/wm/status_area_layout_manager.h +++ b/ash/wm/status_area_layout_manager.h @@ -22,9 +22,9 @@ class StatusAreaLayoutManager : public SnapToPixelLayoutManager { virtual ~StatusAreaLayoutManager(); // Overridden from aura::LayoutManager: - virtual void OnWindowResized() OVERRIDE; + virtual void OnWindowResized() override; virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; private: // Updates layout of the status area. Effectively calls ShelfLayoutManager diff --git a/ash/wm/system_background_controller.h b/ash/wm/system_background_controller.h index 95c4d5c..41e7c98 100644 --- a/ash/wm/system_background_controller.h +++ b/ash/wm/system_background_controller.h @@ -35,7 +35,7 @@ class SystemBackgroundController : public aura::WindowObserver { // aura::WindowObserver overrides: virtual void OnWindowBoundsChanged(aura::Window* root, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; private: class HostContentLayerDelegate; diff --git a/ash/wm/system_gesture_event_filter.h b/ash/wm/system_gesture_event_filter.h index 43bf758..bdde803 100644 --- a/ash/wm/system_gesture_event_filter.h +++ b/ash/wm/system_gesture_event_filter.h @@ -24,10 +24,10 @@ class SystemGestureEventFilter : public ui::EventHandler { virtual ~SystemGestureEventFilter(); // Overridden from ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnScrollEvent(ui::ScrollEvent* event) override; + virtual void OnTouchEvent(ui::TouchEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: friend class ash::test::SystemGestureEventFilterTest; diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index b2472b0..e1bcbf0 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -50,10 +50,10 @@ class ResizableWidgetDelegate : public views::WidgetDelegateView { virtual ~ResizableWidgetDelegate() {} private: - virtual bool CanResize() const OVERRIDE { return true; } - virtual bool CanMaximize() const OVERRIDE { return true; } - virtual bool CanMinimize() const OVERRIDE { return true; } - virtual void DeleteDelegate() OVERRIDE { delete this; } + virtual bool CanResize() const override { return true; } + virtual bool CanMaximize() const override { return true; } + virtual bool CanMinimize() const override { return true; } + virtual void DeleteDelegate() override { delete this; } DISALLOW_COPY_AND_ASSIGN(ResizableWidgetDelegate); }; @@ -63,15 +63,15 @@ class MaxSizeNCFV : public views::NonClientFrameView { public: MaxSizeNCFV() {} private: - virtual gfx::Size GetMaximumSize() const OVERRIDE { + virtual gfx::Size GetMaximumSize() const override { return gfx::Size(200, 200); } - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE { + virtual gfx::Rect GetBoundsForClientView() const override { return gfx::Rect(); }; virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE { + const gfx::Rect& client_bounds) const override { return gfx::Rect(); }; @@ -79,15 +79,15 @@ class MaxSizeNCFV : public views::NonClientFrameView { // the parent NonClientView because that makes it more difficult to calculate // hittests for regions that are partially obscured by the ClientView, e.g. // HTSYSMENU. - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE { + virtual int NonClientHitTest(const gfx::Point& point) override { return HTNOWHERE; } virtual void GetWindowMask(const gfx::Size& size, - gfx::Path* window_mask) OVERRIDE {} - virtual void ResetWindowControls() OVERRIDE {} - virtual void UpdateWindowIcon() OVERRIDE {} - virtual void UpdateWindowTitle() OVERRIDE {} - virtual void SizeConstraintsChanged() OVERRIDE {} + gfx::Path* window_mask) override {} + virtual void ResetWindowControls() override {} + virtual void UpdateWindowIcon() override {} + virtual void UpdateWindowTitle() override {} + virtual void SizeConstraintsChanged() override {} DISALLOW_COPY_AND_ASSIGN(MaxSizeNCFV); }; @@ -98,11 +98,11 @@ class MaxSizeWidgetDelegate : public views::WidgetDelegateView { virtual ~MaxSizeWidgetDelegate() {} private: - virtual bool CanResize() const OVERRIDE { return true; } - virtual bool CanMaximize() const OVERRIDE { return false; } - virtual void DeleteDelegate() OVERRIDE { delete this; } + virtual bool CanResize() const override { return true; } + virtual bool CanMaximize() const override { return false; } + virtual void DeleteDelegate() override { delete this; } virtual views::NonClientFrameView* CreateNonClientFrameView( - views::Widget* widget) OVERRIDE { + views::Widget* widget) override { return new MaxSizeNCFV; } @@ -137,7 +137,7 @@ class SystemGestureEventFilterTest : public AshTestBase { } // Overridden from AshTestBase: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // TODO(jonross): TwoFingerDragDelayed() and ThreeFingerGestureStopsDrag() // both use hardcoded touch points, assuming that they target empty header // space. Window control order now reflects configuration files and can diff --git a/ash/wm/system_modal_container_event_filter.h b/ash/wm/system_modal_container_event_filter.h index 7c00d6f..a2218443 100644 --- a/ash/wm/system_modal_container_event_filter.h +++ b/ash/wm/system_modal_container_event_filter.h @@ -21,8 +21,8 @@ class ASH_EXPORT SystemModalContainerEventFilter : public ui::EventHandler { virtual ~SystemModalContainerEventFilter(); // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; private: SystemModalContainerEventFilterDelegate* delegate_; diff --git a/ash/wm/system_modal_container_layout_manager.h b/ash/wm/system_modal_container_layout_manager.h index 436897f..e877da3 100644 --- a/ash/wm/system_modal_container_layout_manager.h +++ b/ash/wm/system_modal_container_layout_manager.h @@ -42,20 +42,20 @@ class ASH_EXPORT SystemModalContainerLayoutManager bool has_modal_background() const { return modal_background_ != NULL; } // Overridden from SnapToPixelLayoutManager: - virtual void OnWindowResized() OVERRIDE; - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; + virtual void OnWindowResized() override; + virtual void OnWindowAddedToLayout(aura::Window* child) override; + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override; virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; // Overridden from aura::WindowObserver: virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + intptr_t old) override; + virtual void OnWindowDestroying(aura::Window* window) override; // Overridden from keyboard::KeyboardControllerObserver: - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE; + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; // Can a given |window| receive and handle input events? bool CanWindowReceiveEvents(aura::Window* window); diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index 6bc665b..541242f 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc @@ -73,15 +73,15 @@ class TestWindow : public views::WidgetDelegateView { } // Overridden from views::View: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(50, 50); } // Overridden from views::WidgetDelegate: - virtual views::View* GetContentsView() OVERRIDE { + virtual views::View* GetContentsView() override { return this; } - virtual ui::ModalType GetModalType() const OVERRIDE { + virtual ui::ModalType GetModalType() const override { return modal_ ? ui::MODAL_TYPE_SYSTEM : ui::MODAL_TYPE_NONE; } @@ -113,7 +113,7 @@ class EventTestWindow : public TestWindow { } // Overridden from views::View: - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE { + virtual bool OnMousePressed(const ui::MouseEvent& event) override { mouse_presses_++; return false; } @@ -133,7 +133,7 @@ class TransientWindowObserver : public aura::WindowObserver { bool destroyed() const { return destroyed_; } // Overridden from aura::WindowObserver: - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroyed(aura::Window* window) override { destroyed_ = true; } @@ -147,7 +147,7 @@ class TransientWindowObserver : public aura::WindowObserver { class SystemModalContainerLayoutManagerTest : public AshTestBase { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Allow a virtual keyboard (and initialize it per default). CommandLine::ForCurrentProcess()->AppendSwitch( keyboard::switches::kEnableVirtualKeyboard); @@ -156,7 +156,7 @@ class SystemModalContainerLayoutManagerTest : public AshTestBase { keyboard::KeyboardController::GetInstance()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { Shell::GetPrimaryRootWindowController()->DeactivateKeyboard( keyboard::KeyboardController::GetInstance()); AshTestBase::TearDown(); diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc index ce1d020..22a3e07 100644 --- a/ash/wm/toplevel_window_event_handler.cc +++ b/ash/wm/toplevel_window_event_handler.cc @@ -100,11 +100,11 @@ class ToplevelWindowEventHandler::ScopedWindowResizer WindowResizer* resizer() { return resizer_.get(); } // WindowObserver overrides: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; // WindowStateObserver overrides: virtual void OnPreWindowStateTypeChange(wm::WindowState* window_state, - wm::WindowStateType type) OVERRIDE; + wm::WindowStateType type) override; private: ToplevelWindowEventHandler* handler_; diff --git a/ash/wm/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h index 246b042..4e6dc1b 100644 --- a/ash/wm/toplevel_window_event_handler.h +++ b/ash/wm/toplevel_window_event_handler.h @@ -39,19 +39,19 @@ class ASH_EXPORT ToplevelWindowEventHandler virtual ~ToplevelWindowEventHandler(); // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; // Overridden form aura::client::WindowMoveClient: virtual aura::client::WindowMoveResult RunMoveLoop( aura::Window* source, const gfx::Vector2d& drag_offset, - aura::client::WindowMoveSource move_source) OVERRIDE; - virtual void EndMoveLoop() OVERRIDE; + aura::client::WindowMoveSource move_source) override; + virtual void EndMoveLoop() override; // Overridden form ash::DisplayController::Observer: - virtual void OnDisplayConfigurationChanging() OVERRIDE; + virtual void OnDisplayConfigurationChanging() override; private: class ScopedWindowResizer; diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index 7c4f4d6..ba1d912c 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc @@ -52,7 +52,7 @@ class TestWindowDelegate : public aura::test::TestWindowDelegate { private: // Overridden from aura::Test::TestWindowDelegate: - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroyed(aura::Window* window) override { delete this; } diff --git a/ash/wm/video_detector.h b/ash/wm/video_detector.h index d50f9f3..41139df 100644 --- a/ash/wm/video_detector.h +++ b/ash/wm/video_detector.h @@ -66,15 +66,15 @@ class ASH_EXPORT VideoDetector : public aura::EnvObserver, void RemoveObserver(VideoDetectorObserver* observer); // EnvObserver overrides. - virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; + virtual void OnWindowInitialized(aura::Window* window) override; // WindowObserver overrides. virtual void OnDelegatedFrameDamage(aura::Window* window, - const gfx::Rect& region) OVERRIDE; - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + const gfx::Rect& region) override; + virtual void OnWindowDestroyed(aura::Window* window) override; // ShellObserver overrides. - virtual void OnAppTerminating() OVERRIDE; + virtual void OnAppTerminating() override; private: class WindowInfo; diff --git a/ash/wm/video_detector_unittest.cc b/ash/wm/video_detector_unittest.cc index f5682e6..d2443da 100644 --- a/ash/wm/video_detector_unittest.cc +++ b/ash/wm/video_detector_unittest.cc @@ -40,7 +40,7 @@ class TestVideoDetectorObserver : public VideoDetectorObserver { } // VideoDetectorObserver implementation. - virtual void OnVideoDetected(bool is_fullscreen) OVERRIDE { + virtual void OnVideoDetected(bool is_fullscreen) override { num_invocations_++; if (is_fullscreen) num_fullscreens_++; @@ -66,7 +66,7 @@ class VideoDetectorTest : public AshTestBase { VideoDetectorTest() {} virtual ~VideoDetectorTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); observer_.reset(new TestVideoDetectorObserver); detector_ = Shell::GetInstance()->video_detector(); @@ -76,7 +76,7 @@ class VideoDetectorTest : public AshTestBase { detector_->set_now_for_test(now_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { detector_->RemoveObserver(observer_.get()); AshTestBase::TearDown(); } diff --git a/ash/wm/virtual_keyboard_container_layout_manager.h b/ash/wm/virtual_keyboard_container_layout_manager.h index 1b849e5..1f90f73 100644 --- a/ash/wm/virtual_keyboard_container_layout_manager.h +++ b/ash/wm/virtual_keyboard_container_layout_manager.h @@ -20,7 +20,7 @@ class VirtualKeyboardContainerLayoutManager : public SnapToPixelLayoutManager { virtual ~VirtualKeyboardContainerLayoutManager(); // Overridden from SnapToPixelLayoutManager: - virtual void OnWindowResized() OVERRIDE; + virtual void OnWindowResized() override; private: aura::Window* parent_container_; diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 8743414..d4e05b2 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -284,33 +284,33 @@ class CrossFadeObserver : public ui::CompositorObserver, } // ui::CompositorObserver overrides: - virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE { + virtual void OnCompositingDidCommit(ui::Compositor* compositor) override { } virtual void OnCompositingStarted(ui::Compositor* compositor, - base::TimeTicks start_time) OVERRIDE { + base::TimeTicks start_time) override { } - virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE { + virtual void OnCompositingEnded(ui::Compositor* compositor) override { } - virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE { + virtual void OnCompositingAborted(ui::Compositor* compositor) override { // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. layer_owner_->root()->GetAnimator()->StopAnimating(); } virtual void OnCompositingLockStateChanged( - ui::Compositor* compositor) OVERRIDE { + ui::Compositor* compositor) override { } // aura::WindowObserver overrides: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { + virtual void OnWindowDestroying(aura::Window* window) override { // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. layer_owner_->root()->GetAnimator()->StopAnimating(); } virtual void OnWindowRemovingFromRootWindow(aura::Window* window, - aura::Window* new_root) OVERRIDE { + aura::Window* new_root) override { layer_owner_->root()->GetAnimator()->StopAnimating(); } // ui::ImplicitAnimationObserver overrides: - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { delete this; } diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc index 387f6f9..575e9e2 100644 --- a/ash/wm/window_animations_unittest.cc +++ b/ash/wm/window_animations_unittest.cc @@ -25,7 +25,7 @@ class WindowAnimationsTest : public ash::test::AshTestBase { public: WindowAnimationsTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { AshTestBase::TearDown(); } @@ -48,14 +48,14 @@ class MinimizeAnimationObserver : public ui::LayerAnimationObserver { protected: // ui::LayerAnimationObserver: virtual void OnLayerAnimationScheduled( - ui::LayerAnimationSequence* sequence) OVERRIDE { + ui::LayerAnimationSequence* sequence) override { duration_ = animator_->GetTransitionDuration(); animator_->RemoveObserver(this); } virtual void OnLayerAnimationEnded( - ui::LayerAnimationSequence* sequence) OVERRIDE {} + ui::LayerAnimationSequence* sequence) override {} virtual void OnLayerAnimationAborted( - ui::LayerAnimationSequence* sequence) OVERRIDE {} + ui::LayerAnimationSequence* sequence) override {} private: ui::LayerAnimator* animator_; diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc index 54e702c..412d275 100644 --- a/ash/wm/window_cycle_controller.cc +++ b/ash/wm/window_cycle_controller.cc @@ -24,7 +24,7 @@ class WindowCycleEventFilter : public ui::EventHandler { virtual ~WindowCycleEventFilter(); // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) override; private: DISALLOW_COPY_AND_ASSIGN(WindowCycleEventFilter); diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc index 06cc61e..59618db 100644 --- a/ash/wm/window_cycle_controller_unittest.cc +++ b/ash/wm/window_cycle_controller_unittest.cc @@ -40,7 +40,7 @@ class WindowCycleControllerTest : public test::AshTestBase { WindowCycleControllerTest() {} virtual ~WindowCycleControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); ASSERT_TRUE(test::TestShelfDelegate::instance()); diff --git a/ash/wm/window_cycle_list.cc b/ash/wm/window_cycle_list.cc index 26ac064..d8f7418 100644 --- a/ash/wm/window_cycle_list.cc +++ b/ash/wm/window_cycle_list.cc @@ -43,7 +43,7 @@ class ScopedShowWindow : public aura::WindowObserver { aura::Window* window() { return window_; } // aura::WindowObserver: - virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; + virtual void OnWillRemoveWindow(aura::Window* window) override; private: // The window being shown. diff --git a/ash/wm/window_cycle_list.h b/ash/wm/window_cycle_list.h index 7efddbb..5363b44 100644 --- a/ash/wm/window_cycle_list.h +++ b/ash/wm/window_cycle_list.h @@ -39,7 +39,7 @@ class ASH_EXPORT WindowCycleList : public aura::WindowObserver { // There is a chance a window is destroyed, for example by JS code. We need to // take care of that even if it is not intended for the user to close a window // while window cycling. - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroyed(aura::Window* window) override; // List of weak pointers to windows to use while cycling with the keyboard. // List is built when the user initiates the gesture (i.e. hits alt-tab the diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index 6a8d500..bd5ec05 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -39,7 +39,7 @@ class TestingCursorClientObserver : public aura::client::CursorClientObserver { bool did_visibility_change() const { return did_visibility_change_; } // Overridden from aura::client::CursorClientObserver: - virtual void OnCursorVisibilityChanged(bool is_visible) OVERRIDE { + virtual void OnCursorVisibilityChanged(bool is_visible) override { cursor_visibility_ = is_visible; did_visibility_change_ = true; } @@ -75,7 +75,7 @@ class CustomEventHandler : public ui::test::TestEventHandler { } // Overridden from ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE { + virtual void OnKeyEvent(ui::KeyEvent* event) override { ui::test::TestEventHandler::OnKeyEvent(event); if (key_result_ & ui::ER_HANDLED) event->SetHandled(); @@ -83,7 +83,7 @@ class CustomEventHandler : public ui::test::TestEventHandler { event->StopPropagation(); } - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { + virtual void OnMouseEvent(ui::MouseEvent* event) override { ui::test::TestEventHandler::OnMouseEvent(event); if (mouse_result_ & ui::ER_HANDLED) event->SetHandled(); @@ -109,7 +109,7 @@ class NonFocusableDelegate : public aura::test::TestWindowDelegate { NonFocusableDelegate() {} private: - virtual bool CanFocus() OVERRIDE { + virtual bool CanFocus() override { return false; } @@ -126,7 +126,7 @@ class HitTestWindowDelegate : public aura::test::TestWindowDelegate { private: // Overridden from TestWindowDelegate: - virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { + virtual int GetNonClientComponent(const gfx::Point& point) const override { return hittest_code_; } diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc index 8fbb64f..f4b9662 100644 --- a/ash/wm/window_modality_controller_unittest.cc +++ b/ash/wm/window_modality_controller_unittest.cc @@ -327,7 +327,7 @@ class TouchTrackerWindowDelegate : public aura::test::TestWindowDelegate { private: // Overridden from aura::test::TestWindowDelegate. - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { + virtual void OnTouchEvent(ui::TouchEvent* event) override { received_touch_ = true; last_event_type_ = event->type(); aura::test::TestWindowDelegate::OnTouchEvent(event); diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc index 1459853..d6d0a8d 100644 --- a/ash/wm/window_positioner_unittest.cc +++ b/ash/wm/window_positioner_unittest.cc @@ -109,19 +109,19 @@ class OutOfDisplayDelegate : public views::WidgetDelegate { virtual ~OutOfDisplayDelegate() {} // Overridden from WidgetDelegate: - virtual void DeleteDelegate() OVERRIDE { + virtual void DeleteDelegate() override { delete this; } - virtual views::Widget* GetWidget() OVERRIDE { + virtual views::Widget* GetWidget() override { return widget_; } - virtual const views::Widget* GetWidget() const OVERRIDE { + virtual const views::Widget* GetWidget() const override { return widget_; } virtual bool GetSavedWindowPlacement( const views::Widget* widget, gfx::Rect* bounds, - ui::WindowShowState* show_state) const OVERRIDE { + ui::WindowShowState* show_state) const override { bounds->SetRect(450, 10, 100, 100); *show_state = ui::SHOW_STATE_NORMAL; return true; diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc index e95dc40..9431887 100644 --- a/ash/wm/window_state.cc +++ b/ash/wm/window_state.cc @@ -41,14 +41,14 @@ class BoundsSetter : public aura::LayoutManager { virtual ~BoundsSetter() {} // aura::LayoutManager overrides: - virtual void OnWindowResized() OVERRIDE {} - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {} - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {} - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {} + virtual void OnWindowResized() override {} + virtual void OnWindowAddedToLayout(aura::Window* child) override {} + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {} + virtual void OnWindowRemovedFromLayout(aura::Window* child) override {} virtual void OnChildWindowVisibilityChanged( - aura::Window* child, bool visible) OVERRIDE {} + aura::Window* child, bool visible) override {} virtual void SetChildBounds( - aura::Window* child, const gfx::Rect& requested_bounds) OVERRIDE {} + aura::Window* child, const gfx::Rect& requested_bounds) override {} void SetBounds(aura::Window* window, const gfx::Rect& bounds) { SetChildBoundsDirect(window, bounds); diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h index 2ea571e..a765557 100644 --- a/ash/wm/window_state.h +++ b/ash/wm/window_state.h @@ -300,7 +300,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver { // aura::WindowObserver overrides: virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; + intptr_t old) override; private: friend class DefaultState; diff --git a/ash/wm/window_state_unittest.cc b/ash/wm/window_state_unittest.cc index 3a45728..79f765a 100644 --- a/ash/wm/window_state_unittest.cc +++ b/ash/wm/window_state_unittest.cc @@ -25,22 +25,22 @@ class AlwaysMaximizeTestState : public WindowState::State { // WindowState::State overrides: virtual void OnWMEvent(WindowState* window_state, - const WMEvent* event) OVERRIDE { + const WMEvent* event) override { // We don't do anything here. } - virtual WindowStateType GetType() const OVERRIDE { + virtual WindowStateType GetType() const override { return state_type_; } virtual void AttachState( WindowState* window_state, - WindowState::State* previous_state) OVERRIDE { + WindowState::State* previous_state) override { // We always maximize. if (state_type_ != WINDOW_STATE_TYPE_MAXIMIZED) { window_state->Maximize(); state_type_ = WINDOW_STATE_TYPE_MAXIMIZED; } } - virtual void DetachState(WindowState* window_state) OVERRIDE {} + virtual void DetachState(WindowState* window_state) override {} private: WindowStateType state_type_; diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc index 34af90b..1a2f652 100644 --- a/ash/wm/workspace/multi_window_resize_controller.cc +++ b/ash/wm/workspace/multi_window_resize_controller.cc @@ -71,32 +71,32 @@ class MultiWindowResizeController::ResizeView : public views::View { } // views::View overrides: - virtual gfx::Size GetPreferredSize() const OVERRIDE { + virtual gfx::Size GetPreferredSize() const override { return gfx::Size(image_->width(), image_->height()); } - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaint(gfx::Canvas* canvas) override { canvas->DrawImageInt(*image_, 0, 0); } - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE { + virtual bool OnMousePressed(const ui::MouseEvent& event) override { gfx::Point location(event.location()); views::View::ConvertPointToScreen(this, &location); controller_->StartResize(location); return true; } - virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE { + virtual bool OnMouseDragged(const ui::MouseEvent& event) override { gfx::Point location(event.location()); views::View::ConvertPointToScreen(this, &location); controller_->Resize(location, event.flags()); return true; } - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE { + virtual void OnMouseReleased(const ui::MouseEvent& event) override { controller_->CompleteResize(); } - virtual void OnMouseCaptureLost() OVERRIDE { + virtual void OnMouseCaptureLost() override { controller_->CancelResize(); } virtual gfx::NativeCursor GetCursor( - const ui::MouseEvent& event) OVERRIDE { + const ui::MouseEvent& event) override { int component = (direction_ == LEFT_RIGHT) ? HTRIGHT : HTBOTTOM; return ::wm::CompoundEventFilter::CursorForWindowComponent( component); @@ -119,7 +119,7 @@ class MultiWindowResizeController::ResizeMouseWatcherHost : // MouseWatcherHost overrides: virtual bool Contains(const gfx::Point& point_in_screen, - MouseEventType type) OVERRIDE { + MouseEventType type) override { return host_->IsOverWindows(point_in_screen); } diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h index 5e21b24..18a0395 100644 --- a/ash/wm/workspace/multi_window_resize_controller.h +++ b/ash/wm/workspace/multi_window_resize_controller.h @@ -50,10 +50,10 @@ class ASH_EXPORT MultiWindowResizeController : void Hide(); // MouseWatcherListenre overrides: - virtual void MouseMovedOutOfHost() OVERRIDE; + virtual void MouseMovedOutOfHost() override; // WindowObserver overrides: - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + virtual void OnWindowDestroying(aura::Window* window) override; private: friend class MultiWindowResizeControllerTest; diff --git a/ash/wm/workspace/multi_window_resize_controller_unittest.cc b/ash/wm/workspace/multi_window_resize_controller_unittest.cc index 7a7da34..f686515 100644 --- a/ash/wm/workspace/multi_window_resize_controller_unittest.cc +++ b/ash/wm/workspace/multi_window_resize_controller_unittest.cc @@ -25,7 +25,7 @@ class MultiWindowResizeControllerTest : public test::AshTestBase { MultiWindowResizeControllerTest() : resize_controller_(NULL) {} virtual ~MultiWindowResizeControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); WorkspaceController* wc = test::ShellTestApi(Shell::GetInstance()).workspace_controller(); diff --git a/ash/wm/workspace/workspace_event_handler.h b/ash/wm/workspace/workspace_event_handler.h index 0610537..ae4869d 100644 --- a/ash/wm/workspace/workspace_event_handler.h +++ b/ash/wm/workspace/workspace_event_handler.h @@ -21,8 +21,8 @@ class WorkspaceEventHandler : public ui::EventHandler { virtual ~WorkspaceEventHandler(); // ui::EventHandler: - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) override; + virtual void OnGestureEvent(ui::GestureEvent* event) override; private: friend class WorkspaceEventHandlerTestHelper; diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc index e9c9f15..85572fc 100644 --- a/ash/wm/workspace/workspace_event_handler_unittest.cc +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc @@ -71,7 +71,7 @@ class WindowPropertyObserver : public aura::WindowObserver { private: virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE { + intptr_t old) override { properties_changed_.push_back(key); } diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h index 598276e..ae0c03a 100644 --- a/ash/wm/workspace/workspace_layout_manager.h +++ b/ash/wm/workspace/workspace_layout_manager.h @@ -59,41 +59,41 @@ class ASH_EXPORT WorkspaceLayoutManager scoped_ptr<WorkspaceLayoutManagerDelegate> delegate); // Overridden from aura::LayoutManager: - virtual void OnWindowResized() OVERRIDE {} - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE; + virtual void OnWindowResized() override {} + virtual void OnWindowAddedToLayout(aura::Window* child) override; + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override; + virtual void OnWindowRemovedFromLayout(aura::Window* child) override; virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visibile) OVERRIDE; + bool visibile) override; virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE; + const gfx::Rect& requested_bounds) override; // ash::ShellObserver overrides: - virtual void OnDisplayWorkAreaInsetsChanged() OVERRIDE; + virtual void OnDisplayWorkAreaInsetsChanged() override; // Overriden from WindowObserver: virtual void OnWindowHierarchyChanged( - const WindowObserver::HierarchyChangeParams& params) OVERRIDE; + const WindowObserver::HierarchyChangeParams& params) override; virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE; - virtual void OnWindowStackingChanged(aura::Window* window) OVERRIDE; - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; + intptr_t old) override; + virtual void OnWindowStackingChanged(aura::Window* window) override; + virtual void OnWindowDestroying(aura::Window* window) override; virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE; + const gfx::Rect& new_bounds) override; // aura::client::ActivationChangeObserver overrides: virtual void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) OVERRIDE; + aura::Window* lost_active) override; // keyboard::KeyboardControllerObserver overrides: - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE; + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; // WindowStateObserver overrides: virtual void OnPostWindowStateTypeChange( wm::WindowState* window_state, - wm::WindowStateType old_type) OVERRIDE; + wm::WindowStateType old_type) override; private: typedef std::set<aura::Window*> WindowSet; diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index ea7e5df7..302fa8f 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc @@ -51,7 +51,7 @@ class MaximizeDelegateView : public views::WidgetDelegateView { virtual bool GetSavedWindowPlacement( const views::Widget* widget, gfx::Rect* bounds, - ui::WindowShowState* show_state) const OVERRIDE { + ui::WindowShowState* show_state) const override { *bounds = initial_bounds_; *show_state = ui::SHOW_STATE_MAXIMIZED; return true; @@ -75,7 +75,7 @@ class TestShellObserver : public ShellObserver { } virtual void OnFullscreenStateChanged(bool is_fullscreen, - aura::Window* root_window) OVERRIDE { + aura::Window* root_window) override { call_count_++; is_fullscreen_ = is_fullscreen; } @@ -315,7 +315,7 @@ class DontClobberRestoreBoundsWindowObserver : public aura::WindowObserver { virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, - intptr_t old) OVERRIDE { + intptr_t old) override { if (!window_) return; @@ -579,7 +579,7 @@ class FocusDelegate : public aura::test::TestWindowDelegate { void set_window(aura::Window* window) { window_ = window; } // aura::test::TestWindowDelegate overrides: - virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE { + virtual void OnWindowTargetVisibilityChanged(bool visible) override { if (window_) { if (visible) window_->Focus(); @@ -790,7 +790,7 @@ class WorkspaceLayoutManagerBackdropTest : public test::AshTestBase { WorkspaceLayoutManagerBackdropTest() {} virtual ~WorkspaceLayoutManagerBackdropTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); UpdateDisplay("800x600"); default_container_ = Shell::GetContainer(Shell::GetPrimaryRootWindow(), @@ -978,7 +978,7 @@ class WorkspaceLayoutManagerKeyboardTest : public test::AshTestBase { WorkspaceLayoutManagerKeyboardTest() {} virtual ~WorkspaceLayoutManagerKeyboardTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test::AshTestBase::SetUp(); UpdateDisplay("800x600"); aura::Window* default_container = Shell::GetContainer( @@ -1050,7 +1050,7 @@ class FakeTextInputClient : public ui::DummyTextInputClient { explicit FakeTextInputClient(gfx::NativeWindow window) : window_(window) {} virtual ~FakeTextInputClient() {} - virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE { + virtual gfx::NativeWindow GetAttachedWindow() const override { return window_; } diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h index ec73f4a..6270b60 100644 --- a/ash/wm/workspace/workspace_window_resizer.h +++ b/ash/wm/workspace/workspace_window_resizer.h @@ -57,9 +57,9 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { // WindowResizer: virtual void Drag(const gfx::Point& location_in_parent, - int event_flags) OVERRIDE; - virtual void CompleteDrag() OVERRIDE; - virtual void RevertDrag() OVERRIDE; + int event_flags) override; + virtual void CompleteDrag() override; + virtual void RevertDrag() override; private: WorkspaceWindowResizer(wm::WindowState* window_state, diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index bb580d2..17ab629 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc @@ -51,11 +51,11 @@ class TestWindowDelegate : public aura::test::TestWindowDelegate { private: // Overridden from aura::Test::TestWindowDelegate: - virtual gfx::Size GetMinimumSize() const OVERRIDE { + virtual gfx::Size GetMinimumSize() const override { return min_size_; } - virtual gfx::Size GetMaximumSize() const OVERRIDE { + virtual gfx::Size GetMaximumSize() const override { return max_size_; } @@ -72,7 +72,7 @@ class WorkspaceWindowResizerTest : public test::AshTestBase { WorkspaceWindowResizerTest() : workspace_resizer_(NULL) {} virtual ~WorkspaceWindowResizerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AshTestBase::SetUp(); UpdateDisplay(base::StringPrintf("800x%d", kRootHeight)); // Ignore the touch slop region. @@ -112,7 +112,7 @@ class WorkspaceWindowResizerTest : public test::AshTestBase { window4_->set_id(4); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { window_.reset(); window2_.reset(); window3_.reset(); diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index 77f001f..aa4cee7 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc @@ -647,7 +647,7 @@ class DontCrashOnChangeAndActivateDelegate // WindowDelegate overrides: virtual void OnBoundsChanged(const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) OVERRIDE { + const gfx::Rect& new_bounds) override { if (window_) { wm::ActivateWindow(window_); window_ = NULL; @@ -1330,7 +1330,7 @@ class DragMaximizedNonTrackedWindowObserver // Counts number of times a window is reparented. Ignores reparenting into and // from a docked container which is expected when a tab is dragged. virtual void OnWindowHierarchyChanged( - const HierarchyChangeParams& params) OVERRIDE { + const HierarchyChangeParams& params) override { if (params.target != window_ || (params.old_parent->id() == kShellWindowId_DefaultContainer && params.new_parent->id() == kShellWindowId_DockedContainer) || |