Updating user count before unmapping user pod windows.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2010 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 338 matching lines @@
   delete_scheduled_instance_ = this;
   delete_timer_.Start(base::TimeDelta::FromSeconds(1), this,
                       &ExistingUserController::Delete);
 }
 
 void ExistingUserController::RemoveUser(UserController* source) {
   ClearErrors();
 
   UserManager::Get()->RemoveUser(source->user().email());
 
-  // We need to unmap entry windows, the windows will be unmapped in destructor.
   controllers_.erase(controllers_.begin() + source->user_index());
-  delete source;
 
   EnableTooltipsIfNeeded(controllers_);
+
+  // Update user count before unmapping windows, otherwise window manager won't
+  // be in the right state.
   int new_size = static_cast<int>(controllers_.size());
   for (int i = 0; i < new_size; ++i)
     controllers_[i]->UpdateUserCount(i, new_size);
+
+  // We need to unmap entry windows, the windows will be unmapped in destructor.
+  delete source;
 }
 
 void ExistingUserController::SelectUser(int index) {
   if (index >= 0 && index < static_cast<int>(controllers_.size()) &&
       index != static_cast<int>(selected_view_index_)) {
     WmIpc::Message message(WM_IPC_MESSAGE_WM_SELECT_LOGIN_USER);
     message.set_param(0, index);
     WmIpc::instance()->SendMessage(message);
   }
 }
@@ skipping 188 matching lines @@
 void ExistingUserController::ResyncEncryptedData() {
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(authenticator_.get(),
                         &Authenticator::ResyncEncryptedData,
                         cached_credentials_));
   cached_credentials_ = GaiaAuthConsumer::ClientLoginResult();
 }
 
 }  // namespace chromeos