Rename ash desktop_background to wallpaper.

ash/wm/session_state_animator_impl.cc

 // 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.
 
 #include "ash/wm/session_state_animator_impl.h"
 
 #include <vector>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/wm_window_animations.h"
@@ skipping 12 matching lines @@
 // pre-shutdown states.
 const float kSlowCloseSizeRatio = 0.95f;
 
 // Maximum opacity of white layer when animating pre-shutdown state.
 const float kPartialFadeRatio = 0.3f;
 
 // Minimum size. Not zero as it causes numeric issues.
 const float kMinimumScale = 1e-4f;
 
 // Returns the primary root window's container.
-aura::Window* GetBackground() {
+aura::Window* GetWallpaper() {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
-  return Shell::GetContainer(root_window,
-                             kShellWindowId_DesktopBackgroundContainer);
+  return Shell::GetContainer(root_window, kShellWindowId_WallpaperContainer);
 }
 
 // Returns the transform that should be applied to containers for the slow-close
 // animation.
 gfx::Transform GetSlowCloseTransform() {
   gfx::Size root_size = Shell::GetPrimaryRootWindow()->bounds().size();
   gfx::Transform transform;
   transform.Translate(
       floor(0.5 * (1.0 - kSlowCloseSizeRatio) * root_size.width() + 0.5),
       floor(0.5 * (1.0 - kSlowCloseSizeRatio) * root_size.height() + 0.5));
@@ skipping 335 matching lines @@
   return true;
 }
 
 void GetContainersInRootWindow(int container_mask,
                                aura::Window* root_window,
                                aura::Window::Windows* containers) {
   if (container_mask & SessionStateAnimator::ROOT_CONTAINER) {
     containers->push_back(root_window);
   }
 
-  if (container_mask & SessionStateAnimator::DESKTOP_BACKGROUND) {
-    containers->push_back(Shell::GetContainer(
-        root_window, kShellWindowId_DesktopBackgroundContainer));
+  if (container_mask & SessionStateAnimator::WALLPAPER) {
+    containers->push_back(
+        Shell::GetContainer(root_window, kShellWindowId_WallpaperContainer));
   }
   if (container_mask & SessionStateAnimator::LAUNCHER) {
     containers->push_back(
         Shell::GetContainer(root_window, kShellWindowId_ShelfContainer));
   }
   if (container_mask & SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS) {
     // TODO(antrim): Figure out a way to eliminate a need to exclude launcher
     // in such way.
     aura::Window* non_lock_screen_containers = Shell::GetContainer(
         root_window, kShellWindowId_NonLockScreenContainersContainer);
     // |non_lock_screen_containers| may already be removed in some tests.
     if (non_lock_screen_containers) {
       for (aura::Window* window : non_lock_screen_containers->children()) {
         if (window->id() == kShellWindowId_ShelfContainer)
           continue;
         containers->push_back(window);
       }
     }
   }
-  if (container_mask & SessionStateAnimator::LOCK_SCREEN_BACKGROUND) {
+  if (container_mask & SessionStateAnimator::LOCK_SCREEN_WALLPAPER) {
     containers->push_back(Shell::GetContainer(
-        root_window, kShellWindowId_LockScreenBackgroundContainer));
+        root_window, kShellWindowId_LockScreenWallpaperContainer));
   }
   if (container_mask & SessionStateAnimator::LOCK_SCREEN_CONTAINERS) {
     containers->push_back(Shell::GetContainer(
         root_window, kShellWindowId_LockScreenContainersContainer));
   }
   if (container_mask & SessionStateAnimator::LOCK_SCREEN_RELATED_CONTAINERS) {
     containers->push_back(Shell::GetContainer(
         root_window, kShellWindowId_LockScreenRelatedContainersContainer));
   }
 }
@@ skipping 127 matching lines @@
         new CallbackAnimationObserver(callback);
     RunAnimationForWindow(*it, type, speed, observer);
   }
 }
 
 SessionStateAnimator::AnimationSequence*
 SessionStateAnimatorImpl::BeginAnimationSequence(base::Closure callback) {
   return new AnimationSequence(this, callback);
 }
 
-bool SessionStateAnimatorImpl::IsBackgroundHidden() const {
-  return !GetBackground()->IsVisible();
+bool SessionStateAnimatorImpl::IsWallpaperHidden() const {
+  return !GetWallpaper()->IsVisible();
 }
 
-void SessionStateAnimatorImpl::ShowBackground() {
+void SessionStateAnimatorImpl::ShowWallpaper() {
   ui::ScopedLayerAnimationSettings settings(
-      GetBackground()->layer()->GetAnimator());
+      GetWallpaper()->layer()->GetAnimator());
   settings.SetTransitionDuration(base::TimeDelta());
-  GetBackground()->Show();
+  GetWallpaper()->Show();
 }
 
-void SessionStateAnimatorImpl::HideBackground() {
+void SessionStateAnimatorImpl::HideWallpaper() {
   ui::ScopedLayerAnimationSettings settings(
-      GetBackground()->layer()->GetAnimator());
+      GetWallpaper()->layer()->GetAnimator());
   settings.SetTransitionDuration(base::TimeDelta());
-  GetBackground()->Hide();
+  GetWallpaper()->Hide();
 }
 
 void SessionStateAnimatorImpl::StartAnimationInSequence(
     int container_mask,
     AnimationType type,
     AnimationSpeed speed,
     AnimationSequence* observer) {
   aura::Window::Windows containers;
   GetContainers(container_mask, &containers);
   for (aura::Window::Windows::const_iterator it = containers.begin();
@@ skipping 62 matching lines @@
                                                  gfx::Tween::EASE_IN, observer);
       break;
     case ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS:
       StartGrayscaleBrightnessAnimationForWindow(
           window, 0.0, duration, gfx::Tween::EASE_IN_OUT, observer);
       break;
   }
 }
 
 }  // namespace ash