diff options
| -rw-r--r-- | chrome/browser/chromeos/login/wizard_controller.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/wizard_controller_browsertest.cc | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index d0c3a40..bcfc0fcc7 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -450,7 +450,10 @@ void WizardController::OnUpdateErrorUpdating() { // If there was an error while getting or applying the update, // return to network selection screen. // TODO(nkostylev): Show message to the user explaining update error. - ShowNetworkScreen(); + // TODO(nkostylev): Update should be required during OOBE. + // Temporary fix, need to migrate to new API. http://crosbug.com/4321 + MarkOobeCompleted(); + ShowLoginScreen(); } void WizardController::OnUserImageSelected() { diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index 4da996f..f7b77af 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -162,12 +162,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) { EXPECT_EQ(controller()->GetUpdateScreen(), controller()->current_screen()); EXPECT_CALL(*mock_update_screen_, Hide()).Times(1); - EXPECT_CALL(*mock_network_screen_, Show()).Times(1); - EXPECT_CALL(*mock_network_screen_, Hide()).Times(0); // last transition + EXPECT_CALL(*mock_login_screen_, Show()).Times(1); + EXPECT_CALL(*mock_login_screen_, Hide()).Times(0); // last transition controller()->OnExit( chromeos::ScreenObserver::UPDATE_ERROR_UPDATING); - EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen()); + EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen()); } IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorNetwork) { |