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

trunk/src/ash/shell/window_watcher.cc

Index: trunk/src/ash/shell/window_watcher.cc
===================================================================
--- trunk/src/ash/shell/window_watcher.cc	(revision 233812)
+++ trunk/src/ash/shell/window_watcher.cc	(working copy)
@@ -70,18 +70,18 @@
 
 WindowWatcher::WindowWatcher() {
   workspace_window_watcher_.reset(new WorkspaceWindowWatcher(this));
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  for (aura::Window::Windows::iterator iter = root_windows.begin();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+  for (Shell::RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++ iter) {
     workspace_window_watcher_->RootWindowAdded(*iter);
   }
 }
 
 WindowWatcher::~WindowWatcher() {
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  for (aura::Window::Windows::iterator iter = root_windows.begin();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+  for (Shell::RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++ iter) {
-    workspace_window_watcher_->RootWindowRemoved((*iter)->GetDispatcher());
+    workspace_window_watcher_->RootWindowRemoved(*iter);
   }
 }