Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..."

trunk/src/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_state_delegate.h"
 #include "ash/shell.h"
@@ skipping 39 matching lines @@
 }
 
 // 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.
 // If |top_most_at_end|, the list is returned in descending (bottom-most / least
 // recently used) order.
 MruWindowTracker::WindowList BuildWindowListInternal(
     const std::list<aura::Window*>* mru_windows,
     bool top_most_at_end) {
   MruWindowTracker::WindowList windows;
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   aura::Window* active_root = Shell::GetTargetRootWindow();
-  for (aura::Window::Windows::const_iterator iter = root_windows.begin();
+  for (Shell::RootWindowList::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);
   }
 
   // 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)
@@ skipping 115 matching lines @@
   if (!ignore_window_activations_)
     SetActiveWindow(gained_active);
 }
 
 void MruWindowTracker::OnWindowDestroying(aura::Window* window) {
   mru_windows_.remove(window);
   window->RemoveObserver(this);
 }
 
 }  // namespace ash