| 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 fb4e8f6e8b9337b6849a83b15650965c9914bb37..c6a08451948ffc611fb8300a8e67f112a143f749 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.cc
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.cc
|
| @@ -462,7 +462,8 @@ 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());
|
| SetCurrentScreen(screen);
|
| }
|
|
|
| @@ -770,6 +771,10 @@ void WizardController::OnHostPairingFinished() {
|
| ShowAutoEnrollmentCheckScreen();
|
| }
|
|
|
| +void WizardController::OnControllerPairingNeedEnrollment() {
|
| + ShowAutoEnrollmentCheckScreen();
|
| +}
|
| +
|
| void WizardController::InitiateOOBEUpdate() {
|
| PerformPostEulaActions();
|
| SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true);
|
| @@ -1015,6 +1020,9 @@ void WizardController::OnExit(ExitCodes exit_code) {
|
| case HOST_PAIRING_FINISHED:
|
| OnHostPairingFinished();
|
| break;
|
| + case CONTROLLER_PAIRING_NEED_ENROLLMENT:
|
| + OnControllerPairingNeedEnrollment();
|
| + break;
|
| default:
|
| NOTREACHED();
|
| }
|
|
|