Mixed Licenses Enrollment

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

Index: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
index a0d7b4e0e228c308254b4d35fd0b378c67f6b216..9befb744b9cffc754c27ddc9d2aa3f51593a2622 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
@@ -51,12 +51,40 @@ const char * const kMetricEnrollmentTimeFailure =
 const char * const kMetricEnrollmentTimeSuccess =
     "Enterprise.EnrollmentTime.Success";
 
+const char* const kLicenseTypePerpetual = "perpetual";
+const char* const kLicenseTypeAnnual = "annual";
+const char* const kLicenseTypeKiosk = "kiosk";
+
 // Retry policy constants.
 constexpr int kInitialDelayMS = 4 * 1000;  // 4 seconds
 constexpr double kMultiplyFactor = 1.5;
 constexpr double kJitterFactor = 0.1;           // +/- 10% jitter
 constexpr int64_t kMaxDelayMS = 8 * 60 * 1000;  // 8 minutes
 
+::policy::LicenseType GetLicenseTypeById(const std::string& id) {
+  if (id == kLicenseTypePerpetual)
+    return ::policy::LicenseType::PERPETUAL;
+  if (id == kLicenseTypeAnnual)
+    return ::policy::LicenseType::ANNUAL;
+  if (id == kLicenseTypeKiosk)
+    return ::policy::LicenseType::KIOSK;
+  return ::policy::LicenseType::UNKNOWN;
+}
+
+const std::string GetLicenseIdByType(::policy::LicenseType type) {

[emaxx, 2017/07/21 12:57:29]

nit: s/const //
(There's no benefit from making the result returned by value as const.)

[Denis Kuznetsov (DE-MUC), 2017/07/25 21:51:05]

Done.

+  switch (type) {
+    case ::policy::LicenseType::PERPETUAL:
+      return kLicenseTypePerpetual;
+    case ::policy::LicenseType::ANNUAL:
+      return kLicenseTypeAnnual;
+    case ::policy::LicenseType::KIOSK:
+      return kLicenseTypeKiosk;
+    default:
+      NOTREACHED();
+      return std::string();
+  }
+}
+
 }  // namespace
 
 namespace chromeos {
@@ -202,7 +230,12 @@ void EnrollmentScreen::OnLoginDone(const std::string& user,
       auth_code, shark_controller_ != nullptr /* fetch_additional_token */);
 }
 
-void EnrollmentScreen::OnLicenseTypeSelected(const std::string& license_type) {}
+void EnrollmentScreen::OnLicenseTypeSelected(const std::string& license_type) {
+  view_->ShowEnrollmentSpinnerScreen();
+  auto license = GetLicenseTypeById(license_type);
+  CHECK(license != ::policy::LicenseType::UNKNOWN);
+  enrollment_helper_->UseLicenseType(license);
+}
 
 void EnrollmentScreen::OnRetry() {
   retry_task_.Cancel();
@@ -265,6 +298,15 @@ void EnrollmentScreen::OnAuthError(const GoogleServiceAuthError& error) {
   view_->ShowAuthError(error);
 }
 
+void EnrollmentScreen::OnMultipleLicensesAvailable(
+    const EnrollmentLicenseMap& licenses) {
+  base::DictionaryValue license_dict;
+  for (auto it = licenses.begin(); it != licenses.end(); it++) {

[emaxx, 2017/07/21 12:57:29]

nit: Replace with range-based for?

[Denis Kuznetsov (DE-MUC), 2017/07/25 21:51:05]

Done.

+    license_dict.SetInteger(GetLicenseIdByType(it->first), it->second);
+  }
+  view_->ShowLicenseTypeSelectionScreen(license_dict);
+}
+
 void EnrollmentScreen::OnEnrollmentError(policy::EnrollmentStatus status) {
   // TODO(pbond): remove this LOG once http://crbug.com/586961 is fixed.
   LOG(WARNING) << "Enrollment error occured: status=" << status.status()