| Index: chrome/browser/chromeos/preferences.h
|
| diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
|
| index 3ba680fdda6ae4bc5ebe2c9b5b33e71af839b3ab..4cf6a13f2a4365b50ead702bfb55efbd07ed7e48 100644
|
| --- a/chrome/browser/chromeos/preferences.h
|
| +++ b/chrome/browser/chromeos/preferences.h
|
| @@ -14,6 +14,7 @@
|
| #include "chrome/browser/chromeos/language_preferences.h"
|
| #include "chrome/browser/chromeos/login/users/user_manager.h"
|
| #include "chrome/browser/prefs/pref_service_syncable_observer.h"
|
| +#include "chromeos/ime/input_method_manager.h"
|
|
|
| class PrefRegistrySimple;
|
| class PrefService;
|
| @@ -105,6 +106,8 @@ class Preferences : public PrefServiceSyncableObserver,
|
| // Overriden form UserManager::UserSessionStateObserver.
|
| virtual void ActiveUserChanged(const User* active_user) OVERRIDE;
|
|
|
| + void ActivateInputMethods(const User* active_user);
|
| +
|
| PrefServiceSyncable* prefs_;
|
|
|
| input_method::InputMethodManager* input_method_manager_;
|
| @@ -139,6 +142,10 @@ class Preferences : public PrefServiceSyncableObserver,
|
| // Whether user is a primary user.
|
| bool user_is_primary_;
|
|
|
| + // Reconfigure ime_state_ after user becomes active.
|
| + bool ime_state_outdated_;
|
| + scoped_refptr<input_method::InputMethodManager::State> ime_state_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(Preferences);
|
| };
|
|
|
|
|