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

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

Issue 2699633004: Revert of cros: ensure update check to complete at OOBE before allowing login (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8d7eee487738c9504ee81561df5b0a3aa522dd00..ffdc6e4eebda0dd2ce23743d62a2e6863f410c0e 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -732,21 +732,12 @@
}
void WizardController::OnUpdateErrorCheckingForUpdate() {
- const bool is_hands_off_mode =
- (policy::DeviceCloudPolicyManagerChromeOS::GetZeroTouchEnrollmentMode() ==
- policy::ZeroTouchEnrollmentMode::HANDS_OFF);
-
- // If there was an error while checking for update, return to the network
- // selection screen if the OOBE isn't complete (unless it's in the zero-touch
- // enrollment mode) as we don't want to miss any critical update. Otherwise,
- // we do not want to block users from being able to proceed to the login
- // screen if there is any error checking for an update. They could use
- // "browse without sign-in" feature to set up the network to be able to
- // perform the update later.
- if (is_out_of_box_ && !is_hands_off_mode)
- ShowNetworkScreen();
- else
- OnUpdateCompleted();
+ // TODO(nkostylev): Update should be required during OOBE.
+ // We do not want to block users from being able to proceed to the login
+ // screen if there is any error checking for an update.
+ // They could use "browse without sign-in" feature to set up the network to be
+ // able to perform the update later.
+ OnUpdateCompleted();
}
void WizardController::OnUpdateErrorUpdating(bool is_critical_update) {
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698