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

chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_TERMS_OF_SERVICE_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_TERMS_OF_SERVICE_SCREEN_HANDLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
 namespace chromeos {
 
 class CoreOobeActor;
 
 // The sole implementation of the TermsOfServiceScreenActor, using WebUI.
 class TermsOfServiceScreenHandler : public BaseScreenHandler,
                                     public TermsOfServiceScreenActor {
@@ skipping 13 matching lines @@
   virtual void Hide() override;
   virtual void SetDomain(const std::string& domain) override;
   virtual void OnLoadError() override;
   virtual void OnLoadSuccess(const std::string& terms_of_service) override;
 
  private:
   // BaseScreenHandler:
   virtual void Initialize() override;
 
   // Callback invoked after the UI locale has been changed.
-  void OnLanguageChangedCallback(
-      const locale_util::LanguageSwitchResult& result);
+  void OnLanguageChangedCallback(const std::string& requested_locale,
+                                 const std::string& loaded_locale,
+                                 const bool success);
 
   // Switch to the user's preferred input method and show the screen. This
   // method is called after it has been ensured that the current UI locale
   // matches the UI locale chosen by the user.
   void DoShow();
 
   // Update the domain name shown in the UI.
   void UpdateDomainInUI();
 
   // Update the UI to show an error message or the Terms of Service, depending
@@ skipping 24 matching lines @@
 
   // Set to the Terms of Service when the download is successful.
   std::string terms_of_service_;
 
   DISALLOW_COPY_AND_ASSIGN(TermsOfServiceScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_TERMS_OF_SERVICE_SCREEN_HANDLER_H_