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

> Eliminate Shell::RootWindowList in favor of aura::Window::Windows.
> 
> This is necessary as part of my plan to rework RootWindow, specifically making it not be a subclass of Window. (It will eventually be renamed WindowEventDispatcher). Code that expected to get the RootWindow interface from this type can still call GetDispatcher() on members of the returned vector of Windows.
> 
> R=oshima@chromium.org
> http://crbug.com/308843
> 
> Review URL: https://codereview.chromium.org/64933002

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/59153004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233813 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 9 deletions

diff --git a/ash/debug.cc b/ash/debug.cc
index f5c6220..060627c 100644
--- a/ash/debug.cc
+++ b/ash/debug.cc
@@ -13,12 +13,12 @@ namespace ash {
 namespace debug {
 
 void ToggleShowDebugBorders() {
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   scoped_ptr<bool> value;
-  for (aura::Window::Windows::iterator it = root_windows.begin();
+  for (Shell::RootWindowList::iterator it = root_windows.begin();
        it != root_windows.end(); ++it) {
-    ui::Compositor* compositor = (*it)->GetDispatcher()->compositor();
+    ui::Compositor* compositor = (*it)->compositor();
     cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState();
     if (!value.get())
       value.reset(new bool(!state.show_debug_borders));
@@ -28,12 +28,12 @@ void ToggleShowDebugBorders() {
 }
 
 void ToggleShowFpsCounter() {
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   scoped_ptr<bool> value;
-  for (aura::Window::Windows::iterator it = root_windows.begin();
+  for (Shell::RootWindowList::iterator it = root_windows.begin();
        it != root_windows.end(); ++it) {
-    ui::Compositor* compositor = (*it)->GetDispatcher()->compositor();
+    ui::Compositor* compositor = (*it)->compositor();
     cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState();
     if (!value.get())
       value.reset(new bool(!state.show_fps_counter));
@@ -43,12 +43,12 @@ void ToggleShowFpsCounter() {
 }
 
 void ToggleShowPaintRects() {
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   scoped_ptr<bool> value;
-  for (aura::Window::Windows::iterator it = root_windows.begin();
+  for (Shell::RootWindowList::iterator it = root_windows.begin();
        it != root_windows.end(); ++it) {
-    ui::Compositor* compositor = (*it)->GetDispatcher()->compositor();
+    ui::Compositor* compositor = (*it)->compositor();
     cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState();
     if (!value.get())
       value.reset(new bool(!state.show_paint_rects));