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

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

Issue 390443006: Support for remote enrollment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 5 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/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 882302b6c074f9a87eca60e1c273da981561dd66..b046b508c7f8464aa68881f4aef94af9ac462fd4 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -501,7 +501,7 @@ void WizardController::ShowEnrollmentScreen() {
mode = EnrollmentScreenActor::ENROLLMENT_MODE_FORCED;
EnrollmentScreen* screen = GetEnrollmentScreen();
- screen->SetParameters(mode, GetForcedEnrollmentDomain(), user);
+ screen->SetParameters(mode, GetForcedEnrollmentDomain(), user, auth_token_);
SetCurrentScreen(screen);
}
@@ -1262,4 +1262,16 @@ bool WizardController::SetOnTimeZoneResolvedForTesting(
return true;
}
+void WizardController::OnEnrollmentAuthTokenReceived(
bartfab (slow) 2014/07/16 10:09:15 Nit: There are no callers of this method yet. Docu
achuithb 2014/08/13 01:57:43 Done, kept it brief.
+ const std::string& token) {
+ VLOG(1) << "OnEnrollmentAuthTokenReceived " << token;
+ if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
+ StartupUtils::MarkEulaAccepted();
bartfab (slow) 2014/07/16 10:09:15 Is it OK to just silently accept the EULA?
achuithb 2014/08/13 01:57:43 Yup, the EULA is accepted on the controller side,
+ auth_token_ = token;
+ InitiateOOBEUpdate();
+ } else {
+ LOG(WARNING) << "Not in device enrollment";
bartfab (slow) 2014/07/16 10:09:15 Nit: Add full stop to make this a complete sentenc
achuithb 2014/08/13 01:57:43 Done.
+ }
+}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698