Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(637)

Unified Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 417103003: Retrieve the list of keyboard layouts for public sessions async (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index f10ee6e7b37d6286dc60569fc4d323f5e9fe7e62..11835427665da46c748af1341f3c5356cfa7e973 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -38,7 +38,7 @@ 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.
@@ -103,15 +103,14 @@ void UserSelectionScreen::FillUserDictionary(
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());
}
}
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/l10n_util.h » ('j') | chrome/browser/ui/webui/chromeos/login/l10n_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698