Force enterprise enrollment flow upon detection of inconsistent state.

chrome/browser/chromeos/login/ui/login_display_host_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 
 #include <vector>
 
 #include "ash/audio/sounds.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 1175 matching lines @@
     const std::string& auto_launch_app_id =
         chromeos::KioskAppManager::Get()->GetAutoLaunchApp();
     display_host->StartAppLaunch(auto_launch_app_id,
                                  false /* diagnostic_mode */);
     return;
   }
 
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   bool should_show_enrollment_screen =
-      first_screen_name.empty() && oobe_complete &&
-      chromeos::WizardController::ShouldAutoStartEnrollment() &&
-      !connector->IsEnterpriseManaged();
+      chromeos::WizardController::ShouldRecoverEnrollment() ||
+      ( first_screen_name.empty() && oobe_complete &&

[pastarmovj, 2014/07/08 12:36:31]

nit: no spaces in the braces.

[Thiemo Nagel, 2014/07/08 14:02:04]

Done.

+        chromeos::WizardController::ShouldAutoStartEnrollment() &&
+        !connector->IsEnterpriseManaged() );

[pastarmovj, 2014/07/08 12:36:31]

I think you should still respect the first_Screen_name if set and respect it.

[Thiemo Nagel, 2014/07/08 14:02:04]

Ok, thanks.

   if (should_show_enrollment_screen) {
     // Shows networks screen instead of enrollment screen to resume the
     // interrupted auto start enrollment flow because enrollment screen does
     // not handle flaky network. See http://crbug.com/332572
     display_host->StartWizard(chromeos::WizardController::kNetworkScreenName,
                               scoped_ptr<base::DictionaryValue>());
     return;
   }
 
   if (StartupUtils::IsEulaAccepted()) {
@@ skipping 52 matching lines @@
   scoped_ptr<locale_util::SwitchLanguageCallback> callback(
       new locale_util::SwitchLanguageCallback(
           base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
 
   // Load locale keyboards here. Hardware layout would be automatically enabled.
   locale_util::SwitchLanguage(
       locale, true, true /* login_layouts_only */, callback.Pass());
 }
 
 }  // namespace chromeos