A11y: Introduce High Contrast Mode and Screen Magnifier to ubar tray.

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 1247 matching lines @@
   args->GetBoolean(0, &enabled);
 
   chromeos::accessibility::EnableHighContrast(enabled);
 }
 
 void BrowserOptionsHandler::ScreenMagnifierChangeCallback(
     const ListValue* args) {
   std::string type_name;
   args->GetString(0, &type_name);
 
-  chromeos::accessibility::ScreenMagnifierType type =
-      chromeos::accessibility::ScreenMagnifierTypeFromName(type_name.c_str());
+  ash::MagnifierType type =
+      chromeos::accessibility::MagnifierTypeFromName(type_name.c_str());
 
   chromeos::accessibility::SetScreenMagnifier(type);
 }
 
 void BrowserOptionsHandler::VirtualKeyboardChangeCallback(
     const ListValue* args) {
   bool enabled = false;
   args->GetBoolean(0, &enabled);
 
   chromeos::accessibility::EnableVirtualKeyboard(enabled);
@@ skipping 23 matching lines @@
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setSpokenFeedbackCheckboxState",
       spoken_feedback_enabled);
   base::FundamentalValue high_contrast_enabled(
       pref_service->GetBoolean(prefs::kHighContrastEnabled));
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setHighContrastCheckboxState",
       high_contrast_enabled);
 
   base::StringValue magnifier_type(
-      pref_service->GetString(prefs::kScreenMagnifierType));
+      pref_service->GetString(prefs::kMagnifierType));
   web_ui()->CallJavascriptFunction(
-      "BrowserOptions.setScreenMagnifierTypeState",
+      "BrowserOptions.setMagnifierTypeState",
       magnifier_type);
 
   base::FundamentalValue virtual_keyboard_enabled(
       pref_service->GetBoolean(prefs::kVirtualKeyboardEnabled));
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setVirtualKeyboardCheckboxState",
       virtual_keyboard_enabled);
 }
 #endif
 
@@ skipping 91 matching lines @@
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
   StringValue label(label_str);
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setupProxySettingsSection", disabled, label);
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options