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

trunk/src/ash/shell/window_watcher.cc

 // Copyright (c) 2012 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/shell/window_watcher.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
@@ skipping 52 matching lines @@
   }
 
  private:
   WindowWatcher* watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowWatcher);
 };
 
 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);
   }
 }
 
 aura::Window* WindowWatcher::GetWindowByID(ash::LauncherID id) {
   IDToWindow::const_iterator i = id_to_window_.find(id);
   return i != id_to_window_.end() ? i->second : NULL;
 }
 
 ash::LauncherID WindowWatcher::GetIDByWindow(aura::Window* window) const {
   for (IDToWindow::const_iterator i = id_to_window_.begin();
@@ skipping 60 matching lines @@
   workspace_window_watcher_->RootWindowAdded(root);
 }
 
 void WindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) {
   // All windows in the display has already been removed, so no need to
   // remove observers.
 }
 
 }  // namespace shell
 }  // namespace ash