Merge 173933

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/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 325 matching lines @@
 
 void MagnificationControllerImpl::AfterAnimationMoveCursorTo(
     const gfx::Point& location) {
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window_);
   if (cursor_client) {
     // When cursor is invisible, do not move or show the cursor after the
     // animation.
     if (!cursor_client->IsCursorVisible())
       return;
-    cursor_client->ShowCursor(false);
+    cursor_client->DisableMouseEvents();
   }
   move_cursor_after_animation_ = true;
   position_after_animation_ = location;
 }
 
 gfx::Size MagnificationControllerImpl::GetHostSizeDIP() const {
   return ui::ConvertSizeToDIP(root_window_->layer(),
                               root_window_->GetHostSize());
 }
 
@@ skipping 29 matching lines @@
   if (!is_on_animation_)
     return;
 
   if (move_cursor_after_animation_) {
     root_window_->MoveCursorTo(position_after_animation_);
     move_cursor_after_animation_ = false;
 
     aura::client::CursorClient* cursor_client =
         aura::client::GetCursorClient(root_window_);
     if (cursor_client)
-      cursor_client->ShowCursor(true);
+      cursor_client->EnableMouseEvents();
   }
 
   is_on_animation_ = false;
 }
 
 void MagnificationControllerImpl::SwitchTargetRootWindow(
     aura::RootWindow* new_root_window) {
   if (new_root_window == root_window_)
     return;
 
@@ skipping 118 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationController:
 
 // static
 MagnificationController* MagnificationController::CreateInstance() {
   return new MagnificationControllerImpl();
 }
 
 }  // namespace ash