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

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

Issue 398543002: Add language and keyboard layout pickers to public session pods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Base the list of keyboard layouts offered on the resolved locale, not the selected locale. 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
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/resources/login/screen_account_picker.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8e12c9b059764877a62c0bb014c104e519ba6857..0113178a59460516301619a38bc3878e503f38cb 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
+#include <vector>
+
#include "ash/shell.h"
#include "base/logging.h"
#include "base/prefs/pref_service.h"
@@ -12,6 +14,7 @@
#include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/signin/screenlock_bridge.h"
+#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "chrome/common/pref_names.h"
#include "components/user_manager/user_type.h"
@@ -34,6 +37,8 @@ const char kKeyIsOwner[] = "isOwner";
const char kKeyInitialAuthType[] = "initialAuthType";
const char kKeyMultiProfilesAllowed[] = "isMultiProfilesAllowed";
const char kKeyMultiProfilesPolicy[] = "multiProfilesPolicy";
+const char kKeyInitialLocales[] = "initialLocales";
+const char kKeyInitialKeyboardLayouts[] = "initialKeyboardLayouts";
// Max number of users to show.
// Please keep synced with one in signin_userlist_unittest.cc.
@@ -97,6 +102,16 @@ void UserSelectionScreen::FillUserDictionary(
user_dict->SetString(kKeyEnterpriseDomain,
policy_connector->GetEnterpriseDomain());
}
+
+ // TODO(bartfab): Initialize |locale| and |most_relevant_languages| 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());
}
}
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/resources/login/screen_account_picker.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698