| 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 54d05fd2c01a11e0631a3141f38fe58ab44f8e50..1c14ba4af86d463a6534bb061259229bc7311898 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| @@ -863,6 +863,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) {
|
| @@ -1308,17 +1320,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,
|
|
|