| Index: chrome/browser/chromeos/login/wizard_controller.h
|
| diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
|
| index ffc4e5cca3d9bc8a6dee2e44a9e9d682179599ba..08b9f300afe6aeff903f8d1f75ab331e46c2bc55 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.h
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.h
|
| @@ -90,6 +90,9 @@ class WizardController : public ScreenObserver {
|
| // If being at register screen proceeds to the next one.
|
| void SkipRegistration();
|
|
|
| + // Skip update, go straight to enrollment after EULA is accepted.
|
| + void SkipUpdateEnrollAfterEula();
|
| +
|
| // Lazy initializers and getters for screens.
|
| NetworkScreen* GetNetworkScreen();
|
| UpdateScreen* GetUpdateScreen();
|
| @@ -149,13 +152,20 @@ class WizardController : public ScreenObserver {
|
| // Shows update screen and starts update process.
|
| void InitiateOOBEUpdate();
|
|
|
| + // Actions that should be done right after EULA is accepted,
|
| + // before update check.
|
| + void PerformPostEulaActions();
|
| +
|
| + // Actions that should be done right after update stage is finished.
|
| + void PerformPostUpdateActions();
|
| +
|
| // Overridden from ScreenObserver:
|
| virtual void OnExit(ExitCodes exit_code) OVERRIDE;
|
| virtual void ShowCurrentScreen() OVERRIDE;
|
| virtual void OnSetUserNamePassword(const std::string& username,
|
| const std::string& password) OVERRIDE;
|
| - virtual void set_usage_statistics_reporting(bool val) OVERRIDE;
|
| - virtual bool usage_statistics_reporting() const OVERRIDE;
|
| + virtual void SetUsageStatisticsReporting(bool val) OVERRIDE;
|
| + virtual bool GetUsageStatisticsReporting() const OVERRIDE;
|
|
|
| // Switches from one screen to another.
|
| void SetCurrentScreen(WizardScreen* screen);
|
| @@ -215,6 +225,10 @@ class WizardController : public ScreenObserver {
|
| // during wizard lifetime.
|
| bool usage_statistics_reporting_;
|
|
|
| + // If true then update check is cancelled and enrollment is started after
|
| + // EULA is accepted.
|
| + bool skip_update_enroll_after_eula_;
|
| +
|
| // Time when the EULA was accepted. Used to measure the duration from the EULA
|
| // acceptance until the Sign-In screen is displayed.
|
| base::Time time_eula_accepted_;
|
|
|