Add new animations in second implementation.

ash/wm/session_state_animator.h

Index: ash/wm/session_state_animator.h
diff --git a/ash/wm/session_state_animator.h b/ash/wm/session_state_animator.h
index 6dd9bf42637cc93b4d2c6ff8d065440888a5dfb9..6c378e489d99580164b89aff45d1d23df779163f 100644
--- a/ash/wm/session_state_animator.h
+++ b/ash/wm/session_state_animator.h
@@ -11,6 +11,7 @@
 #include "base/timer.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window.h"
+#include "ash/wm/workspace/colored_window_controller.h"

[Daniel Erat, 2012/10/22 17:45:48]

keep this list alphabetized

 
 namespace gfx {
 class Rect;
@@ -30,12 +31,17 @@ class ASH_EXPORT SessionStateAnimator : public aura::RootWindowObserver {
  public:
   // Animations that can be applied to groups of containers.
   enum AnimationType {
-    ANIMATION_SLOW_CLOSE = 0,
-    ANIMATION_UNDO_SLOW_CLOSE,
-    ANIMATION_FAST_CLOSE,
+    ANIMATION_PARTIAL_CLOSE = 0,
+    ANIMATION_UNDO_PARTIAL_CLOSE,
+    ANIMATION_FULL_CLOSE,
     ANIMATION_FADE_IN,
     ANIMATION_HIDE,
     ANIMATION_RESTORE,
+    ANIMATION_LIFT_UP,
+    ANIMATION_PUT_DOWN,

[Daniel Erat, 2012/10/22 17:45:48]

maybe just ANIMATION_RAISE and ANIMATION_LOWER for these?

+    ANIMATION_PARTIAL_FADE_IN,
+    ANIMATION_UNDO_PARTIAL_FADE_IN,
+    ANIMATION_FULL_FADE_IN,
   };
 
   // Specific containers or groups of containers that can be animated.
@@ -59,6 +65,8 @@ class ASH_EXPORT SessionStateAnimator : public aura::RootWindowObserver {
     // Multiple system layers belong here like status, menu, tooltip
     // and overlay layers.
     LOCK_SCREEN_RELATED_CONTAINERS = 1 << 5,
+
+    LOCK_SCREEN_SYSTEM_FOREGROUND = 1 << 6,
   };
 
   // Helper class used by tests to access internal state.
@@ -106,6 +114,9 @@ class ASH_EXPORT SessionStateAnimator : public aura::RootWindowObserver {
   void ShowBlackLayer();
   void DropBlackLayer();
 
+  void CreateForeground();
+  void DropForeground();
+
   // Drops back layer after |UNDO_SLOW_CLOSE| animation delay.
   void ScheduleDropBlackLayer();
 
@@ -129,6 +140,8 @@ class ASH_EXPORT SessionStateAnimator : public aura::RootWindowObserver {
   // http://crbug.com/113445
   scoped_ptr<ui::Layer> black_layer_;
 
+  scoped_ptr<ColoredWindowController> foreground_;

[Daniel Erat, 2012/10/22 17:45:48]

add a comment describing what this is

+
   // Started when we abort the pre-lock state.  When it fires, we hide
   // |black_layer_|, as the desktop background is now covering the whole
   // screen.