From 3433d4d6dfdae531334f216b78dc718eec268e20 Mon Sep 17 00:00:00 2001
From: "ben@chromium.org"
 <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 8 Nov 2013 05:52:59 +0000
Subject: 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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233787 0039d316-1c4b-4281-b951-d872f2087c98
---
 ash/debug.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'ash/debug.cc')

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