| 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 c224c7322114f6fef356e7a3a79ce7f7257654c7..e81187f1a662f4a3d3e0b84020f2edf48c322045 100644
|
| --- a/chrome/browser/chromeos/accessibility/accessibility_manager.h
|
| +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
|
| @@ -8,7 +8,6 @@
|
| #include <set>
|
|
|
| #include "ash/common/accessibility_types.h"
|
| -#include "ash/common/session/session_state_observer.h"
|
| #include "ash/common/shell_observer.h"
|
| #include "base/callback_forward.h"
|
| #include "base/callback_list.h"
|
| @@ -20,6 +19,7 @@
|
| #include "chrome/browser/chromeos/accessibility/chromevox_panel.h"
|
| #include "chrome/browser/extensions/api/braille_display_private/braille_controller.h"
|
| #include "components/prefs/pref_change_registrar.h"
|
| +#include "components/user_manager/user_manager.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "extensions/browser/event_router.h"
|
| @@ -92,7 +92,7 @@ class AccessibilityManager
|
| : public content::NotificationObserver,
|
| public extensions::api::braille_display_private::BrailleObserver,
|
| public extensions::ExtensionRegistryObserver,
|
| - public ash::SessionStateObserver,
|
| + public user_manager::UserManager::UserSessionStateObserver,
|
| public ash::ShellObserver,
|
| public input_method::InputMethodManager::Observer {
|
| public:
|
| @@ -216,11 +216,10 @@ class AccessibilityManager
|
| // false.
|
| bool IsBrailleDisplayConnected() const;
|
|
|
| - // SessionStateObserver overrides:
|
| - void ActiveUserChanged(const AccountId& account_id) override;
|
| + // user_manager::UserManager::UserSessionStateObserver overrides:
|
| + void ActiveUserChanged(const user_manager::User* active_user) override;
|
|
|
| // ShellObserver overrides:
|
| - void OnAppTerminating() override;
|
| void OnFullscreenStateChanged(bool is_fullscreen,
|
| ash::WmWindow* root_window) override;
|
|
|
| @@ -355,7 +354,8 @@ class AccessibilityManager
|
| content::NotificationRegistrar notification_registrar_;
|
| std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
|
| std::unique_ptr<PrefChangeRegistrar> local_state_pref_change_registrar_;
|
| - std::unique_ptr<ash::ScopedSessionStateObserver> session_state_observer_;
|
| + std::unique_ptr<user_manager::ScopedUserSessionStateObserver>
|
| + session_state_observer_;
|
|
|
| PrefHandler large_cursor_pref_handler_;
|
| PrefHandler spoken_feedback_pref_handler_;
|
|
|