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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 426063005: Allow recommended locales to be set for public sessions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix buffer overflow in test. Created 6 years, 4 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/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 8b226e95b17383166411636fe2a3fbeee74a5eee..38e6c601783cbbf697bf438379df6c1fc107d16d 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -885,6 +885,18 @@ void SigninScreenHandler::SetPublicSessionDisplayName(
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) {
@@ -1330,17 +1342,19 @@ void SigninScreenHandler::HandleGetPublicSessionKeyboardLayouts(
GetKeyboardLayoutsForLocale(
base::Bind(&SigninScreenHandler::SendPublicSessionKeyboardLayouts,
weak_factory_.GetWeakPtr(),
- user_id),
+ user_id,
+ locale),
locale);
}
void SigninScreenHandler::SendPublicSessionKeyboardLayouts(
const std::string& user_id,
+ const std::string& locale,
scoped_ptr<base::ListValue> keyboard_layouts) {
- web_ui()->CallJavascriptFunction(
- "login.AccountPickerScreen.setPublicSessionKeyboardLayouts",
- base::StringValue(user_id),
- *keyboard_layouts);
+ CallJS("login.AccountPickerScreen.setPublicSessionKeyboardLayouts",
+ user_id,
+ locale,
+ *keyboard_layouts);
}
void SigninScreenHandler::HandleLaunchKioskApp(const std::string& app_id,

Powered by Google App Engine
This is Rietveld 408576698