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

Unified Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen.h

Issue 2977033002: Mixed Licenses Enrollment (Closed)
Patch Set: Fix last nit Created 3 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enrollment/enrollment_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/enrollment/enrollment_screen.h
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
index ff3807a21fa38a65d065cdd5e93ac913ed35574d..2470117e231770e72cd7be373c8884bc78d07cd2 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
@@ -74,6 +74,8 @@ class EnrollmentScreen
// EnterpriseEnrollmentHelper::EnrollmentStatusConsumer implementation:
void OnAuthError(const GoogleServiceAuthError& error) override;
+ void OnMultipleLicensesAvailable(
+ const EnrollmentLicenseMap& licenses) override;
void OnEnrollmentError(policy::EnrollmentStatus status) override;
void OnOtherError(EnterpriseEnrollmentHelper::OtherError error) override;
void OnDeviceEnrolled(const std::string& additional_token) override;
@@ -87,8 +89,8 @@ class EnrollmentScreen
EnrollmentScreenView* GetView() { return view_; }
private:
- friend class EnrollmentScreenUnitTest;
- FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestSuccess);
+ friend class MultiLicenseEnrollmentScreenUnitTest;
+ friend class ZeroTouchEnrollmentScreenUnitTest;
FRIEND_TEST_ALL_PREFIXES(AttestationAuthEnrollmentScreenTest, TestCancel);
FRIEND_TEST_ALL_PREFIXES(ForcedAttestationAuthEnrollmentScreenTest,
TestCancel);
@@ -105,9 +107,12 @@ class EnrollmentScreen
TestActiveDirectoryEnrollment_UIErrors);
FRIEND_TEST_ALL_PREFIXES(HandsOffNetworkScreenTest, RequiresNoInput);
FRIEND_TEST_ALL_PREFIXES(HandsOffNetworkScreenTest, ContinueClickedOnlyOnce);
- FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenUnitTest, Retries);
- FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenUnitTest, DoesNotRetryOnTopOfUser);
- FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenUnitTest, DoesNotRetryAfterSuccess);
+ FRIEND_TEST_ALL_PREFIXES(ZeroTouchEnrollmentScreenUnitTest, Retries);
+ FRIEND_TEST_ALL_PREFIXES(ZeroTouchEnrollmentScreenUnitTest, TestSuccess);
+ FRIEND_TEST_ALL_PREFIXES(ZeroTouchEnrollmentScreenUnitTest,
+ DoesNotRetryOnTopOfUser);
+ FRIEND_TEST_ALL_PREFIXES(ZeroTouchEnrollmentScreenUnitTest,
+ DoesNotRetryAfterSuccess);
// The authentication mechanisms that this class can use.
enum Auth {
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enrollment/enrollment_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698