Rename ash desktop_background to wallpaper.

ash/common/root_window_controller_common.cc

 // Copyright 2016 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/common/root_window_controller_common.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ skipping 19 matching lines @@
     : root_(root), root_window_layout_(nullptr) {}
 
 RootWindowControllerCommon::~RootWindowControllerCommon() {}
 
 void RootWindowControllerCommon::CreateContainers() {
   // These containers are just used by PowerButtonController to animate groups
   // of containers simultaneously without messing up the current transformations
   // on those containers. These are direct children of the root window; all of
   // the other containers are their children.
 
-  // The desktop background container is not part of the lock animation, so it
-  // is not included in those animate groups.
-  // When screen is locked desktop background is moved to lock screen background
-  // container (moved back on unlock). We want to make sure that there's an
-  // opaque layer occluding the non-lock-screen layers.
-  WmWindow* desktop_background_container =
-      CreateContainer(kShellWindowId_DesktopBackgroundContainer,
-                      "DesktopBackgroundContainer", root_);
-  desktop_background_container->SetChildWindowVisibilityChangesAnimated();
+  // The wallpaper container is not part of the lock animation, so it is not
+  // included in those animate groups. When the screen is locked, the wallpaper
+  // is moved to the lock screen wallpaper container (and moved back on unlock).
+  // Ensure that there's an opaque layer occluding the non-lock-screen layers.
+  WmWindow* wallpaper_container = CreateContainer(
+      kShellWindowId_WallpaperContainer, "WallpaperContainer", root_);

[James Cook, 2016/08/30 05:18:19]

Nice that you renamed the container too.

[msw, 2016/08/30 16:07:59]

Acknowledged.

+  wallpaper_container->SetChildWindowVisibilityChangesAnimated();
 
   WmWindow* non_lock_screen_containers =
       CreateContainer(kShellWindowId_NonLockScreenContainersContainer,
                       "NonLockScreenContainersContainer", root_);
   // Clip all windows inside this container, as half pixel of the window's
   // texture may become visible when the screen is scaled. crbug.com/368591.
   non_lock_screen_containers->SetMasksToBounds(true);
 
-  WmWindow* lock_background_containers =
-      CreateContainer(kShellWindowId_LockScreenBackgroundContainer,
-                      "LockScreenBackgroundContainer", root_);
-  lock_background_containers->SetChildWindowVisibilityChangesAnimated();
+  WmWindow* lock_wallpaper_containers =
+      CreateContainer(kShellWindowId_LockScreenWallpaperContainer,
+                      "LockScreenWallpaperContainer", root_);
+  lock_wallpaper_containers->SetChildWindowVisibilityChangesAnimated();
 
   WmWindow* lock_screen_containers =
       CreateContainer(kShellWindowId_LockScreenContainersContainer,
                       "LockScreenContainersContainer", root_);
   WmWindow* lock_screen_related_containers =
       CreateContainer(kShellWindowId_LockScreenRelatedContainersContainer,
                       "LockScreenRelatedContainersContainer", root_);
 
   CreateContainer(kShellWindowId_UnparentedControlContainer,
                   "UnparentedControlContainer", non_lock_screen_containers);
@@ skipping 139 matching lines @@
   CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
                   "PowerButtonAnimationContainer", root_);
 }
 
 void RootWindowControllerCommon::CreateLayoutManagers() {
   root_window_layout_ = new wm::RootWindowLayoutManager(root_);
   root_->SetLayoutManager(base::WrapUnique(root_window_layout_));
 }
 
 }  // namespace ash