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

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: 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 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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 std::string enrollment_domain = GetForcedEnrollmentDomain(); 420 std::string enrollment_domain = GetForcedEnrollmentDomain();
421 if (is_auto_enrollment) { 421 if (is_auto_enrollment) {
422 mode = EnrollmentScreenActor::ENROLLMENT_MODE_AUTO; 422 mode = EnrollmentScreenActor::ENROLLMENT_MODE_AUTO;
423 } else if (enrollment_recovery_) { 423 } else if (enrollment_recovery_) {
424 mode = EnrollmentScreenActor::ENROLLMENT_MODE_RECOVERY; 424 mode = EnrollmentScreenActor::ENROLLMENT_MODE_RECOVERY;
425 enrollment_domain = GetEnrollmentRecoveryDomain(); 425 enrollment_domain = GetEnrollmentRecoveryDomain();
426 } else if (ShouldAutoStartEnrollment() && !CanExitEnrollment()) { 426 } else if (ShouldAutoStartEnrollment() && !CanExitEnrollment()) {
427 mode = EnrollmentScreenActor::ENROLLMENT_MODE_FORCED; 427 mode = EnrollmentScreenActor::ENROLLMENT_MODE_FORCED;
428 } 428 }
429 429
430 screen->SetParameters(mode, enrollment_domain, user, auth_token_); 430 screen->SetParameters(mode, enrollment_domain, user, auth_token_,
431 controller_pairing_controller_.get(),
432 host_pairing_controller_.get());
431 SetCurrentScreen(screen); 433 SetCurrentScreen(screen);
432 } 434 }
433 435
434 void WizardController::ShowResetScreen() { 436 void WizardController::ShowResetScreen() {
435 VLOG(1) << "Showing reset screen."; 437 VLOG(1) << "Showing reset screen.";
436 SetStatusAreaVisible(false); 438 SetStatusAreaVisible(false);
437 SetCurrentScreen(GetScreen(kResetScreenName)); 439 SetCurrentScreen(GetScreen(kResetScreenName));
438 } 440 }
439 441
440 void WizardController::ShowKioskEnableScreen() { 442 void WizardController::ShowKioskEnableScreen() {
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 // TODO(nkostylev): Show message to the user explaining update error. 621 // TODO(nkostylev): Show message to the user explaining update error.
620 // TODO(nkostylev): Update should be required during OOBE. 622 // TODO(nkostylev): Update should be required during OOBE.
621 // Temporary fix, need to migrate to new API. http://crosbug.com/4321 623 // Temporary fix, need to migrate to new API. http://crosbug.com/4321
622 OnUpdateCompleted(); 624 OnUpdateCompleted();
623 } 625 }
624 626
625 void WizardController::EnableUserImageScreenReturnToPreviousHack() { 627 void WizardController::EnableUserImageScreenReturnToPreviousHack() {
626 user_image_screen_return_to_previous_hack_ = true; 628 user_image_screen_return_to_previous_hack_ = true;
627 } 629 }
628 630
631 void WizardController::OnEnrollmentAuthTokenReceived(
632 const std::string& token) {
633 VLOG(1) << "OnEnrollmentAuthTokenReceived " << token;
634 if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
635 StartupUtils::MarkEulaAccepted();
636 auth_token_ = token;
637 ShowEnrollmentScreen();
638 } else {
639 LOG(WARNING) << "Not in device enrollment.";
640 }
641 }
642
629 void WizardController::OnUserImageSelected() { 643 void WizardController::OnUserImageSelected() {
630 if (user_image_screen_return_to_previous_hack_) { 644 if (user_image_screen_return_to_previous_hack_) {
631 user_image_screen_return_to_previous_hack_ = false; 645 user_image_screen_return_to_previous_hack_ = false;
632 DCHECK(previous_screen_); 646 DCHECK(previous_screen_);
633 if (previous_screen_) { 647 if (previous_screen_) {
634 SetCurrentScreen(previous_screen_); 648 SetCurrentScreen(previous_screen_);
635 return; 649 return;
636 } 650 }
637 } 651 }
638 if (!time_oobe_started_.is_null()) { 652 if (!time_oobe_started_.is_null()) {
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
1207 1221
1208 bool WizardController::SetOnTimeZoneResolvedForTesting( 1222 bool WizardController::SetOnTimeZoneResolvedForTesting(
1209 const base::Closure& callback) { 1223 const base::Closure& callback) {
1210 if (timezone_resolved_) 1224 if (timezone_resolved_)
1211 return false; 1225 return false;
1212 1226
1213 on_timezone_resolved_for_testing_ = callback; 1227 on_timezone_resolved_for_testing_ = callback;
1214 return true; 1228 return true;
1215 } 1229 }
1216 1230
1217 void WizardController::OnEnrollmentAuthTokenReceived(
1218 const std::string& token) {
1219 // TODO(achuith, zork): This will be called via Bluetooth from a remote
1220 // controller.
1221 VLOG(1) << "OnEnrollmentAuthTokenReceived " << token;
1222 if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
1223 StartupUtils::MarkEulaAccepted();
1224 auth_token_ = token;
1225 InitiateOOBEUpdate();
1226 } else {
1227 LOG(WARNING) << "Not in device enrollment.";
1228 }
1229 }
1230
1231 } // namespace chromeos 1231 } // namespace chromeos
OLDNEW
« 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