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

Unified Diff: ash/test/test_session_state_animator.cc

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)
Patch Set: Address comments. Created 4 years, 4 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 | « ash/test/test_session_state_animator.h ('k') | ash/test/test_wallpaper_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_session_state_animator.cc
diff --git a/ash/test/test_session_state_animator.cc b/ash/test/test_session_state_animator.cc
index 686598821d61303a29759fa589c11689a483535b..f67f431c11392e3cdcaa6b8949716c76397a24d7 100644
--- a/ash/test/test_session_state_animator.cc
+++ b/ash/test/test_session_state_animator.cc
@@ -19,10 +19,10 @@ void DummyCallback() {}
const SessionStateAnimator::Container
TestSessionStateAnimator::kAllContainers[] = {
- SessionStateAnimator::DESKTOP_BACKGROUND,
+ SessionStateAnimator::WALLPAPER,
SessionStateAnimator::LAUNCHER,
SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
- SessionStateAnimator::LOCK_SCREEN_BACKGROUND,
+ SessionStateAnimator::LOCK_SCREEN_WALLPAPER,
SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
SessionStateAnimator::LOCK_SCREEN_RELATED_CONTAINERS,
SessionStateAnimator::ROOT_CONTAINER};
@@ -98,7 +98,7 @@ TestSessionStateAnimator::ActiveAnimation::ActiveAnimation(
TestSessionStateAnimator::ActiveAnimation::~ActiveAnimation() {}
TestSessionStateAnimator::TestSessionStateAnimator()
- : last_animation_epoch_(0), is_background_hidden_(false) {}
+ : last_animation_epoch_(0), is_wallpaper_hidden_(false) {}
TestSessionStateAnimator::~TestSessionStateAnimator() {
CompleteAllAnimations(false);
@@ -225,16 +225,16 @@ TestSessionStateAnimator::BeginAnimationSequence(base::Closure callback) {
return new AnimationSequence(callback, this);
}
-bool TestSessionStateAnimator::IsBackgroundHidden() const {
- return is_background_hidden_;
+bool TestSessionStateAnimator::IsWallpaperHidden() const {
+ return is_wallpaper_hidden_;
}
-void TestSessionStateAnimator::ShowBackground() {
- is_background_hidden_ = false;
+void TestSessionStateAnimator::ShowWallpaper() {
+ is_wallpaper_hidden_ = false;
}
-void TestSessionStateAnimator::HideBackground() {
- is_background_hidden_ = true;
+void TestSessionStateAnimator::HideWallpaper() {
+ is_wallpaper_hidden_ = true;
}
void TestSessionStateAnimator::StartAnimationInSequence(
« no previous file with comments | « ash/test/test_session_state_animator.h ('k') | ash/test/test_wallpaper_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698