| 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 f0e2e8be60aa0438781c26a9d4113a6d8ce788d6..529ad83c7158fb6827458929e194350f7cb9f0fb 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:
|
| //
|
| @@ -635,6 +627,10 @@ void ExistingUserController::Signout() {
|
| NOTREACHED();
|
| }
|
|
|
| +void ExistingUserController::LaunchKioskApp(const std::string& app_id) {
|
| + host_->StartAppLaunch(app_id);
|
| +}
|
| +
|
| void ExistingUserController::OnConsumerKioskModeCheckCompleted(
|
| KioskAppManager::ConsumerKioskModeStatus status) {
|
| if (status == KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE)
|
|
|