| Index: chrome/browser/chromeos/login/existing_user_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
|
| index bc3d737c38346246c6e39a70b57e8924991c4a86..4078fde54c1bdf13a737609aa41d0810c1c3110b 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller.cc
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller.cc
|
| @@ -216,14 +216,6 @@ void ExistingUserController::ResumeLogin() {
|
| resume_login_callback_.Reset();
|
| }
|
|
|
| -void ExistingUserController::PrepareKioskAppLaunch() {
|
| - // Disable login UI while waiting for the kiosk app launch. There is no
|
| - // balanced UI enable call because this very login screen will not be
|
| - // accessed again. If app is launched, it will be destroyed. If app fails to
|
| - // launch, chrome is restarted to go back to a new login screen.
|
| - login_display_->SetUIEnabled(false);
|
| -}
|
| -
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // ExistingUserController, content::NotificationObserver implementation:
|
| //
|
| @@ -580,6 +572,10 @@ void ExistingUserController::LoginAsPublicAccount(
|
| l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_LOGIN_SIGNIN_PUBLIC_ACCOUNT));
|
| }
|
|
|
| +void ExistingUserController::LoginAsKioskApp(const std::string& app_id) {
|
| + host_->StartAppLaunch(app_id);
|
| +}
|
| +
|
| void ExistingUserController::OnSigninScreenReady() {
|
| signin_screen_ready_ = true;
|
| StartPublicSessionAutoLoginTimer();
|
|
|