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

Unified Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

Issue 10664017: Introduce a new error code from the DM server - 402 - missing licenses. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/serials/licenses// Created 8 years, 6 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/enrollment/enterprise_enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
index d07686913e9b65c6cd30143a8e79827dea3dd86a..2e30d207927c39654c790fb7bc78763da2d0cd5f 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
@@ -119,10 +119,16 @@ void EnterpriseEnrollmentScreen::OnPolicyStateChanged(
case policy::CloudPolicySubsystem::UNENROLLED:
switch (error_details) {
case policy::CloudPolicySubsystem::BAD_SERIAL_NUMBER:
- actor_->ShowSerialNumberError();
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::SERIAL_NUMBER_ERROR);
break;
case policy::CloudPolicySubsystem::BAD_ENROLLMENT_MODE:
- actor_->ShowEnrollmentModeError();
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::ENROLLMENT_MODE_ERROR);
+ break;
+ case policy::CloudPolicySubsystem::MISSING_LICENSES:
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::MISSING_LICENSES_ERROR);
break;
default: // Still working...
return;
@@ -130,13 +136,16 @@ void EnterpriseEnrollmentScreen::OnPolicyStateChanged(
break;
case policy::CloudPolicySubsystem::BAD_GAIA_TOKEN:
case policy::CloudPolicySubsystem::LOCAL_ERROR:
- actor_->ShowFatalEnrollmentError();
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::FATAL_ERROR);
break;
case policy::CloudPolicySubsystem::UNMANAGED:
- actor_->ShowAccountError();
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::ACCOUNT_ERROR);
break;
case policy::CloudPolicySubsystem::NETWORK_ERROR:
- actor_->ShowNetworkEnrollmentError();
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::NETWORK_ERROR);
break;
case policy::CloudPolicySubsystem::TOKEN_FETCHED:
if (!is_auto_enrollment_ ||
@@ -150,7 +159,8 @@ void EnterpriseEnrollmentScreen::OnPolicyStateChanged(
<< "not supported for non-enterprise enrollment modes.";
policy::AutoEnrollmentClient::CancelAutoEnrollment();
is_auto_enrollment_ = false;
- actor_->ShowAutoEnrollmentError();
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::AUTO_ENROLLMENT_ERROR);
// Set the error state to something distinguishable in the logs.
state = policy::CloudPolicySubsystem::LOCAL_ERROR;
error_details = policy::CloudPolicySubsystem::AUTO_ENROLLMENT_ERROR;
@@ -203,18 +213,21 @@ void EnterpriseEnrollmentScreen::WriteInstallAttributesData() {
base::TimeDelta::FromMilliseconds(kLockRetryIntervalMs));
lockbox_init_duration_ += kLockRetryIntervalMs;
} else {
- actor_->ShowLockboxTimeoutError();
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::LOCKBOX_TIMEOUT_ERROR);
}
return;
}
case policy::EnterpriseInstallAttributes::LOCK_BACKEND_ERROR: {
- actor_->ShowFatalEnrollmentError();
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::FATAL_ERROR);
return;
}
case policy::EnterpriseInstallAttributes::LOCK_WRONG_USER: {
LOG(ERROR) << "Enrollment can not proceed because the InstallAttrs "
<< "has been locked already!";
- actor_->ShowFatalEnrollmentError();
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::FATAL_ERROR);
return;
}
}
@@ -236,8 +249,10 @@ void EnterpriseEnrollmentScreen::RegisterForDevicePolicy(
connector->GetEnterpriseDomain() != gaia::ExtractDomainName(user_)) {
LOG(ERROR) << "Trying to re-enroll to a different domain than "
<< connector->GetEnterpriseDomain();
- if (is_showing_)
- actor_->ShowDomainMismatchError();
+ if (is_showing_) {
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::DOMAIN_MISMATCH_ERROR);
+ }
return;
}
// Make sure the device policy subsystem is in a clean slate.
@@ -253,8 +268,10 @@ void EnterpriseEnrollmentScreen::RegisterForDevicePolicy(
return;
}
NOTREACHED();
- if (is_showing_)
- actor_->ShowFatalEnrollmentError();
+ if (is_showing_) {
+ actor_->ShowEnrollmentError(
+ EnterpriseEnrollmentScreenActor::FATAL_ERROR);
+ }
}
} // namespace chromeos
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698