Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(523)

Unified Diff: ash/wm/session_state_animator.h

Issue 11453012: Fix black background when locking with fullscreen window: (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rename undo/stop to cancel Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/wm/session_state_animator.cc » ('j') | ash/wm/session_state_controller_impl2.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/session_state_animator.h
diff --git a/ash/wm/session_state_animator.h b/ash/wm/session_state_animator.h
index 751017312be86ee7e4e893e0ae1a4450601af4a2..1479d2306a2d300ad04273aea895516b6a37dd8f 100644
--- a/ash/wm/session_state_animator.h
+++ b/ash/wm/session_state_animator.h
@@ -11,6 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/timer.h"
#include "ui/aura/window.h"
+#include "ui/compositor/layer_animation_observer.h"
namespace gfx {
class Rect;
@@ -34,11 +35,13 @@ class ASH_EXPORT SessionStateAnimator {
ANIMATION_UNDO_PARTIAL_CLOSE,
ANIMATION_FULL_CLOSE,
ANIMATION_FADE_IN,
+ ANIMATION_FADE_OUT,
ANIMATION_HIDE_IMMEDIATELY,
ANIMATION_RESTORE,
// Animations that raise/lower windows to/from area "in front" of the
// screen.
ANIMATION_LIFT,
+ ANIMATION_UNDO_LIFT,
ANIMATION_DROP,
// Animations that raise/lower windows from/to area "behind" of the screen.
ANIMATION_RAISE_TO_SCREEN,
@@ -97,8 +100,6 @@ class ASH_EXPORT SessionStateAnimator {
// 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.
@@ -159,6 +160,13 @@ class ASH_EXPORT SessionStateAnimator {
AnimationSpeed speed,
base::Callback<void(void)>& callback);
+// Apply animation |type| to all containers included in |container_mask| with
Daniel Erat 2012/12/13 21:47:33 nit: indent this comment two more spaces
+// specified |speed| and add |observer| to all animations.
+ void StartAnimationWithObserver(int container_mask,
+ AnimationType type,
+ AnimationSpeed speed,
+ ui::LayerAnimationObserver* observer);
+
// Applies animation |type| whith specified |speed| to the root container.
void StartGlobalAnimation(AnimationType type,
AnimationSpeed speed);
« no previous file with comments | « no previous file | ash/wm/session_state_animator.cc » ('j') | ash/wm/session_state_controller_impl2.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698