Add a pref to track progress of OOBE and resume if needed.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 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/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 191 matching lines @@
     if (status == PrefService::INITIALIZATION_STATUS_ERROR) {
       OnLocalStateInitialized(false);
       return;
     } else if (status == PrefService::INITIALIZATION_STATUS_WAITING) {
       GetLocalState()->AddPrefInitObserver(
           base::Bind(&WizardController::OnLocalStateInitialized,
                      weak_factory_.GetWeakPtr()));
     }
   }
 
-  AdvanceToScreen(first_screen_name);
+  bool shoud_not_resume = is_out_of_box_ && !first_screen_name.empty() &&

[ygorshenin1, 2014/05/16 13:03:29]

nit: could you please replace
"should_not_resume = A && !B && !C" by "should_resume = !A || B || C" ?

[pastarmovj, 2014/05/19 14:12:27]

Actually compacted the logic further and i even think it was not exactly right
before anyway.

+      first_screen_name != WizardController::kTestNoScreenName;
+  const PrefService::Preference* oobe_stage_pref =
+      GetLocalState()->FindPreference(prefs::kOobeScreenPending);
+  if (!oobe_stage_pref->IsDefaultValue() && !shoud_not_resume)
+    first_screen_name_ = GetLocalState()->GetString(prefs::kOobeScreenPending);
+
+  AdvanceToScreen(first_screen_name_);
   if (!IsMachineHWIDCorrect() && !StartupUtils::IsDeviceRegistered() &&
-      first_screen_name.empty())
+      first_screen_name_.empty())
     ShowWrongHWIDScreen();
 }
 
 chromeos::NetworkScreen* WizardController::GetNetworkScreen() {
   if (!network_screen_.get())
     network_screen_.reset(new chromeos::NetworkScreen(
         this, oobe_display_->GetNetworkScreenActor()));
   return network_screen_.get();
 }
 
@@ skipping 481 matching lines @@
   host_->GetAutoEnrollmentController()->Start();
   host_->PrewarmAuthentication();
   NetworkPortalDetector::Get()->Enable(true);
 }
 
 void WizardController::PerformOOBECompletedActions() {
   StartupUtils::MarkOobeCompleted();
 }
 
 void WizardController::SetCurrentScreen(WizardScreen* new_current) {
+  // First remember how far have we reached so that we can resume if needed.

[Mattias Nissler (ping if slow), 2014/05/15 09:30:25]

So there are some interstitial screens that we may not want to return to after
restarting OOBE. The error screen is probably in that category. Not sure whether
that's a problem in practice and if so how to filter them. You probably want to
ask Nikita or Yuri for that.

[ygorshenin1, 2014/05/16 13:03:29]

Yes, we definitely shouldn't return to the error screen. Instead, it's better to
resume it's parent screen (take a look at
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/chr...).
Also, I thought there're no sense to resume EULA screen or update screen - we
can just start OOBE from scratch.

On 2014/05/15 09:30:25, Mattias Nissler wrote:

[pastarmovj, 2014/05/19 14:12:27]

Ok new proposal implemented below is only store the last screen of the main OOBE
sequence - Network -> EULA -> AU -> (the new screen to come) -> Register.

+  if (is_out_of_box_)
+    StartupUtils::SaveOobePendingScreen(new_current->GetName());
+
   SetCurrentScreenSmooth(new_current, false);
 }
 
 void WizardController::ShowCurrentScreen() {
   // ShowCurrentScreen may get called by smooth_show_timer_ even after
   // flow has been switched to sign in screen (ExistingUserController).
   if (!oobe_display_)
     return;
 
   smooth_show_timer_.Stop();
@@ skipping 28 matching lines @@
   } else {
     ShowCurrentScreen();
   }
 }
 
 void WizardController::SetStatusAreaVisible(bool visible) {
   host_->SetStatusAreaVisible(visible);
 }
 
 void WizardController::AdvanceToScreen(const std::string& screen_name) {
+  // First remember how far have we reached so that we can resume if needed.
+  if (is_out_of_box_)
+    StartupUtils::SaveOobePendingScreen(screen_name);
+
   if (screen_name == kNetworkScreenName) {
     ShowNetworkScreen();
   } else if (screen_name == kLoginScreenName) {
     ShowLoginScreen(LoginScreenContext());
   } else if (screen_name == kUpdateScreenName) {
     InitiateOOBEUpdate();
   } else if (screen_name == kUserImageScreenName) {
     ShowUserImageScreen();
   } else if (screen_name == kEulaScreenName) {
     ShowEulaScreen();
@@ skipping 286 matching lines @@
   // cancelled on destruction.
   GetTimezoneProvider()->RequestTimezone(
       position,
       false,  // sensor
       timeout - elapsed,
       base::Bind(&WizardController::OnTimezoneResolved,
                  base::Unretained(this)));
 }
 
 }  // namespace chromeos