| 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 7815141b9719843440ab3833acafa6e045cf24d7..6db874699bef496458634fc55ab2406dfe8b8642 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller.h
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller.h
|
| @@ -55,7 +55,7 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| public:
|
| // All UI initialization is deferred till Init() call.
|
| explicit ExistingUserController(LoginDisplayHost* host);
|
| - virtual ~ExistingUserController();
|
| + ~ExistingUserController() override;
|
|
|
| // Returns the current existing user controller if it has been created.
|
| static ExistingUserController* current_controller() {
|
| @@ -72,29 +72,29 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| void StopPublicSessionAutoLoginTimer();
|
|
|
| // LoginDisplay::Delegate: implementation
|
| - virtual void CancelPasswordChangedFlow() override;
|
| - virtual void CreateAccount() override;
|
| - virtual void CompleteLogin(const UserContext& user_context) override;
|
| - virtual base::string16 GetConnectedNetworkName() override;
|
| - virtual bool IsSigninInProgress() const override;
|
| - virtual void Login(const UserContext& user_context,
|
| - const SigninSpecifics& specifics) override;
|
| - virtual void MigrateUserData(const std::string& old_password) override;
|
| - virtual void OnSigninScreenReady() override;
|
| - virtual void OnStartEnterpriseEnrollment() override;
|
| - virtual void OnStartEnableDebuggingScreen() override;
|
| - virtual void OnStartKioskEnableScreen() override;
|
| - virtual void OnStartKioskAutolaunchScreen() override;
|
| - virtual void ResetPublicSessionAutoLoginTimer() override;
|
| - virtual void ResyncUserData() override;
|
| - virtual void SetDisplayEmail(const std::string& email) override;
|
| - virtual void ShowWrongHWIDScreen() override;
|
| - virtual void Signout() override;
|
| + void CancelPasswordChangedFlow() override;
|
| + void CreateAccount() override;
|
| + void CompleteLogin(const UserContext& user_context) override;
|
| + base::string16 GetConnectedNetworkName() override;
|
| + bool IsSigninInProgress() const override;
|
| + void Login(const UserContext& user_context,
|
| + const SigninSpecifics& specifics) override;
|
| + void MigrateUserData(const std::string& old_password) override;
|
| + void OnSigninScreenReady() override;
|
| + void OnStartEnterpriseEnrollment() override;
|
| + void OnStartEnableDebuggingScreen() override;
|
| + void OnStartKioskEnableScreen() override;
|
| + void OnStartKioskAutolaunchScreen() override;
|
| + void ResetPublicSessionAutoLoginTimer() override;
|
| + void ResyncUserData() override;
|
| + void SetDisplayEmail(const std::string& email) override;
|
| + void ShowWrongHWIDScreen() override;
|
| + void Signout() override;
|
|
|
| // content::NotificationObserver implementation.
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| // Set a delegate that we will pass AuthStatusConsumer events to.
|
| // Used for testing.
|
| @@ -138,18 +138,16 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| void OnPublicSessionAutoLoginTimerFire();
|
|
|
| // LoginPerformer::Delegate implementation:
|
| - virtual void OnAuthFailure(const AuthFailure& error) override;
|
| - virtual void OnAuthSuccess(const UserContext& user_context) override;
|
| - virtual void OnOffTheRecordAuthSuccess() override;
|
| - virtual void OnPasswordChangeDetected() override;
|
| - virtual void WhiteListCheckFailed(const std::string& email) override;
|
| - virtual void PolicyLoadFailed() override;
|
| - virtual void OnOnlineChecked(
|
| - const std::string& username, bool success) override;
|
| + void OnAuthFailure(const AuthFailure& error) override;
|
| + void OnAuthSuccess(const UserContext& user_context) override;
|
| + void OnOffTheRecordAuthSuccess() override;
|
| + void OnPasswordChangeDetected() override;
|
| + void WhiteListCheckFailed(const std::string& email) override;
|
| + void PolicyLoadFailed() override;
|
| + void OnOnlineChecked(const std::string& username, bool success) override;
|
|
|
| // LoginUtils::Delegate implementation:
|
| - virtual void OnProfilePrepared(Profile* profile,
|
| - bool browser_launched) override;
|
| + void OnProfilePrepared(Profile* profile, bool browser_launched) override;
|
|
|
| // Called when device settings change.
|
| void DeviceSettingsChanged();
|
|
|