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 f8277d54fe1d98378e0ca9cfe886ede4075256f7..47fb6aae666c3a1e1dd6358c4436595e19af2434 100644 |
--- a/chrome/browser/chromeos/login/wizard_controller.cc |
+++ b/chrome/browser/chromeos/login/wizard_controller.cc |
@@ -169,7 +169,6 @@ WizardController::WizardController(chromeos::LoginDisplayHost* host, |
host_(host), |
oobe_display_(oobe_display), |
usage_statistics_reporting_(true), |
- skip_update_enroll_after_eula_(false), |
login_screen_started_(false), |
user_image_screen_return_to_previous_hack_(false), |
timezone_resolved_(false), |
@@ -521,10 +520,6 @@ void WizardController::OnSessionStart() { |
FOR_EACH_OBSERVER(Observer, observer_list_, OnSessionStart()); |
} |
-void WizardController::SkipUpdateEnrollAfterEula() { |
- skip_update_enroll_after_eula_ = true; |
-} |
- |
/////////////////////////////////////////////////////////////////////////////// |
// WizardController, ExitHandlers: |
void WizardController::OnHIDDetectionCompleted() { |
@@ -577,13 +572,7 @@ void WizardController::OnEulaAccepted() { |
#endif |
} |
- if (skip_update_enroll_after_eula_) { |
- PerformPostEulaActions(); |
- PerformOOBECompletedActions(); |
- ShowEnrollmentScreen(); |
- } else { |
- InitiateOOBEUpdate(); |
- } |
+ InitiateOOBEUpdate(); |
} |
void WizardController::OnUpdateErrorCheckingForUpdate() { |