2 files changed, 9 insertions, 13 deletions
diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc
index 3e762b7..a24ba51 100644
--- a/ash/magnifier/partial_magnification_controller.cc
+++ b/ash/magnifier/partial_magnification_controller.cc
@@ -99,7 +99,7 @@ void PartialMagnificationController::OnWindowDestroying(
     aura::Window* window) {
   CloseMagnifierWindow();
 
-  aura::RootWindow* new_root_window = GetCurrentRootWindow();
+  aura::Window* new_root_window = GetCurrentRootWindow();
   if (new_root_window != window)
     SwitchTargetRootWindow(new_root_window);
 }
@@ -131,13 +131,13 @@ void PartialMagnificationController::CreateMagnifierWindow() {
   if (zoom_widget_)
     return;
 
-  aura::RootWindow* root_window = GetCurrentRootWindow();
+  aura::Window* root_window = GetCurrentRootWindow();
   if (!root_window)
     return;
 
   root_window->AddObserver(this);
 
-  gfx::Point mouse(root_window->GetLastMouseLocationInRoot());
+  gfx::Point mouse(root_window->GetDispatcher()->GetLastMouseLocationInRoot());
 
   zoom_widget_ = new views::Widget;
   views::Widget::InitParams params(
@@ -196,13 +196,13 @@ void PartialMagnificationController::SwitchTargetRootWindow(
   SetScale(GetScale());
 }
 
-aura::RootWindow* PartialMagnificationController::GetCurrentRootWindow() {
-  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
-  for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
+aura::Window* PartialMagnificationController::GetCurrentRootWindow() {
+  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  for (aura::Window::Windows::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
-    aura::RootWindow* root_window = *iter;
+    aura::Window* root_window = *iter;
     if (root_window->ContainsPointInRoot(
-            root_window->GetLastMouseLocationInRoot()))
+            root_window->GetDispatcher()->GetLastMouseLocationInRoot()))
       return root_window;
   }
   return NULL;
diff --git a/ash/magnifier/partial_magnification_controller.h b/ash/magnifier/partial_magnification_controller.h
index 01c3a2b..eaecd12 100644
--- a/ash/magnifier/partial_magnification_controller.h
+++ b/ash/magnifier/partial_magnification_controller.h
@@ -10,10 +10,6 @@
 #include "ui/gfx/point.h"
 #include "ui/views/widget/widget_observer.h"
 
-namespace aura {
-class RootWindow;
-}
-
 namespace ash {
 
 const float kDefaultPartialMagnifiedScale = 1.5f;
@@ -52,7 +48,7 @@ class PartialMagnificationController
   void SwitchTargetRootWindow(aura::Window* new_root_window);
 
   // Returns the root window that contains the mouse cursor.
-  aura::RootWindow* GetCurrentRootWindow();
+  aura::Window* GetCurrentRootWindow();
 
   // Return true if the magnification scale > kMinPartialMagnifiedScaleThreshold
   bool IsPartialMagnified() const;