| 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
|
|
|