Chromium Code Reviews| 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 492fd2e9d8afb1e801412c386ef2a347e1cbc45c..b76b9c1405913478bdcbdaa4ae6a8cc73550ac1a 100644 |
| --- a/chrome/browser/chromeos/login/wizard_controller.h |
| +++ b/chrome/browser/chromeos/login/wizard_controller.h |
| @@ -42,7 +42,7 @@ class HostPairingScreen; |
| struct Geoposition; |
|
Pam (message me for reviews)
2014/07/16 18:12:36
while you're here, alphabetize
Marc Treib
2014/07/17 08:58:39
Done.
|
| class KioskAutolaunchScreen; |
| class KioskEnableScreen; |
| -class LocallyManagedUserCreationScreen; |
| +class SupervisedUserCreationScreen; |
|
Pam (message me for reviews)
2014/07/16 18:12:36
alphabetize
Marc Treib
2014/07/17 08:58:39
Done.
|
| class LoginDisplayHost; |
| class LoginScreenContext; |
| class NetworkScreen; |
| @@ -141,7 +141,7 @@ class WizardController : public ScreenObserver { |
| TermsOfServiceScreen* GetTermsOfServiceScreen(); |
| WrongHWIDScreen* GetWrongHWIDScreen(); |
| AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen(); |
| - LocallyManagedUserCreationScreen* GetLocallyManagedUserCreationScreen(); |
| + SupervisedUserCreationScreen* GetSupervisedUserCreationScreen(); |
| HIDDetectionScreen* GetHIDDetectionScreen(); |
| ControllerPairingScreen* GetControllerPairingScreen(); |
| HostPairingScreen* GetHostPairingScreen(); |
| @@ -168,7 +168,7 @@ class WizardController : public ScreenObserver { |
| static const char kTermsOfServiceScreenName[]; |
| static const char kAutoEnrollmentCheckScreenName[]; |
| static const char kWrongHWIDScreenName[]; |
| - static const char kLocallyManagedUserCreationScreenName[]; |
| + static const char kSupervisedUserCreationScreenName[]; |
| static const char kAppLaunchSplashScreenName[]; |
| static const char kHIDDetectionScreenName[]; |
| static const char kControllerPairingScreenName[]; |
| @@ -190,7 +190,7 @@ class WizardController : public ScreenObserver { |
| void ShowTermsOfServiceScreen(); |
| void ShowWrongHWIDScreen(); |
| void ShowAutoEnrollmentCheckScreen(); |
| - void ShowLocallyManagedUserCreationScreen(); |
| + void ShowSupervisedUserCreationScreen(); |
| void ShowHIDDetectionScreen(); |
| void ShowControllerPairingScreen(); |
| void ShowHostPairingScreen(); |
| @@ -328,8 +328,7 @@ class WizardController : public ScreenObserver { |
| 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<SupervisedUserCreationScreen> supervised_user_creation_screen_; |
| scoped_ptr<HIDDetectionScreen> hid_detection_screen_; |
| scoped_ptr<ControllerPairingScreen> controller_pairing_screen_; |
| scoped_ptr<HostPairingScreen> host_pairing_screen_; |