Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2087)

Unified Diff: chrome/browser/chromeos/login/wizard_controller.h

Issue 289133002: Add a enterprise enrollment check screen to OOBE in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adjusted tests and replaced webkit-box with flex. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/ui/oobe_display.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a2c42e641f98ee46e71841c17fa94a899ce6e33c..ea5c83da73a63f0942f0105a14ee16dec80f6f1d 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();
@@ -310,6 +309,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_;
@@ -338,9 +338,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_;
« no previous file with comments | « chrome/browser/chromeos/login/ui/oobe_display.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698