Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h |
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h |
index 1cc1a0c4e54ac5fb1940e49aafdcc22eee30672e..4b575a824678a986b7ad18ca90838152745c4ec1 100644 |
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h |
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h |
@@ -61,6 +61,13 @@ class MultiUserWindowManagerChromeOS |
public content::NotificationObserver, |
public wm::TransientWindowObserver { |
public: |
+ // The speed which should be used to perform animations. |
+ enum AnimationSpeed { |
+ ANIMATION_SPEED_NORMAL, // The normal animation speed. |
+ ANIMATION_SPEED_FAST, // Unit test speed which test animations. |
+ ANIMATION_SPEED_DISABLED // Unit tests which do not require animations. |
+ }; |
+ |
// Create the manager and use |active_user_id| as the active user. |
explicit MultiUserWindowManagerChromeOS(const std::string& active_user_id); |
virtual ~MultiUserWindowManagerChromeOS(); |
@@ -104,7 +111,7 @@ class MultiUserWindowManagerChromeOS |
const content::NotificationDetails& details) OVERRIDE; |
// Disable any animations for unit tests. |
- void SetAnimationsForTest(bool disable); |
+ void SetAnimationSpeedForTest(AnimationSpeed speed); |
// Returns true when a user switch animation is running. For unit tests. |
bool IsAnimationRunningForTest(); |
@@ -244,8 +251,8 @@ class MultiUserWindowManagerChromeOS |
// used is quite expensive. |
static MultiProfileMode multi_user_mode_; |
- // If true, all animations will be suppressed. |
- bool animations_disabled_; |
+ // The speed which is used to perform any animations. |
+ AnimationSpeed animation_speed_; |
// The animation between users. |
scoped_ptr<UserSwichAnimatorChromeOS> animation_; |