Index: chrome/browser/chromeos/login/session/user_session_manager.cc |
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc |
index 5b68bb9e79e8218ee1de6f5dfbbf3c7a3bfb250d..a66fe09e3151fa0fa33f3ed231abb0274c9da9d3 100644 |
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc |
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc |
@@ -172,9 +172,12 @@ void InitLocaleAndInputMethodsForNewUser( |
} |
// Save the preferred languages in the user's preferences. |
- StringPrefMember language_preferred_languages; |
- language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, prefs); |
- language_preferred_languages.SetValue(JoinString(language_codes, ',')); |
+ prefs->SetString(prefs::kLanguagePreferredLanguages, |
+ JoinString(language_codes, ',')); |
+ |
+ // Indicate that we need to merge the syncable input methods when we sync, |
+ // since we have not applied the synced prefs before. |
+ prefs->SetBoolean(prefs::kLanguageShouldMergeInputMethods, true); |
} |
#if defined(ENABLE_RLZ) |
@@ -1485,4 +1488,8 @@ void UserSessionManager::RunCallbackOnLocaleLoaded( |
callback.Run(); |
} |
+void UserSessionManager::RemoveProfileForTesting(Profile* profile) { |
+ default_ime_states_.erase(profile); |
+} |
+ |
} // namespace chromeos |