Introduce AcccessibilityManager

chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

 // Copyright 2013 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/chrome_shell_delegate.h"
 
 #include "ash/keyboard_overlay/keyboard_overlay_view.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h"
 #include "chrome/browser/chromeos/extensions/media_player_api.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
@@ skipping 90 matching lines @@
         l10n_util::GetStringUTF16(IDS_NETWORK_ACTIVATION_ERROR_TITLE),
         l10n_util::GetStringFUTF16(IDS_NETWORK_ACTIVATION_NEEDS_CONNECTION,
                                    UTF8ToUTF16((cellular->name()))),
         std::vector<string16>());
     return;
   }
   MobileSetupDialog::Show(service_path);
 }
 
 void ChromeShellDelegate::ToggleHighContrast() {
-  bool enabled = chromeos::accessibility::IsHighContrastEnabled();
-  chromeos::accessibility::EnableHighContrast(!enabled);
+  bool enabled = chromeos::AccessibilityManager::Get()->IsHighContrastEnabled();
+  chromeos::AccessibilityManager::Get()->EnableHighContrast(!enabled);
 }
 
 bool ChromeShellDelegate::IsSpokenFeedbackEnabled() const {
-  return chromeos::accessibility::IsSpokenFeedbackEnabled();
+  return chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled();
 }
 
 void ChromeShellDelegate::ToggleSpokenFeedback(
     ash::AccessibilityNotificationVisibility notify) {
   content::WebUI* web_ui = NULL;
 
   chromeos::LoginDisplayHostImpl* host =
       static_cast<chromeos::LoginDisplayHostImpl*>(
           chromeos::LoginDisplayHostImpl::default_host());
   if (host && host->GetOobeUI())
     web_ui = host->GetOobeUI()->web_ui();
 
   if (!web_ui &&
       chromeos::ScreenLocker::default_screen_locker() &&
       chromeos::ScreenLocker::default_screen_locker()->locked()) {
     web_ui = chromeos::ScreenLocker::default_screen_locker()->
         GetAssociatedWebUI();
   }
-  chromeos::accessibility::ToggleSpokenFeedback(web_ui, notify);
+  chromeos::AccessibilityManager::Get()->ToggleSpokenFeedback(web_ui, notify);
 }
 
 bool ChromeShellDelegate::IsHighContrastEnabled() const {
-  return chromeos::accessibility::IsHighContrastEnabled();
+  return chromeos::AccessibilityManager::Get()->IsHighContrastEnabled();
 }
 
 bool ChromeShellDelegate::IsMagnifierEnabled() const {
   DCHECK(chromeos::MagnificationManager::Get());
   return chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
 }
 
 ash::MagnifierType ChromeShellDelegate::GetMagnifierType() const {
   DCHECK(chromeos::MagnificationManager::Get());
   return chromeos::MagnificationManager::Get()->GetMagnifierType();
@@ skipping 89 matching lines @@
 }
 
 void ChromeShellDelegate::PlatformInit() {
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
 }