Introduce a new error code from the DM server - 402 - missing licenses.

chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

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..7ef017e0a5fe993dcecfe53db7702cfe42356e8b 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_LICESES_ERROR);

[Mattias Nissler (ping if slow), 2012/06/26 09:19:34]

Eclipse auto-complete strikes again.

[pastarmovj, 2012/06/26 16:59:29]

Prolly :) Fixed.

             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_ENROLLMENT_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_ENROLLMENT_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_ENROLLMENT_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_ENROLLMENT_ERROR);
       return;
     }
   }
@@ -237,7 +250,8 @@ void EnterpriseEnrollmentScreen::RegisterForDevicePolicy(
       LOG(ERROR) << "Trying to re-enroll to a different domain than "
                  << connector->GetEnterpriseDomain();
       if (is_showing_)

[Mattias Nissler (ping if slow), 2012/06/26 09:19:34]

curlies

[pastarmovj, 2012/06/26 16:59:29]

Done.

-        actor_->ShowDomainMismatchError();
+        actor_->ShowEnrollmentError(
+            EnterpriseEnrollmentScreenActor::DOMAIN_MISMATCH_ERROR);
       return;
     }
     // Make sure the device policy subsystem is in a clean slate.
@@ -254,7 +268,8 @@ void EnterpriseEnrollmentScreen::RegisterForDevicePolicy(
   }
   NOTREACHED();
   if (is_showing_)

[Mattias Nissler (ping if slow), 2012/06/26 09:19:34]

curlies

[pastarmovj, 2012/06/26 16:59:29]

Done.

-    actor_->ShowFatalEnrollmentError();
+    actor_->ShowEnrollmentError(
+        EnterpriseEnrollmentScreenActor::FATAL_ENROLLMENT_ERROR);
 }
 
 }  // namespace chromeos