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

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

 // 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.
 
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
 
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chromeos/ime/ime_keyboard.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/user_activity_detector.h"
 
 namespace chromeos {
 
-namespace {
-
-const int kPasswordClearTimeoutSec = 60;
-
-}
-
 // WebUILoginDisplay, public: --------------------------------------------------
 
 WebUILoginDisplay::~WebUILoginDisplay() {
   if (webui_handler_)
     webui_handler_->ResetSigninScreenHandlerDelegate();
   wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
       user_activity_detector();
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
 }
@@ skipping 14 matching lines @@
       webui_handler_->ClearAndEnablePassword();
 }
 
 void WebUILoginDisplay::Init(const UserList& users,
                              bool show_guest,
                              bool show_users,
                              bool show_new_user) {
   // 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;
 
   wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()->
       user_activity_detector();
   if (!activity_detector->HasObserver(this))
     activity_detector->AddObserver(this);
 }
 
 // ---- Common methods
 
 // ---- User selection screen methods
 
 void WebUILoginDisplay::OnBeforeUserRemoved(const std::string& username) {
   user_selection_screen_->OnBeforeUserRemoved(username);
 }
 
 void WebUILoginDisplay::OnUserRemoved(const std::string& username) {
   user_selection_screen_->OnUserRemoved(username);
 }
 
 void WebUILoginDisplay::OnUserImageChanged(const User& user) {
   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
 
 void WebUILoginDisplay::OnPreferencesChanged() {
   if (webui_handler_)
     webui_handler_->OnPreferencesChanged();
 }
 
 void WebUILoginDisplay::SetUIEnabled(bool is_enabled) {
@@ skipping 217 matching lines @@
 }
 
 bool WebUILoginDisplay::IsShowGuest() const {
   return show_guest_;
 }
 
 bool WebUILoginDisplay::IsShowUsers() const {
   return show_users_;
 }
 
-bool WebUILoginDisplay::IsShowNewUser() const {
-  return show_new_user_;
-}
-
 bool WebUILoginDisplay::IsSigninInProgress() const {
   return delegate_->IsSigninInProgress();
 }
 
 bool WebUILoginDisplay::IsUserSigninCompleted() const {
   return is_signin_completed();
 }
 
 void WebUILoginDisplay::SetDisplayEmail(const std::string& email) {
   if (delegate_)
     delegate_->SetDisplayEmail(email);
 }
 
 void WebUILoginDisplay::Signout() {
   delegate_->Signout();
 }
 
 void WebUILoginDisplay::LoginAsKioskApp(const std::string& app_id,
                                         bool diagnostic_mode) {
   delegate_->LoginAsKioskApp(app_id, diagnostic_mode);
 }
 
 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