Revert of ChromeOS login webui refactoring: split user selection/gaia login screens.

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

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 e2efd2628d31a0f569c74e6ffcff5b2f08b62d85..552cfba39bae4938165c05eb611549b4f7d13790 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.h
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.h
@@ -10,8 +10,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/timer/timer.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/ui/login_display.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
@@ -39,7 +37,10 @@
   virtual void OnBeforeUserRemoved(const std::string& username) OVERRIDE;
   virtual void OnUserImageChanged(const User& user) OVERRIDE;
   virtual void OnUserRemoved(const std::string& username) OVERRIDE;
+  virtual void OnFadeOut() OVERRIDE;
+  virtual void OnLoginSuccess(const std::string& username) OVERRIDE;
   virtual void SetUIEnabled(bool is_enabled) OVERRIDE;
+  virtual void SelectPod(int index) OVERRIDE;
   virtual void ShowError(int error_msg_id,
                          int login_attempts,
                          HelpAppLauncher::HelpTopic help_topic_id) OVERRIDE;
@@ -93,6 +94,9 @@
   void StartPasswordClearTimer();
   void OnPasswordClearTimerExpired();
 
+  // Set of Users that are visible.
+  UserList users_;
+
   // Whether to show guest login.
   bool show_guest_;
 
@@ -109,9 +113,6 @@
   // Reference to the WebUI handling layer for the login screen
   LoginDisplayWebUIHandler* webui_handler_;
 
-  scoped_ptr<GaiaScreen> gaia_screen_;
-  scoped_ptr<UserSelectionScreen> user_selection_screen_;
-
   DISALLOW_COPY_AND_ASSIGN(WebUILoginDisplay);
 };