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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 101 matching lines @@
 
 void EnterpriseEnrollmentScreen::OnPolicyStateChanged(
     policy::CloudPolicySubsystem::PolicySubsystemState state,
     policy::CloudPolicySubsystem::ErrorDetails error_details) {
 
   if (is_showing_) {
     switch (state) {
       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;
         }
         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_ ||
             g_browser_process->browser_policy_connector()->
                 GetDeviceCloudPolicyDataStore()->device_mode() ==
             policy::DEVICE_MODE_ENTERPRISE) {
           WriteInstallAttributesData();
           return;
         } else {
           LOG(ERROR) << "Enrollment can not proceed because Auto-enrollment is "
                      << "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;
         }
         break;
       case policy::CloudPolicySubsystem::SUCCESS:
         // Success!
         registrar_.reset();
         actor_->ShowConfirmationScreen();
         return;
@@ skipping 32 matching lines @@
         // InstallAttributes not ready yet, retry later.
         LOG(WARNING) << "Install Attributes not ready yet will retry in "
                      << kLockRetryIntervalMs << "ms.";
         MessageLoop::current()->PostDelayedTask(
             FROM_HERE,
             base::Bind(&EnterpriseEnrollmentScreen::WriteInstallAttributesData,
                        weak_ptr_factory_.GetWeakPtr()),
             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;
     }
   }
 
   NOTREACHED();
 }
 
 void EnterpriseEnrollmentScreen::RegisterForDevicePolicy(
     const std::string& token) {
   policy::BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
   if (!connector->device_cloud_policy_subsystem()) {
     LOG(ERROR) << "Cloud policy subsystem not initialized.";
   } else if (connector->device_cloud_policy_subsystem()->state() ==
       policy::CloudPolicySubsystem::SUCCESS) {
     LOG(ERROR) << "A previous enrollment already succeeded!";
   } else {
     if (connector->IsEnterpriseManaged() &&
         connector->GetEnterpriseDomain() != gaia::ExtractDomainName(user_)) {
       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.
     connector->ResetDevicePolicy();
     connector->ScheduleServiceInitialization(0);
     registrar_.reset(new policy::CloudPolicySubsystem::ObserverRegistrar(
         connector->device_cloud_policy_subsystem(), this));
     // Push the credentials to the policy infrastructure. It'll start enrollment
     // and notify us of progress through CloudPolicySubsystem::Observer.
     connector->RegisterForDevicePolicy(user_, token,
                                        is_auto_enrollment_,
                                        connector->IsEnterpriseManaged());
     return;
   }
   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