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

Unified Diff: ash/wm/lock_state_controller.h

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/wm/event_client_impl.cc ('k') | ash/wm/lock_state_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/lock_state_controller.h
diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
index e9ed12e15e338133056ec2f0ccc61f9f8f7e4424..a3cdbe86af59450045b82a6ef6e41eeea46e1f18 100644
--- a/ash/wm/lock_state_controller.h
+++ b/ash/wm/lock_state_controller.h
@@ -210,7 +210,7 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
friend class test::LockStateControllerTest;
struct UnlockedStateProperties {
- bool background_is_hidden;
+ bool wallpaper_is_hidden;
};
// Reverts the pre-lock animation, reports the error.
@@ -262,13 +262,13 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
void StoreUnlockedProperties();
void RestoreUnlockedProperties();
- // Fades in background layer with |speed| if it was hidden in unlocked state.
- void AnimateBackgroundAppearanceIfNecessary(
+ // Fades in wallpaper layer with |speed| if it was hidden in unlocked state.
+ void AnimateWallpaperAppearanceIfNecessary(
ash::SessionStateAnimator::AnimationSpeed speed,
SessionStateAnimator::AnimationSequence* animation_sequence);
- // Fades out background layer with |speed| if it was hidden in unlocked state.
- void AnimateBackgroundHidingIfNecessary(
+ // Fades out wallpaper layer with |speed| if it was hidden in unlocked state.
+ void AnimateWallpaperHidingIfNecessary(
ash::SessionStateAnimator::AnimationSpeed speed,
SessionStateAnimator::AnimationSequence* animation_sequence);
« no previous file with comments | « ash/wm/event_client_impl.cc ('k') | ash/wm/lock_state_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698