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

Side by Side Diff: ash/test/test_session_state_animator.h

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)
Patch Set: Address comments. Created 4 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 unified diff | Download patch
« no previous file with comments | « ash/sysui/wallpaper_delegate_mus.cc ('k') | ash/test/test_session_state_animator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_TEST_TEST_SESSION_STATE_ANIMATOR_H_ 5 #ifndef ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_
6 #define ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_ 6 #define ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 // ash::SessionStateAnimator: 66 // ash::SessionStateAnimator:
67 void StartAnimation(int container_mask, 67 void StartAnimation(int container_mask,
68 AnimationType type, 68 AnimationType type,
69 AnimationSpeed speed) override; 69 AnimationSpeed speed) override;
70 void StartAnimationWithCallback(int container_mask, 70 void StartAnimationWithCallback(int container_mask,
71 AnimationType type, 71 AnimationType type,
72 AnimationSpeed speed, 72 AnimationSpeed speed,
73 base::Closure callback) override; 73 base::Closure callback) override;
74 AnimationSequence* BeginAnimationSequence(base::Closure callback) override; 74 AnimationSequence* BeginAnimationSequence(base::Closure callback) override;
75 bool IsBackgroundHidden() const override; 75 bool IsWallpaperHidden() const override;
76 void ShowBackground() override; 76 void ShowWallpaper() override;
77 void HideBackground() override; 77 void HideWallpaper() override;
78 78
79 private: 79 private:
80 class AnimationSequence; 80 class AnimationSequence;
81 friend class AnimationSequence; 81 friend class AnimationSequence;
82 82
83 // Data structure to track the currently active animations and their 83 // Data structure to track the currently active animations and their
84 // callbacks. 84 // callbacks.
85 struct ActiveAnimation { 85 struct ActiveAnimation {
86 ActiveAnimation(int animation_epoch, 86 ActiveAnimation(int animation_epoch,
87 base::TimeDelta duration, 87 base::TimeDelta duration,
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // Used for easy iteration over all the containers. 144 // Used for easy iteration over all the containers.
145 static const SessionStateAnimator::Container kAllContainers[]; 145 static const SessionStateAnimator::Container kAllContainers[];
146 146
147 // A map of currently active animations. 147 // A map of currently active animations.
148 ActiveAnimationsMap active_animations_; 148 ActiveAnimationsMap active_animations_;
149 149
150 // A time counter that tracks the last scheduled animation or animation 150 // A time counter that tracks the last scheduled animation or animation
151 // sequence. 151 // sequence.
152 int last_animation_epoch_; 152 int last_animation_epoch_;
153 153
154 // Tracks whether the background is hidden or not. 154 // Tracks whether the wallpaper is hidden or not.
155 bool is_background_hidden_; 155 bool is_wallpaper_hidden_;
156 156
157 DISALLOW_COPY_AND_ASSIGN(TestSessionStateAnimator); 157 DISALLOW_COPY_AND_ASSIGN(TestSessionStateAnimator);
158 }; 158 };
159 159
160 } // namespace test 160 } // namespace test
161 } // namespace ash 161 } // namespace ash
162 162
163 #endif // ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_ 163 #endif // ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_
OLDNEW
« no previous file with comments | « ash/sysui/wallpaper_delegate_mus.cc ('k') | ash/test/test_session_state_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698