WizardScreen is merged to BaseScreen.

chrome/browser/chromeos/login/enrollment/enrollment_screen.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_ENROLLMENT_ENROLLMENT_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/wizard_screen.h"
+#include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "components/pairing/host_pairing_controller.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/enterprise_metrics.h"
 
 namespace base {
 class ElapsedTimer;
 }
 
 namespace pairing_chromeos {
 class ControllerPairingController;
 }
 
 namespace chromeos {
 
 class ScreenManager;
 class ScreenObserver;
 
 // The screen implementation that links the enterprise enrollment UI into the
 // OOBE wizard.
 class EnrollmentScreen
-    : public WizardScreen,
+    : public BaseScreen,
       public pairing_chromeos::HostPairingController::Observer,
       public EnrollmentScreenActor::Controller {
  public:
   typedef pairing_chromeos::HostPairingController::Stage Stage;
 
   EnrollmentScreen(ScreenObserver* observer,
                    EnrollmentScreenActor* actor);
   virtual ~EnrollmentScreen();
 
   static EnrollmentScreen* Get(ScreenManager* manager);
 
   // Setup how this screen will handle enrollment.
   //   |shark_controller| is an interface that is used to communicate with a
   //     remora device for remote enrollment.
   //   |remora_controller| is an interface that is used to communicate with a
   //     shark device for remote enrollment.
   void SetParameters(
       EnrollmentScreenActor::EnrollmentMode enrollment_mode,
       const std::string& management_domain,
       const std::string& enrollment_user,
       pairing_chromeos::ControllerPairingController* shark_controller,
       pairing_chromeos::HostPairingController* remora_controller);
 
-  // WizardScreen implementation:
+  // BaseScreen implementation:
   virtual void PrepareToShow() override;
   virtual void Show() override;
   virtual void Hide() override;
   virtual std::string GetName() const override;
 
   // pairing_chromeos::HostPairingController::Observer:
   virtual void PairingStageChanged(Stage new_stage) override;
   virtual void ConfigureHost(bool accepted_eula,
                              const std::string& lang,
                              const std::string& timezone,
@@ skipping 61 matching lines @@
   std::string user_;
   scoped_ptr<base::ElapsedTimer> elapsed_timer_;
   base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_