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

Unified Diff: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc

Issue 2771803003: Don't start FRE from the login screen (Closed)
Patch Set: Fix browser tests 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
Index: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
index 2190197966cb6d336724b425f390ef2a00b3b8df..46e30e4b4a30db5ed736075655ea244840cfd830 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
@@ -114,7 +114,10 @@ void AutoEnrollmentCheckScreen::Show() {
auto_enrollment_state_ = new_auto_enrollment_state;
// Make sure gears are in motion in the background.
- auto_enrollment_controller_->Start();
+ if (auto_enrollment_controller_->state() ==
achuithb 2017/04/19 19:04:43 Why not do this state check inside Start()?
Thiemo Nagel 2017/04/20 13:24:00 Done.
+ policy::AUTO_ENROLLMENT_STATE_IDLE) {
+ auto_enrollment_controller_->Start();
+ }
network_portal_detector::GetInstance()->StartDetectionIfIdle();
}
@@ -205,9 +208,6 @@ bool AutoEnrollmentCheckScreen::UpdateAutoEnrollmentState(
policy::AutoEnrollmentState new_auto_enrollment_state) {
switch (new_auto_enrollment_state) {
case policy::AUTO_ENROLLMENT_STATE_IDLE:
- // The client should have been started already.
- NOTREACHED();
- return false;
case policy::AUTO_ENROLLMENT_STATE_PENDING:
case policy::AUTO_ENROLLMENT_STATE_SERVER_ERROR:
case policy::AUTO_ENROLLMENT_STATE_TRIGGER_ENROLLMENT:

Powered by Google App Engine
This is Rietveld 408576698