[cros] Add Ctrl+Alt+E shortcut to Welcome/EULA screen that cancels update and starts with enrollment

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 117 matching lines @@
                                    chromeos::OobeDisplay* oobe_display)
     : current_screen_(NULL),
 #if defined(GOOGLE_CHROME_BUILD)
       is_official_build_(true),
 #else
       is_official_build_(false),
 #endif
       is_out_of_box_(false),
       host_(host),
       oobe_display_(oobe_display),
-      usage_statistics_reporting_(true) {
+      usage_statistics_reporting_(true),
+      skip_update_enroll_after_eula_(false) {
   DCHECK(default_controller_ == NULL);
   default_controller_ = this;
 }
 
 WizardController::~WizardController() {
   if (default_controller_ == this) {
     default_controller_ = NULL;
   } else {
     NOTREACHED() << "More than one controller are alive.";
   }
@@ skipping 256 matching lines @@
       OptionsUtil::ResolveMetricsReportingEnabled(usage_statistics_reporting_);
   CrosSettings::Get()->SetBoolean(kStatsReportingPref, enabled);
   if (enabled) {
 #if defined(USE_LINUX_BREAKPAD)
     // The crash reporter initialization needs IO to complete.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     InitCrashReporter();
 #endif
   }
 
-  InitiateOOBEUpdate();
+  if (skip_update_enroll_after_eula_) {
+    PerformPostEulaActions();
+    ShowEnterpriseEnrollmentScreen();
+  } else {
+    InitiateOOBEUpdate();
+  }
 }
 
 void WizardController::OnUpdateErrorCheckingForUpdate() {
   // TODO(nkostylev): Update should be required during OOBE.
   // We do not want to block users from being able to proceed to the login
   // screen if there is any error checking for an update.
   // They could use "browse without sign-in" feature to set up the network to be
   // able to perform the update later.
   OnOOBECompleted();
 }
@@ skipping 51 matching lines @@
   VLOG(1) << "Automagic enrollment done, resuming previous signin";
   ResumeLoginScreen();
 }
 
 void WizardController::OnOOBECompleted() {
   MarkOobeCompleted();
   ShowLoginScreen();
 }
 
 void WizardController::InitiateOOBEUpdate() {
+  PerformPostEulaActions();
+  GetUpdateScreen()->StartUpdate();
+  SetCurrentScreenSmooth(GetUpdateScreen(), true);
+}
+
+void WizardController::PerformPostEulaActions() {
   // Now that EULA has been accepted (for official builds), enable portal check.
   // ChromiumOS builds would go though this code path too.
   chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
       SetDefaultCheckPortalList();
   host_->CheckForAutoEnrollment();

[Nikita (slow), 2012/04/16 16:24:47]

Joao: Even though we'll be starting auto enrollment check in this scenario, it
will be only used in the case:

1. Press Ctrl+Alt+E to skip update and go straight to enrollment after EULA is
accepted.
2. Cancel enrollment flow
3. Sign in with a user
4. Auto enrollment kicks in on ExistingUserController::CompleteLogin().

-  GetUpdateScreen()->StartUpdate();
-  SetCurrentScreenSmooth(GetUpdateScreen(), true);
 }
 
-
 void WizardController::SetCurrentScreen(WizardScreen* new_current) {
   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;
 
@@ skipping 218 matching lines @@
       OnEnterpriseEnrollmentDone();
       break;
     case ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED:
       OnEnterpriseAutoEnrollmentDone();
       break;
     default:
       NOTREACHED();
   }
 }
 
+void WizardController::SkipUpdateEnrollAfterEula() {
+  skip_update_enroll_after_eula_ = true;
+}
+
 void WizardController::OnSetUserNamePassword(const std::string& username,
                                              const std::string& password) {
   username_ = username;
   password_ = password;
 }
 
-void WizardController::set_usage_statistics_reporting(bool val) {
+void WizardController::SetUsageStatisticsReporting(bool val) {
   usage_statistics_reporting_ = val;
 }
 
-bool WizardController::usage_statistics_reporting() const {
+bool WizardController::GetUsageStatisticsReporting() const {
   return usage_statistics_reporting_;
 }
 
 void WizardController::SetZeroDelays() {
   kShowDelayMs = 0;
 }
 
 }  // namespace chromeos