Logic fix for switching to Reset screen.

BUG=382630

Review URL: https://codereview.chromium.org/335413002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277888 0039d316-1c4b-4281-b951-d872f2087c98
parent 7121fe34
...@@ -168,8 +168,11 @@ void CoreOobeHandler::ShowDeviceResetScreen() { ...@@ -168,8 +168,11 @@ void CoreOobeHandler::ShowDeviceResetScreen() {
wizard_controller->AdvanceToScreen(WizardController::kResetScreenName); wizard_controller->AdvanceToScreen(WizardController::kResetScreenName);
} else { } else {
scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue()); scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
LoginDisplayHostImpl::default_host()->StartWizard( DCHECK(LoginDisplayHostImpl::default_host());
WizardController::kResetScreenName, params.Pass()); if (LoginDisplayHostImpl::default_host()) {
LoginDisplayHostImpl::default_host()->StartWizard(
WizardController::kResetScreenName, params.Pass());
}
} }
} }
} }
......
...@@ -1128,9 +1128,10 @@ void SigninScreenHandler::HandleAccountPickerReady() { ...@@ -1128,9 +1128,10 @@ void SigninScreenHandler::HandleAccountPickerReady() {
PrefService* prefs = g_browser_process->local_state(); PrefService* prefs = g_browser_process->local_state();
if (prefs->GetBoolean(prefs::kFactoryResetRequested)) { if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
if (core_oobe_actor_) if (core_oobe_actor_) {
core_oobe_actor_->ShowDeviceResetScreen(); core_oobe_actor_->ShowDeviceResetScreen();
return; return;
}
} }
is_account_picker_showing_first_time_ = true; is_account_picker_showing_first_time_ = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment