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

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 312023002: Sync starting language and input method preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index caef5731dcf6872eacfe81bacaf3bde15eead31c..964f318148e9cfd7034c9fddb04e4e6b4ecf9e9d 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -731,20 +731,20 @@ void LoginUtilsImpl::SetFirstLoginPrefs(PrefService* prefs) {
BootTimesLoader* btl = BootTimesLoader::Get();
std::string locale = g_browser_process->GetApplicationLocale();
- // First, we'll set kLanguagePreloadEngines.
+ // First, we'll set kLanguagePreloadEnginesLocal.
input_method::InputMethodManager* manager =
input_method::InputMethodManager::Get();
std::vector<std::string> input_method_ids;
manager->GetInputMethodUtil()->GetFirstLoginInputMethodIds(
locale, manager->GetCurrentInputMethod(), &input_method_ids);
// Save the input methods in the user's preferences.
- StringPrefMember language_preload_engines;
- language_preload_engines.Init(prefs::kLanguagePreloadEngines,
- prefs);
- language_preload_engines.SetValue(JoinString(input_method_ids, ','));
+ StringPrefMember language_preload_engines_local;
+ language_preload_engines_local.Init(prefs::kLanguagePreloadEnginesLocal,
+ prefs);
+ language_preload_engines_local.SetValue(JoinString(input_method_ids, ','));
btl->AddLoginTimeMarker("IMEStarted", false);
- // Second, we'll set kLanguagePreferredLanguages.
+ // Second, we'll set kLanguagePreferredLanguagesLocal.
std::vector<std::string> language_codes;
// The current locale should be on the top.
language_codes.push_back(locale);
@@ -766,10 +766,10 @@ void LoginUtilsImpl::SetFirstLoginPrefs(PrefService* prefs) {
}
}
// 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, ','));
+ StringPrefMember language_preferred_languages_local;
+ language_preferred_languages_local.Init(
+ prefs::kLanguagePreferredLanguagesLocal, prefs);
+ language_preferred_languages_local.SetValue(JoinString(language_codes, ','));
}
scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator(

Powered by Google App Engine
This is Rietveld 408576698