Revert 275492 "ChromeOS login webui refactoring : Simplify login..."

trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.h

Index: trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.h
===================================================================
--- trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.h	(revision 275547)
+++ trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.h	(working copy)
@@ -11,7 +11,6 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/screens/gaia_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
-#include "chrome/browser/chromeos/login/signin_specifics.h"
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
@@ -53,21 +52,19 @@
 
   // 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 CancelUserAdding() OVERRIDE;
   virtual void CreateAccount() OVERRIDE;
   virtual void CompleteLogin(const UserContext& user_context) OVERRIDE;
-
-  virtual void OnSigninScreenReady() OVERRIDE;
-  virtual void CancelUserAdding() OVERRIDE;
+  virtual void Login(const UserContext& user_context) OVERRIDE;
+  virtual void LoginAsRetailModeUser() OVERRIDE;
+  virtual void LoginAsGuest() OVERRIDE;
+  virtual void MigrateUserData(const std::string& old_password) OVERRIDE;
+  virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
   virtual void LoadWallpaper(const std::string& username) OVERRIDE;
   virtual void LoadSigninWallpaper() OVERRIDE;
+  virtual void OnSigninScreenReady() OVERRIDE;
   virtual void RemoveUser(const std::string& username) OVERRIDE;
+  virtual void ResyncUserData() OVERRIDE;
   virtual void ShowEnterpriseEnrollmentScreen() OVERRIDE;
   virtual void ShowKioskEnableScreen() OVERRIDE;
   virtual void ShowKioskAutolaunchScreen() OVERRIDE;
@@ -79,8 +76,12 @@
   virtual const UserList& GetUsers() const OVERRIDE;
   virtual bool IsShowGuest() const OVERRIDE;
   virtual bool IsShowUsers() const OVERRIDE;
+  virtual bool IsSigninInProgress() const OVERRIDE;
   virtual bool IsUserSigninCompleted() const OVERRIDE;
   virtual void SetDisplayEmail(const std::string& email) OVERRIDE;
+  virtual void Signout() OVERRIDE;
+  virtual void LoginAsKioskApp(const std::string& app_id,
+                               bool diagnostic_mode) OVERRIDE;
   virtual void HandleGetUsers() OVERRIDE;
   virtual void SetAuthType(
       const std::string& username,