OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_SESSION_STATE_ANIMATOR_H_ | 5 #ifndef ASH_WM_SESSION_STATE_ANIMATOR_H_ |
6 #define ASH_WM_SESSION_STATE_ANIMATOR_H_ | 6 #define ASH_WM_SESSION_STATE_ANIMATOR_H_ |
7 | 7 |
8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
9 #include "ash/wm/workspace/colored_window_controller.h" | 9 #include "ash/wm/workspace/colored_window_controller.h" |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 // pre-lock and pre-shutdown animations. | 61 // pre-lock and pre-shutdown animations. |
62 ANIMATION_SPEED_REVERT, | 62 ANIMATION_SPEED_REVERT, |
63 // Speed for user action that can not be undone, Used for lock and shutdown | 63 // Speed for user action that can not be undone, Used for lock and shutdown |
64 // animations requested via menus/shortcuts and for animating remaining | 64 // animations requested via menus/shortcuts and for animating remaining |
65 // parts of partial lock/shutdown animations. | 65 // parts of partial lock/shutdown animations. |
66 ANIMATION_SPEED_FAST, | 66 ANIMATION_SPEED_FAST, |
67 // Speed for lock screen appearance in "old" animation set. | 67 // Speed for lock screen appearance in "old" animation set. |
68 ANIMATION_SPEED_SHOW_LOCK_SCREEN, | 68 ANIMATION_SPEED_SHOW_LOCK_SCREEN, |
69 // Speed for workspace-like animations in "new" animation set. | 69 // Speed for workspace-like animations in "new" animation set. |
70 ANIMATION_SPEED_MOVE_WINDOWS, | 70 ANIMATION_SPEED_MOVE_WINDOWS, |
| 71 // Speed for undoing workspace-like animations in "new" animation set. |
| 72 ANIMATION_SPEED_UNDO_MOVE_WINDOWS, |
71 // Speed for shutdown in "new" animation set. | 73 // Speed for shutdown in "new" animation set. |
72 ANIMATION_SPEED_SHUTDOWN, | 74 ANIMATION_SPEED_SHUTDOWN, |
73 // Speed for reverting shutdown in "new" animation set. | 75 // Speed for reverting shutdown in "new" animation set. |
74 ANIMATION_SPEED_REVERT_SHUTDOWN, | 76 ANIMATION_SPEED_REVERT_SHUTDOWN, |
75 }; | 77 }; |
76 | 78 |
77 // Specific containers or groups of containers that can be animated. | 79 // Specific containers or groups of containers that can be animated. |
78 enum Container { | 80 enum Container { |
79 DESKTOP_BACKGROUND = 1 << 0, | 81 DESKTOP_BACKGROUND = 1 << 0, |
80 LAUNCHER = 1 << 1, | 82 LAUNCHER = 1 << 1, |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 // everything into white". | 174 // everything into white". |
173 scoped_ptr<ColoredWindowController> foreground_; | 175 scoped_ptr<ColoredWindowController> foreground_; |
174 | 176 |
175 DISALLOW_COPY_AND_ASSIGN(SessionStateAnimator); | 177 DISALLOW_COPY_AND_ASSIGN(SessionStateAnimator); |
176 }; | 178 }; |
177 | 179 |
178 } // namespace internal | 180 } // namespace internal |
179 } // namespace ash | 181 } // namespace ash |
180 | 182 |
181 #endif // ASH_WM_SESSION_STATE_ANIMATOR_H_ | 183 #endif // ASH_WM_SESSION_STATE_ANIMATOR_H_ |
OLD | NEW |