Revert 176102

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 176110)
+++ chrome/browser/ui/ash/chrome_shell_delegate.cc	(working copy)
@@ -355,22 +355,38 @@
 #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::MAGNIFIER_OFF;
+  return ash::kDefaultMagnifierType;
 #endif
 }
 
-void ChromeShellDelegate::SetMagnifier(ash::MagnifierType type) {
+void ChromeShellDelegate::SetMagnifierEnabled(bool enabled) {
 #if defined(OS_CHROMEOS)
   DCHECK(chromeos::MagnificationManager::Get());
-  return chromeos::MagnificationManager::Get()->SetMagnifier(type);
+  return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled);
 #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())