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

Unified Diff: chrome/browser/chromeos/login/screens/host_pairing_screen.cc

Issue 2977033002: Mixed Licenses Enrollment (Closed)
Patch Set: Fix CloudPolicyClientTest Created 3 years, 5 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/screens/host_pairing_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
index 82524049ed4462fa0a2806d83edd18fb94afbf0c..09753ea2388970ad0d00cd27552972cd8e5573a8 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/login/screens/host_pairing_screen.h"
#include "base/command_line.h"
+#include "base/logging.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -187,6 +188,18 @@ void HostPairingScreen::OnAuthError(const GoogleServiceAuthError& error) {
OnAnyEnrollmentError();
}
+void HostPairingScreen::OnMultipleLicensesAvailable(
+ const EnrollmentLicenseMap& licenses) {
+ LOG(ERROR) << "Host-paired enrollment is not yet compatible "
+ << "with Mixed Licenses Enrollment Flow";
+ enrollment_error_string_ = view_->GetErrorStringFromOtherError(
+ EnterpriseEnrollmentHelper::OTHER_ERROR_FATAL);
achuithb 2017/07/31 21:03:23 Could we add a more specific error here?
Denis Kuznetsov (DE-MUC) 2017/08/01 10:50:54 Well, we have logged detailed explanation above. A
+ enrollment_error_code_ = GetEnrollmentErrorCode(
+ HostPairingController::ErrorCode::OTHER_ERROR,
+ static_cast<int>(EnterpriseEnrollmentHelper::OTHER_ERROR_FATAL));
+ OnAnyEnrollmentError();
+}
+
void HostPairingScreen::OnEnrollmentError(policy::EnrollmentStatus status) {
enrollment_error_string_ = view_->GetErrorStringFromEnrollmentError(status);
enrollment_error_code_ =

Powered by Google App Engine
This is Rietveld 408576698