| Index: chrome/browser/chromeos/login/existing_user_controller.h
|
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
|
| index 73e5f0db2d94cfb3e2dbc6a4f784aa0c62732848..dd82d473964a8127f09f0b9112adf3e8ffe3ec2e 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller.h
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller.h
|
| @@ -63,6 +63,12 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| // Tells the controller to resume a pending login.
|
| void ResumeLogin();
|
|
|
| + // Start the public account auto-login timer.
|
| + void StartAutoLoginTimer();
|
| +
|
| + // Stop the public account auto-login timer when a login attempt begins.
|
| + void StopAutoLoginTimer();
|
| +
|
| // LoginDisplay::Delegate: implementation
|
| virtual void CancelPasswordChangedFlow() OVERRIDE;
|
| virtual void CreateAccount() OVERRIDE;
|
| @@ -77,6 +83,7 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| virtual void LoginAsRetailModeUser() OVERRIDE;
|
| virtual void LoginAsGuest() OVERRIDE;
|
| virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
|
| + virtual void OnSigninScreenReady() OVERRIDE;
|
| virtual void OnUserSelected(const std::string& username) OVERRIDE;
|
| virtual void OnStartEnterpriseEnrollment() OVERRIDE;
|
| virtual void OnStartDeviceReset() OVERRIDE;
|
| @@ -194,6 +201,9 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| // Updates the |login_display_| attached to this controller.
|
| void UpdateLoginDisplay(const UserList& users);
|
|
|
| + // Public account auto-login timer.
|
| + base::OneShotTimer<ExistingUserController> auto_login_timer_;
|
| +
|
| // Used to execute login operations.
|
| scoped_ptr<LoginPerformer> login_performer_;
|
|
|
| @@ -257,6 +267,9 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| // session.
|
| bool do_auto_enrollment_;
|
|
|
| + // Whether the sign-in UI is finished loading.
|
| + bool signin_screen_ready_;
|
| +
|
| // The username used for auto-enrollment, if it was triggered.
|
| std::string auto_enrollment_username_;
|
|
|
|
|