Factory reset screen is added

chrome/browser/chromeos/login/wizard_controller.cc

Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 53a9b0007fac28bb82fc4568c226ff920017e844..409a5e62bb50ef68ed1676daf0045ca8b28aee61 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/oobe_display.h"
 #include "chrome/browser/chromeos/login/registration_screen.h"
+#include "chrome/browser/chromeos/login/reset_screen.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/user_image_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ -110,6 +111,7 @@ const char WizardController::kEulaScreenName[] = "eula";
 const char WizardController::kRegistrationScreenName[] = "register";
 const char WizardController::kHTMLPageScreenName[] = "html";
 const char WizardController::kEnterpriseEnrollmentScreenName[] = "enroll";
+const char WizardController::kResetScreenName[] = "reset";
 
 // Passing this parameter as a "first screen" initiates full OOBE flow.
 const char WizardController::kOutOfBoxScreenName[] = "oobe";
@@ -244,6 +246,14 @@ chromeos::EnterpriseEnrollmentScreen*
   return enterprise_enrollment_screen_.get();
 }
 
+chromeos::ResetScreen* WizardController::GetResetScreen() {
+  if (!reset_screen_.get()) {
+    reset_screen_.reset(
+        new chromeos::ResetScreen(this, oobe_display_->GetResetScreenActor()));
+  }
+  return reset_screen_.get();
+}
+
 void WizardController::ShowNetworkScreen() {
   VLOG(1) << "Showing network screen.";
   SetStatusAreaVisible(false);
@@ -332,6 +342,12 @@ void WizardController::ShowEnterpriseEnrollmentScreen() {
   SetCurrentScreen(screen);
 }
 
+void WizardController::ShowResetScreen() {
+  VLOG(1) << "Showing reset screen.";
+  SetStatusAreaVisible(false);
+  SetCurrentScreen(GetResetScreen());
+}
+
 void WizardController::SkipToLoginForTesting() {
   MarkEulaAccepted();
   PerformPostEulaActions();
@@ -611,6 +627,8 @@ void WizardController::AdvanceToScreen(const std::string& screen_name) {
       // Just proceed to image screen.
       OnRegistrationSuccess();
     }
+  } else if (screen_name == kResetScreenName) {
+    ShowResetScreen();
   } else if (screen_name == kHTMLPageScreenName) {
     ShowHTMLPageScreen();
   } else if (screen_name == kEnterpriseEnrollmentScreenName) {
@@ -769,6 +787,7 @@ void WizardController::OnExit(ExitCodes exit_code) {
       OnRegistrationSkipped();
       break;
     case ENTERPRISE_ENROLLMENT_COMPLETED:
+    case RESET_CANCELED:
       OnEnterpriseEnrollmentDone();

[Nikita (slow), 2012/09/12 13:22:21]

You should not rely on OnEnterpriseEnrollmentDone().

Create separate method OnResetCancelled() which:
1. Returns to any previous wizard screen that was shown before that (you have to
save it).
2. Otherwise returns to sign in screen.

[glotov, 2012/09/12 22:40:25]

But we are not supposed to run from other screen except the login one. So
currently no need to save previous screen and restore it.

On 2012/09/12 13:22:21, Nikita Kostylev wrote:

[Nikita (slow), 2012/09/13 07:35:59]

That may change in future so your new code should be able to handle that. Please
add this handling in this CL since it is not that hard.

On the using OnEnterpriseEnrollmentDone: as you could see in this switch no
other exit code is reusing  another handler. Some code could be added into
OnEnterpriseEnrollmentDone which will break your feature.

[glotov, 2012/09/14 16:37:02]

Done.

       break;
     case ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED: