Converts MruWindowTracker to work with common types

ash/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/wm/window_cycle_controller.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_cycle_list.h"
 #include "base/metrics/histogram.h"
-#include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 
 namespace ash {
 
 namespace {
 
 // Returns the most recently active window from the |window_list| or nullptr
 // if the list is empty.
-aura::Window* GetActiveWindow(const MruWindowTracker::WindowList& window_list) {
+WmWindow* GetActiveWindow(const MruWindowTracker::WindowList& window_list) {
   return window_list.empty() ? nullptr : window_list[0];
 }
 
 // Filter to watch for the termination of a keyboard gesture to cycle through
 // multiple windows.
 class WindowCycleEventFilter : public ui::EventHandler {
  public:
   WindowCycleEventFilter();
   ~WindowCycleEventFilter() override;
 
@@ skipping 69 matching lines @@
 // WindowCycleController, private:
 
 void WindowCycleController::Step(Direction direction) {
   DCHECK(window_cycle_list_.get());
   window_cycle_list_->Step(direction);
 }
 
 void WindowCycleController::StopCycling() {
   window_cycle_list_.reset();
 
-  aura::Window* active_window_after_window_cycle = GetActiveWindow(
+  WmWindow* active_window_after_window_cycle = GetActiveWindow(
       Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
 
   // Remove our key event filter.
   event_handler_.reset();
   UMA_HISTOGRAM_MEDIUM_TIMES("Ash.WindowCycleController.CycleTime",
                              base::Time::Now() - cycle_start_time_);
 
   if (active_window_after_window_cycle != nullptr &&
       active_window_before_window_cycle_ != active_window_after_window_cycle) {
     Shell::GetInstance()
         ->metrics()
         ->task_switch_metrics_recorder()
         .OnTaskSwitch(TaskSwitchMetricsRecorder::WINDOW_CYCLE_CONTROLLER);
   }
   active_window_before_window_cycle_ = nullptr;
 }
 
 }  // namespace ash