| Index: chrome/browser/chromeos/login/wizard_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
|
| index d1c2702ae6d01b184fc9c666900a5cba069ab901..853b311819a11f4e7e398b49c8b5446287eb0517 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.cc
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.cc
|
| @@ -305,10 +305,12 @@ void WizardController::Init(const std::string& first_screen_name,
|
| }
|
|
|
| void WizardController::Show() {
|
| - // In tests we might startup without initial screen
|
| - // so widget_ hasn't been created yet.
|
| - if (first_screen_name_ != kTestNoScreenName)
|
| + // In tests and in case of --login-screen=login there is no screen to show.
|
| + if (first_screen_name_ != kTestNoScreenName &&
|
| + first_screen_name_ != kLoginScreenName) {
|
| DCHECK(widget_);
|
| + }
|
| +
|
| if (widget_)
|
| widget_->Show();
|
| }
|
|
|