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

Unified Diff: ash/wm/power_button_controller.h

Issue 10990118: Polish lock animation - launcher should do a fade out. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 3 months 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/power_button_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/power_button_controller.h
diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h
index 1bb4d321a5449e1c981ebb67c0bfd5d6c5ce795b..29b99a20caab8e46448c97ddf642e9f85bde7fb8 100644
--- a/ash/wm/power_button_controller.h
+++ b/ash/wm/power_button_controller.h
@@ -58,22 +58,24 @@ class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver,
enum Container {
DESKTOP_BACKGROUND = 1 << 0,
+ LAUNCHER = 1 << 1,
+
// All user session related containers including system background but
- // not including desktop background (wallpaper).
- NON_LOCK_SCREEN_CONTAINERS = 1 << 1,
+ // not including desktop background (wallpaper) and launcher.
+ NON_LOCK_SCREEN_CONTAINERS = 1 << 2,
// Desktop wallpaper is moved to this layer when screen is locked.
// This layer is excluded from lock animation so that wallpaper stays as is,
// user session windows are hidden and lock UI is shown on top of it.
// This layer is included in shutdown animation.
- LOCK_SCREEN_BACKGROUND = 1 << 2,
+ LOCK_SCREEN_BACKGROUND = 1 << 3,
// Lock screen and lock screen modal containers.
- LOCK_SCREEN_CONTAINERS = 1 << 3,
+ LOCK_SCREEN_CONTAINERS = 1 << 4,
// Multiple system layers belong here like status, menu, tooltip
// and overlay layers.
- LOCK_SCREEN_RELATED_CONTAINERS = 1 << 4,
+ LOCK_SCREEN_RELATED_CONTAINERS = 1 << 5,
};
// Helper class used by tests to access internal state.
« no previous file with comments | « no previous file | ash/wm/power_button_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698