Revert 275046 "ChromeOS login webui refactoring: split user sele..."

trunk/src/chrome/browser/chromeos/login/screens/user_selection_screen.h

Index: trunk/src/chrome/browser/chromeos/login/screens/user_selection_screen.h
===================================================================
--- trunk/src/chrome/browser/chromeos/login/screens/user_selection_screen.h	(revision 275549)
+++ trunk/src/chrome/browser/chromeos/login/screens/user_selection_screen.h	(working copy)
@@ -5,74 +5,36 @@
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
 
-#include <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
-#include "base/timer/timer.h"
-#include "base/values.h"
 #include "chrome/browser/chromeos/login/users/user.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
-#include "ui/wm/core/user_activity_observer.h"
 
 namespace chromeos {
 
 class LoginDisplayWebUIHandler;
 
 // This class represents User Selection screen: user pod-based login screen.
-class UserSelectionScreen : public wm::UserActivityObserver {
+class UserSelectionScreen {
  public:
   UserSelectionScreen();
   virtual ~UserSelectionScreen();
 
   void SetHandler(LoginDisplayWebUIHandler* handler);
 
-  void Init(const UserList& users, bool show_guest);
+  void Init(const UserList& users);
   const UserList& GetUsers() const;
   void OnUserImageChanged(const User& user);
   void OnBeforeUserRemoved(const std::string& username);
   void OnUserRemoved(const std::string& username);
 
-  void OnPasswordClearTimerExpired();
-  void SendUserList(bool animated);
-  void HandleGetUsers();
-  void SetAuthType(const std::string& username,
-                   ScreenlockBridge::LockHandler::AuthType auth_type);
-  ScreenlockBridge::LockHandler::AuthType GetAuthType(
-      const std::string& username) const;
-
-  // wm::UserActivityDetector implementation:
-  virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
-
-  // Fills |user_dict| with information about |user|.
-  static void FillUserDictionary(
-      User* user,
-      bool is_owner,
-      bool is_signin_to_add,
-      ScreenlockBridge::LockHandler::AuthType auth_type,
-      base::DictionaryValue* user_dict);
-
-  // Determines if user auth status requires online sign in.
-  static bool ShouldForceOnlineSignIn(const User* user);
-
  private:
   LoginDisplayWebUIHandler* handler_;
 
   // Set of Users that are visible.
   UserList users_;
 
-  // Whether to show guest login.
-  bool show_guest_;
-
-  // Map of usernames to their current authentication type. If a user is not
-  // contained in the map, it is using the default authentication type.
-  std::map<std::string, ScreenlockBridge::LockHandler::AuthType>
-      user_auth_type_map_;
-
-  // Timer for measuring idle state duration before password clear.
-  base::OneShotTimer<UserSelectionScreen> password_clear_timer_;
-
   DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
 };