Makes WorkspaceLayoutManager use ash/wm/common types

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/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
-#include "ash/switchable_windows.h"
 #include "ash/wm/ash_focus_rules.h"
+#include "ash/wm/aura/wm_window_aura.h"
+#include "ash/wm/common/switchable_windows.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
@@ skipping 27 matching lines @@
     const std::list<aura::Window*>* mru_windows,
     const CanActivateWindowPredicate& should_include_window_predicate) {
   MruWindowTracker::WindowList windows;
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   aura::Window* active_root = Shell::GetTargetRootWindow();
   for (aura::Window::Windows::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     if (*iter == active_root)
       continue;
-    for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i)
-      AddTrackedWindows(*iter, kSwitchableWindowContainerIds[i], &windows);
+    for (size_t i = 0; i < wm::kSwitchableWindowContainerIdsLength; ++i)
+      AddTrackedWindows(*iter, 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 < kSwitchableWindowContainerIdsLength; ++i)
-    AddTrackedWindows(active_root, kSwitchableWindowContainerIds[i], &windows);
+  for (size_t i = 0; i < wm::kSwitchableWindowContainerIdsLength; ++i)
+    AddTrackedWindows(active_root, wm::kSwitchableWindowContainerIds[i],
+                      &windows);
 
   // Removes unfocusable windows.
   std::vector<aura::Window*>::iterator itr = windows.begin();
   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 (std::list<aura::Window*>::const_reverse_iterator ix =
          mru_windows->rbegin();
          ix != mru_windows->rend(); ++ix) {
       // Exclude windows in non-switchable containers and those which cannot
       // be activated.
-      if (!IsSwitchableContainer((*ix)->parent()) ||
+      if (!wm::IsSwitchableContainer(wm::WmWindowAura::Get((*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 90 matching lines @@
   mru_windows_.remove(window);
   window->RemoveObserver(this);
 }
 
 bool MruWindowTracker::IsWindowConsideredActivateable(
     aura::Window* window) const {
   return focus_rules_->IsWindowConsideredActivatable(window);
 }
 
 }  // namespace ash