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

chrome/browser/ui/ash/ash_init.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/ash/ash_init.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
@@ skipping 76 matching lines @@
       scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass());
 #if defined(OS_CHROMEOS)
   shell->accelerator_controller()->SetBrightnessControlDelegate(
       scoped_ptr<ash::BrightnessControlDelegate>(
           new BrightnessController).Pass());
   shell->accelerator_controller()->SetImeControlDelegate(
       scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass());
   ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(
       chromeos::accessibility::IsHighContrastEnabled());
 
-  chromeos::accessibility::ScreenMagnifierType magnifier_type =
-      chromeos::accessibility::GetScreenMagnifierType();
+  ash::MagnifierType magnifier_type =
+      chromeos::accessibility::GetMagnifierType();
   ash::Shell::GetInstance()->magnification_controller()->SetEnabled(
-      magnifier_type == chromeos::accessibility::MAGNIFIER_FULL);
+      magnifier_type == ash::MAGNIFIER_FULL);
   ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled(
-      magnifier_type == chromeos::accessibility::MAGNIFIER_PARTIAL);
+      magnifier_type == ash::MAGNIFIER_PARTIAL);
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableZeroBrowsersOpenForTests)) {
     browser::StartKeepAlive();
   }
 #endif
   ash::Shell::GetPrimaryRootWindow()->ShowRootWindow();
 }
 
 void CloseAsh() {
   if (ash::Shell::HasInstance())
     ash::Shell::DeleteInstance();
 }
 
 }  // namespace chrome