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

chrome/browser/ui/webui/chromeos/login/core_oobe_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/chromeos/login/core_oobe_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
@@ skipping 56 matching lines @@
   localized_strings->SetString("highContrastOption",
       l10n_util::GetStringUTF16(IDS_OOBE_HIGH_CONTRAST_MODE_OPTION));
   localized_strings->SetString("screenMagnifierOption",
       l10n_util::GetStringUTF16(IDS_OOBE_SCREEN_MAGNIFIER_OPTION));
 
   // TODO(nkostylev): Move OOBE/login WebUI from localStrings to loadTimeData.
   if (chromeos::accessibility::IsHighContrastEnabled())
     localized_strings->SetString("highContrastEnabled", "on");
   if (chromeos::accessibility::IsSpokenFeedbackEnabled())
     localized_strings->SetString("spokenFeedbackEnabled", "on");
-  if (chromeos::accessibility::GetScreenMagnifierType() !=
-      chromeos::accessibility::MAGNIFIER_OFF) {
+  if (chromeos::accessibility::GetMagnifierType() !=
+      ash::MAGNIFIER_OFF) {
     localized_strings->SetString("screenMagnifierEnabled", "on");
   }
 }
 
 void CoreOobeHandler::Initialize() {
   UpdateOobeUIVisibility();
 #if defined(OFFICIAL_BUILD)
   version_info_updater_.StartUpdate(true);
 #else
   version_info_updater_.StartUpdate(false);
@@ skipping 50 matching lines @@
   chromeos::accessibility::EnableHighContrast(enabled);
 }
 
 void CoreOobeHandler::HandleEnableScreenMagnifier(const base::ListValue* args) {
   bool enabled;
   if (!args->GetBoolean(0, &enabled)) {
     NOTREACHED();
     return;
   }
   // TODO(nkostylev): Add support for partial screen magnifier.
-  chromeos::accessibility::ScreenMagnifierType type = enabled ?
-      chromeos::accessibility::MAGNIFIER_FULL :
-      chromeos::accessibility::MAGNIFIER_OFF;
-  chromeos::accessibility::SetScreenMagnifier(type);
+  ash::MagnifierType type = enabled ? ash::MAGNIFIER_FULL :
+                                      ash::MAGNIFIER_OFF;
+  chromeos::accessibility::SetMagnifier(type);
 }
 
 void CoreOobeHandler::HandleEnableSpokenFeedback(const base::ListValue* args) {
   // Checkbox is initialized on page init and updates when spoken feedback
   // setting is changed so just toggle spoken feedback here.
   chromeos::accessibility::ToggleSpokenFeedback(web_ui());
 }
 
 void CoreOobeHandler::ShowOobeUI(bool show) {
   if (show == show_oobe_ui_)
@@ skipping 43 matching lines @@
                                   const std::string& text) {
   base::StringValue id_value(UTF8ToUTF16(id));
   base::StringValue text_value(UTF8ToUTF16(text));
   web_ui()->CallJavascriptFunction("cr.ui.Oobe.setLabelText",
                                    id_value,
                                    text_value);
 }
 
 }  // namespace chromeos