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

ash/magnifier/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/magnification_controller.h"
 
 #include "ash/accessibility_delegate.h"
 #include "ash/display/root_window_transformers.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 109 matching lines @@
 
   // Move the mouse cursot to the given point. Actual move will be done when
   // the animation is completed. This should be called after animation is
   // started.
   void AfterAnimationMoveCursorTo(const gfx::Point& location);
 
   // Switch Magnified RootWindow to |new_root_window|. This does following:
   //  - Unzoom the current root_window.
   //  - Zoom the given new root_window |new_root_window|.
   //  - Switch the target window from current window to |new_root_window|.
-  void SwitchTargetRootWindow(aura::RootWindow* new_root_window,
+  void SwitchTargetRootWindow(aura::Window* new_root_window,
                               bool redraw_original_root_window);
 
   // Returns if the magnification scale is 1.0 or not (larger then 1.0).
   bool IsMagnified() const;
 
   // Returns the rect of the magnification window.
   gfx::RectF GetWindowRectDIP(float scale) const;
   // Returns the size of the root window.
   gfx::Size GetHostSizeDIP() const;
 
   // Correct the givin scale value if nessesary.
   void ValidateScale(float* scale);
 
   // ui::EventHandler overrides:
   virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
   virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
   virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
 
   // Target root window. This must not be NULL.
-  aura::RootWindow* root_window_;
+  aura::Window* root_window_;
 
   // True if the magnified window is currently animating a change. Otherwise,
   // false.
   bool is_on_animation_;
 
   bool is_enabled_;
 
   // True if the cursor needs to move the given position after the animation
   // will be finished. When using this, set |position_after_animation_| as well.
   bool move_cursor_after_animation_;
@@ skipping 105 matching lines @@
   settings.SetPreemptionStrategy(
       ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
   settings.SetTweenType(gfx::Tween::EASE_OUT);
   settings.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(animate ? 100 : 0));
 
   gfx::Display display =
       Shell::GetScreen()->GetDisplayNearestWindow(root_window_);
   scoped_ptr<aura::RootWindowTransformer> transformer(
       internal::CreateRootWindowTransformerForDisplay(root_window_, display));
-  root_window_->SetRootWindowTransformer(transformer.Pass());
+  root_window_->GetDispatcher()->SetRootWindowTransformer(transformer.Pass());
 
   if (animate)
     is_on_animation_ = true;
 
   return true;
 }
 
 void MagnificationControllerImpl::EnsureRectIsVisibleWithScale(
     const gfx::Rect& target_rect,
     float scale,
@@ skipping 86 matching lines @@
   y = top + y_diff;
 
   if (start_zoom && !is_on_animation_) {
     // No animation on panning.
     bool animate = false;
     bool ret = RedrawDIP(gfx::Point(x, y), scale_, animate);
 
     if (ret) {
       // If the magnified region is moved, hides the mouse cursor and moves it.
       if (x_diff != 0 || y_diff != 0)
-        MoveCursorTo(root_window_, mouse);
+        MoveCursorTo(root_window_->GetDispatcher(), mouse);
     }
   }
 }
 
 void MagnificationControllerImpl::AfterAnimationMoveCursorTo(
     const gfx::Point& location) {
   DCHECK(root_window_);
 
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window_);
@@ skipping 36 matching lines @@
     *scale = kMaxMagnifiedScale;
 
   DCHECK(kNonMagnifiedScale <= *scale && *scale <= kMaxMagnifiedScale);
 }
 
 void MagnificationControllerImpl::OnImplicitAnimationsCompleted() {
   if (!is_on_animation_)
     return;
 
   if (move_cursor_after_animation_) {
-    MoveCursorTo(root_window_, position_after_animation_);
+    MoveCursorTo(root_window_->GetDispatcher(), position_after_animation_);
     move_cursor_after_animation_ = false;
 
     aura::client::CursorClient* cursor_client =
         aura::client::GetCursorClient(root_window_);
     if (cursor_client)
       cursor_client->EnableMouseEvents();
   }
 
   is_on_animation_ = false;
 }
 
 void MagnificationControllerImpl::OnWindowDestroying(
     aura::Window* root_window) {
   if (root_window == root_window_) {
     // There must be at least one root window because this controller is
     // destroyed before the root windows get destroyed.
     DCHECK(root_window);
 
-    aura::RootWindow* target_root_window = Shell::GetTargetRootWindow();
+    aura::Window* target_root_window = Shell::GetTargetRootWindow();
     CHECK(target_root_window);
 
     // The destroyed root window must not be target.
     CHECK_NE(target_root_window, root_window);
     // Don't redraw the old root window as it's being destroyed.
     SwitchTargetRootWindow(target_root_window, false);
     point_of_interest_ = target_root_window->bounds().CenterPoint();
   }
 }
 
 void MagnificationControllerImpl::OnWindowBoundsChanged(
     aura::Window* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   // TODO(yoshiki): implement here. crbug.com/230979
 }
 
 void MagnificationControllerImpl::SwitchTargetRootWindow(
-    aura::RootWindow* new_root_window,
+    aura::Window* new_root_window,
     bool redraw_original_root_window) {
   DCHECK(new_root_window);
 
   if (new_root_window == root_window_)
     return;
 
   // Stores the previous scale.
   float scale = GetScale();
 
   // Unmagnify the previous root window.
@@ skipping 81 matching lines @@
 
 bool MagnificationControllerImpl::IsEnabled() const {
   return is_enabled_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationControllerImpl: aura::EventFilter implementation
 
 void MagnificationControllerImpl::OnMouseEvent(ui::MouseEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
-  aura::RootWindow* current_root = target->GetRootWindow();
+  aura::Window* current_root = target->GetRootWindow();
   gfx::Rect root_bounds = current_root->bounds();
 
   if (root_bounds.Contains(event->root_location())) {
     // This must be before |SwitchTargetRootWindow()|.
     point_of_interest_ = event->root_location();
 
     if (current_root != root_window_) {
       DCHECK(current_root);
       SwitchTargetRootWindow(current_root, true);
     }
@@ skipping 17 matching lines @@
       scale += scroll_event->y_offset() * kScrollScaleChangeFactor;
       SetScale(scale, true);
       event->StopPropagation();
       return;
     }
   }
 }
 
 void MagnificationControllerImpl::OnTouchEvent(ui::TouchEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
-  aura::RootWindow* current_root = target->GetRootWindow();
+  aura::Window* current_root = target->GetRootWindow();
   if (current_root == root_window_) {
     gfx::Rect root_bounds = current_root->bounds();
     if (root_bounds.Contains(event->root_location()))
       point_of_interest_ = event->root_location();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationController:
 
 // static
 MagnificationController* MagnificationController::CreateInstance() {
   return new MagnificationControllerImpl();
 }
 
 }  // namespace ash