Removed old login screen from source.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2011 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/existing_user_controller.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 
@@ skipping 99 matching lines @@
     bool show_tooltip = controllers[i]->is_new_user() ||
                         controllers[i]->is_guest() ||
                         visible_display_names[display_name] > 1;
     controllers[i]->EnableNameTooltip(show_tooltip);
   }
 }
 
 }  // namespace
 
 ExistingUserController*
-  ExistingUserController::delete_scheduled_instance_ = NULL;
+  ExistingUserController::current_controller_ = NULL;
 
 // TODO(xiyuan): Wait for the cached settings update before using them.
 ExistingUserController::ExistingUserController(
     const std::vector<UserManager::User>& users,
     const gfx::Rect& background_bounds)
     : background_bounds_(background_bounds),
       background_window_(NULL),
       background_view_(NULL),
       selected_view_index_(kNotSelected),
       num_login_attempts_(0),
       bubble_(NULL),
       user_settings_(new UserCrosSettingsProvider),
       method_factory_(this) {
-  if (delete_scheduled_instance_)
-    delete_scheduled_instance_->Delete();
+  if (current_controller_)
+    current_controller_->Delete();
+  current_controller_ = this;
 
   // Calculate the max number of users from available screen size.
   bool show_guest = UserCrosSettingsProvider::cached_allow_guest();
   bool show_new_user = true;
   if (UserCrosSettingsProvider::cached_show_users_on_signin()) {
     size_t max_users = kMaxUsers;
     int screen_width = background_bounds.width();
     if (screen_width > 0) {
       size_t users_per_screen = (screen_width - login::kUserImageSize)
           / (UserController::kUnselectedSize + UserController::kPadding);
@@ skipping 94 matching lines @@
 ExistingUserController::~ExistingUserController() {
   ClearErrors();
 
   if (background_window_)
     background_window_->Close();
 
   WmMessageListener::GetInstance()->RemoveObserver(this);
 
   STLDeleteElements(&controllers_);
   STLDeleteElements(&invisible_controllers_);
+  DCHECK(current_controller_ != NULL);
+  current_controller_ = NULL;
 }
 
 void ExistingUserController::Delete() {
-  delete_scheduled_instance_ = NULL;
   delete this;
 }
 
 void ExistingUserController::ProcessWmMessage(const WmIpc::Message& message,
                                               GdkWindow* window) {
   if (message.type() != WM_IPC_MESSAGE_CHROME_CREATE_GUEST_WINDOW)
     return;
 
   ActivateWizard(std::string());
 }
@@ skipping 17 matching lines @@
     selected_view_index_ = i - controllers_.begin();
     num_login_attempts_ = 0;
   }
 
   // Disable clicking on other windows.
   SendSetLoginState(false);
 
   // Use the same LoginPerformer for subsequent login as it has state
   // such as CAPTCHA challenge token & corresponding user input.
   if (!login_performer_.get() || num_login_attempts_ <= 1) {
-    login_performer_.reset(new LoginPerformer(this));
+    LoginPerformer::Delegate* delegate = this;
+    if (login_performer_delegate_.get())
+      delegate = login_performer_delegate_.get();
+    login_performer_.reset(new LoginPerformer(delegate));
   }
   login_performer_->Login(controllers_[selected_view_index_]->user().email(),
                           UTF16ToUTF8(password));
 }
 
 void ExistingUserController::WhiteListCheckFailed(const std::string& email) {
   ShowError(IDS_LOGIN_ERROR_WHITELIST, email);
 
   // Reenable userview and use ClearAndEnablePassword to keep username on
   // screen with the error bubble.
@@ skipping 52 matching lines @@
   WizardController* controller = new WizardController();
 
   // Give the background window to the controller.
   controller->OwnBackground(background_window_, background_view_);
   background_window_ = NULL;
 
   controller->Init(screen_name, background_bounds_);
   controller->set_start_url(start_url_);
   controller->Show();
 
-  // And schedule us for deletion. We delay for a second as the window manager
-  // is doing an animation with our windows.
-  DCHECK(!delete_scheduled_instance_);
-  delete_scheduled_instance_ = this;
-
   delete_timer_.Start(base::TimeDelta::FromSeconds(1), this,
                       &ExistingUserController::Delete);
 }
 
 void ExistingUserController::RemoveUser(UserController* source) {
   ClearErrors();
 
   // Owner is not allowed to be removed from the device.
   // It must be enforced at upper levels.
   DCHECK(user_settings_->RequestTrustedOwner(NULL));
@@ skipping 279 matching lines @@
     login_performer_->RecoverEncryptedData(old_password);
 }
 
 void ExistingUserController::ResyncEncryptedData() {
   // LoginPerformer instance has state of the user so it should exist.
   if (login_performer_.get())
     login_performer_->ResyncEncryptedData();
 }
 
 }  // namespace chromeos