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

trunk/src/ash/wm/drag_window_resizer.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/wm/drag_window_resizer.h"
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 23 matching lines @@
 // The opacity of the window when dragging it over a user item in the tray.
 const float kOpacityWhenDraggedOverUserIcon = 0.4f;
 
 // Returns true if Ash has more than one root window.
 bool HasSecondaryRootWindow() {
   return Shell::GetAllRootWindows().size() > 1;
 }
 
 // When there are two root windows, returns one of the root windows which is not
 // |root_window|. Returns NULL if only one root window exists.
-aura::Window* GetAnotherRootWindow(aura::Window* root_window) {
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+aura::RootWindow* GetAnotherRootWindow(aura::Window* root_window) {
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   if (root_windows.size() < 2)
     return NULL;
   DCHECK_EQ(2U, root_windows.size());
   if (root_windows[0] == root_window)
     return root_windows[1];
   return root_windows[0];
 }
 
 }  // namespace
 
@@ skipping 212 matching lines @@
   if (!tray_user->TransferWindowToUser(details_.window)) {
     GetTarget()->layer()->SetOpacity(old_opacity);
     return false;
   }
   RevertDrag();
   return true;
 }
 
 }  // namespace internal
 }  // namespace ash