Rename ash desktop_background to wallpaper.

chrome/browser/chromeos/login/ui/login_display_host_impl.cc

 // Copyright 2014 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 "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm_shell.h"
-#include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/public/interfaces/container.mojom.h"
 #include "ash/shell.h"
+#include "ash/wallpaper/wallpaper_controller.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 231 matching lines @@
 }  // namespace
 
 namespace chromeos {
 
 // static
 const int LoginDisplayHostImpl::kShowLoginWebUIid = 0x1111;
 
 ////////////////////////////////////////////////////////////////////////////////
 // LoginDisplayHostImpl, public
 
-LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds)
-    : background_bounds_(background_bounds),
+LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& wallpaper_bounds)
+    : wallpaper_bounds_(wallpaper_bounds),
       shutting_down_(false),
       oobe_progress_bar_visible_(false),
       session_starting_(false),
       login_window_(NULL),
       login_view_(NULL),
       webui_login_display_(NULL),
       is_showing_login_(false),
       is_wallpaper_loaded_(false),
       status_area_saved_visibility_(false),
       crash_count_(0),
@@ skipping 167 matching lines @@
         ProfileManager::GetActiveUserProfile()))->EnableOfflineMode();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LoginDisplayHostImpl, LoginDisplayHost:
 
 LoginDisplay* LoginDisplayHostImpl::CreateLoginDisplay(
     LoginDisplay::Delegate* delegate) {
   webui_login_display_ = new WebUILoginDisplay(delegate);
-  webui_login_display_->set_background_bounds(background_bounds());
+  webui_login_display_->set_background_bounds(wallpaper_bounds());
   return webui_login_display_;
 }
 
 gfx::NativeWindow LoginDisplayHostImpl::GetNativeWindow() const {
   return login_window_ ? login_window_->GetNativeWindow() : NULL;
 }
 
 WebUILoginView* LoginDisplayHostImpl::GetWebUILoginView() const {
   return login_view_;
 }
 
 void LoginDisplayHostImpl::BeforeSessionStart() {
   session_starting_ = true;
 }
 
 void LoginDisplayHostImpl::Finalize() {
   DVLOG(1) << "Session starting";
-  // When adding another user into the session, we defer the background
-  // wallpaper's animation in order to prevent the flashing of the previous
-  // user's windows. See crbug.com/541864.
+  // When adding another user into the session, we defer the wallpaper's
+  // animation in order to prevent the flashing of the previous user's windows.
+  // See crbug.com/541864.
   if (ash::Shell::HasInstance() &&
       finalize_animation_type_ != ANIMATION_ADD_USER) {
     ash::Shell::GetInstance()
-        ->desktop_background_controller()
-        ->MoveDesktopToUnlockedContainer();
+        ->wallpaper_controller()
+        ->MoveToUnlockedContainer();
   }
   if (wizard_controller_.get())
     wizard_controller_->OnSessionStart();
 
   switch (finalize_animation_type_) {
     case ANIMATION_NONE:
       ShutdownDisplayHost(false);
       break;
     case ANIMATION_WORKSPACE:
       if (ash::Shell::HasInstance())
@@ skipping 104 matching lines @@
   // We should emit this signal only at login screen (after reboot or sign out).
   login_view_->set_should_emit_login_prompt_visible(false);
 
   if (!chrome::IsRunningInMash()) {
     // Lock container can be transparent after lock screen animation.
     aura::Window* lock_container = ash::Shell::GetContainer(
         ash::Shell::GetPrimaryRootWindow(),
         ash::kShellWindowId_LockScreenContainersContainer);
     lock_container->layer()->SetOpacity(1.0);
 
-    ash::Shell::GetInstance()
-        ->desktop_background_controller()
-        ->MoveDesktopToLockedContainer();
+    ash::Shell::GetInstance()->wallpaper_controller()->MoveToLockedContainer();
   } else {
     NOTIMPLEMENTED();
   }
 
   existing_user_controller_.reset();  // Only one controller in a time.
   existing_user_controller_.reset(new chromeos::ExistingUserController(this));
 
   if (!signin_screen_controller_.get()) {
     signin_screen_controller_.reset(new SignInScreenController(
         GetOobeUI(), webui_login_display_->delegate()));
@@ skipping 220 matching lines @@
     OnBrowserCreated();
     registrar_.Remove(this,
                       chrome::NOTIFICATION_CLOSE_ALL_BROWSERS_REQUEST,
                       content::NotificationService::AllSources());
     registrar_.Remove(this,
                       chrome::NOTIFICATION_BROWSER_OPENED,
                       content::NotificationService::AllSources());
   } else if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED &&
              user_manager::UserManager::Get()->IsCurrentUserNew()) {
     if (!chrome::IsRunningInMash()) {
-      // For new user, move desktop to locker container so that windows created
-      // during the user image picker step are below it.
+      // For new user, move wallpaper to locker container so that windows

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

nit: locker -> lock or locked

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

Done.

+      // created during the user image picker step are below it.
       ash::Shell::GetInstance()
-          ->desktop_background_controller()
-          ->MoveDesktopToLockedContainer();
+          ->wallpaper_controller()
+          ->MoveToLockedContainer();
     } else {
       NOTIMPLEMENTED();
     }
     registrar_.Remove(this,
                       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                       content::NotificationService::AllSources());
   } else if (chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED == type) {
     VLOG(1) << "Login WebUI >> wp animation done";
     is_wallpaper_loaded_ = true;
     if (!chrome::IsRunningInMash()) {
@@ skipping 143 matching lines @@
     base::MessageLoop::current()->QuitWhenIdle();
 
   if (!completion_callback_.is_null())
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   completion_callback_);
 
   if (ash::Shell::HasInstance() &&
       finalize_animation_type_ == ANIMATION_ADD_USER) {
     if (!chrome::IsRunningInMash()) {
       ash::Shell::GetInstance()
-          ->desktop_background_controller()
-          ->MoveDesktopToUnlockedContainer();
+          ->wallpaper_controller()
+          ->MoveToUnlockedContainer();
     } else {
       NOTIMPLEMENTED();
     }
   }
 }
 
 void LoginDisplayHostImpl::ScheduleWorkspaceAnimation() {
   if (chrome::IsRunningInMash()) {
     NOTIMPLEMENTED();
     return;
   }
   if (ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
-                               ash::kShellWindowId_DesktopBackgroundContainer)
+                               ash::kShellWindowId_WallpaperContainer)
           ->children()
           .empty()) {
-    // If there is no background window, don't perform any animation on the
-    // default and background layer because there is nothing behind it.
+    // If there is no wallpaper window, don't perform any animation on the
+    // default and wallpaper layer because there is nothing behind it.
     return;
   }
 
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableLoginAnimations))
     ash::Shell::GetInstance()->DoInitialWorkspaceAnimation();
 }
 
 void LoginDisplayHostImpl::ScheduleFadeOutAnimation(int animation_speed_ms) {
   // login window might have been closed by OnBrowserCreated() at this moment.
@@ skipping 76 matching lines @@
     views::FocusManager::set_arrow_key_traversal_enabled(true);
     // crbug.com/405859
     focus_ring_controller_.reset(new FocusRingController);
     focus_ring_controller_->SetVisible(true);
 
     keyboard_driven_oobe_key_handler_.reset(new KeyboardDrivenOobeKeyHandler);
   }
 
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  params.bounds = background_bounds();
+  params.bounds = wallpaper_bounds();
   params.show_state = ui::SHOW_STATE_FULLSCREEN;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   // The ash::Shell containers are not available in Mash
   if (!chrome::IsRunningInMash()) {
     params.parent =
         ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
                                  ash::kShellWindowId_LockScreenContainer);
   } else {
     params.mus_properties[ash::mojom::kWindowContainer_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
@@ skipping 229 matching lines @@
 
   locale_util::SwitchLanguageCallback callback(
       base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data))));
 
   // Load locale keyboards here. Hardware layout would be automatically enabled.
   locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
                               callback, ProfileManager::GetActiveUserProfile());
 }
 
 }  // namespace chromeos