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 68 matching lines @@
 namespace {
 // If reboot didn't happen, ask user to reboot device manually.
 const int kWaitForRebootTimeSec = 3;
 
 // Interval in ms which is used for smooth screen showing.
 static int kShowDelayMs = 400;
 
 // Total timezone resolving process timeout.
 const unsigned int kResolveTimeZoneTimeoutSeconds = 60;
 
+// Stores the list of all screens that should be shown when resuming OOBE.
+const char *kResumableScreens[] = {
+  chromeos::WizardController::kNetworkScreenName,
+  chromeos::WizardController::kUpdateScreenName,
+  chromeos::WizardController::kEulaScreenName,
+  chromeos::WizardController::kEnrollmentScreenName,
+  chromeos::WizardController::kTermsOfServiceScreenName
+};
+
 // Checks flag for HID-detection screen show.
 bool CanShowHIDDetectionScreen() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kEnableHIDDetectionOnOOBE);
 }
 
+bool IsResumableScreen(const std::string& screen) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kResumableScreens); ++i) {
+    if (screen == kResumableScreens[i])
+      return true;
+  }
+  return false;
+}
+
 }  // namespace
 
 namespace chromeos {
 
 const char WizardController::kNetworkScreenName[] = "network";
 const char WizardController::kLoginScreenName[] = "login";
 const char WizardController::kUpdateScreenName[] = "update";
 const char WizardController::kUserImageScreenName[] = "image";
 const char WizardController::kEulaScreenName[] = "eula";
 const char WizardController::kEnrollmentScreenName[] = "enroll";
@@ skipping 97 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);
+  const std::string screen_pref =
+      GetLocalState()->GetString(prefs::kOobeScreenPending);
+  if (is_out_of_box_ && !screen_pref.empty() && (first_screen_name.empty() ||
+      first_screen_name == WizardController::kTestNoScreenName)) {
+    first_screen_name_ = GetLocalState()->GetString(prefs::kOobeScreenPending);

[Mattias Nissler (ping if slow), 2014/05/20 09:33:12]

nit: no need to ask local_state again, just assign |screen_pref|

[pastarmovj, 2014/05/20 13:57:01]

Of course :) this was a branch messing artifact :)

+  }
+
+  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.
+  if (is_out_of_box_ && IsResumableScreen(new_current->GetName()))
+    StartupUtils::SaveOobePendingScreen(new_current->GetName());

[Mattias Nissler (ping if slow), 2014/05/20 09:33:12]

Shouldn't this code be in SetCurrentScreenSmooth (i.e. at the point where we
actually set |current_screen_|, so we catch any screen transitions?

[pastarmovj, 2014/05/20 13:57:01]

Done.

+
   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_ && IsResumableScreen(screen_name))
+    StartupUtils::SaveOobePendingScreen(screen_name);

[Mattias Nissler (ping if slow), 2014/05/20 09:33:12]

Isn't the code below going through SetCurrentScreen anyways?

[pastarmovj, 2014/05/20 13:57:01]

Done.

+
   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