| 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 645272514bf2e7433e7ff389638c54cf08cd8b9f..0b7aec71073a03cbfee5689548c078c165804d24 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.h
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.h
|
| @@ -89,18 +89,18 @@ class WizardController : public BaseScreenDelegate,
|
| static bool IsZeroDelayEnabled();
|
|
|
| // Checks whether screen show time should be tracked with UMA.
|
| - static bool IsOOBEStepToTrack(const std::string& screen_id);
|
| + static bool IsOOBEStepToTrack(OobeScreen screen_id);
|
|
|
| // Skips any screens that may normally be shown after login (registration,
|
| // Terms of Service, user image selection).
|
| static void SkipPostLoginScreensForTesting();
|
|
|
| - // Shows the first screen defined by |first_screen_name| or by default
|
| - // if the parameter is empty.
|
| - void Init(const std::string& first_screen_name);
|
| + // Shows the first screen defined by |first_screen_id| or by default if the
|
| + // parameter is empty.
|
| + void Init(OobeScreen first_screen_id);
|
|
|
| - // Advances to screen defined by |screen_name| and shows it.
|
| - void AdvanceToScreen(const std::string& screen_name);
|
| + // Advances to screen defined by |screen| and shows it.
|
| + void AdvanceToScreen(OobeScreen screen);
|
|
|
| // Advances to login screen. Should be used in for testing only.
|
| void SkipToLoginForTesting(const LoginScreenContext& context);
|
| @@ -131,32 +131,8 @@ class WizardController : public BaseScreenDelegate,
|
| bool login_screen_started() const { return login_screen_started_; }
|
|
|
| // ScreenManager implementation.
|
| - BaseScreen* GetScreen(const std::string& screen_name) override;
|
| - BaseScreen* CreateScreen(const std::string& screen_name) override;
|
| -
|
| - static const char kNetworkScreenName[];
|
| - static const char kLoginScreenName[];
|
| - static const char kUpdateScreenName[];
|
| - static const char kUserImageScreenName[];
|
| - static const char kOutOfBoxScreenName[];
|
| - static const char kTestNoScreenName[];
|
| - static const char kEulaScreenName[];
|
| - static const char kEnableDebuggingScreenName[];
|
| - static const char kEnrollmentScreenName[];
|
| - static const char kResetScreenName[];
|
| - static const char kKioskEnableScreenName[];
|
| - static const char kKioskAutolaunchScreenName[];
|
| - static const char kErrorScreenName[];
|
| - static const char kTermsOfServiceScreenName[];
|
| - static const char kArcTermsOfServiceScreenName[];
|
| - static const char kAutoEnrollmentCheckScreenName[];
|
| - static const char kWrongHWIDScreenName[];
|
| - static const char kSupervisedUserCreationScreenName[];
|
| - static const char kAppLaunchSplashScreenName[];
|
| - static const char kHIDDetectionScreenName[];
|
| - static const char kControllerPairingScreenName[];
|
| - static const char kHostPairingScreenName[];
|
| - static const char kDeviceDisabledScreenName[];
|
| + BaseScreen* GetScreen(OobeScreen screen) override;
|
| + BaseScreen* CreateScreen(OobeScreen screen) override;
|
|
|
| // Volume percent at which spoken feedback is still audible.
|
| static const int kMinAudibleOutputVolumePercent;
|
| @@ -293,7 +269,7 @@ class WizardController : public BaseScreenDelegate,
|
| local_state_for_testing_ = local_state;
|
| }
|
|
|
| - std::string first_screen_name() { return first_screen_name_; }
|
| + OobeScreen first_screen_id() const { return first_screen_id_; }
|
|
|
| // Called when network is UP.
|
| void StartTimezoneResolve();
|
| @@ -362,7 +338,7 @@ class WizardController : public BaseScreenDelegate,
|
| bool is_out_of_box_ = false;
|
|
|
| // Value of the screen name that WizardController was started with.
|
| - std::string first_screen_name_;
|
| + OobeScreen first_screen_id_;
|
|
|
| // OOBE/login display host.
|
| LoginDisplayHost* host_ = nullptr;
|
| @@ -430,7 +406,7 @@ class WizardController : public BaseScreenDelegate,
|
| // Pairing controller for remora devices.
|
| std::unique_ptr<pairing_chromeos::HostPairingController> remora_controller_;
|
|
|
| - // Maps screen ids to last time of their shows.
|
| + // Maps screen names to last time of their shows.
|
| base::hash_map<std::string, base::Time> screen_show_times_;
|
|
|
| // Tests check result of timezone resolve.
|
|
|