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

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

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 months 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
« no previous file with comments | « chrome/browser/chromeos/login/screen_manager.h ('k') | chrome/browser/chromeos/login/screens/base_screen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 55d0182e3d21dfa51d2bb78b5350e5888c39d80c..8b2e4c6a384b27ab119c4b5f5f5bd70e334df096 100644
--- a/chrome/browser/chromeos/login/screen_manager.cc
+++ b/chrome/browser/chromeos/login/screen_manager.cc
@@ -12,12 +12,12 @@ ScreenManager::ScreenManager() {
ScreenManager::~ScreenManager() {
}
-WizardScreen* ScreenManager::GetScreen(const std::string& screen_name) {
+BaseScreen* ScreenManager::GetScreen(const std::string& screen_name) {
ScreenMap::const_iterator iter = screens_.find(screen_name);
if (iter != screens_.end()) {
return iter->second.get();
}
- WizardScreen* result = CreateScreen(screen_name);
+ BaseScreen* result = CreateScreen(screen_name);
DCHECK(result) << "Can not create screen named " << screen_name;
screens_[screen_name] = make_linked_ptr(result);
return result;
« no previous file with comments | « chrome/browser/chromeos/login/screen_manager.h ('k') | chrome/browser/chromeos/login/screens/base_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698