WizardScreen is merged to BaseScreen.

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 <string>
 
@@ skipping 42 matching lines @@
 class UserImageScreen;
 
 // Class that manages control flow between wizard screens. Wizard controller
 // interacts with screen controllers to move the user between screens.
 class WizardController : public ScreenObserver, public ScreenManager {
  public:
   // Observes screen changes.
   class Observer {
    public:
     // Called before a screen change happens.
-    virtual void OnScreenChanged(WizardScreen* next_screen) = 0;
+    virtual void OnScreenChanged(BaseScreen* next_screen) = 0;
 
     // Called after the browser session has started.
     virtual void OnSessionStart() = 0;
   };
 
   WizardController(LoginDisplayHost* host, OobeDisplay* oobe_display);
   virtual ~WizardController();
 
   // Returns the default wizard controller if it has been created.
   static WizardController* default_controller() {
@@ skipping 49 matching lines @@
 
   // Skip update, go straight to enrollment after EULA is accepted.
   void SkipUpdateEnrollAfterEula();
 
   // TODO(antrim) : temporary hack. Should be removed once screen system is
   // reworked at hackaton.
   void EnableUserImageScreenReturnToPreviousHack();
 
   // Returns a pointer to the current screen or NULL if there's no such
   // screen.
-  WizardScreen* current_screen() const { return current_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.
-  virtual WizardScreen* CreateScreen(const std::string& screen_name) override;
+  virtual 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 kEnrollmentScreenName[];
   static const char kResetScreenName[];
@@ skipping 84 matching lines @@
 
   // Overridden from ScreenObserver:
   virtual void OnExit(ExitCodes exit_code) override;
   virtual void ShowCurrentScreen() override;
   virtual void OnSetUserNamePassword(const std::string& username,
                                      const std::string& password) override;
   virtual void SetUsageStatisticsReporting(bool val) override;
   virtual bool GetUsageStatisticsReporting() const override;
   virtual ErrorScreen* GetErrorScreen() override;
   virtual void ShowErrorScreen() override;
-  virtual void HideErrorScreen(WizardScreen* parent_screen) override;
+  virtual void HideErrorScreen(BaseScreen* parent_screen) override;
 
   // Notification of a change in the state of an accessibility setting.
   void OnAccessibilityStatusChanged(
       const AccessibilityStatusEventDetails& details);
 
   // Switches from one screen to another.
-  void SetCurrentScreen(WizardScreen* screen);
+  void SetCurrentScreen(BaseScreen* screen);
 
   // Switches from one screen to another with delay before showing. Calling
   // ShowCurrentScreen directly forces screen to be shown immediately.
-  void SetCurrentScreenSmooth(WizardScreen* screen, bool use_smoothing);
+  void SetCurrentScreenSmooth(BaseScreen* screen, bool use_smoothing);
 
   // Changes status area visibility.
   void SetStatusAreaVisible(bool visible);
 
   // Logs in the specified user via default login screen.
   void Login(const std::string& username, const std::string& password);
 
   // Launched kiosk app configured for auto-launch.
   void AutoLaunchKioskApp();
 
@@ skipping 46 matching lines @@
   void OnSharkConnected(
       scoped_ptr<pairing_chromeos::HostPairingController> pairing_controller);
 
   // Whether to skip any screens that may normally be shown after login
   // (registration, Terms of Service, user image selection).
   static bool skip_post_login_screens_;
 
   static bool zero_delay_enabled_;
 
   // Screen that's currently active.
-  WizardScreen* current_screen_;
+  BaseScreen* current_screen_;
 
   // Screen that was active before, or NULL for login screen.
-  WizardScreen* previous_screen_;
+  BaseScreen* previous_screen_;
 
   std::string username_;
   std::string password_;
 
   // True if running official BUILD.
   bool is_official_build_;
 
   // True if full OOBE flow should be shown.
   bool is_out_of_box_;
 
@@ skipping 79 matching lines @@
       shark_connection_listener_;
 
   base::WeakPtrFactory<WizardController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_