| Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| index c6b8cfe336e97200c91d498b705c21578232c96f..e7678f9bfd80e363bc95b3644275ed3a5e266b1f 100644
|
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| @@ -668,7 +668,8 @@ void LoginDisplayHostImpl::StartDemoAppLaunch() {
|
| }
|
|
|
| void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id,
|
| - bool diagnostic_mode) {
|
| + bool diagnostic_mode,
|
| + bool auto_launch) {
|
| VLOG(1) << "Login WebUI >> start app launch.";
|
| SetStatusAreaVisible(false);
|
|
|
| @@ -679,7 +680,8 @@ void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id,
|
| &LoginDisplayHostImpl::StartAppLaunch,
|
| pointer_factory_.GetWeakPtr(),
|
| app_id,
|
| - diagnostic_mode));
|
| + diagnostic_mode,
|
| + auto_launch));
|
| if (status == CrosSettingsProvider::TEMPORARILY_UNTRUSTED)
|
| return;
|
|
|
| @@ -709,7 +711,7 @@ void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id,
|
| app_launch_controller_.reset(new AppLaunchController(
|
| app_id, diagnostic_mode, this, GetOobeUI()));
|
|
|
| - app_launch_controller_->StartAppLaunch();
|
| + app_launch_controller_->StartAppLaunch(auto_launch);
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -1191,7 +1193,8 @@ void ShowLoginWizard(const std::string& first_screen_name) {
|
| const std::string& auto_launch_app_id =
|
| KioskAppManager::Get()->GetAutoLaunchApp();
|
| display_host->StartAppLaunch(auto_launch_app_id,
|
| - false /* diagnostic_mode */);
|
| + false /* diagnostic_mode */,
|
| + true /* auto_launch */);
|
| return;
|
| }
|
|
|
|
|