OLD | NEW |
---|---|
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
50 ANIMATION_FAST_CLOSE, | 50 ANIMATION_FAST_CLOSE, |
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 // Groups of containers that can be animated. | 56 // Groups of containers that can be animated. |
57 // Exposed here for TestApi::ContainerGroupIsAnimated(). | 57 // Exposed here for TestApi::ContainerGroupIsAnimated(). |
58 enum ContainerGroup { | 58 enum ContainerGroup { |
59 ALL_CONTAINERS = 0, | 59 ALL_CONTAINERS = 0, |
60 SCREEN_LOCKER_CONTAINERS, | 60 SCREEN_LOCKER_CONTAINERS_EXCEPT_WALLPAPER, |
Daniel Erat
2012/08/30 16:04:53
I find this confusing. The containers that each e
Nikita (slow)
2012/08/30 17:04:51
Are you proposing to abandon those predefined grou
Daniel Erat
2012/08/30 17:08:43
Yes, if the concepts of which containers each grou
Denis Kuznetsov (DE-MUC)
2012/08/30 17:15:04
I think exclusion-based name like "non-something"
Nikita (slow)
2012/09/03 14:50:59
Done.
| |
61 SCREEN_LOCKER_AND_RELATED_CONTAINERS, | 61 SCREEN_LOCKER_AND_RELATED_CONTAINERS, |
62 ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS, | 62 ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS, |
63 }; | 63 }; |
64 | 64 |
65 // Helper class used by tests to access internal state. | 65 // Helper class used by tests to access internal state. |
66 class ASH_EXPORT TestApi { | 66 class ASH_EXPORT TestApi { |
67 public: | 67 public: |
68 explicit TestApi(PowerButtonController* controller) | 68 explicit TestApi(PowerButtonController* controller) |
69 : controller_(controller) {} | 69 : controller_(controller) {} |
70 | 70 |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
255 // |background_layer_|, as the desktop background is now covering the whole | 255 // |background_layer_|, as the desktop background is now covering the whole |
256 // screen. | 256 // screen. |
257 base::OneShotTimer<PowerButtonController> hide_background_layer_timer_; | 257 base::OneShotTimer<PowerButtonController> hide_background_layer_timer_; |
258 | 258 |
259 DISALLOW_COPY_AND_ASSIGN(PowerButtonController); | 259 DISALLOW_COPY_AND_ASSIGN(PowerButtonController); |
260 }; | 260 }; |
261 | 261 |
262 } // namespace ash | 262 } // namespace ash |
263 | 263 |
264 #endif // ASH_WM_POWER_BUTTON_CONTROLLER_H_ | 264 #endif // ASH_WM_POWER_BUTTON_CONTROLLER_H_ |
OLD | NEW |