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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.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
Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index e078e824f7b0a2da2c3876f255df1d96efd5cb05..5a13b62717e8773897ac6e32c716d78ecfdb0c00 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -520,11 +520,11 @@ void LoginDisplayHostImpl::StartWizard(
// Keep parameters to restore if renderer crashes.
restore_path_ = RESTORE_WIZARD;
- wizard_first_screen_name_ = first_screen_name;
+ first_screen_name_ = first_screen_name;
if (screen_parameters.get())
- wizard_screen_parameters_.reset(screen_parameters->DeepCopy());
+ screen_parameters_.reset(screen_parameters->DeepCopy());
else
- wizard_screen_parameters_.reset();
+ screen_parameters_.reset();
is_showing_login_ = false;
if (waiting_for_wallpaper_load_ && !initialize_webui_hidden_) {
@@ -1025,8 +1025,7 @@ void LoginDisplayHostImpl::StartPostponedWebUI() {
switch (restore_path_) {
case RESTORE_WIZARD:
- StartWizard(wizard_first_screen_name_,
- wizard_screen_parameters_.Pass());
+ StartWizard(first_screen_name_, screen_parameters_.Pass());
break;
case RESTORE_SIGN_IN:
StartSignInScreen(LoginScreenContext());
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.h ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698