| Index: ash/wm/immersive_fullscreen_controller.h
|
| diff --git a/ash/wm/immersive_fullscreen_controller.h b/ash/wm/immersive_fullscreen_controller.h
|
| index 47f2610f6587ce1f7ee444ae03029bfb668be419..773c5eca63082ad216ffdfebf31c7b18b70befa8 100644
|
| --- a/ash/wm/immersive_fullscreen_controller.h
|
| +++ b/ash/wm/immersive_fullscreen_controller.h
|
| @@ -86,7 +86,7 @@ class ASH_EXPORT ImmersiveFullscreenController
|
| };
|
|
|
| ImmersiveFullscreenController();
|
| - virtual ~ImmersiveFullscreenController();
|
| + ~ImmersiveFullscreenController() override;
|
|
|
| // Initializes the controller. Must be called prior to enabling immersive
|
| // fullscreen via SetEnabled(). |top_container| is used to keep the
|
| @@ -126,34 +126,33 @@ 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;
|
| + void OnMouseEvent(ui::MouseEvent* event) override;
|
| + void OnTouchEvent(ui::TouchEvent* event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| // views::FocusChangeObserver overrides:
|
| - virtual void OnWillChangeFocus(views::View* focused_before,
|
| - views::View* focused_now) override;
|
| - virtual void OnDidChangeFocus(views::View* focused_before,
|
| - views::View* focused_now) override;
|
| + void OnWillChangeFocus(views::View* focused_before,
|
| + views::View* focused_now) override;
|
| + void OnDidChangeFocus(views::View* focused_before,
|
| + views::View* focused_now) override;
|
|
|
| // views::WidgetObserver overrides:
|
| - virtual void OnWidgetDestroying(views::Widget* widget) override;
|
| - virtual void OnWidgetActivationChanged(views::Widget* widget,
|
| - bool active) override;
|
| + void OnWidgetDestroying(views::Widget* widget) override;
|
| + void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
|
|
|
| // gfx::AnimationDelegate overrides:
|
| - virtual void AnimationEnded(const gfx::Animation* animation) override;
|
| - virtual void AnimationProgressed(const gfx::Animation* animation) override;
|
| + void AnimationEnded(const gfx::Animation* animation) override;
|
| + void AnimationProgressed(const gfx::Animation* animation) override;
|
|
|
| // ::wm::TransientWindowObserver overrides:
|
| - virtual void OnTransientChildAdded(aura::Window* window,
|
| - aura::Window* transient) override;
|
| - virtual void OnTransientChildRemoved(aura::Window* window,
|
| - aura::Window* transient) override;
|
| + void OnTransientChildAdded(aura::Window* window,
|
| + aura::Window* transient) override;
|
| + void OnTransientChildRemoved(aura::Window* window,
|
| + aura::Window* transient) override;
|
|
|
| // ash::ImmersiveRevealedLock::Delegate overrides:
|
| - virtual void LockRevealedState(AnimateReveal animate_reveal) override;
|
| - virtual void UnlockRevealedState() override;
|
| + void LockRevealedState(AnimateReveal animate_reveal) override;
|
| + void UnlockRevealedState() override;
|
|
|
| private:
|
| friend class ImmersiveFullscreenControllerTest;
|
|
|