Chromium Code Reviews| 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 87558f07d4196f70fb0e78b0198dd0202226371f..4eacf04bf19d586b90583207b0997d416321d170 100644 |
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
| @@ -28,7 +28,6 @@ |
| #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| #include "chrome/browser/chromeos/boot_times_loader.h" |
| #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| -#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| #include "chrome/browser/chromeos/login/hwid_checker.h" |
| #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" |
| @@ -409,9 +408,6 @@ void SigninScreenHandler::DeclareLocalizedValues( |
| IDS_ENTERPRISE_ENROLLMENT_AUTH_FATAL_ERROR); |
| builder->Add("insecureURLEnrollmentError", |
| IDS_ENTERPRISE_ENROLLMENT_AUTH_INSECURE_URL_ERROR); |
| - |
| - if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) |
| - builder->Add("demoLoginMessage", IDS_KIOSK_MODE_LOGIN_MESSAGE); |
|
bartfab (slow)
2014/10/15 09:52:21
Remove IDS_KIOSK_MODE_LOGIN_MESSAGE from chrome/ap
rkc
2014/11/20 21:06:34
Done.
|
| } |
| void SigninScreenHandler::Show(const LoginScreenContext& context) { |
| @@ -433,10 +429,6 @@ void SigninScreenHandler::Show(const LoginScreenContext& context) { |
| ShowImpl(); |
| } |
| -void SigninScreenHandler::ShowRetailModeLoginSpinner() { |
| - CallJS("showLoginSpinner"); |
| -} |
| - |
| void SigninScreenHandler::SetDelegate(SigninScreenHandlerDelegate* delegate) { |
| delegate_ = delegate; |
| if (delegate_) |
| @@ -730,7 +722,6 @@ void SigninScreenHandler::RegisterMessages() { |
| AddCallback("authenticateUser", &SigninScreenHandler::HandleAuthenticateUser); |
| AddCallback("attemptUnlock", &SigninScreenHandler::HandleAttemptUnlock); |
| AddCallback("getUsers", &SigninScreenHandler::HandleGetUsers); |
| - AddCallback("launchDemoUser", &SigninScreenHandler::HandleLaunchDemoUser); |
| AddCallback("launchIncognito", &SigninScreenHandler::HandleLaunchIncognito); |
| AddCallback("showSupervisedUserCreationScreen", |
| &SigninScreenHandler::HandleShowSupervisedUserCreationScreen); |
| @@ -1098,12 +1089,6 @@ void SigninScreenHandler::HandleAttemptUnlock(const std::string& username) { |
| service->AttemptAuth(username); |
| } |
| -void SigninScreenHandler::HandleLaunchDemoUser() { |
| - UserContext context(user_manager::USER_TYPE_RETAIL_MODE, std::string()); |
| - if (delegate_) |
| - delegate_->Login(context, SigninSpecifics()); |
| -} |
| - |
| void SigninScreenHandler::HandleLaunchIncognito() { |
| UserContext context(user_manager::USER_TYPE_GUEST, std::string()); |
| if (delegate_) |