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

trunk/src/ash/wm/overview/window_overview.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/overview/window_overview.h"
 
 #include <algorithm>
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 296 matching lines @@
   for (WindowSelectorItemList::iterator iter = windows_->begin();
        iter != windows_->end(); ++iter) {
     aura::Window* selected = (*iter)->TargetedWindow(window);
     if (selected)
       return selected;
   }
   return NULL;
 }
 
 void WindowOverview::HideAndTrackNonOverviewWindows() {
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  for (aura::Window::Windows::const_iterator root_iter = root_windows.begin();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+  for (Shell::RootWindowList::const_iterator root_iter = root_windows.begin();
        root_iter != root_windows.end(); ++root_iter) {
     for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) {
       aura::Window* container = Shell::GetContainer(*root_iter,
           kSwitchableWindowContainerIds[i]);
       // Copy the children list as it can change during iteration.
       aura::Window::Windows children(container->children());
       for (aura::Window::Windows::const_iterator iter = children.begin();
            iter != children.end(); ++iter) {
         if (GetTargetedWindow(*iter) || !(*iter)->IsVisible())
           continue;
@@ skipping 13 matching lines @@
 
 void WindowOverview::PositionWindows() {
   if (single_root_window_) {
     std::vector<WindowSelectorItem*> windows;
     for (WindowSelectorItemList::iterator iter = windows_->begin();
          iter != windows_->end(); ++iter) {
       windows.push_back(*iter);
     }
     PositionWindowsOnRoot(single_root_window_, windows);
   } else {
-    aura::Window::Windows root_window_list = Shell::GetAllRootWindows();
+    Shell::RootWindowList root_window_list = Shell::GetAllRootWindows();
     for (size_t i = 0; i < root_window_list.size(); ++i)
       PositionWindowsFromRoot(root_window_list[i]);
   }
 }
 
 void WindowOverview::PositionWindowsFromRoot(aura::Window* root_window) {
   std::vector<WindowSelectorItem*> windows;
   for (WindowSelectorItemList::iterator iter = windows_->begin();
        iter != windows_->end(); ++iter) {
     if ((*iter)->GetRootWindow() == root_window)
@@ skipping 71 matching lines @@
 }
 
 gfx::Rect WindowOverview::GetSelectionBounds(size_t index) {
   gfx::Rect bounds((*windows_)[index]->bounds());
   bounds.Inset(-kWindowOverviewSelectionPadding,
                -kWindowOverviewSelectionPadding);
   return bounds;
 }
 
 }  // namespace ash