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

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"
@@ skipping 28 matching lines @@
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
 }
 
 // LoginDisplay implementation: ------------------------------------------------
 
 WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate)
     : LoginDisplay(delegate, gfx::Rect()),
       show_guest_(false),
       show_new_user_(false),
-      webui_handler_(NULL),
-      gaia_screen_(new GaiaScreen()),
-      user_selection_screen_(new UserSelectionScreen()) {
+      webui_handler_(NULL) {
 }
 
 void WebUILoginDisplay::ClearAndEnablePassword() {
   if (webui_handler_)
       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);
+  users_ = users;
   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
-
-const UserList& WebUILoginDisplay::GetUsers() const {
-  return user_selection_screen_->GetUsers();
-}
-
-// ---- Gaia screen methods
-
-// ---- Not yet classified methods
-
 void WebUILoginDisplay::OnPreferencesChanged() {
   if (webui_handler_)
     webui_handler_->OnPreferencesChanged();
 }
 
+void WebUILoginDisplay::OnBeforeUserRemoved(const std::string& username) {
+  for (UserList::iterator it = users_.begin(); it != users_.end(); ++it) {
+    if ((*it)->email() == username) {
+      users_.erase(it);
+      break;
+    }
+  }
+}
+
+void WebUILoginDisplay::OnUserImageChanged(const User& user) {
+  if (webui_handler_)
+    webui_handler_->OnUserImageChanged(user);
+}
+
+void WebUILoginDisplay::OnUserRemoved(const std::string& username) {
+  if (webui_handler_)
+    webui_handler_->OnUserRemoved(username);
+}
+
+void WebUILoginDisplay::OnFadeOut() {
+}
+
+void WebUILoginDisplay::OnLoginSuccess(const std::string& username) {
+  if (webui_handler_)
+    webui_handler_->OnLoginSuccess(username);
+}
+
 void WebUILoginDisplay::SetUIEnabled(bool is_enabled) {
   // TODO(nkostylev): Cleanup this condition,
   // see http://crbug.com/157885 and http://crbug.com/158255.
   // Allow this call only before user sign in or at lock screen.
   // If this call is made after new user signs in but login screen is still
   // around that would trigger a sign in extension refresh.
-  if (is_enabled && (!UserManager::Get()->IsUserLoggedIn() ||
-                     ScreenLocker::default_screen_locker())) {
+  if (is_enabled &&
+      (!UserManager::Get()->IsUserLoggedIn() ||
+       ScreenLocker::default_screen_locker())) {
     ClearAndEnablePassword();
   }
 
   if (chromeos::LoginDisplayHost* host =
           chromeos::LoginDisplayHostImpl::default_host()) {
     if (chromeos::WebUILoginView* login_view = host->GetWebUILoginView())
       login_view->SetUIEnabled(is_enabled);
   }
 }
 
+void WebUILoginDisplay::SelectPod(int index) {
+}
+
 void WebUILoginDisplay::ShowError(int error_msg_id,
                                   int login_attempts,
                                   HelpAppLauncher::HelpTopic help_topic_id) {
   VLOG(1) << "Show error, error_id: " << error_msg_id
           << ", attempts:" << login_attempts
           <<  ", help_topic_id: " << help_topic_id;
   if (!webui_handler_)
     return;
 
   std::string error_text;
@@ skipping 176 matching lines @@
 }
 
 void WebUILoginDisplay::ShowWrongHWIDScreen() {
   if (delegate_)
     delegate_->ShowWrongHWIDScreen();
 }
 
 void WebUILoginDisplay::SetWebUIHandler(
     LoginDisplayWebUIHandler* webui_handler) {
   webui_handler_ = webui_handler;
-  gaia_screen_->SetHandler(webui_handler_);
-  user_selection_screen_->SetHandler(webui_handler_);
 }
 
 void WebUILoginDisplay::ShowSigninScreenForCreds(
     const std::string& username,
     const std::string& password) {
   if (webui_handler_)
     webui_handler_->ShowSigninScreenForCreds(username, password);
 }
 
+const UserList& WebUILoginDisplay::GetUsers() const {
+  return users_;
+}
+
 bool WebUILoginDisplay::IsShowGuest() const {
   return show_guest_;
 }
 
 bool WebUILoginDisplay::IsShowUsers() const {
   return show_users_;
 }
 
 bool WebUILoginDisplay::IsShowNewUser() const {
   return show_new_user_;
@@ skipping 35 matching lines @@
       base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec), this,
       &WebUILoginDisplay::OnPasswordClearTimerExpired);
 }
 
 void WebUILoginDisplay::OnPasswordClearTimerExpired() {
   if (webui_handler_)
     webui_handler_->ClearUserPodPassword();
 }
 
 }  // namespace chromeos