Introduce AcccessibilityManager

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 1f64fcc3b67bd9334d2931b2215f574f0554e12b..3b0e7c858898f8ab4dcd14a041cd3a8a1c31f8da 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -43,7 +43,7 @@
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.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/audio/audio_handler.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
@@ -1004,7 +1004,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
   }
 
   virtual void MaybeSpeak(const std::string& utterance) const OVERRIDE {
-    accessibility::MaybeSpeak(utterance);
+    AccessibilityManager::Get()->MaybeSpeak(utterance);
   }
 
  private:
@@ -1318,8 +1318,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
       case chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK:
       case chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE:
       case chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFIER: {
-        accessibility::AccessibilityStatusEventDetails* accessibility_status =
-            content::Details<accessibility::AccessibilityStatusEventDetails>(
+        AccessibilityStatusEventDetails* accessibility_status =
+            content::Details<AccessibilityStatusEventDetails>(
                 details).ptr();

[Daniel Erat, 2013/04/26 13:58:58]

unwrap this too?

[yoshiki, 2013/05/24 18:49:45]

Done.

         OnAccessibilityModeChanged(accessibility_status->notify);
         break;