cros: Replace WizardController string constants with OobeScreen values.

chrome/browser/chromeos/login/wizard_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 71 matching lines @@
     return skip_post_login_screens_;
   }
 
   // Sets delays to zero. MUST be used only for tests.
   static void SetZeroDelays();
 
   // If true zero delays have been enabled (for browser tests).
   static bool IsZeroDelayEnabled();
 
   // Checks whether screen show time should be tracked with UMA.
-  static bool IsOOBEStepToTrack(const std::string& screen_id);

[Alexander Alekseev, 2016/12/13 03:08:05]

Why not "screen_id" ?

[jdufault, 2016/12/13 22:30:27]

Done.

+  static bool IsOOBEStepToTrack(OobeScreen screen);
 
   // 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);
+  void Init(OobeScreen first_screen_name);
 
-  // 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);
 
   // Should be used for testing only.
   pairing_chromeos::SharkConnectionListener*
   GetSharkConnectionListenerForTesting();
 
   // Adds and removes an observer.
   void AddObserver(Observer* observer);
@@ skipping 10 matching lines @@
   void EnableUserImageScreenReturnToPreviousHack();
 
   // Returns a pointer to the current screen or nullptr if there's no such
   // screen.
   BaseScreen* current_screen() const { return current_screen_; }
 
   // Returns true if the current wizard instance has reached the login screen.
   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;
 
  private:
   // Show specific screen.
   void ShowNetworkScreen();
   void ShowUpdateScreen();
   void ShowUserImageScreen();
   void ShowEulaScreen();
@@ skipping 116 matching lines @@
   // Called when LocalState is initialized.
   void OnLocalStateInitialized(bool /* succeeded */);
 
   // Returns local state.
   PrefService* GetLocalState();
 
   static void set_local_state_for_testing(PrefService* local_state) {
     local_state_for_testing_ = local_state;
   }
 
-  std::string first_screen_name() { return first_screen_name_; }
+  OobeScreen first_screen_name() const { return first_screen_name_; }
 
   // Called when network is UP.
   void StartTimezoneResolve();
 
   // Creates provider on demand.
   TimeZoneProvider* GetTimezoneProvider();
 
   // TimeZoneRequest::TimeZoneResponseCallback implementation.
   void OnTimezoneResolved(std::unique_ptr<TimeZoneResponseData> timezone,
                           bool server_error);
@@ skipping 48 matching lines @@
 #if defined(GOOGLE_CHROME_BUILD)
   bool is_official_build_ = true;
 #else
   bool is_official_build_ = false;
 #endif
 
   // True if full OOBE flow should be shown.
   bool is_out_of_box_ = false;
 
   // Value of the screen name that WizardController was started with.
-  std::string first_screen_name_;
+  // TODO(jdufault): Rename to first_screen_
+  OobeScreen first_screen_name_;
 
   // OOBE/login display host.
   LoginDisplayHost* host_ = nullptr;
 
   // Default WizardController.
   static WizardController* default_controller_;
 
   base::OneShotTimer smooth_show_timer_;
 
   OobeUI* const oobe_ui_;
@@ skipping 47 matching lines @@
   std::unique_ptr<SimpleGeolocationProvider> geolocation_provider_;
   std::unique_ptr<TimeZoneProvider> timezone_provider_;
 
   // Pairing controller for shark devices.
   std::unique_ptr<pairing_chromeos::ControllerPairingController>
       shark_controller_;
 
   // 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.
   bool timezone_resolved_ = false;
   base::Closure on_timezone_resolved_for_testing_;
 
   // Listens for incoming connection from a shark controller if a regular (not
   // pairing) remora OOBE is active. If connection is established, wizard
   // conroller swithces to a pairing OOBE.
   std::unique_ptr<pairing_chromeos::SharkConnectionListener>
       shark_connection_listener_;
 
   BaseScreen* hid_screen_ = nullptr;
 
   base::WeakPtrFactory<WizardController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_