Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Unified Diff: trunk/src/chrome/browser/chromeos/login/existing_user_controller.h

Issue 319633005: Revert 275492 "ChromeOS login webui refactoring : Simplify login..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/chromeos/login/existing_user_controller.h
===================================================================
--- trunk/src/chrome/browser/chromeos/login/existing_user_controller.h (revision 275547)
+++ trunk/src/chrome/browser/chromeos/login/existing_user_controller.h (working copy)
@@ -81,10 +81,15 @@
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 Login(const UserContext& user_context) 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;
@@ -94,11 +99,6 @@
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,

Powered by Google App Engine
This is Rietveld 408576698