[mus+ash] Removes WmWindow from ash/wm/mru_window_tracker and overview mode

ash/focus_cycler.cc

 // Copyright (c) 2012 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/focus_cycler.h"
 
 #include "ash/shell.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/widget_finder.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_window.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 namespace {
 
 bool HasFocusableWindow() {
@@ skipping 10 matching lines @@
   widgets_.push_back(widget);
 }
 
 void FocusCycler::RemoveWidget(views::Widget* widget) {
   auto iter = std::find(widgets_.begin(), widgets_.end(), widget);
   if (iter != widgets_.end())
     widgets_.erase(iter);
 }
 
 void FocusCycler::RotateFocus(Direction direction) {
-  WmWindow* window = WmWindow::Get(wm::GetActiveWindow());
+  aura::Window* window = wm::GetActiveWindow();
   if (window) {
-    views::Widget* widget = GetInternalWidgetForWindow(window->aura_window());
+    views::Widget* widget = GetInternalWidgetForWindow(window);
     // First try to rotate focus within the active widget. If that succeeds,
     // we're done.
     if (widget &&
         widget->GetFocusManager()->RotatePaneFocus(
             direction == BACKWARD ? views::FocusManager::kBackward
                                   : views::FocusManager::kForward,
             views::FocusManager::kNoWrap)) {
       return;
     }
   }
@@ skipping 22 matching lines @@
     // Ensure that we don't loop more than once.
     if (index == start_index)
       break;
 
     if (index == browser_index) {
       // Activate the most recently active browser window.
       MruWindowTracker::WindowList mru_windows(
           Shell::Get()->mru_window_tracker()->BuildMruWindowList());
       if (mru_windows.empty())
         break;
-      WmWindow* window = mru_windows.front();
-      window->GetWindowState()->Activate();
-      views::Widget* widget = GetInternalWidgetForWindow(window->aura_window());
+      auto* window = mru_windows.front();
+      wm::GetWindowState(window)->Activate();
+      views::Widget* widget = GetInternalWidgetForWindow(window);
       if (!widget)
         break;
       views::FocusManager* focus_manager = widget->GetFocusManager();
       focus_manager->ClearFocus();
       focus_manager->RotatePaneFocus(direction == BACKWARD
                                          ? views::FocusManager::kBackward
                                          : views::FocusManager::kForward,
                                      views::FocusManager::kWrap);
       break;
     } else {
       if (FocusWidget(widgets_[index]))
         break;
     }
   }
 }
 
 bool FocusCycler::FocusWidget(views::Widget* widget) {
   // Note: It is not necessary to set the focus directly to the pane since that
   // will be taken care of by the widget activation.
   widget_activating_ = widget;
   widget->Activate();
   widget_activating_ = NULL;
   return widget->IsActive();
 }
 
 }  // namespace ash