Revert 162080 - Full Screen Magnifier: Add MagnificationManager

MagnificationManager controls the full screen magnifier from chrome-browser side (not ash side. Note that MagnificationController is on ash side).

MagnificationManager does:
- Watch logged-in. Change the behavior between the login screen and user desktop. 
- Watch change of the pref. When the pref changes, the setting of the magnifier will interlock with it.

In addition, this patch make the magnifier settings per-user instead of per-device.

BUG=151891
TEST=manual, browser_test passes.

Review URL: https://chromiumcodereview.appspot.com/11065008

TBR=yoshiki@chromium.org
Review URL: https://codereview.chromium.org/11169002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162087 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 6 deletions

diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index fc6333b..f0ab732 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -47,7 +47,6 @@ class MagnificationControllerImpl : virtual public MagnificationController,
 
   // MagnificationController overrides:
   virtual void SetEnabled(bool enabled) OVERRIDE;
-  virtual bool IsEnabled() OVERRIDE { return is_enabled_; }
   virtual void SetScale(float scale, bool animate) OVERRIDE;
   virtual float GetScale() const OVERRIDE { return scale_; }
   virtual void MoveWindow(int x, int y, bool animate) OVERRIDE;
@@ -425,8 +424,6 @@ void MagnificationControllerImpl::SetEnabled(bool enabled) {
   if (enabled) {
     float scale =
         ash::Shell::GetInstance()->delegate()->GetSavedScreenMagnifierScale();
-    if (scale <= 0.0f)
-      scale = kInitialMagnifiedScale;
     ValidateScale(&scale);
     RedrawKeepingMousePosition(scale, true);
     is_enabled_ = enabled;
diff --git a/ash/magnifier/magnification_controller.h b/ash/magnifier/magnification_controller.h
index 3edc586..4b0e865 100644
--- a/ash/magnifier/magnification_controller.h
+++ b/ash/magnifier/magnification_controller.h
@@ -30,9 +30,6 @@ class MagnificationController {
   // Enables (or disables if |enabled| is false) screen magnifier feature.
   virtual void SetEnabled(bool enabled) = 0;
 
-  // Returns if the screen magnifier is enabled or not.
-  virtual bool IsEnabled() = 0;
-
   // Sets the magnification ratio. 1.0f means no magnification.
   virtual void SetScale(float scale, bool animate) = 0;
   // Returns the current magnification ratio.