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

ash/test/ui_controls_factory_ash.cc

 // Copyright 2013 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.h"
 #include "ash/shell_factory.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 12 matching lines @@
 namespace {
 
 using ui_controls::UIControlsAura;
 using ui_controls::MouseButton;
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(UIControlsAura, kUIControlsKey, NULL);
 
 // Returns the UIControls object for RootWindow.
 // kUIControlsKey is owned property and UIControls object
 // will be deleted when the root window is deleted.
-UIControlsAura* GetUIControlsForRootWindow(aura::RootWindow* root_window) {
+UIControlsAura* GetUIControlsForRootWindow(aura::Window* root_window) {
   UIControlsAura* native_ui_control =
       root_window->GetProperty(kUIControlsKey);
   if (!native_ui_control) {
-    native_ui_control = aura::test::CreateUIControlsAura(root_window);
+    native_ui_control =
+        aura::test::CreateUIControlsAura(root_window->GetDispatcher());
     // Pass the ownership to the |root_window|.
     root_window->SetProperty(kUIControlsKey, native_ui_control);
   }
   return native_ui_control;
 }
 
 // Returns the UIControls object for the RootWindow at the |point_in_screen|
 // in virtual screen coordinates, and updates the |point| relative to the
 // UIControlsAura's root window.  NULL if there is no RootWindow under
 // the |point_in_screen|.
 UIControlsAura* GetUIControlsAt(gfx::Point* point_in_screen) {
   // TODO(mazda): Support the case passive grab is taken.
-  aura::RootWindow* root = ash::wm::GetRootWindowAt(*point_in_screen);
+  aura::Window* root = ash::wm::GetRootWindowAt(*point_in_screen);
 
   aura::client::ScreenPositionClient* screen_position_client =
       aura::client::GetScreenPositionClient(root);
   if (screen_position_client)
     screen_position_client->ConvertPointFromScreen(root, point_in_screen);
 
   return GetUIControlsForRootWindow(root);
 }
 
 }  // namespace
@@ skipping 17 matching lines @@
   }
 
   virtual bool SendKeyPressNotifyWhenDone(
       gfx::NativeWindow window,
       ui::KeyboardCode key,
       bool control,
       bool shift,
       bool alt,
       bool command,
       const base::Closure& closure) OVERRIDE {
-    aura::RootWindow* root =
+    aura::Window* root =
         window ? window->GetRootWindow() : ash::Shell::GetTargetRootWindow();
     UIControlsAura* ui_controls = GetUIControlsForRootWindow(root);
     return ui_controls && ui_controls->SendKeyPressNotifyWhenDone(
         window, key, control, shift, alt, command, closure);
   }
 
   virtual bool SendMouseMove(long x, long y) OVERRIDE {
     gfx::Point p(x, y);
     UIControlsAura* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseMove(p.x(), p.y());
@@ skipping 40 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
 };
 
 ui_controls::UIControlsAura* CreateAshUIControls() {
   return new ash::test::UIControlsAsh();
 }
 
 }  // namespace test
 }  // namespace ash