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

ash/wm/mru_window_tracker.cc

 // Copyright 2013 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/mru_window_tracker.h"
 
 #include <algorithm>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/focus_rules.h"
 #include "ash/wm/switchable_windows.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_window.h"
 #include "base/bind.h"
 #include "ui/aura/window.h"
+#include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 namespace {
 
-using CanActivateWindowPredicate = base::Callback<bool(WmWindow*)>;
+using CanActivateWindowPredicate = base::Callback<bool(aura::Window*)>;
 
-bool CallCanActivate(WmWindow* window) {
-  return window->CanActivate();
+bool CallCanActivate(aura::Window* window) {
+  return ::wm::CanActivateWindow(window);
 }
 
 // Adds the windows that can be cycled through for the specified window id to
 // |windows|.
-void AddTrackedWindows(WmWindow* root,
+void AddTrackedWindows(aura::Window* root,
                        int container_id,
                        MruWindowTracker::WindowList* windows) {
-  WmWindow* container = root->GetChildByShellWindowId(container_id);
-  const MruWindowTracker::WindowList children(container->GetChildren());
+  aura::Window* container = root->GetChildById(container_id);
+  const MruWindowTracker::WindowList children(container->children());
   windows->insert(windows->end(), children.begin(), children.end());
 }
 
 // Returns a list of windows ordered by their stacking order.
 // If |mru_windows| is passed, these windows are moved to the front of the list.
 // It uses the given |should_include_window_predicate| to determine whether to
 // include a window in the returned list or not.
 MruWindowTracker::WindowList BuildWindowListInternal(
-    const std::list<WmWindow*>* mru_windows,
+    const std::list<aura::Window*>* mru_windows,
     const CanActivateWindowPredicate& should_include_window_predicate) {
   MruWindowTracker::WindowList windows;
   aura::Window* active_root = Shell::GetRootWindowForNewWindows();
-  for (WmWindow* window : ShellPort::Get()->GetAllRootWindows()) {
-    if (window->aura_window() == active_root)
+  for (auto* window : Shell::GetAllRootWindows()) {
+    if (window == active_root)
       continue;
     for (size_t i = 0; i < wm::kSwitchableWindowContainerIdsLength; ++i)
       AddTrackedWindows(window, wm::kSwitchableWindowContainerIds[i], &windows);
   }
 
   // Add windows in the active root windows last so that the topmost window
   // in the active root window becomes the front of the list.
-  for (size_t i = 0; i < wm::kSwitchableWindowContainerIdsLength; ++i) {
-    AddTrackedWindows(WmWindow::Get(active_root),
-                      wm::kSwitchableWindowContainerIds[i], &windows);
-  }
+  for (size_t i = 0; i < wm::kSwitchableWindowContainerIdsLength; ++i)

[msw, 2017/05/23 22:50:24]

nit: keep curlies for multi-line loop block

[varkha, 2017/05/24 15:29:14]

Done.

+    AddTrackedWindows(active_root, wm::kSwitchableWindowContainerIds[i],
+                      &windows);
 
   // Removes unfocusable windows.
-  std::vector<WmWindow*>::iterator itr = windows.begin();
+  std::vector<aura::Window*>::iterator itr = windows.begin();

[msw, 2017/05/23 22:50:24]

nit: aura::Window::Windows

[varkha, 2017/05/24 15:29:14]

Done.

   while (itr != windows.end()) {
     if (!should_include_window_predicate.Run(*itr))
       itr = windows.erase(itr);
     else
       ++itr;
   }
 
   // Put the windows in the mru_windows list at the head, if it's available.
   if (mru_windows) {
     // Iterate through the list backwards, so that we can move each window to
     // the front of the windows list as we find them.
     for (auto ix = mru_windows->rbegin(); ix != mru_windows->rend(); ++ix) {
       // Exclude windows in non-switchable containers and those which cannot
       // be activated.
-      if (((*ix)->GetParent() &&
-           !wm::IsSwitchableContainer((*ix)->GetParent()->aura_window())) ||
+      if (((*ix)->parent() && !wm::IsSwitchableContainer((*ix)->parent())) ||
           !should_include_window_predicate.Run(*ix)) {
         continue;
       }
 
       MruWindowTracker::WindowList::iterator window =
           std::find(windows.begin(), windows.end(), *ix);
       if (window != windows.end()) {
         windows.erase(window);
         windows.push_back(*ix);
       }
@@ skipping 10 matching lines @@
 
 //////////////////////////////////////////////////////////////////////////////
 // MruWindowTracker, public:
 
 MruWindowTracker::MruWindowTracker() : ignore_window_activations_(false) {
   Shell::Get()->activation_client()->AddObserver(this);
 }
 
 MruWindowTracker::~MruWindowTracker() {
   Shell::Get()->activation_client()->RemoveObserver(this);
-  for (WmWindow* window : mru_windows_)
-    window->aura_window()->RemoveObserver(this);
+  for (auto* window : mru_windows_)
+    window->RemoveObserver(this);
 }
 
 MruWindowTracker::WindowList MruWindowTracker::BuildMruWindowList() const {
   return BuildWindowListInternal(&mru_windows_, base::Bind(&CallCanActivate));
 }
 
 MruWindowTracker::WindowList MruWindowTracker::BuildWindowListIgnoreModal()
     const {
   return BuildWindowListInternal(nullptr,
                                  base::Bind(&IsWindowConsideredActivatable));
 }
 
 void MruWindowTracker::SetIgnoreActivations(bool ignore) {
   ignore_window_activations_ = ignore;
 
   // If no longer ignoring window activations, move currently active window
   // to front.
   if (!ignore)
-    SetActiveWindow(WmWindow::Get(wm::GetActiveWindow()));
+    SetActiveWindow(wm::GetActiveWindow());
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // MruWindowTracker, private:
 
-void MruWindowTracker::SetActiveWindow(WmWindow* active_window) {
+void MruWindowTracker::SetActiveWindow(aura::Window* active_window) {
   if (!active_window)
     return;
 
-  std::list<WmWindow*>::iterator iter =
+  std::list<aura::Window*>::iterator iter =
       std::find(mru_windows_.begin(), mru_windows_.end(), active_window);
   // Observe all newly tracked windows.
   if (iter == mru_windows_.end())
-    active_window->aura_window()->AddObserver(this);
+    active_window->AddObserver(this);
   else
     mru_windows_.erase(iter);
   mru_windows_.push_front(active_window);
 }
 
 void MruWindowTracker::OnWindowActivated(ActivationReason reason,
                                          aura::Window* gained_active,
                                          aura::Window* lost_active) {
   if (!ignore_window_activations_)
-    SetActiveWindow(WmWindow::Get(gained_active));
+    SetActiveWindow(gained_active);
 }
 
 void MruWindowTracker::OnWindowDestroyed(aura::Window* window) {
   // It's possible for OnWindowActivated() to be called after
   // OnWindowDestroying(). This means we need to override OnWindowDestroyed()
   // else we may end up with a deleted window in |mru_windows_|.
-  mru_windows_.remove(WmWindow::Get(window));
+  mru_windows_.remove(window);
   window->RemoveObserver(this);
 }
 
 }  // namespace ash