Revert 176087

ash/system/tray_accessibility.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/system/tray_accessibility.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 26 matching lines @@
   A11Y_SCREEN_MAGNIFIER = 1 << 2,
 };
 
 uint32 GetAccessibilityState() {
   ShellDelegate* shell_delegate = Shell::GetInstance()->delegate();
   uint32 state = A11Y_NONE;
   if (shell_delegate->IsSpokenFeedbackEnabled())
     state |= A11Y_SPOKEN_FEEDBACK;
   if (shell_delegate->IsHighContrastEnabled())
     state |= A11Y_HIGH_CONTRAST;
-  if (shell_delegate->IsMagnifierEnabled())
+  if (shell_delegate->GetMagnifierType() != ash::MAGNIFIER_OFF)
     state |= A11Y_SCREEN_MAGNIFIER;
   return state;
 }
 
 user::LoginStatus GetCurrentLoginStatus() {
   return Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
 }
 
 }  // namespace
 
@@ skipping 73 matching lines @@
       bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SPOKEN_FEEDBACK),
       spoken_feedback_enabled_ ? gfx::Font::BOLD : gfx::Font::NORMAL,
       spoken_feedback_enabled_);
   high_contrast_enabled_ = shell_delegate->IsHighContrastEnabled();
   high_contrast_view_ = AddScrollListItem(
       bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_HIGH_CONTRAST_MODE),
       high_contrast_enabled_ ? gfx::Font::BOLD : gfx::Font::NORMAL,
       high_contrast_enabled_);
-  screen_magnifier_enabled_ = shell_delegate->IsMagnifierEnabled();
+  screen_magnifier_enabled_ =
+      shell_delegate->GetMagnifierType() == ash::MAGNIFIER_FULL;
   screen_magnifier_view_ = AddScrollListItem(
       bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SCREEN_MAGNIFIER),
       screen_magnifier_enabled_ ? gfx::Font::BOLD : gfx::Font::NORMAL,
       screen_magnifier_enabled_);
 }
 
 void AccessibilityDetailedView::AppendHelpEntries() {
   // Currently the help page requires a browser window.
   // TODO(yoshiki): show this even on login/lock screen. crbug.com/158286
@@ skipping 38 matching lines @@
 
 void AccessibilityDetailedView::ClickedOn(views::View* sender) {
   ShellDelegate* shell_delegate = Shell::GetInstance()->delegate();
   if (sender == footer()->content()) {
     owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   } else if (sender == spoken_feedback_view_) {
     shell_delegate->ToggleSpokenFeedback(ash::A11Y_NOTIFICATION_NONE);
   } else if (sender == high_contrast_view_) {
     shell_delegate->ToggleHighContrast();
   } else if (sender == screen_magnifier_view_) {
-    shell_delegate->SetMagnifierEnabled(!shell_delegate->IsMagnifierEnabled());
+    bool screen_magnifier_enabled =
+        shell_delegate->GetMagnifierType() == ash::MAGNIFIER_FULL;
+    shell_delegate->SetMagnifier(
+        screen_magnifier_enabled ? ash::MAGNIFIER_OFF : ash::MAGNIFIER_FULL);
   }
 }
 
 void AccessibilityDetailedView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   SystemTrayDelegate* tray_delegate =
       Shell::GetInstance()->system_tray_delegate();
   if (sender == help_view_)
     tray_delegate->ShowAccessibilityHelp();
 }
@@ skipping 106 matching lines @@
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace internal
 }  // namespace ash