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

Side by Side 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: Move launcher container up Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_POWER_BUTTON_CONTROLLER_H_ 5 #ifndef ASH_WM_POWER_BUTTON_CONTROLLER_H_
6 #define ASH_WM_POWER_BUTTON_CONTROLLER_H_ 6 #define ASH_WM_POWER_BUTTON_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shell_observer.h" 9 #include "ash/shell_observer.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ANIMATION_FADE_IN, 51 ANIMATION_FADE_IN,
52 ANIMATION_HIDE, 52 ANIMATION_HIDE,
53 ANIMATION_RESTORE, 53 ANIMATION_RESTORE,
54 }; 54 };
55 55
56 // Specific containers or groups of containers that can be animated. 56 // Specific containers or groups of containers that can be animated.
57 // Exposed here for TestApi::ContainersAreAnimated(). 57 // Exposed here for TestApi::ContainersAreAnimated().
58 enum Container { 58 enum Container {
59 DESKTOP_BACKGROUND = 1 << 0, 59 DESKTOP_BACKGROUND = 1 << 0,
60 60
61 LAUNCHER = 1 << 1,
62
61 // All user session related containers including system background but 63 // All user session related containers including system background but
62 // not including desktop background (wallpaper). 64 // not including desktop background (wallpaper) and launcher.
63 NON_LOCK_SCREEN_CONTAINERS = 1 << 1, 65 NON_LOCK_SCREEN_CONTAINERS = 1 << 2,
64 66
65 // Desktop wallpaper is moved to this layer when screen is locked. 67 // Desktop wallpaper is moved to this layer when screen is locked.
66 // This layer is excluded from lock animation so that wallpaper stays as is, 68 // This layer is excluded from lock animation so that wallpaper stays as is,
67 // user session windows are hidden and lock UI is shown on top of it. 69 // user session windows are hidden and lock UI is shown on top of it.
68 // This layer is included in shutdown animation. 70 // This layer is included in shutdown animation.
69 LOCK_SCREEN_BACKGROUND = 1 << 2, 71 LOCK_SCREEN_BACKGROUND = 1 << 3,
70 72
71 // Lock screen and lock screen modal containers. 73 // Lock screen and lock screen modal containers.
72 LOCK_SCREEN_CONTAINERS = 1 << 3, 74 LOCK_SCREEN_CONTAINERS = 1 << 4,
73 75
74 // Multiple system layers belong here like status, menu, tooltip 76 // Multiple system layers belong here like status, menu, tooltip
75 // and overlay layers. 77 // and overlay layers.
76 LOCK_SCREEN_RELATED_CONTAINERS = 1 << 4, 78 LOCK_SCREEN_RELATED_CONTAINERS = 1 << 5,
77 }; 79 };
78 80
79 // Helper class used by tests to access internal state. 81 // Helper class used by tests to access internal state.
80 class ASH_EXPORT TestApi { 82 class ASH_EXPORT TestApi {
81 public: 83 public:
82 explicit TestApi(PowerButtonController* controller) 84 explicit TestApi(PowerButtonController* controller)
83 : controller_(controller) {} 85 : controller_(controller) {}
84 86
85 bool lock_timer_is_running() const { 87 bool lock_timer_is_running() const {
86 return controller_->lock_timer_.IsRunning(); 88 return controller_->lock_timer_.IsRunning();
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // |black_layer_|, as the desktop background is now covering the whole 274 // |black_layer_|, as the desktop background is now covering the whole
273 // screen. 275 // screen.
274 base::OneShotTimer<PowerButtonController> hide_black_layer_timer_; 276 base::OneShotTimer<PowerButtonController> hide_black_layer_timer_;
275 277
276 DISALLOW_COPY_AND_ASSIGN(PowerButtonController); 278 DISALLOW_COPY_AND_ASSIGN(PowerButtonController);
277 }; 279 };
278 280
279 } // namespace ash 281 } // namespace ash
280 282
281 #endif // ASH_WM_POWER_BUTTON_CONTROLLER_H_ 283 #endif // ASH_WM_POWER_BUTTON_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698