[mus+ash] Removes WmWindow from ash/wm/window_cycle_*

ash/wm/window_cycle_controller.h

Index: ash/wm/window_cycle_controller.h
diff --git a/ash/wm/window_cycle_controller.h b/ash/wm/window_cycle_controller.h
index 65b354ce7bc065c27023a3238ee7ca6686e8ef55..26b69955c7f5053635a3e26a442c7bf000a88be0 100644
--- a/ash/wm/window_cycle_controller.h
+++ b/ash/wm/window_cycle_controller.h
@@ -11,11 +11,14 @@
 #include "base/macros.h"
 #include "base/time/time.h"
 
+namespace aura {
+class Window;
+}
+
 namespace ash {
 
 class WindowCycleEventFilter;
 class WindowCycleList;
-class WmWindow;
 
 // Controls cycling through windows with the keyboard via alt-tab.
 // Windows are sorted primarily by most recently used, and then by screen order.
@@ -67,7 +70,7 @@ class ASH_EXPORT WindowCycleController {
 
   // Tracks what Window was active when starting to cycle and used to determine
   // if the active Window changed in when ending cycling.
-  WmWindow* active_window_before_window_cycle_ = nullptr;
+  aura::Window* active_window_before_window_cycle_ = nullptr;
 
   // Non-null while actively cycling.
   std::unique_ptr<WindowCycleEventFilter> event_filter_;