Chromium Code Reviews| 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 4753d7db28f2c0cec80c7b72d710cd40f42af2bd..5c03fbcef06e5dd1359db41356c09e6f37b45e76 100644 |
| --- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h |
| +++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h |
| @@ -83,6 +83,10 @@ class EnrollmentScreen |
| private: |
| FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestSuccess); |
| + FRIEND_TEST_ALL_PREFIXES(AttestationAuthEnrollmentScreenTest, TestCancel); |
| + FRIEND_TEST_ALL_PREFIXES(ForcedAttestationAuthEnrollmentScreenTest, |
| + TestCancel); |
| + FRIEND_TEST_ALL_PREFIXES(MultiAuthEnrollmentScreenTest, TestCancel); |
| FRIEND_TEST_ALL_PREFIXES(EnterpriseEnrollmentTest, |
| TestProperPageGetsLoadedOnEnrollmentSuccess); |
| FRIEND_TEST_ALL_PREFIXES(EnterpriseEnrollmentTest, |
| @@ -90,7 +94,16 @@ class EnrollmentScreen |
| FRIEND_TEST_ALL_PREFIXES(EnterpriseEnrollmentTest, |
| TestAuthCodeGetsProperlyReceivedFromGaia); |
| - // Creates an enrollment helper. |
| + // The authentication mechanisms that this class can use. |
| + enum Auth { |
| + AUTH_ATTESTATION, |
| + AUTH_OAUTH, |
| + }; |
| + |
| + // Sets the current config to use for enrollment. |
| + void SetConfig(); |
| + |
| + // Creates an enrollment helper if needed. |
| void CreateEnrollmentHelper(); |
| // Clears auth in |enrollment_helper_|. Deletes |enrollment_helper_| and runs |
| @@ -112,6 +125,12 @@ class EnrollmentScreen |
| // |enrollment_mode_|. |
| void UMA(policy::MetricEnrollment sample); |
| + // Do attestation based enrollment. |
| + void AuthenticateUsingAttestation(); |
| + |
| + // Shows the interactive screen. Resets auth then shows the signin screen. |
| + void ShowInteractiveScreen(); |
| + |
| // Shows the signin screen. Used as a callback to run after auth reset. |
| void ShowSigninScreen(); |
| @@ -119,12 +138,19 @@ class EnrollmentScreen |
| // Used as a callback to run after successful enrollment. |
| void ShowAttributePromptScreen(); |
| + // Handle enrollment errors. |
| void OnAnyEnrollmentError(); |
| + // Advance to the next authentication mechanism if possible. |
| + bool AdvanceToNextAuth(); |
| + |
| pairing_chromeos::ControllerPairingController* shark_controller_; |
| EnrollmentScreenActor* actor_; |
|
achuithb
2016/08/23 18:16:44
These should be initialized here.
https://groups.g
The one and only Dr. Crash
2016/08/23 21:24:18
Done.
|
| + policy::EnrollmentConfig config_; |
| policy::EnrollmentConfig enrollment_config_; |
| + Auth current_auth_; |
| + Auth last_auth_; |
| bool enrollment_failed_once_; |
| std::string enrolling_user_domain_; |
| std::unique_ptr<base::ElapsedTimer> elapsed_timer_; |