Do not let MagnificationController move cursor on login screen when cursor is invisible.

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 87 matching lines @@
 
   // 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);
 
   // Returns if the magnification scale is 1.0 or not (larger then 1.0).
   bool IsMagnified() const;
 
-  // Returns the default scale which depends on the login status.
-  float GetDefaultZoomScale() const {
+  // Returns true if the user is logged in.
+  bool IsUserLoggedIn() const {
     user::LoginStatus login = Shell::GetInstance()->tray_delegate() ?
         Shell::GetInstance()->tray_delegate()->GetUserLoginStatus() :

[Daniel Erat, 2012/11/28 15:35:23]

it seems pretty strange to me how all of this code is going through the tray
delegate.  would the shell delegate make more sense?  it already has a
IsUserLoggedIn() method; does that do what you need?

GetUserLoginStatus() should probably also be moved from the tray delegate to the
shell delegate, but that's outside the scope of this change.

[mazda, 2012/11/28 19:27:16]

I filed a cleanup issue (http://crbug.com/163170) and will work on it in another
CL.
Thanks.

         user::LOGGED_IN_NONE;
+    return login != user::LOGGED_IN_NONE;
+  }
 
+  // Returns the default scale which depends on the login status.
+  float GetDefaultZoomScale() const {
     // On login screen, don't magnify the screen by default.
-    if (login == user::LOGGED_IN_NONE)
+    if (!IsUserLoggedIn())
       return kNonMagnifiedScale;
 
     return kInitialMagnifiedScale;
   }
 
   // Returns the rect of the magnification window.
   gfx::RectF GetWindowRectDIP(float scale) const;
   // Returns the size of the root window.
   gfx::Size GetHostSizeDIP() const;
 
@@ skipping 26 matching lines @@
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationControllerImpl:
 
 MagnificationControllerImpl::MagnificationControllerImpl()
     : root_window_(ash::Shell::GetPrimaryRootWindow()),
       is_on_animation_(false),
       is_enabled_(false),
       move_cursor_after_animation_(false),
       scale_(std::numeric_limits<double>::min()) {

[yoshiki, 2012/11/28 05:00:14]

Could you change it from "std::numeric_limits<double>::min()" to "1.0f"? The
initial scale must be 1.0f.

[mazda, 2012/11/28 19:27:16]

Done.

   Shell::GetInstance()->AddPreTargetHandler(this);
 }
 
 MagnificationControllerImpl::~MagnificationControllerImpl() {
   Shell::GetInstance()->RemovePreTargetHandler(this);
 }
 
 void MagnificationControllerImpl::RedrawKeepingMousePosition(
     float scale, bool animate) {
   gfx::Point mouse_in_root = root_window_->GetLastMouseLocationInRoot();
@@ skipping 171 matching lines @@
       if (x_diff != 0 || y_diff != 0)
         AfterAnimationMoveCursorTo(mouse);
     }
   }
 }
 
 void MagnificationControllerImpl::AfterAnimationMoveCursorTo(
     const gfx::Point& location) {
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window_);
-  if (cursor_client)
+  if (cursor_client) {
+    // When cursor is invisible on login screen, do not move cursor nor show

[Daniel Erat, 2012/11/28 15:35:23]

nit: s/nor/or/, s/cursor/the cursor/g

("nor" would work in "... neither move the cursor nor show ...")

[mazda, 2012/11/28 19:27:16]

Done.

+    // cursor after the animation.
+    if (!IsUserLoggedIn() && !cursor_client->IsCursorVisible())

[yoshiki, 2012/11/28 05:00:14]

I think you can remove "!IsUserLoggedIn()". We should keep the cursor hidden
after animation if it is hidden before animation, even when not on login screen.

[mazda, 2012/11/28 19:27:16]

Done.

+      return;
     cursor_client->ShowCursor(false);
+  }
   move_cursor_after_animation_ = true;
   position_after_animation_ = location;
 }
 
 gfx::Size MagnificationControllerImpl::GetHostSizeDIP() const {
   return ui::ConvertSizeToDIP(root_window_->layer(),
                               root_window_->GetHostSize());
 }
 
 gfx::RectF MagnificationControllerImpl::GetWindowRectDIP(float scale) const {
@@ skipping 24 matching lines @@
   DCHECK(kNonMagnifiedScale <= *scale && *scale <= kMaxMagnifiedScale);
 }
 
 void MagnificationControllerImpl::OnImplicitAnimationsCompleted() {
   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);
   }
 
-  aura::client::CursorClient* cursor_client =
-      aura::client::GetCursorClient(root_window_);
-  if (cursor_client)
-    cursor_client->ShowCursor(true);
-
   is_on_animation_ = false;
 }
 
 void MagnificationControllerImpl::SwitchTargetRootWindow(
     aura::RootWindow* new_root_window) {
   if (new_root_window == root_window_)
     return;
 
   float scale = GetScale();
 
@@ skipping 109 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationController:
 
 // static
 MagnificationController* MagnificationController::CreateInstance() {
   return new MagnificationControllerImpl();
 }
 
 }  // namespace ash