| Index: chrome/browser/chromeos/login/login_display_host_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc
|
| index cc4355ccab6e2de001ea765d5888b42060b9567c..8b24997b548401f5c47ad5a67340a1d567297cb4 100644
|
| --- a/chrome/browser/chromeos/login/login_display_host_impl.cc
|
| +++ b/chrome/browser/chromeos/login/login_display_host_impl.cc
|
| @@ -1122,7 +1122,6 @@ void ShowLoginWizard(const std::string& first_screen_name) {
|
|
|
| bool show_app_launch_splash_screen = (first_screen_name ==
|
| chromeos::WizardController::kAppLaunchSplashScreenName);
|
| -
|
| if (show_app_launch_splash_screen) {
|
| const std::string& auto_launch_app_id =
|
| chromeos::KioskAppManager::Get()->GetAutoLaunchApp();
|
| @@ -1130,6 +1129,16 @@ void ShowLoginWizard(const std::string& first_screen_name) {
|
| return;
|
| }
|
|
|
| + bool should_show_enrollment_screen =
|
| + first_screen_name.empty() && oobe_complete &&
|
| + chromeos::WizardController::ShouldAutoStartEnrollment() &&
|
| + !g_browser_process->browser_policy_connector()->IsEnterpriseManaged();
|
| + if (should_show_enrollment_screen) {
|
| + display_host->StartWizard(chromeos::WizardController::kEnrollmentScreenName,
|
| + scoped_ptr<DictionaryValue>());
|
| + return;
|
| + }
|
| +
|
| bool show_login_screen =
|
| (first_screen_name.empty() && oobe_complete) ||
|
| first_screen_name == chromeos::WizardController::kLoginScreenName;
|
|
|