mash: Migrate wallpaper controllers to ash/common.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.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/users/wallpaper/wallpaper_manager.h"
 
 #include <stdint.h>
 #include <numeric>
 #include <utility>
 #include <vector>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_switches.h"
+#include "ash/common/wallpaper/wallpaper_controller.h"
+#include "ash/common/wm_shell.h"
 #include "ash/public/interfaces/wallpaper.mojom.h"
-#include "ash/shell.h"
-#include "ash/wallpaper/wallpaper_controller.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
@@ skipping 186 matching lines @@
   if (chrome::IsRunningInMash()) {
     shell::Connector* connector =
         content::MojoShellConnection::GetForProcess()->GetConnector();
     ash::mojom::WallpaperControllerPtr wallpaper_controller;
     connector->ConnectToInterface("mojo:ash", &wallpaper_controller);
     wallpaper_controller->SetWallpaper(*image.bitmap(),
                                        WallpaperLayoutToMojo(layout));
     return;
   }
   // Avoid loading unnecessary wallpapers in tests without a shell instance.
-  if (ash::Shell::HasInstance()) {
-    ash::Shell::GetInstance()->wallpaper_controller()->SetWallpaperImage(
-        image, layout);
+  if (ash::WmShell::HasInstance()) {
+    ash::WmShell::Get()->wallpaper_controller()->SetWallpaperImage(image,
+                                                                   layout);
   }
 }
 
 }  // namespace
 
 // This is "wallpaper either scheduled to load, or loading right now".
 //
 // While enqueued, it defines moment in the future, when it will be loaded.
 // Enqueued but not started request might be updated by subsequent load
 // request. Therefore it's created empty, and updated being enqueued.
@@ skipping 180 matching lines @@
       CrosSettings::Get()->AddSettingsObserver(
           kAccountsPrefShowUserNamesOnSignIn,
           base::Bind(&WallpaperManager::InitializeRegisteredDeviceWallpaper,
                      weak_factory_.GetWeakPtr()));
 }
 
 void WallpaperManager::EnsureLoggedInUserWallpaperLoaded() {
   // Some browser tests do not have a shell instance. As no wallpaper is needed
   // in these tests anyway, avoid loading one, preventing crashes and speeding
   // up the tests.
-  if (!ash::Shell::HasInstance())
+  if (!ash::WmShell::HasInstance())
     return;
 
   WallpaperInfo info;
   if (GetLoggedInUserWallpaperInfo(&info)) {
     UMA_HISTOGRAM_ENUMERATION("Ash.Wallpaper.Type", info.type,
                               user_manager::User::WALLPAPER_TYPE_COUNT);
     if (info == current_user_wallpaper_info_)
       return;
   }
   SetUserWallpaperNow(
@@ skipping 21 matching lines @@
     // used here to determine if current user is guest.
     return;
   }
 
   if (command_line->HasSwitch(::switches::kTestType))
     WizardController::SetZeroDelays();
 
   // Zero delays is also set in autotests.
   if (WizardController::IsZeroDelayEnabled()) {
     // Ensure tests have some sort of wallpaper.
-    ash::Shell::GetInstance()->wallpaper_controller()->CreateEmptyWallpaper();
+    ash::WmShell::Get()->wallpaper_controller()->CreateEmptyWallpaper();
     return;
   }
 
   if (!user_manager->IsUserLoggedIn()) {
     if (!StartupUtils::IsDeviceRegistered())
       SetDefaultWallpaperDelayed(login::SignInAccountId());
     else
       InitializeRegisteredDeviceWallpaper();
     return;
   }
@@ skipping 656 matching lines @@
 
 void WallpaperManager::SetDefaultWallpaperPath(
     const base::FilePath& default_small_wallpaper_file,
     std::unique_ptr<gfx::ImageSkia> small_wallpaper_image,
     const base::FilePath& default_large_wallpaper_file,
     std::unique_ptr<gfx::ImageSkia> large_wallpaper_image) {
   default_small_wallpaper_file_ = default_small_wallpaper_file;
   default_large_wallpaper_file_ = default_large_wallpaper_file;
 
   ash::WallpaperController* controller =
-      ash::Shell::GetInstance()->wallpaper_controller();
+      ash::WmShell::Get()->wallpaper_controller();
 
   // |need_update_screen| is true if the previous default wallpaper is visible
   // now, so we need to update wallpaper on the screen.
   //
   // Layout is ignored here, so wallpaper::WALLPAPER_LAYOUT_CENTER is used
   // as a placeholder only.
   const bool need_update_screen =
       default_wallpaper_image_.get() &&
       controller->WallpaperIsAlreadyLoaded(default_wallpaper_image_->image(),
                                            false /* compare_layouts */,
@@ skipping 25 matching lines @@
                                               &stored_value)) {
     return wallpaper::WallpaperFilesId::FromString(stored_value);
   }
   const std::string& old_id = account_id.GetUserEmail();  // Migrated
   const wallpaper::WallpaperFilesId files_id = HashWallpaperFilesIdStr(old_id);
   SetKnownUserWallpaperFilesId(account_id, files_id);
   return files_id;
 }
 
 }  // namespace chromeos