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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 547503002: Redirect to the enterprise enrollment screen during remora and shark pairing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 std::string enrollment_domain = GetForcedEnrollmentDomain(); 455 std::string enrollment_domain = GetForcedEnrollmentDomain();
456 if (is_auto_enrollment) { 456 if (is_auto_enrollment) {
457 mode = EnrollmentScreenActor::ENROLLMENT_MODE_AUTO; 457 mode = EnrollmentScreenActor::ENROLLMENT_MODE_AUTO;
458 } else if (enrollment_recovery_) { 458 } else if (enrollment_recovery_) {
459 mode = EnrollmentScreenActor::ENROLLMENT_MODE_RECOVERY; 459 mode = EnrollmentScreenActor::ENROLLMENT_MODE_RECOVERY;
460 enrollment_domain = GetEnrollmentRecoveryDomain(); 460 enrollment_domain = GetEnrollmentRecoveryDomain();
461 } else if (ShouldAutoStartEnrollment() && !CanExitEnrollment()) { 461 } else if (ShouldAutoStartEnrollment() && !CanExitEnrollment()) {
462 mode = EnrollmentScreenActor::ENROLLMENT_MODE_FORCED; 462 mode = EnrollmentScreenActor::ENROLLMENT_MODE_FORCED;
463 } 463 }
464 464
465 screen->SetParameters(mode, enrollment_domain, user, auth_token_); 465 screen->SetParameters(mode, enrollment_domain, user, auth_token_,
466 controller_pairing_controller_.get());
466 SetCurrentScreen(screen); 467 SetCurrentScreen(screen);
467 } 468 }
468 469
469 void WizardController::ShowResetScreen() { 470 void WizardController::ShowResetScreen() {
470 VLOG(1) << "Showing reset screen."; 471 VLOG(1) << "Showing reset screen.";
471 SetStatusAreaVisible(false); 472 SetStatusAreaVisible(false);
472 SetCurrentScreen(GetScreen(kResetScreenName)); 473 SetCurrentScreen(GetScreen(kResetScreenName));
473 } 474 }
474 475
475 void WizardController::ShowKioskEnableScreen() { 476 void WizardController::ShowKioskEnableScreen() {
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 } 764 }
764 765
765 void WizardController::OnControllerPairingFinished() { 766 void WizardController::OnControllerPairingFinished() {
766 ShowAutoEnrollmentCheckScreen(); 767 ShowAutoEnrollmentCheckScreen();
767 } 768 }
768 769
769 void WizardController::OnHostPairingFinished() { 770 void WizardController::OnHostPairingFinished() {
770 ShowAutoEnrollmentCheckScreen(); 771 ShowAutoEnrollmentCheckScreen();
771 } 772 }
772 773
774 void WizardController::OnControllerPairingNeedEnrollment() {
775 ShowAutoEnrollmentCheckScreen();
776 }
777
773 void WizardController::InitiateOOBEUpdate() { 778 void WizardController::InitiateOOBEUpdate() {
774 PerformPostEulaActions(); 779 PerformPostEulaActions();
775 SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true); 780 SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true);
776 GetUpdateScreen()->StartNetworkCheck(); 781 GetUpdateScreen()->StartNetworkCheck();
777 } 782 }
778 783
779 void WizardController::StartTimezoneResolve() { 784 void WizardController::StartTimezoneResolve() {
780 geolocation_provider_.reset(new SimpleGeolocationProvider( 785 geolocation_provider_.reset(new SimpleGeolocationProvider(
781 g_browser_process->system_request_context(), 786 g_browser_process->system_request_context(),
782 SimpleGeolocationProvider::DefaultGeolocationProviderURL())); 787 SimpleGeolocationProvider::DefaultGeolocationProviderURL()));
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 break; 1013 break;
1009 case WRONG_HWID_WARNING_SKIPPED: 1014 case WRONG_HWID_WARNING_SKIPPED:
1010 OnWrongHWIDWarningSkipped(); 1015 OnWrongHWIDWarningSkipped();
1011 break; 1016 break;
1012 case CONTROLLER_PAIRING_FINISHED: 1017 case CONTROLLER_PAIRING_FINISHED:
1013 OnControllerPairingFinished(); 1018 OnControllerPairingFinished();
1014 break; 1019 break;
1015 case HOST_PAIRING_FINISHED: 1020 case HOST_PAIRING_FINISHED:
1016 OnHostPairingFinished(); 1021 OnHostPairingFinished();
1017 break; 1022 break;
1023 case CONTROLLER_PAIRING_NEED_ENROLLMENT:
1024 OnControllerPairingNeedEnrollment();
1025 break;
1018 default: 1026 default:
1019 NOTREACHED(); 1027 NOTREACHED();
1020 } 1028 }
1021 } 1029 }
1022 1030
1023 void WizardController::OnSetUserNamePassword(const std::string& username, 1031 void WizardController::OnSetUserNamePassword(const std::string& username,
1024 const std::string& password) { 1032 const std::string& password) {
1025 username_ = username; 1033 username_ = username;
1026 password_ = password; 1034 password_ = password;
1027 } 1035 }
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) { 1265 if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
1258 StartupUtils::MarkEulaAccepted(); 1266 StartupUtils::MarkEulaAccepted();
1259 auth_token_ = token; 1267 auth_token_ = token;
1260 InitiateOOBEUpdate(); 1268 InitiateOOBEUpdate();
1261 } else { 1269 } else {
1262 LOG(WARNING) << "Not in device enrollment."; 1270 LOG(WARNING) << "Not in device enrollment.";
1263 } 1271 }
1264 } 1272 }
1265 1273
1266 } // namespace chromeos 1274 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698