Retrieve the list of keyboard layouts for public sessions async

chrome/browser/chromeos/login/screens/user_selection_screen.cc

 // Copyright 2014 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/screens/user_selection_screen.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
 const char kKeyEnterpriseDomain[] = "enterpriseDomain";
 const char kKeyPublicAccount[] = "publicAccount";
 const char kKeySupervisedUser[] = "supervisedUser";
 const char kKeySignedIn[] = "signedIn";
 const char kKeyCanRemove[] = "canRemove";
 const char kKeyIsOwner[] = "isOwner";
 const char kKeyInitialAuthType[] = "initialAuthType";
 const char kKeyMultiProfilesAllowed[] = "isMultiProfilesAllowed";
 const char kKeyMultiProfilesPolicy[] = "multiProfilesPolicy";
 const char kKeyInitialLocales[] = "initialLocales";
-const char kKeyInitialKeyboardLayouts[] = "initialKeyboardLayouts";
+const char kKeyInitialKeyboardLayout[] = "initialKeyboardLayout";
 
 // Max number of users to show.
 // Please keep synced with one in signin_userlist_unittest.cc.
 const size_t kMaxUsers = 18;
 
 const int kPasswordClearTimeoutSec = 60;
 
 }  // namespace
 
 UserSelectionScreen::UserSelectionScreen() : handler_(NULL) {
@@ skipping 44 matching lines @@
 
   if (is_public_account) {
     policy::BrowserPolicyConnectorChromeOS* policy_connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
 
     if (policy_connector->IsEnterpriseManaged()) {
       user_dict->SetString(kKeyEnterpriseDomain,
                            policy_connector->GetEnterpriseDomain());
     }
 
-    // TODO(bartfab): Initialize |locale| and |most_relevant_languages| based on
-    // policy.
+    // TODO(bartfab): Initialize |locale| based on policy.
     const std::string locale;
     std::vector<std::string> most_relevant_languages;
     user_dict->Set(
         kKeyInitialLocales,
         GetUILanguageList(&most_relevant_languages, locale).release());
-    user_dict->Set(kKeyInitialKeyboardLayouts,
-                   GetKeyboardLayoutsForLocale(locale).release());
+    user_dict->Set(kKeyInitialKeyboardLayout,
+                   GetCurrentKeyboardLayout().release());
   }
 }
 
 // static
 bool UserSelectionScreen::ShouldForceOnlineSignIn(
     const user_manager::User* user) {
   // Public sessions are always allowed to log in offline.
   // Supervised user are allowed to log in offline if their OAuth token status
   // is unknown or valid.
   // For all other users, force online sign in if:
@@ skipping 183 matching lines @@
 }
 
 ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType(
     const std::string& username) const {
   if (user_auth_type_map_.find(username) == user_auth_type_map_.end())
     return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
   return user_auth_type_map_.find(username)->second;
 }
 
 }  // namespace chromeos