| 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 121c5e99c9a4fa1d2014b6c29bb799650412c66b..563cfc510d97800b1db3d1f2ddc55bc73c574e3a 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.cc
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.cc
|
| @@ -427,7 +427,9 @@ void WizardController::ShowEnrollmentScreen() {
|
| mode = EnrollmentScreenActor::ENROLLMENT_MODE_FORCED;
|
| }
|
|
|
| - screen->SetParameters(mode, enrollment_domain, user, auth_token_);
|
| + screen->SetParameters(mode, enrollment_domain, user, auth_token_,
|
| + controller_pairing_controller_.get(),
|
| + host_pairing_controller_.get());
|
| SetCurrentScreen(screen);
|
| }
|
|
|
| @@ -626,6 +628,18 @@ void WizardController::EnableUserImageScreenReturnToPreviousHack() {
|
| user_image_screen_return_to_previous_hack_ = true;
|
| }
|
|
|
| +void WizardController::OnEnrollmentAuthTokenReceived(
|
| + const std::string& token) {
|
| + VLOG(1) << "OnEnrollmentAuthTokenReceived " << token;
|
| + if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
|
| + StartupUtils::MarkEulaAccepted();
|
| + auth_token_ = token;
|
| + ShowEnrollmentScreen();
|
| + } else {
|
| + LOG(WARNING) << "Not in device enrollment.";
|
| + }
|
| +}
|
| +
|
| void WizardController::OnUserImageSelected() {
|
| if (user_image_screen_return_to_previous_hack_) {
|
| user_image_screen_return_to_previous_hack_ = false;
|
| @@ -1214,18 +1228,4 @@ bool WizardController::SetOnTimeZoneResolvedForTesting(
|
| return true;
|
| }
|
|
|
| -void WizardController::OnEnrollmentAuthTokenReceived(
|
| - const std::string& token) {
|
| - // TODO(achuith, zork): This will be 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
|
|
|