| Index: chrome/browser/chromeos/login/ui/webui_login_display.h
|
| diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.h b/chrome/browser/chromeos/login/ui/webui_login_display.h
|
| index 4089aa7657420c5128912406382ea5d891f7f0ef..9ee4d5d13d55a71d7f457e5bc3809ffd3c4b40f5 100644
|
| --- a/chrome/browser/chromeos/login/ui/webui_login_display.h
|
| +++ b/chrome/browser/chromeos/login/ui/webui_login_display.h
|
| @@ -26,63 +26,62 @@ class WebUILoginDisplay : public LoginDisplay,
|
| public ui::UserActivityObserver {
|
| public:
|
| explicit WebUILoginDisplay(LoginDisplay::Delegate* delegate);
|
| - virtual ~WebUILoginDisplay();
|
| + ~WebUILoginDisplay() override;
|
|
|
| // LoginDisplay implementation:
|
| - virtual void ClearAndEnablePassword() override;
|
| - virtual void Init(const user_manager::UserList& users,
|
| - bool show_guest,
|
| - bool show_users,
|
| - bool show_new_user) override;
|
| - virtual void OnPreferencesChanged() override;
|
| - virtual void RemoveUser(const std::string& user_id) override;
|
| - virtual void SetUIEnabled(bool is_enabled) override;
|
| - virtual void ShowError(int error_msg_id,
|
| - int login_attempts,
|
| - HelpAppLauncher::HelpTopic help_topic_id) override;
|
| - virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) override;
|
| - virtual void ShowGaiaPasswordChanged(const std::string& username) override;
|
| - virtual void ShowPasswordChangedDialog(bool show_password_error) override;
|
| - virtual void ShowSigninUI(const std::string& email) override;
|
| + void ClearAndEnablePassword() override;
|
| + void Init(const user_manager::UserList& users,
|
| + bool show_guest,
|
| + bool show_users,
|
| + bool show_new_user) override;
|
| + void OnPreferencesChanged() override;
|
| + void RemoveUser(const std::string& user_id) override;
|
| + void SetUIEnabled(bool is_enabled) override;
|
| + void ShowError(int error_msg_id,
|
| + int login_attempts,
|
| + HelpAppLauncher::HelpTopic help_topic_id) override;
|
| + void ShowErrorScreen(LoginDisplay::SigninError error_id) override;
|
| + void ShowGaiaPasswordChanged(const std::string& username) override;
|
| + void ShowPasswordChangedDialog(bool show_password_error) override;
|
| + void ShowSigninUI(const std::string& email) override;
|
|
|
| // NativeWindowDelegate implementation:
|
| - virtual gfx::NativeWindow GetNativeWindow() const override;
|
| + gfx::NativeWindow GetNativeWindow() const override;
|
|
|
| // SigninScreenHandlerDelegate implementation:
|
| - virtual void CancelPasswordChangedFlow() override;
|
| - virtual void ResyncUserData() override;
|
| - virtual void MigrateUserData(const std::string& old_password) override;
|
| -
|
| - virtual void Login(const UserContext& user_context,
|
| - const SigninSpecifics& specifics) override;
|
| - virtual bool IsSigninInProgress() const override;
|
| - virtual void Signout() override;
|
| - virtual void CreateAccount() override;
|
| - virtual void CompleteLogin(const UserContext& user_context) override;
|
| -
|
| - virtual void OnSigninScreenReady() override;
|
| - virtual void CancelUserAdding() override;
|
| - virtual void LoadWallpaper(const std::string& username) override;
|
| - virtual void LoadSigninWallpaper() override;
|
| - virtual void ShowEnterpriseEnrollmentScreen() override;
|
| - virtual void ShowEnableDebuggingScreen() override;
|
| - virtual void ShowKioskEnableScreen() override;
|
| - virtual void ShowKioskAutolaunchScreen() override;
|
| - virtual void ShowWrongHWIDScreen() override;
|
| - virtual void SetWebUIHandler(
|
| - LoginDisplayWebUIHandler* webui_handler) override;
|
| + void CancelPasswordChangedFlow() override;
|
| + void ResyncUserData() override;
|
| + void MigrateUserData(const std::string& old_password) override;
|
| +
|
| + void Login(const UserContext& user_context,
|
| + const SigninSpecifics& specifics) override;
|
| + bool IsSigninInProgress() const override;
|
| + void Signout() override;
|
| + void CreateAccount() override;
|
| + void CompleteLogin(const UserContext& user_context) override;
|
| +
|
| + void OnSigninScreenReady() override;
|
| + void CancelUserAdding() override;
|
| + void LoadWallpaper(const std::string& username) override;
|
| + void LoadSigninWallpaper() override;
|
| + void ShowEnterpriseEnrollmentScreen() override;
|
| + void ShowEnableDebuggingScreen() override;
|
| + void ShowKioskEnableScreen() override;
|
| + void ShowKioskAutolaunchScreen() override;
|
| + void ShowWrongHWIDScreen() override;
|
| + void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) override;
|
| virtual void ShowSigninScreenForCreds(const std::string& username,
|
| const std::string& password);
|
| - virtual bool IsShowGuest() const override;
|
| - virtual bool IsShowUsers() const override;
|
| - virtual bool IsUserSigninCompleted() const override;
|
| - virtual void SetDisplayEmail(const std::string& email) override;
|
| + bool IsShowGuest() const override;
|
| + bool IsShowUsers() const override;
|
| + bool IsUserSigninCompleted() const override;
|
| + void SetDisplayEmail(const std::string& email) override;
|
|
|
| - virtual void HandleGetUsers() override;
|
| - virtual const user_manager::UserList& GetUsers() const override;
|
| + void HandleGetUsers() override;
|
| + const user_manager::UserList& GetUsers() const override;
|
|
|
| // ui::UserActivityDetector implementation:
|
| - virtual void OnUserActivity(const ui::Event* event) override;
|
| + void OnUserActivity(const ui::Event* event) override;
|
|
|
| private:
|
|
|
|
|