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

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

Issue 2816763002: Allow manual testing of FRE on Linux builds (Closed)
Patch Set: Created 3 years, 8 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 | no next file » | 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 e8da5c9e97c1c303b41f6d951112f41b3d44ac63..0bb90ffa50a5ffa7e504dba763c28d2466112f3d 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -664,17 +664,18 @@ void WizardController::OnHIDDetectionCompleted() {
}
void WizardController::OnNetworkConnected() {
- if (is_official_build_) {
- if (!StartupUtils::IsEulaAccepted()) {
+ if (!StartupUtils::IsEulaAccepted()) {
+ if (is_official_build_) {
ShowEulaScreen();
} else {
- // Possible cases:
- // 1. EULA was accepted, forced shutdown/reboot during update.
- // 2. EULA was accepted, planned reboot after update.
- // Make sure that device is up to date.
- InitiateOOBEUpdate();
+ // Follow the same flow as if EULA had been accepted.
+ OnEulaAccepted();
achuithb 2017/04/12 21:09:03 Maybe call this out in the CL description. Somethi
Thiemo Nagel 2017/04/13 04:18:34 Done.
}
} else {
+ // Possible cases:
+ // 1. EULA was accepted, forced shutdown/reboot during update.
+ // 2. EULA was accepted, planned reboot after update.
+ // Make sure that device is up to date.
InitiateOOBEUpdate();
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698