Make GetRootWindow() return a Window instead of a RootWindow.

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 17 matching lines @@
 bool ShouldStayInSameRootWindow(const aura::Window* window) {
   return window &&
       (window->GetProperty(internal::kStayInSameRootWindowKey) ||
        ShouldStayInSameRootWindow(window->parent()));
 }
 
 // Move all transient children to |dst_root|, including the ones in
 // the child windows and transient children of the transient children.
 void MoveAllTransientChildrenToNewRoot(const gfx::Display& display,
                                        aura::Window* window) {
-  aura::RootWindow* dst_root = Shell::GetInstance()->display_controller()->
+  aura::Window* dst_root = Shell::GetInstance()->display_controller()->
       GetRootWindowForDisplayId(display.id());
   aura::Window::Windows transient_children = window->transient_children();
   for (aura::Window::Windows::iterator iter = transient_children.begin();
        iter != transient_children.end(); ++iter) {
     aura::Window* transient_child = *iter;
     int container_id = transient_child->parent()->id();
     DCHECK_GE(container_id, 0);
     aura::Window* container = Shell::GetContainer(dst_root, container_id);
     gfx::Rect parent_bounds_in_screen = transient_child->GetBoundsInScreen();
     container->AddChild(transient_child);
@@ skipping 10 matching lines @@
 }
 
 // Finds the root window at |location| in |window|'s coordinates and returns a
 // pair of root window and location in that root window's coordinates. The
 // function usually returns |window->GetRootWindow()|, but if the mouse pointer
 // is moved outside the |window|'s root while the mouse is captured, it returns
 // the other root window.
 std::pair<aura::RootWindow*, gfx::Point> GetRootWindowRelativeToWindow(
     aura::Window* window,
     const gfx::Point& location) {
-  aura::RootWindow* root_window = window->GetRootWindow();
+  aura::Window* root_window = window->GetRootWindow();
   gfx::Point location_in_root(location);
   aura::Window::ConvertPointToTarget(window, root_window, &location_in_root);
 
 #if defined(USE_X11)
   if (!root_window->ContainsPointInRoot(location_in_root)) {
     // This conversion is necessary to deal with X's passive input
     // grab while dragging window. For example, if we have two
     // displays, say 1000x1000 (primary) and 500x500 (extended one
     // on the right), and start dragging a window at (999, 123), and
     // then move the pointer to the right, the pointer suddenly
     // warps to the extended display. The destination is (0, 123) in
     // the secondary root window's coordinates, or (1000, 123) in
     // the screen coordinates. However, since the mouse is captured
     // by X during drag, a weird LocatedEvent, something like (0, 1123)
     // in the *primary* root window's coordinates, is sent to Chrome
     // (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->ConvertPointToNativeScreen(&location_in_native);
+    root_window->GetDispatcher()->ConvertPointToNativeScreen(
+        &location_in_native);
 
     Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
     for (size_t i = 0; i < root_windows.size(); ++i) {
       const gfx::Rect native_bounds(
           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;
-        root_window->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, location_in_root);
+  return std::make_pair(root_window->GetDispatcher(), location_in_root);
 }
 
 }  // namespace
 
 namespace internal {
 
 void ScreenPositionController::ConvertPointToScreen(
     const aura::Window* window,
     gfx::Point* point) {
-  const aura::RootWindow* root = window->GetRootWindow();
+  const aura::Window* root = window->GetRootWindow();
   aura::Window::ConvertPointToTarget(window, root, point);
   const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow(
-      const_cast<aura::RootWindow*>(root)).bounds().origin();
+      const_cast<aura::Window*>(root)).bounds().origin();
   point->Offset(display_origin.x(), display_origin.y());
 }
 
 void ScreenPositionController::ConvertPointFromScreen(
     const aura::Window* window,
     gfx::Point* point) {
-  const aura::RootWindow* root = window->GetRootWindow();
+  const aura::Window* root = window->GetRootWindow();
   const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow(
-      const_cast<aura::RootWindow*>(root)).bounds().origin();
+      const_cast<aura::Window*>(root)).bounds().origin();
   point->Offset(-display_origin.x(), -display_origin.y());
   aura::Window::ConvertPointToTarget(root, window, point);
 }
 
 void ScreenPositionController::ConvertHostPointToScreen(
     aura::Window* root_window,
     gfx::Point* point) {
-  aura::RootWindow* root = root_window->GetRootWindow();
-  root->ConvertPointFromHost(point);
+  aura::Window* root = root_window->GetRootWindow();
+  root->GetDispatcher()->ConvertPointFromHost(point);
   std::pair<aura::RootWindow*, gfx::Point> pair =
       GetRootWindowRelativeToWindow(root, *point);
   *point = pair.second;
   ConvertPointToScreen(pair.first, point);
 }
 
 void ScreenPositionController::SetBounds(aura::Window* window,
                                          const gfx::Rect& bounds,
                                          const gfx::Display& display) {
   DCHECK_NE(-1, display.id());
   if (!window->parent()->GetProperty(internal::kUsesScreenCoordinatesKey)) {
     window->SetBounds(bounds);
     return;
   }
 
   // Don't move a window to other root window if:
   // a) the window is a transient window. It moves when its
   //    transient_parent moves.
   // b) if the window or its ancestor has kStayInSameRootWindowkey. It's
   //    intentionally kept in the same root window even if the bounds is
   //    outside of the display.
   if (!window->transient_parent() &&
       !ShouldStayInSameRootWindow(window)) {
-    aura::RootWindow* dst_root =
+    aura::Window* dst_root =
         Shell::GetInstance()->display_controller()->GetRootWindowForDisplayId(
             display.id());
     DCHECK(dst_root);
     aura::Window* dst_container = NULL;
     if (dst_root != window->GetRootWindow()) {
       int container_id = window->parent()->id();
       // All containers that uses screen coordinates must have valid window ids.
       DCHECK_GE(container_id, 0);
       // Don't move modal background.
       if (!SystemModalContainerLayoutManager::IsModalBackground(window))
@@ skipping 13 matching lines @@
       if (active && focused != active)
         tracker.Add(active);
 
       dst_container->AddChild(window);
 
       MoveAllTransientChildrenToNewRoot(display, window);
 
       // Restore focused/active window.
       if (tracker.Contains(focused)) {
         aura::client::GetFocusClient(window)->FocusWindow(focused);
+        // TODO(beng): replace with GetRootWindow().
         ash::Shell::GetInstance()->set_target_root_window(
-            focused->GetRootWindow());
+            focused->GetDispatcher());
       } else if (tracker.Contains(active)) {
         activation_client->ActivateWindow(active);
       }
     }
   }
 
   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