Revert 171609

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 {
+    // TODO(yoshiki,mazda): Do not use SystemTrayDelegate to get the user login
+    // status (http://crbug.com/163170).
+    user::LoginStatus login = Shell::GetInstance()->tray_delegate() ?
+        Shell::GetInstance()->tray_delegate()->GetUserLoginStatus() :
+        user::LOGGED_IN_NONE;
+
+    // On login screen, don't magnify the screen by default.
+    if (login == user::LOGGED_IN_NONE)
+      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;
 
   // Correct the givin scale value if nessesary.
   void ValidateScale(float* scale);
 
   // ui::EventHandler overrides:
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
@@ skipping 336 matching lines @@
     return;
 
   EnsurePointIsVisibleWithScale(point, scale_, animate);
 }
 
 void MagnificationControllerImpl::SetEnabled(bool enabled) {
   if (enabled) {
     float scale =
         ash::Shell::GetInstance()->delegate()->GetSavedScreenMagnifierScale();
     if (scale <= 0.0f)
-      scale = kInitialMagnifiedScale;
+      scale = GetDefaultZoomScale();
     ValidateScale(&scale);
 
     // Do nothing, if already enabled with same scale.
     if (is_enabled_ && scale == scale_)
       return;
 
     RedrawKeepingMousePosition(scale, true);
-    ash::Shell::GetInstance()->delegate()->SaveScreenMagnifierScale(scale);
     is_enabled_ = enabled;
   } else {
     // Do nothing, if already disabled.
     if (!is_enabled_)
       return;
 
     RedrawKeepingMousePosition(kNonMagnifiedScale, true);
     is_enabled_ = enabled;
   }
 }
@@ skipping 45 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationController:
 
 // static
 MagnificationController* MagnificationController::CreateInstance() {
   return new MagnificationControllerImpl();
 }
 
 }  // namespace ash