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

Unified Diff: ash/wm/session_state_animator.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/root_window_layout_manager_unittest.cc ('k') | ash/wm/session_state_animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/session_state_animator.h
diff --git a/ash/wm/session_state_animator.h b/ash/wm/session_state_animator.h
index a1c690eaf98d1faa737ddc6645ebed1669701208..977e2663e751740624958c5485057ac44594b8c6 100644
--- a/ash/wm/session_state_animator.h
+++ b/ash/wm/session_state_animator.h
@@ -68,18 +68,18 @@ class ASH_EXPORT SessionStateAnimator {
// Specific containers or groups of containers that can be animated.
enum Container {
- DESKTOP_BACKGROUND = 1 << 0,
+ WALLPAPER = 1 << 0,
LAUNCHER = 1 << 1,
- // All user session related containers including system background but
- // not including desktop background (wallpaper).
+ // All user session related containers including the system wallpaper but
+ // not including the user's wallpaper.
NON_LOCK_SCREEN_CONTAINERS = 1 << 2,
// Desktop wallpaper is moved to this layer when screen is locked.
// This layer is excluded from lock animation so that wallpaper stays as is,
// user session windows are hidden and lock UI is shown on top of it.
// This layer is included in shutdown animation.
- LOCK_SCREEN_BACKGROUND = 1 << 3,
+ LOCK_SCREEN_WALLPAPER = 1 << 3,
// Lock screen and lock screen modal containers.
LOCK_SCREEN_CONTAINERS = 1 << 4,
@@ -204,14 +204,14 @@ class ASH_EXPORT SessionStateAnimator {
// for more details.
virtual AnimationSequence* BeginAnimationSequence(base::Closure callback) = 0;
- // Retruns true if the background is hidden.
- virtual bool IsBackgroundHidden() const = 0;
+ // Retruns true if the wallpaper is hidden.
+ virtual bool IsWallpaperHidden() const = 0;
- // Shows the background immediately.
- virtual void ShowBackground() = 0;
+ // Shows the wallpaper immediately.
+ virtual void ShowWallpaper() = 0;
- // Hides the background immediately.
- virtual void HideBackground() = 0;
+ // Hides the wallpaper immediately.
+ virtual void HideWallpaper() = 0;
private:
DISALLOW_COPY_AND_ASSIGN(SessionStateAnimator);
« no previous file with comments | « ash/wm/root_window_layout_manager_unittest.cc ('k') | ash/wm/session_state_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698