Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..."

trunk/src/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 81 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PartialMagnificationController: aura::WindowObserver implementation
 
 void PartialMagnificationController::OnWindowDestroying(
     aura::Window* window) {
   CloseMagnifierWindow();
 
-  aura::Window* new_root_window = GetCurrentRootWindow();
+  aura::RootWindow* new_root_window = GetCurrentRootWindow();
   if (new_root_window != window)
     SwitchTargetRootWindow(new_root_window);
 }
 
 void PartialMagnificationController::OnWidgetDestroying(
     views::Widget* widget) {
   DCHECK_EQ(widget, zoom_widget_);
   RemoveZoomWidgetObservers();
   zoom_widget_ = NULL;
 }
@@ skipping 11 matching lines @@
 }
 
 bool PartialMagnificationController::IsPartialMagnified() const {
   return scale_ >= kMinPartialMagnifiedScaleThreshold;
 }
 
 void PartialMagnificationController::CreateMagnifierWindow() {
   if (zoom_widget_)
     return;
 
-  aura::Window* root_window = GetCurrentRootWindow();
+  aura::RootWindow* root_window = GetCurrentRootWindow();
   if (!root_window)
     return;
 
   root_window->AddObserver(this);
 
-  gfx::Point mouse(root_window->GetDispatcher()->GetLastMouseLocationInRoot());
+  gfx::Point mouse(root_window->GetLastMouseLocationInRoot());
 
   zoom_widget_ = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.can_activate = false;
   params.accept_events = false;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.parent = root_window;
   zoom_widget_->Init(params);
   zoom_widget_->SetBounds(gfx::Rect(mouse.x() - kMagnifierWidth / 2,
@@ skipping 38 matching lines @@
   if (zoom_widget_ &&
       new_root_window == zoom_widget_->GetNativeView()->GetRootWindow())
     return;
 
   CloseMagnifierWindow();
 
   // Recreate the magnifier window by updating the scale factor.
   SetScale(GetScale());
 }
 
-aura::Window* PartialMagnificationController::GetCurrentRootWindow() {
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  for (aura::Window::Windows::const_iterator iter = root_windows.begin();
+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::Window* root_window = *iter;
+    aura::RootWindow* root_window = *iter;
     if (root_window->ContainsPointInRoot(
-            root_window->GetDispatcher()->GetLastMouseLocationInRoot()))
+            root_window->GetLastMouseLocationInRoot()))
       return root_window;
   }
   return NULL;
 }
 
 }  // namespace ash