Index: chrome/browser/chromeos/preferences.h |
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h |
index 3ba680fdda6ae4bc5ebe2c9b5b33e71af839b3ab..a3f147c6ee03eb7672cae7bffd25c59639f55bf3 100644 |
--- a/chrome/browser/chromeos/preferences.h |
+++ b/chrome/browser/chromeos/preferences.h |
@@ -87,6 +87,12 @@ class Preferences : public PrefServiceSyncableObserver, |
// Restores the user's preferred input method / keyboard layout on signing in. |
void SetInputMethodList(); |
+ // Parses and applies the local extension IME pref. |
+ void SetEnabledExtensionImes(); |
+ |
+ // Copies local language and input method prefs to their global counterparts. |
+ void SetSyncedLocalePrefs(); |
+ |
// Updates the initial key repeat delay and key repeat interval following |
// current prefs values. We set the delay and interval at once since an |
// underlying XKB API requires it. |
@@ -124,10 +130,23 @@ class Preferences : public PrefServiceSyncableObserver, |
BooleanPrefMember touch_hud_projection_enabled_; |
// Input method preferences. |
- StringPrefMember preload_engines_; |
- StringPrefMember current_input_method_; |
StringPrefMember previous_input_method_; |
StringPrefMember enabled_extension_imes_; |
+ // Only apply the local variants to the device settings, since the user may |
+ // have different hardware keyboards on their devices. We only use the global |
+ // variants to note the user's most recent choices, and in the initial |
+ // post-OOBE sync, we add the global most recent choices to the local values. |
+ // This never affects existing profiles. |
+ StringPrefMember preferred_languages_; |
+ StringPrefMember preferred_languages_local_; |
+ StringPrefMember preload_engines_; |
+ StringPrefMember preload_engines_local_; |
+ StringPrefMember current_input_method_; |
+ StringPrefMember enabled_extension_imes_local_; |
+ |
+ // Whether the global language/input method prefs should be merged into the |
+ // local settings for this device. False if we have ever synced. |
+ bool should_merge_locale_prefs_; |
BooleanPrefMember xkb_auto_repeat_enabled_; |
IntegerPrefMember xkb_auto_repeat_delay_pref_; |