show notification on locale change

chrome/browser/chromeos/login/login_utils.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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"
 #include "base/file_util.h"
@@ skipping 311 matching lines @@
     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* pref) {
-  std::string pref_locale = pref->GetString(prefs::kApplicationLocale);
-  if (pref_locale.empty()) {
-    // 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 =
-        pref->GetString(prefs::kApplicationLocaleBackup);
-    if (pref_locale_backup.empty()) {
-      pref->SetString(prefs::kApplicationLocaleBackup,
-                      g_browser_process->GetApplicationLocale());
-      return;
-    } else {
-      pref_locale.swap(pref_locale_backup);
-      pref->SetString(prefs::kApplicationLocale, pref_locale);
+  std::string pref_locale =

[whywhat, 2011/01/11 10:24:14]

Could you use several variables with more specific names instead of reusing this
one for storing three separate preferences?

[Denis Lagno, 2011/01/12 15:33:28]

Done.

+      pref->GetString(prefs::kApplicationLocaleOverride);
+  if (!pref_locale.empty()) {
+    LanguageSwitchMenu::SwitchLanguage(pref_locale);
+    return;
+  }
+
+  if (g_browser_process == NULL)
+    return;
+  std::string cur_locale = g_browser_process->GetApplicationLocale();
+
+  pref_locale = pref->GetString(prefs::kApplicationLocale);
+  if (!pref_locale.empty()) {
+    if (pref->GetString(prefs::kApplicationLocaleAccepted) == pref_locale) {
+      // If locale is accepted then we do not want to show LocaleChangeInfoBar.
+      pref->SetString(prefs::kApplicationLocaleBackup, pref_locale);
+    } else if (pref->GetString(prefs::kApplicationLocaleBackup) != cur_locale) {

[whywhat, 2011/01/11 10:24:14]

I guess pref->GetString(prefs::kApplicationLocaleBackup) could be stored in a
variable and nested if could be eliminated.

[Denis Lagno, 2011/01/12 15:33:28]

Done.

+      if (pref->GetString(prefs::kApplicationLocaleBackup) == pref_locale ||
+          pref->GetString(prefs::kApplicationLocaleBackup).empty()) {
+        pref->SetString(prefs::kApplicationLocaleBackup, cur_locale);
+      }
     }
+    LanguageSwitchMenu::SwitchLanguage(pref_locale);
+    return;
   }
-  LanguageSwitchMenu::SwitchLanguage(pref_locale);
+  // 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.
+  pref_locale = pref->GetString(prefs::kApplicationLocaleBackup);
+  pref->SetString(prefs::kApplicationLocaleBackup, cur_locale);
+  pref->ScheduleSavePersistentPrefs();
+  if (!pref_locale.empty()) {
+    pref->SetString(prefs::kApplicationLocale, pref_locale);
+    pref->ScheduleSavePersistentPrefs();
+    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 164 matching lines @@
   BrowserInit browser_init;
   int return_code;
   browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(),
                              profile,
                              FilePath(),
                              true,
                              &return_code);
 }
 
 }  // namespace chromeos