| 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 9be96f12cccda0ef52941a6311413f4ea6f3053c..963a077cf1dd350ea1944b7a7c1e176f94c74460 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller.h
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller.h
|
| @@ -81,15 +81,10 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| 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) OVERRIDE;
|
| + virtual void Login(const UserContext& user_context,
|
| + const SigninSpecifics& specifics) OVERRIDE;
|
| virtual void MigrateUserData(const std::string& old_password) OVERRIDE;
|
| - virtual void LoginAsRetailModeUser() OVERRIDE;
|
| - virtual void LoginAsGuest() OVERRIDE;
|
| - virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
|
| - virtual void LoginAsKioskApp(const std::string& app_id,
|
| - bool diagnostic_mode) OVERRIDE;
|
| virtual void OnSigninScreenReady() OVERRIDE;
|
| - virtual void OnUserSelected(const std::string& username) OVERRIDE;
|
| virtual void OnStartEnterpriseEnrollment() OVERRIDE;
|
| virtual void OnStartKioskEnableScreen() OVERRIDE;
|
| virtual void OnStartKioskAutolaunchScreen() OVERRIDE;
|
| @@ -99,6 +94,11 @@ class ExistingUserController : public LoginDisplay::Delegate,
|
| virtual void ShowWrongHWIDScreen() OVERRIDE;
|
| virtual void Signout() OVERRIDE;
|
|
|
| + virtual void LoginAsRetailModeUser();
|
| + virtual void LoginAsGuest();
|
| + virtual void LoginAsPublicAccount(const std::string& username);
|
| + virtual void LoginAsKioskApp(const std::string& app_id, bool diagnostic_mode);
|
| +
|
| // content::NotificationObserver implementation.
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
|
|