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

trunk/src/ash/display/screen_position_controller.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/display/screen_position_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 74 matching lines @@
     // (Remember that in the native X11 world, the two root windows
     // are always stacked vertically regardless of the display
     // layout in Ash). We need to figure out that (0, 1123) in the
     // primary root window's coordinates is actually (0, 123) in the
     // extended root window's coordinates.
 
     gfx::Point location_in_native(location_in_root);
     root_window->GetDispatcher()->ConvertPointToNativeScreen(
         &location_in_native);
 
-    aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+    Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
     for (size_t i = 0; i < root_windows.size(); ++i) {
-      aura::WindowEventDispatcher* dispatcher =
-          root_windows[i]->GetDispatcher();
       const gfx::Rect native_bounds(
-          dispatcher->GetHostOrigin(),
-          dispatcher->GetHostSize());  // in px.
+          root_windows[i]->GetHostOrigin(),
+          root_windows[i]->GetHostSize());  // in px.
       if (native_bounds.Contains(location_in_native)) {
+        root_window = root_windows[i];
         location_in_root = location_in_native;
-        dispatcher->ConvertPointFromNativeScreen(&location_in_root);
+        root_window->GetDispatcher()->ConvertPointFromNativeScreen(
+            &location_in_root);
         break;
       }
     }
   }
 #else
   // TODO(yusukes): Support non-X11 platforms if necessary.
 #endif
 
   return std::make_pair(root_window->GetDispatcher(), location_in_root);
 }
@@ skipping 95 matching lines @@
 
   gfx::Point origin(bounds.origin());
   const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow(
       window).bounds().origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds.size()));
 }
 
 }  // internal
 }  // ash