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 1baadadda6c9da5f3403e2167f756b7a4f0b7823..5eae68a893e9d74bf5f94275ba4807e576cdcb47 100644 |
--- a/chrome/browser/chromeos/login/wizard_controller.h |
+++ b/chrome/browser/chromeos/login/wizard_controller.h |
@@ -30,7 +30,7 @@ class DictionaryValue; |
namespace chromeos { |
-class AutoEnrollmentCheckStep; |
+class AutoEnrollmentCheckScreen; |
class EnrollmentScreen; |
class ErrorScreen; |
class EulaScreen; |
@@ -130,6 +130,7 @@ class WizardController : public ScreenObserver { |
KioskEnableScreen* GetKioskEnableScreen(); |
TermsOfServiceScreen* GetTermsOfServiceScreen(); |
WrongHWIDScreen* GetWrongHWIDScreen(); |
+ AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen(); |
HIDDetectionScreen* GetHIDDetectionScreen(); |
LocallyManagedUserCreationScreen* GetLocallyManagedUserCreationScreen(); |
@@ -153,6 +154,7 @@ class WizardController : public ScreenObserver { |
static const char kKioskAutolaunchScreenName[]; |
static const char kErrorScreenName[]; |
static const char kTermsOfServiceScreenName[]; |
+ static const char kAutoEnrollmentCheckScreenName[]; |
static const char kWrongHWIDScreenName[]; |
static const char kLocallyManagedUserCreationScreenName[]; |
static const char kAppLaunchSplashScreenName[]; |
@@ -173,6 +175,7 @@ class WizardController : public ScreenObserver { |
void ShowKioskEnableScreen(); |
void ShowTermsOfServiceScreen(); |
void ShowWrongHWIDScreen(); |
+ void ShowAutoEnrollmentCheckScreen(); |
void ShowLocallyManagedUserCreationScreen(); |
void ShowHIDDetectionScreen(); |
@@ -260,10 +263,6 @@ class WizardController : public ScreenObserver { |
// Called when LocalState is initialized. |
void OnLocalStateInitialized(bool /* succeeded */); |
- // Kicks off the auto-enrollment check step. Once it finishes, it'll call |
- // back via ScreenObserver::OnExit(). |
- void StartAutoEnrollmentCheck(); |
- |
// Returns local state. |
PrefService* GetLocalState(); |
@@ -306,6 +305,7 @@ class WizardController : public ScreenObserver { |
scoped_ptr<ErrorScreen> error_screen_; |
scoped_ptr<TermsOfServiceScreen> terms_of_service_screen_; |
scoped_ptr<WrongHWIDScreen> wrong_hwid_screen_; |
+ scoped_ptr<AutoEnrollmentCheckScreen> auto_enrollment_check_screen_; |
scoped_ptr<LocallyManagedUserCreationScreen> |
locally_managed_user_creation_screen_; |
scoped_ptr<HIDDetectionScreen> hid_detection_screen_; |
@@ -334,9 +334,6 @@ class WizardController : public ScreenObserver { |
// Default WizardController. |
static WizardController* default_controller_; |
- // The auto-enrollment check step, currently active. |
- scoped_ptr<AutoEnrollmentCheckStep> auto_enrollment_check_step_; |
- |
// Parameters for the first screen. May be NULL. |
scoped_ptr<base::DictionaryValue> screen_parameters_; |