| 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 bdcb0fd9aff080d2d940bdbf8017ff33e15404e4..81e0624451f1cd5cdd70ce1daee16b8901e6a289 100644
|
| --- a/chrome/browser/chromeos/login/ui/webui_login_display.h
|
| +++ b/chrome/browser/chromeos/login/ui/webui_login_display.h
|
| @@ -30,66 +30,66 @@ class WebUILoginDisplay : public LoginDisplay,
|
| virtual ~WebUILoginDisplay();
|
|
|
| // LoginDisplay implementation:
|
| - virtual void ClearAndEnablePassword() OVERRIDE;
|
| + 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 OnBeforeUserRemoved(const std::string& username) OVERRIDE;
|
| - virtual void OnUserImageChanged(const user_manager::User& user) OVERRIDE;
|
| - virtual void OnUserRemoved(const std::string& username) OVERRIDE;
|
| - virtual void SetUIEnabled(bool is_enabled) OVERRIDE;
|
| + bool show_new_user) override;
|
| + virtual void OnPreferencesChanged() override;
|
| + virtual void OnBeforeUserRemoved(const std::string& username) override;
|
| + virtual void OnUserImageChanged(const user_manager::User& user) override;
|
| + virtual void OnUserRemoved(const std::string& username) 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;
|
| + 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;
|
|
|
| // NativeWindowDelegate implementation:
|
| - virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
|
| + virtual 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 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 RemoveUser(const std::string& username) OVERRIDE;
|
| - virtual void ShowEnterpriseEnrollmentScreen() OVERRIDE;
|
| - virtual void ShowKioskEnableScreen() OVERRIDE;
|
| - virtual void ShowKioskAutolaunchScreen() OVERRIDE;
|
| - virtual void ShowWrongHWIDScreen() OVERRIDE;
|
| + 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 RemoveUser(const std::string& username) override;
|
| + virtual void ShowEnterpriseEnrollmentScreen() override;
|
| + virtual void ShowKioskEnableScreen() override;
|
| + virtual void ShowKioskAutolaunchScreen() override;
|
| + virtual void ShowWrongHWIDScreen() override;
|
| virtual void SetWebUIHandler(
|
| - LoginDisplayWebUIHandler* webui_handler) OVERRIDE;
|
| + LoginDisplayWebUIHandler* webui_handler) override;
|
| virtual void ShowSigninScreenForCreds(const std::string& username,
|
| const std::string& password);
|
| - virtual const user_manager::UserList& GetUsers() const OVERRIDE;
|
| - virtual bool IsShowGuest() const OVERRIDE;
|
| - virtual bool IsShowUsers() const OVERRIDE;
|
| - virtual bool IsUserSigninCompleted() const OVERRIDE;
|
| - virtual void SetDisplayEmail(const std::string& email) OVERRIDE;
|
| - virtual void HandleGetUsers() OVERRIDE;
|
| + virtual const user_manager::UserList& GetUsers() const override;
|
| + virtual bool IsShowGuest() const override;
|
| + virtual bool IsShowUsers() const override;
|
| + virtual bool IsUserSigninCompleted() const override;
|
| + virtual void SetDisplayEmail(const std::string& email) override;
|
| + virtual void HandleGetUsers() override;
|
| virtual void SetAuthType(
|
| const std::string& username,
|
| - ScreenlockBridge::LockHandler::AuthType auth_type) OVERRIDE;
|
| + ScreenlockBridge::LockHandler::AuthType auth_type) override;
|
| virtual ScreenlockBridge::LockHandler::AuthType GetAuthType(
|
| - const std::string& username) const OVERRIDE;
|
| + const std::string& username) const override;
|
|
|
| // wm::UserActivityDetector implementation:
|
| - virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
|
| + virtual void OnUserActivity(const ui::Event* event) override;
|
|
|
| private:
|
|
|
|
|