Factory reset screen is added

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 15 matching lines @@
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"
 #include "chrome/browser/chromeos/login/eula_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/html_page_screen.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #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"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
@@ skipping 57 matching lines @@
 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::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";
 
 // Special test value that commands not to create any window yet.
 const char WizardController::kTestNoScreenName[] = "test:nowindow";
 
 // Initialize default controller.
 // static
 WizardController* WizardController::default_controller_ = NULL;
@@ skipping 114 matching lines @@
 chromeos::EnterpriseEnrollmentScreen*
     WizardController::GetEnterpriseEnrollmentScreen() {
   if (!enterprise_enrollment_screen_.get()) {
     enterprise_enrollment_screen_.reset(
         new chromeos::EnterpriseEnrollmentScreen(
             this, oobe_display_->GetEnterpriseEnrollmentScreenActor()));
   }
   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);
   SetCurrentScreen(GetNetworkScreen());
 }
 
 void WizardController::ShowLoginScreen() {
   if (!time_eula_accepted_.is_null()) {
     base::TimeDelta delta = base::Time::Now() - time_eula_accepted_;
     UMA_HISTOGRAM_MEDIUM_TIMES("OOBE.EULAToSignInTime", delta);
@@ skipping 68 matching lines @@
   if (screen_parameters_.get()) {
     screen_parameters_->GetBoolean("is_auto_enrollment", &is_auto_enrollment);
     screen_parameters_->GetString("user", &user);
   }
 
   EnterpriseEnrollmentScreen* screen = GetEnterpriseEnrollmentScreen();
   screen->SetParameters(is_auto_enrollment, user);
   SetCurrentScreen(screen);
 }
 
+void WizardController::ShowResetScreen() {
+  VLOG(1) << "Showing reset screen.";
+  SetStatusAreaVisible(false);
+  SetCurrentScreen(GetResetScreen());
+}
+
 void WizardController::SkipToLoginForTesting() {
   MarkEulaAccepted();
   PerformPostEulaActions();
   PerformPostUpdateActions();
   ShowLoginScreen();
 }
 
 void WizardController::SkipImageSelectionForTesting() {
   skip_user_image_selection_ = true;
 }
@@ skipping 259 matching lines @@
     ShowUserImageScreen();
   } else if (screen_name == kEulaScreenName) {
     ShowEulaScreen();
   } else if (screen_name == kRegistrationScreenName) {
     if (is_official_build_) {
       ShowRegistrationScreen();
     } else {
       // Just proceed to image screen.
       OnRegistrationSuccess();
     }
+  } else if (screen_name == kResetScreenName) {
+    ShowResetScreen();
   } else if (screen_name == kHTMLPageScreenName) {
     ShowHTMLPageScreen();
   } else if (screen_name == kEnterpriseEnrollmentScreenName) {
     ShowEnterpriseEnrollmentScreen();
   } else if (screen_name != kTestNoScreenName) {
     if (is_out_of_box_) {
       ShowNetworkScreen();
     } else {
       ShowLoginScreen();
     }
@@ skipping 138 matching lines @@
     case EULA_BACK:
       ShowNetworkScreen();
       break;
     case REGISTRATION_SUCCESS:
       OnRegistrationSuccess();
       break;
     case REGISTRATION_SKIPPED:
       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:
       OnEnterpriseAutoEnrollmentDone();
       break;
     default:
       NOTREACHED();
   }
 }
 
 void WizardController::OnSetUserNamePassword(const std::string& username,
@@ skipping 15 matching lines @@
   return zero_delay_enabled_;
 }
 
 // static
 void WizardController::SetZeroDelays() {
   kShowDelayMs = 0;
   zero_delay_enabled_ = true;
 }
 
 }  // namespace chromeos