Move all typecasting code to individual screens.

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>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #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/screen_manager.h"
 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 
 class AutoEnrollmentCheckScreen;
 class EnrollmentScreen;
 class ErrorScreen;
 struct Geoposition;
 class LoginDisplayHost;
 class LoginScreenContext;
 class NetworkScreen;
 class OobeDisplay;
 class SimpleGeolocationProvider;
 class SupervisedUserCreationScreen;
 class TimeZoneProvider;
 struct TimeZoneResponseData;
 class UpdateScreen;
 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 {
+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;
 
     // Called after the browser session has started.
     virtual void OnSessionStart() = 0;
   };
@@ skipping 53 matching lines @@
   // Called right after the browser session has started.
   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();
-  EnrollmentScreen* GetEnrollmentScreen();
-  AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen();
-  SupervisedUserCreationScreen* GetSupervisedUserCreationScreen();
 
   // 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_; }
 
+  // ScreenManager override.

[ygorshenin1, 2014/09/03 12:58:46]

s/override./implementation:/

[Denis Kuznetsov (DE-MUC), 2014/09/03 13:16:06]

Done.

+  virtual WizardScreen* 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[];
   static const char kKioskEnableScreenName[];
@@ skipping 243 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_