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

Unified 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: Fix comment 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 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 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
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | components/pairing/bluetooth_host_pairing_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698