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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_
 
 #include <string>
 #include <vector>
 
 #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"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/user_activity_observer.h"
 
 namespace chromeos {
 // WebUI-based login UI implementation.
 class WebUILoginDisplay : public LoginDisplay,
@@ skipping 21 matching lines @@
   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;
 
   // 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;
   virtual void ShowWrongHWIDScreen() OVERRIDE;
   virtual void SetWebUIHandler(
       LoginDisplayWebUIHandler* webui_handler) OVERRIDE;
   virtual void ShowSigninScreenForCreds(const std::string& username,
                                         const std::string& password);
   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,
       ScreenlockBridge::LockHandler::AuthType auth_type) OVERRIDE;
   virtual ScreenlockBridge::LockHandler::AuthType GetAuthType(
       const std::string& username) const OVERRIDE;
 
   // wm::UserActivityDetector implementation:
   virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
 
@@ skipping 14 matching lines @@
 
   scoped_ptr<GaiaScreen> gaia_screen_;
   scoped_ptr<UserSelectionScreen> user_selection_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUILoginDisplay);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_