Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(923)

Unified Diff: chrome/browser/chromeos/preferences.h

Issue 419293002: IME refactoring: ChromeOS introduce input methods State. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/preferences.h
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index bf8e6e6d8a6a2cce8e97aec3f600e1b795ec0b56..d5ed304d022927268656217808b638d9f1d8acdf 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;
@@ -52,7 +53,7 @@ class Preferences : public PrefServiceSyncableObserver,
// This method will initialize Chrome OS settings to values in user prefs.
// |user| is the user owning this preferences.
- void Init(PrefServiceSyncable* prefs, const user_manager::User* user);
+ void Init(Profile* profile, const user_manager::User* user);
void InitUserPrefsForTesting(PrefServiceSyncable* prefs,
const user_manager::User* user);
@@ -107,6 +108,8 @@ class Preferences : public PrefServiceSyncableObserver,
virtual void ActiveUserChanged(
const user_manager::User* active_user) OVERRIDE;
+ void ActivateInputMethods(const user_manager::User* active_user);
+
PrefServiceSyncable* prefs_;
input_method::InputMethodManager* input_method_manager_;
@@ -141,6 +144,9 @@ class Preferences : public PrefServiceSyncableObserver,
// Whether user is a primary user.
bool user_is_primary_;
+ // Input Methods state for this user.
+ scoped_refptr<input_method::InputMethodManager::State> ime_state_;
+
DISALLOW_COPY_AND_ASSIGN(Preferences);
};

Powered by Google App Engine
This is Rietveld 408576698