| Index: chrome/browser/chromeos/login/screen_manager.h
|
| diff --git a/chrome/browser/chromeos/login/screen_manager.h b/chrome/browser/chromeos/login/screen_manager.h
|
| index 24731261aa53525403def048a5d919dc83c0646b..360d2b28e96c573a667e271613c148879567e9ff 100644
|
| --- a/chrome/browser/chromeos/login/screen_manager.h
|
| +++ b/chrome/browser/chromeos/login/screen_manager.h
|
| @@ -22,12 +22,12 @@ class ScreenManager {
|
| virtual ~ScreenManager();
|
|
|
| // Getter for screen with lazy initialization.
|
| - virtual BaseScreen* GetScreen(const std::string& screen_name);
|
| + virtual BaseScreen* GetScreen(OobeScreen screen);
|
|
|
| // Factory for screen instances.
|
| - virtual BaseScreen* CreateScreen(const std::string& screen_name) = 0;
|
| + virtual BaseScreen* CreateScreen(OobeScreen screen) = 0;
|
|
|
| - bool HasScreen(const std::string& screen_name);
|
| + bool HasScreen(OobeScreen screen);
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestCancel);
|
| @@ -38,8 +38,7 @@ class ScreenManager {
|
| friend class WizardControllerBrokenLocalStateTest;
|
|
|
| // Screens.
|
| - typedef std::map<std::string, linked_ptr<BaseScreen>> ScreenMap;
|
| - ScreenMap screens_;
|
| + std::map<OobeScreen, linked_ptr<BaseScreen>> screens_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScreenManager);
|
| };
|
|
|