Revert 287581 "Allow recommended locales to be set for public se..."

trunk/src/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 867 matching lines @@
 }
 
 void SigninScreenHandler::SetPublicSessionDisplayName(
       const std::string& user_id,
       const std::string& display_name) {
   CallJS("login.AccountPickerScreen.setPublicSessionDisplayName",
          user_id,
          display_name);
 }
 
-void SigninScreenHandler::SetPublicSessionLocales(
-    const std::string& user_id,
-    scoped_ptr<base::ListValue> locales,
-    const std::string& default_locale,
-    bool multipleRecommendedLocales) {
-  CallJS("login.AccountPickerScreen.setPublicSessionLocales",
-         user_id,
-         *locales,
-         default_locale,
-         multipleRecommendedLocales);
-}
-
 void SigninScreenHandler::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_AUTH_NEEDED: {
       has_pending_auth_ui_ = true;
       break;
     }
     case chrome::NOTIFICATION_AUTH_SUPPLIED:
       has_pending_auth_ui_ = false;
@@ skipping 425 matching lines @@
                  attempt_token),
       Profile::FromWebUI(web_ui())->GetRequestContext()));
 }
 
 void SigninScreenHandler::HandleGetPublicSessionKeyboardLayouts(
     const std::string& user_id,
     const std::string& locale) {
   GetKeyboardLayoutsForLocale(
       base::Bind(&SigninScreenHandler::SendPublicSessionKeyboardLayouts,
                  weak_factory_.GetWeakPtr(),
-                 user_id,
-                 locale),
+                 user_id),
       locale);
 }
 
 void SigninScreenHandler::SendPublicSessionKeyboardLayouts(
     const std::string& user_id,
-    const std::string& locale,
     scoped_ptr<base::ListValue> keyboard_layouts) {
-  CallJS("login.AccountPickerScreen.setPublicSessionKeyboardLayouts",
-         user_id,
-         locale,
-         *keyboard_layouts);
+  web_ui()->CallJavascriptFunction(
+      "login.AccountPickerScreen.setPublicSessionKeyboardLayouts",
+      base::StringValue(user_id),
+      *keyboard_layouts);
 }
 
 void SigninScreenHandler::HandleLaunchKioskApp(const std::string& app_id,
                                                bool diagnostic_mode) {
   UserContext context(user_manager::USER_TYPE_KIOSK_APP, app_id);
   SigninSpecifics specifics;
   specifics.kiosk_diagnostic_mode = diagnostic_mode;
   if (delegate_)
     delegate_->Login(context, specifics);
 }
@@ skipping 123 matching lines @@
   return gaia_screen_handler_->frame_error();
 }
 
 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
   caps_lock_enabled_ = enabled;
   if (page_is_ready())
     CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
 }
 
 }  // namespace chromeos