Revert 176087

chrome/browser/ui/ash/chrome_shell_delegate.cc

Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
===================================================================
--- chrome/browser/ui/ash/chrome_shell_delegate.cc	(revision 176100)
+++ chrome/browser/ui/ash/chrome_shell_delegate.cc	(working copy)
@@ -355,38 +355,22 @@
 #endif
 }
 
-bool ChromeShellDelegate::IsMagnifierEnabled() const {
-#if defined(OS_CHROMEOS)
-  DCHECK(chromeos::MagnificationManager::Get());
-  return chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
-#else
-  return false;
-#endif
-}
-
 ash::MagnifierType ChromeShellDelegate::GetMagnifierType() const {
 #if defined(OS_CHROMEOS)
   DCHECK(chromeos::MagnificationManager::Get());
   return chromeos::MagnificationManager::Get()->GetMagnifierType();
 #else
-  return ash::kDefaultMagnifierType;
+  return ash::MAGNIFIER_OFF;
 #endif
 }
 
-void ChromeShellDelegate::SetMagnifierEnabled(bool enabled) {
+void ChromeShellDelegate::SetMagnifier(ash::MagnifierType type) {
 #if defined(OS_CHROMEOS)
   DCHECK(chromeos::MagnificationManager::Get());
-  return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled);
+  return chromeos::MagnificationManager::Get()->SetMagnifier(type);
 #endif
 }
 
-void ChromeShellDelegate::SetMagnifierType(ash::MagnifierType type) {
-#if defined(OS_CHROMEOS)
-  DCHECK(chromeos::MagnificationManager::Get());
-  return chromeos::MagnificationManager::Get()->SetMagnifierType(type);
-#endif
-}
-
 bool ChromeShellDelegate::ShouldAlwaysShowAccessibilityMenu() const {
 #if defined(OS_CHROMEOS)
   if (!IsUserLoggedIn())