Do not use local override for language settings: always sync.

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2011 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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 137 matching lines @@
       const GaiaAuthConsumer::ClientLoginResult& credentials);
 
   // Sets the current background view.
   virtual void SetBackgroundView(chromeos::BackgroundView* background_view);
 
   // Gets the current background view.
   virtual chromeos::BackgroundView* GetBackgroundView();
 
  private:
   // Check user's profile for kApplicationLocale setting.
-  void RespectLocalePreference(PrefService* pref);
+  void RespectLocalePreference(Profile* pref);
 
   // Indicates if DoBrowserLaunch will actually launch the browser or not.
   bool browser_launch_enabled_;
 
   // The current background view.
   chromeos::BackgroundView* background_view_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginUtilsImpl);
 };
 
@@ skipping 133 matching lines @@
     if (cryptohome->TpmIsEnabled() && !cryptohome->TpmIsBeingOwned()) {
       if (cryptohome->TpmIsOwned()) {
         cryptohome->TpmClearStoredPassword();
       } else {
         cryptohome->TpmCanAttemptOwnership();
       }
     }
   }
   btl->AddLoginTimeMarker("TPMOwned", false);
 
-  RespectLocalePreference(profile->GetPrefs());
+  RespectLocalePreference(profile);
 
   if (first_login) {
     SetFirstLoginPrefs(profile->GetPrefs());
   }
 
   // Enable/disable plugins based on user preferences.
   PluginUpdater::GetInstance()->DisablePluginGroupsFromPrefs(profile);
   btl->AddLoginTimeMarker("PluginsStateUpdated", false);
 
   // We suck. This is a hack since we do not have the enterprise feature
@@ skipping 24 matching lines @@
 void LoginUtilsImpl::FetchTokens(
     Profile* profile,
     const GaiaAuthConsumer::ClientLoginResult& credentials) {
   TokenService* token_service = profile->GetTokenService();
   token_service->UpdateCredentials(credentials);
   if (token_service->AreCredentialsValid()) {
     token_service->StartFetchingTokens();
   }
 }
 
-void LoginUtilsImpl::RespectLocalePreference(PrefService* prefs) {
+void LoginUtilsImpl::RespectLocalePreference(Profile* profile) {
+  DCHECK(profile != NULL);
+  PrefService* prefs = profile->GetPrefs();
   DCHECK(prefs != NULL);
-  std::string pref_locale_override =
-      prefs->GetString(prefs::kApplicationLocaleOverride);
-  if (!pref_locale_override.empty()) {
-    LanguageSwitchMenu::SwitchLanguage(pref_locale_override);
-    return;
-  }
-
   if (g_browser_process == NULL)
     return;
-  std::string cur_locale = g_browser_process->GetApplicationLocale();
 
   std::string pref_locale = prefs->GetString(prefs::kApplicationLocale);
-  if (!pref_locale.empty()) {
-    if (prefs->GetString(prefs::kApplicationLocaleAccepted) == pref_locale) {
-      // If locale is accepted then we do not want to show LocaleChange
-      // notification.  This notification is triggered by different values of
-      // kApplicationLocaleBackup and kApplicationLocale preferences,
-      // so make them identical.
-      prefs->SetString(prefs::kApplicationLocaleBackup, pref_locale);
-    } else {
-      std::string pref_locale_backup =
-          prefs->GetString(prefs::kApplicationLocaleBackup);
-      if (pref_locale_backup != cur_locale) {
-        if (pref_locale_backup == pref_locale || pref_locale_backup.empty()) {
-          prefs->SetString(prefs::kApplicationLocaleBackup, cur_locale);
-        }
-      }
-    }
-    LanguageSwitchMenu::SwitchLanguage(pref_locale);
-    return;
-  }
-  // Profile synchronization takes time and is not completed at that moment
-  // at first login.  So we initialize locale preference in steps:
-  // (1) first save it to temporary backup;
-  // (2) on next login we assume that synchronization is already completed
-  //     and we may finalize initialization.
-  std::string pref_locale_backup =
-      prefs->GetString(prefs::kApplicationLocaleBackup);
-  prefs->SetString(prefs::kApplicationLocaleBackup, cur_locale);
-  prefs->ScheduleSavePersistentPrefs();
-  if (!pref_locale_backup.empty()) {
-    prefs->SetString(prefs::kApplicationLocale, pref_locale_backup);
-    prefs->ScheduleSavePersistentPrefs();
-    LanguageSwitchMenu::SwitchLanguage(pref_locale_backup);
-  }
+  if (pref_locale.empty())
+    pref_locale = prefs->GetString(prefs::kApplicationLocaleBackup);
+  if (pref_locale.empty())
+    pref_locale = g_browser_process->GetApplicationLocale();
+  DCHECK(!pref_locale.empty());
+  profile->ChangeAppLocale(pref_locale, Profile::APP_LOCALE_CHANGED_VIA_LOGIN);
+  LanguageSwitchMenu::SwitchLanguage(pref_locale);
 }
 
 void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) {
   VLOG(1) << "Completing off the record login";
 
   UserManager::Get()->OffTheRecordUserLoggedIn();
 
   if (CrosLibrary::Get()->EnsureLoaded()) {
     // For guest session we ask session manager to restart Chrome with --bwsi
     // flag. We keep only some of the arguments of this process.
@@ skipping 172 matching lines @@
   BrowserInit browser_init;
   int return_code;
   browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(),
                              profile,
                              FilePath(),
                              true,
                              &return_code);
 }
 
 }  // namespace chromeos