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

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: bartfab feedback Created 6 years, 4 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 fc725c04b3024ef0fc399aa385e24bdb36a77a35..6165ee9ae34f55ac50482aa10bffd9c07f9d5e3c 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -506,7 +506,7 @@ void WizardController::ShowEnrollmentScreen() {
mode = EnrollmentScreenActor::ENROLLMENT_MODE_FORCED;
}
- screen->SetParameters(mode, enrollment_domain, user);
+ screen->SetParameters(mode, enrollment_domain, user, auth_token_);
SetCurrentScreen(screen);
}
@@ -649,6 +649,10 @@ void WizardController::OnUpdateCompleted() {
ShowControllerPairingScreen();
} else if (ShouldShowHostPairingScreen()) {
ShowHostPairingScreen();
+ } else if (!auth_token_.empty()) {
+ // TODO(achuith): There is an issue with the auto enrollment check and
+ // remote enrollment. crbug.com/403147.
+ ShowEnrollmentScreen();
} else {
ShowAutoEnrollmentCheckScreen();
}
@@ -1295,4 +1299,17 @@ bool WizardController::SetOnTimeZoneResolvedForTesting(
return true;
}
+void WizardController::OnEnrollmentAuthTokenReceived(
+ const std::string& token) {
+ // TODO(achuith, zork): This is called via bluetooth from a remote controller.
+ VLOG(1) << "OnEnrollmentAuthTokenReceived " << token;
+ if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
+ StartupUtils::MarkEulaAccepted();
+ auth_token_ = token;
+ InitiateOOBEUpdate();
+ } else {
+ LOG(WARNING) << "Not in device enrollment.";
+ }
+}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698