Folds methods in WmShellCommon to WmShell

chrome/browser/chromeos/extensions/wallpaper_private_api.cc

 // Copyright (c) 2013 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/extensions/wallpaper_private_api.h"
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 182 matching lines @@
 
 void WindowStateManager::BuildWindowListAndMinimizeInactiveForUser(
     const std::string& user_id_hash, aura::Window* active_window) {
   if (user_id_hash_window_list_map_.find(user_id_hash) ==
       user_id_hash_window_list_map_.end()) {
     user_id_hash_window_list_map_[user_id_hash] = std::set<aura::Window*>();
   }
   std::set<aura::Window*>* results =
       &user_id_hash_window_list_map_[user_id_hash];
 
-  std::vector<aura::Window*> windows =
-      ash::WmWindowAura::ToAuraWindows(ash::Shell::GetInstance()
-                                           ->mru_window_tracker()
-                                           ->BuildWindowListIgnoreModal());
+  std::vector<aura::Window*> windows = ash::WmWindowAura::ToAuraWindows(
+      ash::WmShell::Get()->mru_window_tracker()->BuildWindowListIgnoreModal());
 
   for (std::vector<aura::Window*>::iterator iter = windows.begin();
        iter != windows.end(); ++iter) {
     // Ignore active window and minimized windows.
     if (*iter == active_window || ash::wm::GetWindowState(*iter)->IsMinimized())
       continue;
 
     if (!(*iter)->HasObserver(this))
       (*iter)->AddObserver(this);
 
@@ skipping 743 matching lines @@
 bool WallpaperPrivateRecordWallpaperUMAFunction::RunSync() {
   std::unique_ptr<record_wallpaper_uma::Params> params(
       record_wallpaper_uma::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   user_manager::User::WallpaperType source = getWallpaperType(params->source);
   UMA_HISTOGRAM_ENUMERATION("Ash.Wallpaper.Source", source,
                             user_manager::User::WALLPAPER_TYPE_COUNT);
   return true;
 }