Revert 275550 "Revert 275046 "ChromeOS login webui refactoring: ..."

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

Index: trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.cc	(revision 275554)
+++ trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.cc	(working copy)
@@ -23,12 +23,6 @@
 
 namespace chromeos {
 
-namespace {
-
-const int kPasswordClearTimeoutSec = 60;
-
-}
-
 // WebUILoginDisplay, public: --------------------------------------------------
 
 WebUILoginDisplay::~WebUILoginDisplay() {
@@ -63,7 +57,7 @@
   // Testing that the delegate has been set.
   DCHECK(delegate_);
 
-  user_selection_screen_->Init(users);
+  user_selection_screen_->Init(users, show_guest);
   show_guest_ = show_guest;
   show_users_ = show_users;
   show_new_user_ = show_new_user;
@@ -90,12 +84,27 @@
   user_selection_screen_->OnUserImageChanged(user);
 }
 
-// User selection screen, screen lock API
+void WebUILoginDisplay::HandleGetUsers() {
+  user_selection_screen_->HandleGetUsers();
+}
 
 const UserList& WebUILoginDisplay::GetUsers() const {
   return user_selection_screen_->GetUsers();
 }
 
+// User selection screen, screen lock API
+
+void WebUILoginDisplay::SetAuthType(
+    const std::string& username,
+    ScreenlockBridge::LockHandler::AuthType auth_type) {
+  user_selection_screen_->SetAuthType(username, auth_type);
+}
+
+ScreenlockBridge::LockHandler::AuthType WebUILoginDisplay::GetAuthType(
+    const std::string& username) const {
+  return user_selection_screen_->GetAuthType(username);
+}
+
 // ---- Gaia screen methods
 
 // ---- Not yet classified methods
@@ -333,10 +342,6 @@
   return show_users_;
 }
 
-bool WebUILoginDisplay::IsShowNewUser() const {
-  return show_new_user_;
-}
-
 bool WebUILoginDisplay::IsSigninInProgress() const {
   return delegate_->IsSigninInProgress();
 }
@@ -360,23 +365,9 @@
 }
 
 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
-  if (!password_clear_timer_.IsRunning())
-    StartPasswordClearTimer();
-  password_clear_timer_.Reset();
   if (delegate_)
     delegate_->ResetPublicSessionAutoLoginTimer();
 }
 
-void WebUILoginDisplay::StartPasswordClearTimer() {
-  DCHECK(!password_clear_timer_.IsRunning());
-  password_clear_timer_.Start(FROM_HERE,
-      base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec), this,
-      &WebUILoginDisplay::OnPasswordClearTimerExpired);
-}
 
-void WebUILoginDisplay::OnPasswordClearTimerExpired() {
-  if (webui_handler_)
-    webui_handler_->ClearUserPodPassword();
-}
-
 }  // namespace chromeos