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

ash/magnifier/partial_magnification_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/magnifier/partial_magnification_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ui/aura/root_window.h"
 #include "ui/views/corewm/compound_event_filter.h"
@@ skipping 61 matching lines @@
     is_enabled_ = enabled;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PartialMagnificationController: ui::EventHandler implementation
 
 void PartialMagnificationController::OnMouseEvent(ui::MouseEvent* event) {
   if (IsPartialMagnified() && event->type() == ui::ET_MOUSE_MOVED) {
     aura::Window* target = static_cast<aura::Window*>(event->target());
-    aura::RootWindow* current_root = target->GetRootWindow();
+    aura::Window* current_root = target->GetRootWindow();
     // TODO(zork): Handle the case where the event is captured on a different
     // display, such as when a menu is opened.
     gfx::Rect root_bounds = current_root->bounds();
 
     if (root_bounds.Contains(event->root_location())) {
       SwitchTargetRootWindow(current_root);
 
       OnMouseMove(event->root_location());
     }
   }
@@ skipping 78 matching lines @@
   if (zoom_widget_) {
     RemoveZoomWidgetObservers();
     zoom_widget_->Close();
     zoom_widget_ = NULL;
   }
 }
 
 void PartialMagnificationController::RemoveZoomWidgetObservers() {
   DCHECK(zoom_widget_);
   zoom_widget_->RemoveObserver(this);
-  aura::RootWindow* root_window =
+  aura::Window* root_window =
       zoom_widget_->GetNativeView()->GetRootWindow();
   DCHECK(root_window);
   root_window->RemoveObserver(this);
 }
 
 void PartialMagnificationController::SwitchTargetRootWindow(
-    aura::RootWindow* new_root_window) {
+    aura::Window* new_root_window) {
   if (zoom_widget_ &&
       new_root_window == zoom_widget_->GetNativeView()->GetRootWindow())
     return;
 
   CloseMagnifierWindow();
 
   // Recreate the magnifier window by updating the scale factor.
   SetScale(GetScale());
 }
 
 aura::RootWindow* PartialMagnificationController::GetCurrentRootWindow() {
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     aura::RootWindow* root_window = *iter;
     if (root_window->ContainsPointInRoot(
             root_window->GetLastMouseLocationInRoot()))
       return root_window;
   }
   return NULL;
 }
 
 }  // namespace ash