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

ui/views/widget/native_widget_aura.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 "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 258 matching lines @@
     window_->ReleaseCapture();
 }
 
 bool NativeWidgetAura::HasCapture() const {
   return window_ && window_->HasCapture();
 }
 
 InputMethod* NativeWidgetAura::CreateInputMethod() {
   if (!window_)
     return NULL;
-  aura::RootWindow* root_window = window_->GetRootWindow();
+  aura::Window* root_window = window_->GetRootWindow();
   ui::InputMethod* host =
       root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
   return new InputMethodBridge(this, host, true);
 }
 
 internal::InputMethodDelegate* NativeWidgetAura::GetInputMethodDelegate() {
   return this;
 }
 
 void NativeWidgetAura::CenterWindow(const gfx::Size& size) {
@@ skipping 94 matching lines @@
     if (restore_bounds)
       return *restore_bounds;
   }
   return window_->GetBoundsInScreen();
 }
 
 void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) {
   if (!window_)
     return;
 
-  aura::RootWindow* root = window_->GetRootWindow();
+  aura::Window* root = window_->GetRootWindow();
   if (root) {
     aura::client::ScreenPositionClient* screen_position_client =
         aura::client::GetScreenPositionClient(root);
     if (screen_position_client) {
       gfx::Display dst_display =
           gfx::Screen::GetScreenFor(window_)->GetDisplayMatching(bounds);
       screen_position_client->SetBounds(window_, bounds, dst_display);
       return;
     }
   }
@@ skipping 111 matching lines @@
   aura::client::GetActivationClient(window_->GetRootWindow())->DeactivateWindow(
       window_);
 }
 
 bool NativeWidgetAura::IsActive() const {
   if (!window_)
     return false;
 
   // We may up here during destruction of the root, in which case
   // GetRootWindow() returns NULL (~RootWindow() has run and we're in ~Window).
-  aura::RootWindow* root = window_->GetRootWindow();
+  aura::Window* root = window_->GetRootWindow();
   return root &&
       aura::client::GetActivationClient(root)->GetActiveWindow() == window_;
 }
 
 void NativeWidgetAura::SetAlwaysOnTop(bool on_top) {
   if (window_)
     window_->SetProperty(aura::client::kAlwaysOnTopKey, on_top);
 }
 
 bool NativeWidgetAura::IsAlwaysOnTop() const {
@@ skipping 574 matching lines @@
     // always done. (The previous behaviour of aura::Window::SetParent() used
     // NULL as a special value that meant ask the WindowTreeClient where things
     // should go.)
     //
     // This probably isn't strictly correct, but its an invariant that a Window
     // in use will be attached to a RootWindow, so we can't just call
     // RemoveChild here. The only possible thing that could assign a RootWindow
     // in this case is the stacking client of the current RootWindow. This
     // matches our previous behaviour; the global stacking client would almost
     // always reattach the window to the same RootWindow.
-    aura::RootWindow* root_window = native_view->GetRootWindow();
+    aura::Window* root_window = native_view->GetRootWindow();
     aura::client::ParentWindowWithContext(
         native_view, root_window, root_window->GetBoundsInScreen());
   }
 
   // And now, notify them that they have a brand new parent.
   for (Widget::Widgets::iterator it = widgets.begin();
       it != widgets.end(); ++it) {
     (*it)->NotifyNativeViewHierarchyChanged();
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::Env::GetInstance()->IsMouseButtonDown();
 }
 
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   return aura::Env::GetInstance()->is_touch_down();
 }
 
 }  // namespace internal
 }  // namespace views