Sync starting language and input method preferences

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/login_utils.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 713 matching lines @@
                                  &command_line);
 
   RestartChrome(cmd_line_str);
 }
 
 void LoginUtilsImpl::SetFirstLoginPrefs(PrefService* prefs) {
   VLOG(1) << "Setting first login 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);
 
   // Add input method IDs based on the input methods, as there may be
   // input methods that are unrelated to the current locale. Example: the
   // hardware keyboard layout xkb:us::eng is used for logging in, but the
   // UI language is set to French. In this case, we should set "fr,en"
   // to the preferred languages preference.
   std::vector<std::string> candidates;
   manager->GetInputMethodUtil()->GetLanguageCodesFromInputMethodIds(
       input_method_ids, &candidates);
   for (size_t i = 0; i < candidates.size(); ++i) {
     const std::string& candidate = candidates[i];
     // Skip if it's already in language_codes.
     if (std::count(language_codes.begin(), language_codes.end(),
                    candidate) == 0) {
       language_codes.push_back(candidate);
     }
   }
   // 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(
     LoginStatusConsumer* consumer) {
   // Screen locker needs new Authenticator instance each time.
   if (ScreenLocker::default_screen_locker()) {
     if (authenticator_.get())
       authenticator_->SetConsumer(NULL);
     authenticator_ = NULL;
   }
@@ skipping 170 matching lines @@
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(
       kAccountsPrefUsers, username, wildcard_match);
 }
 
 }  // namespace chromeos