Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (patchs…

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 194 matching lines @@
                                LoginDisplayHost* login_host,
                                bool locale_pref_checked);
 
   // Switch to the locale that |profile| wishes to use and invoke |callback|.
   virtual void RespectLocalePreference(Profile* profile,
                                        const base::Closure& callback);
 
   static void RunCallbackOnLocaleLoaded(
       const base::Closure& callback,
       InputEventsBlocker* input_events_blocker,
-      const locale_util::LanguageSwitchResult& result);
+      const std::string& locale,
+      const std::string& loaded_locale,
+      const bool success);
 
   // Attempts restarting the browser process and esures that this does
   // not happen while we are still fetching new OAuth refresh tokens.
   void AttemptRestart(Profile* profile);
 
   // Has to be scoped_refptr, see comment for CreateAuthenticator(...).
   scoped_refptr<Authenticator> authenticator_;
 
   // Delegate to be fired when the profile will be prepared.
   LoginUtils::Delegate* delegate_;
@@ skipping 89 matching lines @@
     login_host->Finalize();
   user_manager::UserManager::Get()->SessionStarted();
   chromeos::BootTimesLoader::Get()->LoginDone(
       user_manager::UserManager::Get()->IsCurrentUserNew());
 }
 
 // static
 void LoginUtilsImpl::RunCallbackOnLocaleLoaded(
     const base::Closure& callback,
     InputEventsBlocker* /* input_events_blocker */,
-    const locale_util::LanguageSwitchResult& /* result */) {
+    const std::string& /* locale */,
+    const std::string& /* loaded_locale */,
+    const bool /* success */) {
   callback.Run();
 }
 
 void LoginUtilsImpl::RespectLocalePreference(Profile* profile,
                                              const base::Closure& callback) {
   if (browser_shutdown::IsTryingToQuit())
     return;
 
   user_manager::User* const user =
       ProfileHelper::Get()->GetUserByProfile(profile);
-  locale_util::SwitchLanguageCallback locale_switched_callback(base::Bind(
-      &LoginUtilsImpl::RunCallbackOnLocaleLoaded,
-      callback,
-      base::Owned(new InputEventsBlocker)));  // Block UI events until
-                                              // the ResourceBundle is
-                                              // reloaded.
+  scoped_ptr<locale_util::SwitchLanguageCallback> locale_switched_callback(
+      new locale_util::SwitchLanguageCallback(base::Bind(
+              &LoginUtilsImpl::RunCallbackOnLocaleLoaded,
+              callback,
+              base::Owned(new InputEventsBlocker))));  // Block UI events until
+                                                       // the ResourceBundle is
+                                                       // reloaded.
   if (!UserSessionManager::GetInstance()->RespectLocalePreference(
-          profile, user, locale_switched_callback)) {
+          profile,
+          user,
+          locale_switched_callback.Pass())) {
     callback.Run();
   }
 }
 
 void LoginUtilsImpl::DoBrowserLaunch(Profile* profile,
                                      LoginDisplayHost* login_host) {
   DoBrowserLaunchInternal(profile, login_host, false /* locale_pref_checked */);
 }
 
 void LoginUtilsImpl::PrepareProfile(
@@ skipping 128 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