Rename ash desktop_background to wallpaper.

ash/wm/session_state_animator.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_WM_SESSION_STATE_ANIMATOR_H_
 #define ASH_WM_SESSION_STATE_ANIMATOR_H_
 
 #include "ash/ash_export.h"
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 50 matching lines @@
     // Speed for undoing workspace-like animations in "new" animation set.
     ANIMATION_SPEED_UNDO_MOVE_WINDOWS,
     // Speed for shutdown in "new" animation set.
     ANIMATION_SPEED_SHUTDOWN,
     // Speed for reverting shutdown in "new" animation set.
     ANIMATION_SPEED_REVERT_SHUTDOWN,
   };
 
   // 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,
 
     // Multiple system layers belong here like status, menu, tooltip
     // and overlay layers.
     LOCK_SCREEN_RELATED_CONTAINERS = 1 << 5,
 
     // The primary root window.
     ROOT_CONTAINER = 1 << 6,
@@ skipping 104 matching lines @@
   virtual void StartAnimationWithCallback(int container_mask,
                                           AnimationType type,
                                           AnimationSpeed speed,
                                           base::Closure callback) = 0;
 
   // Begins an animation sequence.  Use this when you need to be notified when
   // a group of animations are completed.  See AnimationSequence documentation
   // 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);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_SESSION_STATE_ANIMATOR_H_