Added login screen mode for adding users into session.

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

 // Copyright (c) 2012 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/system/ash_system_tray_delegate.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 41 matching lines @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user.h"
+#include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/options/network_connect.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/chromeos/status/data_promo_notification.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
 #include "chrome/browser/google/google_util.h"
@@ skipping 506 matching lines @@
     }
 
     // TODO(nkostylev): Show some UI messages why no more users could be added
     // to this session. http://crbug.com/230863
     // We limit list of logged in users to 3 due to memory constraints.
     // TODO(nkostylev): Adjust this limitation based on device capabilites.
     // http://crbug.com/230865
     if (UserManager::Get()->GetLoggedInUsers().size() >= 3)
       return;
 
-    // Check whether there're regular users on the list that are not
-    // currently logged in.
-    const UserList& users = UserManager::Get()->GetUsers();
-    bool has_regular_not_logged_in_users = false;
-    for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
-      const User* user = (*it);
-      if (user->GetType() == User::USER_TYPE_REGULAR &&
-          !user->is_logged_in()) {
-        has_regular_not_logged_in_users = true;
-        break;
-      }
-    }
-
     // Launch sign in screen to add another user to current session.
-    if (has_regular_not_logged_in_users) {
-      ash::Shell::GetInstance()->
-          desktop_background_controller()->MoveDesktopToLockedContainer();
-      ShowLoginWizard(std::string());
-    }
+    if (UserManager::Get()->GetUsersAdmittedForMultiProfile().size())
+      UserAddingScreen::Get()->Start();
   }
 
   virtual void ShutDown() OVERRIDE {
     ash::Shell::GetInstance()->session_state_controller()->RequestShutdown();
   }
 
   virtual void SignOut() OVERRIDE {
     chrome::AttemptUserExit();
   }
 
@@ skipping 723 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos