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

ash/wm/ash_focus_rules.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/wm/ash_focus_rules.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/container_finder.h"
 #include "ash/wm/focus_rules.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state.h"
-#include "ash/wm_window.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
 bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window,
                                             int container_id) {
@@ skipping 10 matching lines @@
 // AshFocusRules, public:
 
 AshFocusRules::AshFocusRules() = default;
 
 AshFocusRules::~AshFocusRules() = default;
 
 ////////////////////////////////////////////////////////////////////////////////
 // AshFocusRules, ::wm::FocusRules:
 
 bool AshFocusRules::IsToplevelWindow(aura::Window* window) const {
-  return ash::IsToplevelWindow(WmWindow::Get(window));
+  return ash::IsToplevelWindow(window);
 }
 
 bool AshFocusRules::SupportsChildActivation(aura::Window* window) const {
   return ash::IsActivatableShellWindowId(window->id());
 }
 
 bool AshFocusRules::IsWindowConsideredVisibleForActivation(
     aura::Window* window) const {
-  return ash::IsWindowConsideredVisibleForActivation(WmWindow::Get(window));
+  return ash::IsWindowConsideredVisibleForActivation(window);
 }
 
 bool AshFocusRules::CanActivateWindow(aura::Window* window) const {
   // Clearing activation is always permissible.
   if (!window)
     return true;
 
   if (!BaseFocusRules::CanActivateWindow(window))
     return false;
 
@@ skipping 19 matching lines @@
 }
 
 aura::Window* AshFocusRules::GetNextActivatableWindow(
     aura::Window* ignore) const {
   DCHECK(ignore);
 
   // Start from the container of the most-recently-used window. If the list of
   // MRU windows is empty, then start from the container of the window that just
   // lost focus |ignore|.
   MruWindowTracker* mru = Shell::Get()->mru_window_tracker();
-  std::vector<WmWindow*> windows = mru->BuildMruWindowList();
-  aura::Window* starting_window =
-      windows.empty() ? ignore : WmWindow::GetAuraWindow(windows[0]);
+  aura::Window::Windows windows = mru->BuildMruWindowList();
+  aura::Window* starting_window = windows.empty() ? ignore : windows[0];
 
   // Look for windows to focus in |starting_window|'s container. If none are
   // found, we look in all the containers in front of |starting_window|'s
   // container, then all behind.
   int starting_container_index = 0;
   aura::Window* root = starting_window->GetRootWindow();
   if (!root)
     root = Shell::GetRootWindowForNewWindows();
   int container_count = static_cast<int>(kNumActivatableShellWindowIds);
   for (int i = 0; i < container_count; i++) {
@@ skipping 42 matching lines @@
     WindowState* window_state = GetWindowState(*i);
     if (*i != ignore && window_state->CanActivate() &&
         !window_state->IsMinimized())
       return *i;
   }
   return nullptr;
 }
 
 }  // namespace wm
 }  // namespace ash