| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ | 5 #ifndef ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ |
| 6 #define ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ | 6 #define ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 // the top-of-window views will animate according to |animate_reveal|. The | 119 // the top-of-window views will animate according to |animate_reveal|. The |
| 120 // caller takes ownership of the returned lock. | 120 // caller takes ownership of the returned lock. |
| 121 ImmersiveRevealedLock* GetRevealedLock( | 121 ImmersiveRevealedLock* GetRevealedLock( |
| 122 AnimateReveal animate_reveal) WARN_UNUSED_RESULT; | 122 AnimateReveal animate_reveal) WARN_UNUSED_RESULT; |
| 123 | 123 |
| 124 // Disables animations and moves the mouse so that it is not over the | 124 // Disables animations and moves the mouse so that it is not over the |
| 125 // top-of-window views for the sake of testing. | 125 // top-of-window views for the sake of testing. |
| 126 void SetupForTest(); | 126 void SetupForTest(); |
| 127 | 127 |
| 128 // ui::EventHandler overrides: | 128 // ui::EventHandler overrides: |
| 129 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; | 129 virtual void OnMouseEvent(ui::MouseEvent* event) override; |
| 130 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; | 130 virtual void OnTouchEvent(ui::TouchEvent* event) override; |
| 131 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; | 131 virtual void OnGestureEvent(ui::GestureEvent* event) override; |
| 132 | 132 |
| 133 // views::FocusChangeObserver overrides: | 133 // views::FocusChangeObserver overrides: |
| 134 virtual void OnWillChangeFocus(views::View* focused_before, | 134 virtual void OnWillChangeFocus(views::View* focused_before, |
| 135 views::View* focused_now) OVERRIDE; | 135 views::View* focused_now) override; |
| 136 virtual void OnDidChangeFocus(views::View* focused_before, | 136 virtual void OnDidChangeFocus(views::View* focused_before, |
| 137 views::View* focused_now) OVERRIDE; | 137 views::View* focused_now) override; |
| 138 | 138 |
| 139 // views::WidgetObserver overrides: | 139 // views::WidgetObserver overrides: |
| 140 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; | 140 virtual void OnWidgetDestroying(views::Widget* widget) override; |
| 141 virtual void OnWidgetActivationChanged(views::Widget* widget, | 141 virtual void OnWidgetActivationChanged(views::Widget* widget, |
| 142 bool active) OVERRIDE; | 142 bool active) override; |
| 143 | 143 |
| 144 // gfx::AnimationDelegate overrides: | 144 // gfx::AnimationDelegate overrides: |
| 145 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; | 145 virtual void AnimationEnded(const gfx::Animation* animation) override; |
| 146 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; | 146 virtual void AnimationProgressed(const gfx::Animation* animation) override; |
| 147 | 147 |
| 148 // ::wm::TransientWindowObserver overrides: | 148 // ::wm::TransientWindowObserver overrides: |
| 149 virtual void OnTransientChildAdded(aura::Window* window, | 149 virtual void OnTransientChildAdded(aura::Window* window, |
| 150 aura::Window* transient) OVERRIDE; | 150 aura::Window* transient) override; |
| 151 virtual void OnTransientChildRemoved(aura::Window* window, | 151 virtual void OnTransientChildRemoved(aura::Window* window, |
| 152 aura::Window* transient) OVERRIDE; | 152 aura::Window* transient) override; |
| 153 | 153 |
| 154 // ash::ImmersiveRevealedLock::Delegate overrides: | 154 // ash::ImmersiveRevealedLock::Delegate overrides: |
| 155 virtual void LockRevealedState(AnimateReveal animate_reveal) OVERRIDE; | 155 virtual void LockRevealedState(AnimateReveal animate_reveal) override; |
| 156 virtual void UnlockRevealedState() OVERRIDE; | 156 virtual void UnlockRevealedState() override; |
| 157 | 157 |
| 158 private: | 158 private: |
| 159 friend class ImmersiveFullscreenControllerTest; | 159 friend class ImmersiveFullscreenControllerTest; |
| 160 | 160 |
| 161 enum Animate { | 161 enum Animate { |
| 162 ANIMATE_NO, | 162 ANIMATE_NO, |
| 163 ANIMATE_SLOW, | 163 ANIMATE_SLOW, |
| 164 ANIMATE_FAST, | 164 ANIMATE_FAST, |
| 165 }; | 165 }; |
| 166 enum RevealState { | 166 enum RevealState { |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 scoped_ptr<BubbleManager> bubble_manager_; | 292 scoped_ptr<BubbleManager> bubble_manager_; |
| 293 | 293 |
| 294 base::WeakPtrFactory<ImmersiveFullscreenController> weak_ptr_factory_; | 294 base::WeakPtrFactory<ImmersiveFullscreenController> weak_ptr_factory_; |
| 295 | 295 |
| 296 DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenController); | 296 DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenController); |
| 297 }; | 297 }; |
| 298 | 298 |
| 299 } // namespace ash | 299 } // namespace ash |
| 300 | 300 |
| 301 #endif // ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ | 301 #endif // ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ |
| OLD | NEW |