Remove partial magnifier from settings page.

chrome/browser/chromeos/accessibility/magnification_manager.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 "chrome/browser/chromeos/accessibility/magnification_manager.h"
 
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ skipping 46 matching lines @@
 
   void SetMagnifier(ash::MagnifierType type) OVERRIDE {
     if (type == type_ && type == ash::MAGNIFIER_OFF)
       return;
 
     type_ = type;
 
     if (profile_) {
       PrefService* prefs = profile_->GetPrefs();
       if (prefs) {
-        std::string typeString =
-            accessibility::ScreenMagnifierNameFromType(type);
-        if (typeString != prefs->GetString(prefs::kMagnifierType)) {
-          prefs->SetString(prefs::kMagnifierType, typeString);
+        bool enabled = (type != ash::MAGNIFIER_OFF);
+        if (enabled != prefs->GetBoolean(prefs::kScreenMagnifierEnabled)) {
+          prefs->SetBoolean(prefs::kScreenMagnifierEnabled, enabled);
           prefs->CommitPendingWrite();
         }
       }
     }
 
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFIER,
         content::NotificationService::AllSources(),
         content::NotificationService::NoDetails());
 
@@ skipping 32 matching lines @@
   }
 
   ash::MagnifierType GetMagnifierTypeFromPref() {
     if (!profile_)
       return ash::MAGNIFIER_OFF;
 
     PrefService* prefs = profile_->GetPrefs();
     if (!prefs)
       return ash::MAGNIFIER_OFF;
 
-    return accessibility::MagnifierTypeFromName(
-        prefs->GetString(prefs::kMagnifierType).c_str());
+    return prefs->GetBoolean(prefs::kScreenMagnifierEnabled) ?
+        ash::MAGNIFIER_FULL : ash::MAGNIFIER_OFF;
   }
 
   void SetProfile(Profile* profile) {
     if (pref_change_registrar_) {
       pref_change_registrar_.reset();
     }
 
     if (profile) {
       pref_change_registrar_.reset(new PrefChangeRegistrar);
       pref_change_registrar_->Init(profile->GetPrefs());
       pref_change_registrar_->Add(
-          prefs::kMagnifierType,
+          prefs::kScreenMagnifierEnabled,
           base::Bind(&MagnificationManagerImpl::UpdateMagnifierStatus,
                      base::Unretained(this)));
     }
 
     profile_ = profile;
     UpdateMagnifierStatus();
   }
 
   void UpdateMagnifierStatus() {
-    // Historycally, from r162080 to r170956, screen magnifier had been enabled
-    // with 1.0x scale on login screen by default, hence some users
-    // unintentionally have the pref to enable magnifier. Now, the default scale
-    // is 2.0x on login screen (same as other screens), so despite them, with
-    // the old pref, their screen might be magnified with 2.0x scale.
-    // The following code prevents it. If the user on login screen has full
-    // screen magnifier pref but no scale pref, doesn't make magnifier enabled.
-    // TODO(yoshiki): remove this in the near future: crbug.com/164627
-    if (first_time_update_) {
-      first_time_update_ = false;
-      UserManager* manager = UserManager::Get();
-      if (profile_ &&
-          !profile_->GetPrefs()->HasPrefPath(prefs::kScreenMagnifierScale) &&
-          accessibility::MagnifierTypeFromName(profile_->GetPrefs()->GetString(
-              prefs::kMagnifierType).c_str()) == ash::MAGNIFIER_FULL &&
-          manager &&
-          !manager->IsSessionStarted()) {
-        SetMagnifier(ash::MAGNIFIER_OFF);
-        profile_->GetPrefs()->SetDouble(prefs::kScreenMagnifierScale,
-                                        kInitialMagnifiedScale);
-        return;
-      }
-    }
-
     ash::MagnifierType type = GetMagnifierTypeFromPref();
     SetMagnifier(type);
   }
 
   // content::NotificationObserver implimentation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     switch (type) {
       case chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE:
@@ skipping 31 matching lines @@
   delete g_magnification_manager;
   g_magnification_manager = NULL;
 }
 
 // static
 MagnificationManager* MagnificationManager::Get() {
   return g_magnification_manager;
 }
 
 }  // namespace chromeos