Folds methods in WmShellCommon to WmShell

chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.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/ui/ash/multi_user/user_switch_animator_chromeos.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
@@ skipping 10 matching lines @@
 
 // The minimal possible animation time for animations which should happen
 // "instantly".
 const int kMinimalAnimationTimeMS = 1;
 
 // logic while the user gets switched.
 class UserChangeActionDisabler {
  public:
   UserChangeActionDisabler() {
     ash::WindowPositioner::DisableAutoPositioning(true);
-    ash::Shell::GetInstance()->mru_window_tracker()->SetIgnoreActivations(true);
+    ash::WmShell::Get()->mru_window_tracker()->SetIgnoreActivations(true);
   }
 
   ~UserChangeActionDisabler() {
     ash::WindowPositioner::DisableAutoPositioning(false);
-    ash::Shell::GetInstance()->mru_window_tracker()->SetIgnoreActivations(
-        false);
+    ash::WmShell::Get()->mru_window_tracker()->SetIgnoreActivations(false);
   }
  private:
 
   DISALLOW_COPY_AND_ASSIGN(UserChangeActionDisabler);
 };
 
 // Defines an animation watcher for the 'hide' animation of the first maximized
 // window we encounter while looping through the old user's windows. This is
 // to observe the end of the animation so that we can destruct the old detached
 // layer of the window.
@@ skipping 298 matching lines @@
       break;
     }
     case ANIMATION_STEP_SHOW_NEW_USER: {
       // In order to make the animation look better, we had to move the code
       // that shows the new user to the previous step. Hence, we do nothing
       // here.
       break;
     }
     case ANIMATION_STEP_FINALIZE: {
       // Reactivate the MRU window of the new user.
-      aura::Window::Windows mru_list =
-          ash::WmWindowAura::ToAuraWindows(ash::Shell::GetInstance()
-                                               ->mru_window_tracker()
-                                               ->BuildMruWindowList());
+      aura::Window::Windows mru_list = ash::WmWindowAura::ToAuraWindows(
+          ash::WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
       if (!mru_list.empty()) {
         aura::Window* window = mru_list[0];
         ash::wm::WindowState* window_state = ash::wm::GetWindowState(window);
         if (owner_->IsWindowOnDesktopOfUser(window, new_account_id_) &&
             !window_state->IsMinimized()) {
           // Several unit tests come here without an activation client.
           aura::client::ActivationClient* client =
               aura::client::GetActivationClient(window->GetRootWindow());
           if (client)
             client->ActivateWindow(window);
@@ skipping 55 matching lines @@
         if (itr != window_to_entry_map.end()) {
           windows_by_account_id_[itr->second->show_for_user()].push_back(
               child_window);
         }
       }
     }
   }
 }
 
 }  // namespace chrome