Revert 176087

chrome/browser/chromeos/accessibility/accessibility_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_UTIL_H_
 
 #include <string>
 
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/shell_delegate.h"
 #include "base/basictypes.h"
 
 class Browser;
 
 namespace content {
 class WebUI;
 }
 
 namespace chromeos {
 namespace accessibility {
 
 struct AccessibilityStatusEventDetails {
   AccessibilityStatusEventDetails(
       bool enabled, ash::AccessibilityNotificationVisibility notify)
     : enabled(enabled),
-      magnifier_type(ash::kDefaultMagnifierType),
-      notify(notify) {}
-
-  AccessibilityStatusEventDetails(
-      bool enabled,
-      ash::MagnifierType magnifier_type,
-      ash::AccessibilityNotificationVisibility notify)
-    : enabled(enabled),
-      magnifier_type(magnifier_type),
       notify(notify) {}
 
   bool enabled;
-  ash::MagnifierType magnifier_type;
   ash::AccessibilityNotificationVisibility notify;
 };
 
 // Do any accessibility initialization that should happen once on startup.
 void Initialize();
 
 // Enables or disables spoken feedback. Enabling spoken feedback installs the
 // ChromeVox component extension.  If this is being called in a login/oobe
 // login screen, pass the WebUI object in login_web_ui so that ChromeVox
 // can be injected directly into that screen, otherwise it should be NULL.
@@ skipping 17 matching lines @@
 
 // Returns true if spoken feedback is enabled, or false if not.
 bool IsSpokenFeedbackEnabled();
 
 // Returns true if High Contrast is enabled, or false if not.
 bool IsHighContrastEnabled();
 
 // Returns true if the Virtual Keyboard is enabled, or false if not.
 bool IsVirtualKeyboardEnabled();
 
+// Translates from a string to MagnifierType.
+ash::MagnifierType MagnifierTypeFromName(const char type_name[]);
+
+// Translates from a MagnifierType to type string.
+const char* ScreenMagnifierNameFromType(ash::MagnifierType type);
+
 // Speaks the given text if the accessibility pref is already set.
 void MaybeSpeak(const std::string& utterance);
 
 // Shows the accessibility help tab on the browser.
 void ShowAccessibilityHelp(Browser* browser);
 
 }  // namespace accessibility
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_UTIL_H_