Rename ash desktop_background to wallpaper.

ash/wm/session_state_animator.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.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 const int SessionStateAnimator::kAllLockScreenContainersMask =
-    SessionStateAnimator::LOCK_SCREEN_BACKGROUND |
+    SessionStateAnimator::LOCK_SCREEN_WALLPAPER |
     SessionStateAnimator::LOCK_SCREEN_CONTAINERS |
     SessionStateAnimator::LOCK_SCREEN_RELATED_CONTAINERS;
 
 const int SessionStateAnimator::kAllNonRootContainersMask =
     SessionStateAnimator::kAllLockScreenContainersMask |
-    SessionStateAnimator::DESKTOP_BACKGROUND | SessionStateAnimator::LAUNCHER |
+    SessionStateAnimator::WALLPAPER | SessionStateAnimator::LAUNCHER |
     SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS;
 
 SessionStateAnimator::AnimationSequence::AnimationSequence(
     base::Closure callback)
     : sequence_ended_(false),
       animation_completed_(false),
       invoke_callback_(false),
       callback_(callback) {}
 
 SessionStateAnimator::AnimationSequence::~AnimationSequence() {}
@@ skipping 49 matching lines @@
     case ANIMATION_SPEED_REVERT_SHUTDOWN:
       return base::TimeDelta::FromMilliseconds(500);
   }
   // Satisfy compilers that do not understand that we will return from switch
   // above anyway.
   DCHECK(false) << "Unhandled animation speed " << speed;
   return base::TimeDelta();
 }
 
 }  // namespace ash