Move yet more from WmShell to Shell

ash/common/wm/window_cycle_controller.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 "ash/common/wm/window_cycle_controller.h"
 
 #include "ash/common/metrics/task_switch_source.h"
 #include "ash/common/session/session_controller.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_cycle_event_filter.h"
@@ skipping 21 matching lines @@
 // WindowCycleController, public:
 
 WindowCycleController::WindowCycleController() {}
 
 WindowCycleController::~WindowCycleController() {}
 
 // static
 bool WindowCycleController::CanCycle() {
   // Prevent window cycling if the screen is locked or a modal dialog is open.
   WmShell* wm_shell = WmShell::Get();
-  return !wm_shell->session_controller()->IsScreenLocked() &&
+  return !Shell::Get()->session_controller()->IsScreenLocked() &&
          !wm_shell->IsSystemModalWindowOpen() && !wm_shell->IsPinned();
 }
 
 void WindowCycleController::HandleCycleWindow(Direction direction) {
   if (!CanCycle())
     return;
 
   if (!IsCycling())
     StartCycling();
 
@@ skipping 65 matching lines @@
 
   if (active_window_after_window_cycle != nullptr &&
       active_window_before_window_cycle_ != active_window_after_window_cycle) {
     WmShell::Get()->RecordTaskSwitchMetric(
         TaskSwitchSource::WINDOW_CYCLE_CONTROLLER);
   }
   active_window_before_window_cycle_ = nullptr;
 }
 
 }  // namespace ash