Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1004)

Unified Diff: chrome/browser/chromeos/login/screen_manager.cc

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screen_manager.cc
diff --git a/chrome/browser/chromeos/login/screen_manager.cc b/chrome/browser/chromeos/login/screen_manager.cc
index 8b2e4c6a384b27ab119c4b5f5f5bd70e334df096..8457c5a667114757f4e2400c5e5c3ad654f67ed6 100644
--- a/chrome/browser/chromeos/login/screen_manager.cc
+++ b/chrome/browser/chromeos/login/screen_manager.cc
@@ -12,19 +12,19 @@ ScreenManager::ScreenManager() {
ScreenManager::~ScreenManager() {
}
-BaseScreen* ScreenManager::GetScreen(const std::string& screen_name) {
- ScreenMap::const_iterator iter = screens_.find(screen_name);
- if (iter != screens_.end()) {
+BaseScreen* ScreenManager::GetScreen(OobeScreen screen) {
+ auto iter = screens_.find(screen);
+ if (iter != screens_.end())
return iter->second.get();
- }
- BaseScreen* result = CreateScreen(screen_name);
- DCHECK(result) << "Can not create screen named " << screen_name;
- screens_[screen_name] = make_linked_ptr(result);
+
+ BaseScreen* result = CreateScreen(screen);
+ DCHECK(result) << "Can not create screen named " << GetOobeScreenName(screen);
+ screens_[screen] = make_linked_ptr(result);
return result;
}
-bool ScreenManager::HasScreen(const std::string& screen_name) {
- return screens_.count(screen_name) > 0;
+bool ScreenManager::HasScreen(OobeScreen screen) {
+ return screens_.count(screen) > 0;
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698