Move yet more from WmShell to Shell

ash/common/wm/overview/window_selector_controller.cc

 // Copyright 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 "ash/common/wm/overview/window_selector_controller.h"
 
 #include <vector>
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
@@ skipping 15 matching lines @@
   for (std::unique_ptr<DelayedAnimationObserver>& animation_observer :
        delayed_animations_) {
     animation_observer->Shutdown();
   }
 }
 
 // static
 bool WindowSelectorController::CanSelect() {
   // Don't allow a window overview if the screen is locked or a modal dialog is
   // open or running in kiosk app session.
-  WmShell* wm_shell = WmShell::Get();
-  SessionController* session_controller = wm_shell->session_controller();
+  SessionController* session_controller = Shell::Get()->session_controller();
   SystemTrayDelegate* system_tray_delegate =
       Shell::Get()->system_tray_delegate();
+  WmShell* wm_shell = WmShell::Get();
   return session_controller->IsActiveUserSessionStarted() &&
          !session_controller->IsScreenLocked() &&
          !wm_shell->IsSystemModalWindowOpen() && !wm_shell->IsPinned() &&
          system_tray_delegate->GetUserLoginStatus() != LoginStatus::KIOSK_APP &&
          system_tray_delegate->GetUserLoginStatus() !=
              LoginStatus::ARC_KIOSK_APP;
 }
 
 bool WindowSelectorController::ToggleOverview() {
   if (IsSelecting()) {
@@ skipping 76 matching lines @@
 }
 
 void WindowSelectorController::OnSelectionStarted() {
   if (!last_selection_time_.is_null()) {
     UMA_HISTOGRAM_LONG_TIMES("Ash.WindowSelector.TimeBetweenUse",
                              base::Time::Now() - last_selection_time_);
   }
 }
 
 }  // namespace ash