Revert 176102

chrome/browser/chromeos/accessibility/accessibility_util.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/accessibility_util.h"
 
 #include <queue>
 
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
@@ skipping 32 matching lines @@
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::RenderViewHost;
 
 namespace chromeos {
 namespace accessibility {
 
-const char kScreenMagnifierOff[] = "";
-const char kScreenMagnifierFull[] = "full";
-const char kScreenMagnifierPartial[] = "partial";
-
 // Helper class that directly loads an extension's content scripts into
 // all of the frames corresponding to a given RenderViewHost.
 class ContentScriptLoader {
  public:
   // Initialize the ContentScriptLoader with the ID of the extension
   // and the RenderViewHost where the scripts should be loaded.
   ContentScriptLoader(const std::string& extension_id,
                       int render_process_id,
                       int render_view_id)
       : extension_id_(extension_id),
@@ skipping 49 matching lines @@
   std::queue<ExtensionResource> resources_;
 };
 
 void UpdateChromeOSAccessibilityHistograms() {
   UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosSpokenFeedback",
                         IsSpokenFeedbackEnabled());
   UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosHighContrast",
                         IsHighContrastEnabled());
   UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosVirtualKeyboard",
                         IsVirtualKeyboardEnabled());
-  if (MagnificationManager::Get())
+  if (MagnificationManager::Get()) {
+    uint32 type = MagnificationManager::Get()->IsMagnifierEnabled() ?
+                      MagnificationManager::Get()->GetMagnifierType() : 0;
+    // '0' means magnifier is disabled.
     UMA_HISTOGRAM_ENUMERATION("Accessibility.CrosScreenMagnifier",
-                              MagnificationManager::Get()->GetMagnifierType(),
-                              3);
+                              type,
+                              ash::kMaxMagnifierType + 1);
+  }
 }
 
 void Initialize() {
   content::BrowserAccessibilityState::GetInstance()->AddHistogramCallback(
       base::Bind(&UpdateChromeOSAccessibilityHistograms));
 }
 
 void EnableSpokenFeedback(bool enabled,
                           content::WebUI* login_web_ui,
                           ash::AccessibilityNotificationVisibility notify) {
@@ skipping 143 matching lines @@
 bool IsVirtualKeyboardEnabled() {
   if (!g_browser_process) {
     return false;
   }
   PrefService* prefs = g_browser_process->local_state();
   bool virtual_keyboard_enabled = prefs &&
       prefs->GetBoolean(prefs::kVirtualKeyboardEnabled);
   return virtual_keyboard_enabled;
 }
 
-ash::MagnifierType MagnifierTypeFromName(const char type_name[]) {
-  if (0 == strcmp(type_name, kScreenMagnifierFull))
-    return ash::MAGNIFIER_FULL;
-  else if (0 == strcmp(type_name, kScreenMagnifierPartial))
-    return ash::MAGNIFIER_PARTIAL;
-  else
-    return ash::MAGNIFIER_OFF;
-}
-
-const char* ScreenMagnifierNameFromType(ash::MagnifierType type) {
-  switch (type) {
-    case ash::MAGNIFIER_OFF:
-      return kScreenMagnifierOff;
-    case ash::MAGNIFIER_FULL:
-      return kScreenMagnifierFull;
-    case ash::MAGNIFIER_PARTIAL:
-      return kScreenMagnifierPartial;
-  }
-  return kScreenMagnifierOff;
-}
-
 void MaybeSpeak(const std::string& utterance) {
   if (IsSpokenFeedbackEnabled())
     Speak(utterance);
 }
 
 void ShowAccessibilityHelp(Browser* browser) {
   chrome::ShowSingletonTab(browser, GURL(chrome::kChromeAccessibilityHelpURL));
 }
 
 }  // namespace accessibility
 }  // namespace chromeos