| Index: chrome/browser/chromeos/accessibility/accessibility_manager.h
|
| diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h
|
| index 41fb8bc40df0414afcf2a4e5190cd5dbea90104a..68e2c26e7267a412909eb164038516ba64b0c49d 100644
|
| --- a/chrome/browser/chromeos/accessibility/accessibility_manager.h
|
| +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
|
| @@ -15,6 +15,7 @@
|
| #include "base/time/time.h"
|
| #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
|
| #include "chrome/browser/extensions/api/braille_display_private/braille_controller.h"
|
| +#include "chromeos/ime/input_method_manager.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "extensions/browser/event_router.h"
|
| @@ -66,9 +67,11 @@ typedef AccessibilityStatusCallbackList::Subscription
|
| // AccessibilityManager changes the statuses of accessibility features
|
| // watching profile notifications and pref-changes.
|
| // TODO(yoshiki): merge MagnificationManager with AccessibilityManager.
|
| -class AccessibilityManager : public content::NotificationObserver,
|
| - extensions::api::braille_display_private::BrailleObserver,
|
| - public ash::SessionStateObserver {
|
| +class AccessibilityManager
|
| + : public content::NotificationObserver,
|
| + public extensions::api::braille_display_private::BrailleObserver,
|
| + public input_method::InputMethodManager::Observer,
|
| + public ash::SessionStateObserver {
|
| public:
|
| // Creates an instance of AccessibilityManager, this should be called once,
|
| // because only one instance should exist at the same time.
|
| @@ -93,6 +96,8 @@ class AccessibilityManager : public content::NotificationObserver,
|
|
|
| private:
|
| const char* pref_path_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(PrefHandler);
|
| };
|
|
|
| // Returns true when the accessibility menu should be shown.
|
| @@ -205,7 +210,7 @@ class AccessibilityManager : public content::NotificationObserver,
|
|
|
| void UpdateChromeOSAccessibilityHistograms();
|
|
|
| - // content::NotificationObserver implementation:
|
| + // content::NotificationObserver
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
| @@ -216,6 +221,11 @@ class AccessibilityManager : public content::NotificationObserver,
|
| const extensions::api::braille_display_private::DisplayState&
|
| display_state) OVERRIDE;
|
|
|
| + // InputMethodManager::Observer
|
| + virtual void InputMethodChanged(input_method::InputMethodManager* manager,
|
| + bool show_message) OVERRIDE;
|
| +
|
| +
|
| // Profile which has the current a11y context.
|
| Profile* profile_;
|
|
|
|
|