| 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 a596e13d35ec7b9d0e0c6e384358bdf21c0ffc47..c6646c4bd61b50f251b6e69cbc4e2fd3b1dcbfe9 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| @@ -20,6 +20,7 @@
|
| #include "chrome/browser/chromeos/dbus/power_manager_client.h"
|
| #include "chrome/browser/chromeos/input_method/input_method_manager.h"
|
| #include "chrome/browser/chromeos/input_method/xkeyboard.h"
|
| +#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h"
|
| #include "chrome/browser/chromeos/login/screen_locker.h"
|
| #include "chrome/browser/chromeos/login/user.h"
|
| #include "chrome/browser/chromeos/login/webui_login_display.h"
|
| @@ -327,6 +328,11 @@ void SigninScreenHandler::GetLocalizedStrings(
|
| l10n_util::GetStringUTF16(IDS_OFFLINE_LOGIN_HTML));
|
| localized_strings->SetString("removeUser",
|
| l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE));
|
| +
|
| + if (chromeos::KioskModeHelper::Get()->IsKioskModeEnabled()) {
|
| + localized_strings->SetString("demoLoginMessage",
|
| + l10n_util::GetStringUTF16(IDS_KIOSK_MODE_LOGIN_MESSAGE));
|
| + }
|
| }
|
|
|
| void SigninScreenHandler::Show(bool oobe_ui) {
|
| @@ -391,6 +397,9 @@ void SigninScreenHandler::RegisterMessages() {
|
| web_ui()->RegisterMessageCallback("getUsers",
|
| base::Bind(&SigninScreenHandler::HandleGetUsers,
|
| base::Unretained(this)));
|
| + web_ui()->RegisterMessageCallback("launchDemoUser",
|
| + base::Bind(&SigninScreenHandler::HandleLaunchDemoUser,
|
| + base::Unretained(this)));
|
| web_ui()->RegisterMessageCallback("launchIncognito",
|
| base::Bind(&SigninScreenHandler::HandleLaunchIncognito,
|
| base::Unretained(this)));
|
| @@ -644,6 +653,12 @@ void SigninScreenHandler::HandleAuthenticateUser(const base::ListValue* args) {
|
| delegate_->Login(username, password);
|
| }
|
|
|
| +void SigninScreenHandler::HandleLaunchDemoUser(const base::ListValue* args) {
|
| + if (!delegate_)
|
| + return;
|
| + delegate_->LoginAsDemoUser();
|
| +}
|
| +
|
| void SigninScreenHandler::HandleLaunchIncognito(const base::ListValue* args) {
|
| if (!delegate_)
|
| return;
|
|
|