Generalize screen getting/instantiation code.

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 <string>

[ygorshenin1, 2014/08/26 14:18:53]

nit: add "#include <map>".

[Denis Kuznetsov (DE-MUC), 2014/09/02 17:40:07]

Done.

 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"

[ygorshenin1, 2014/08/26 14:18:53]

nit: add #include "base/memory/linked_ptr.h".

[Denis Kuznetsov (DE-MUC), 2014/09/02 17:40:07]

Done.

 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 
 class AutoEnrollmentCheckScreen;
-class ControllerPairingScreen;
 class EnrollmentScreen;
 class ErrorScreen;
-class EulaScreen;
 struct Geoposition;
-class HIDDetectionScreen;
-class HostPairingScreen;
-class KioskAutolaunchScreen;
-class KioskEnableScreen;
 class LoginDisplayHost;
 class LoginScreenContext;
 class NetworkScreen;
 class OobeDisplay;
-class ResetScreen;
 class SimpleGeolocationProvider;
 class SupervisedUserCreationScreen;
-class TermsOfServiceScreen;
 class TimeZoneProvider;
 struct TimeZoneResponseData;
 class UpdateScreen;
 class UserImageScreen;
-class WizardScreen;
-class WrongHWIDScreen;
 
 // 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:
   // Observes screen changes.
   class Observer {
    public:
     // Called before a screen change happens.
     virtual void OnScreenChanged(WizardScreen* next_screen) = 0;
@@ skipping 58 matching lines @@
   void OnSessionStart();
 
   // 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();
 
   // Lazy initializers and getters for screens.
+  WizardScreen* GetScreen(const std::string& screen_name);
+  WizardScreen* CreateScreen(const std::string& screen_name);
+
+  // Typed getters for the screens.
   NetworkScreen* GetNetworkScreen();
   UpdateScreen* GetUpdateScreen();
   UserImageScreen* GetUserImageScreen();
-  EulaScreen* GetEulaScreen();

[ygorshenin1, 2014/08/26 14:18:53]

Why did you delete some getters, but leave others?

[Denis Kuznetsov (DE-MUC), 2014/09/02 17:40:07]

I've removed getters that were not used by other classes.

   EnrollmentScreen* GetEnrollmentScreen();
-  ResetScreen* GetResetScreen();
-  KioskAutolaunchScreen* GetKioskAutolaunchScreen();
-  KioskEnableScreen* GetKioskEnableScreen();
-  TermsOfServiceScreen* GetTermsOfServiceScreen();
-  WrongHWIDScreen* GetWrongHWIDScreen();
   AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen();
   SupervisedUserCreationScreen* GetSupervisedUserCreationScreen();
-  HIDDetectionScreen* GetHIDDetectionScreen();
-  ControllerPairingScreen* GetControllerPairingScreen();
-  HostPairingScreen* GetHostPairingScreen();
 
   // Returns a pointer to the current screen or NULL if there's no such
   // screen.
   WizardScreen* 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_; }
 
   static const char kNetworkScreenName[];
   static const char kLoginScreenName[];
@@ skipping 154 matching lines @@
   // Returns false if timezone has already been resolved.
   bool SetOnTimeZoneResolvedForTesting(const base::Closure& callback);
 
   // 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_;
 
   // Screens.
-  scoped_ptr<NetworkScreen> network_screen_;
-  scoped_ptr<UpdateScreen> update_screen_;
-  scoped_ptr<UserImageScreen> user_image_screen_;
-  scoped_ptr<EulaScreen> eula_screen_;
-  scoped_ptr<ResetScreen> reset_screen_;
-  scoped_ptr<KioskAutolaunchScreen> autolaunch_screen_;
-  scoped_ptr<KioskEnableScreen> kiosk_enable_screen_;
-  scoped_ptr<EnrollmentScreen> enrollment_screen_;
-  scoped_ptr<ErrorScreen> error_screen_;
-  scoped_ptr<TermsOfServiceScreen> terms_of_service_screen_;
-  scoped_ptr<WrongHWIDScreen> wrong_hwid_screen_;
-  scoped_ptr<AutoEnrollmentCheckScreen> auto_enrollment_check_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_;
+
+  typedef std::map<std::string, linked_ptr<WizardScreen> > ScreenMap;
+  ScreenMap screens_;
 
   // Screen that's currently active.
   WizardScreen* current_screen_;
 
   // Screen that was active before, or NULL for login screen.
   WizardScreen* previous_screen_;
 
   std::string username_;
   std::string password_;
 
@@ skipping 70 matching lines @@
   base::Closure on_timezone_resolved_for_testing_;
 
   base::WeakPtrFactory<WizardController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_