Clean up SessionStateDelegate in chrome

chrome/browser/ui/ash/session_controller_client.cc

 // Copyright 2016 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/ui/ash/session_controller_client.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/public/cpp/session_types.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/multi_user/user_switch_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/theme_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/service_names.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using session_manager::SessionManager;
 using user_manager::UserManager;
 using user_manager::User;
 using user_manager::UserList;
 
 namespace {
 
-// Limits the number of logged in users to 10 due to memory constraints.
-constexpr uint32_t kMaxUsers = 10;
-
 SessionControllerClient* g_instance = nullptr;
 
 uint32_t GetSessionId(const User* user) {
   const UserList logged_in_users = UserManager::Get()->GetLoggedInUsers();
   // TODO(xiyuan): Update with real session id when user session tracking
   //     code is moved from UserManager to SessionManager.
   for (size_t i = 0; i < logged_in_users.size(); ++i) {
     if (logged_in_users[i] == user)
       return i + 1;
   }
@@ skipping 24 matching lines @@
   return session;
 }
 
 void DoSwitchUser(const AccountId& account_id) {
   UserManager::Get()->SwitchActiveUser(account_id);
 }
 
 }  // namespace
 
 SessionControllerClient::SessionControllerClient() : binding_(this) {
-  session_manager::SessionManager::Get()->AddObserver(this);
+  SessionManager::Get()->AddObserver(this);
   UserManager::Get()->AddSessionStateObserver(this);
 
   ConnectToSessionControllerAndSetClient();
   SendSessionInfoIfChanged();
   // User sessions and their order will be sent via UserSessionStateObserver
   // even for crash-n-restart.
 
   DCHECK(!g_instance);
   g_instance = this;
 }
 
 SessionControllerClient::~SessionControllerClient() {
   DCHECK_EQ(this, g_instance);
   g_instance = nullptr;
 
-  session_manager::SessionManager::Get()->RemoveObserver(this);
+  SessionManager::Get()->RemoveObserver(this);
   UserManager::Get()->RemoveSessionStateObserver(this);
 }
 
 void SessionControllerClient::RequestLockScreen() {
   DoLockScreen();
 }
 
 void SessionControllerClient::SwitchActiveUser(
     const std::string& serialized_account_id) {
   // TODO(xiyuan): Add type map for AccountId.
@@ skipping 53 matching lines @@
 ash::AddUserSessionPolicy SessionControllerClient::GetAddUserSessionPolicy() {
   UserManager* const user_manager = UserManager::Get();
   if (user_manager->GetUsersAllowedForMultiProfile().empty())
     return ash::AddUserSessionPolicy::ERROR_NO_ELIGIBLE_USERS;
 
   if (chromeos::MultiProfileUserController::GetPrimaryUserPolicy() !=
       chromeos::MultiProfileUserController::ALLOWED) {
     return ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER;
   }
 
-  if (UserManager::Get()->GetLoggedInUsers().size() >= kMaxUsers)
+  if (UserManager::Get()->GetLoggedInUsers().size() >=
+      SessionManager::Get()->GetMaximumNumberOfUserSessions())
     return ash::AddUserSessionPolicy::ERROR_MAXIMUM_USERS_REACHED;
 
   return ash::AddUserSessionPolicy::ALLOWED;
 }
 
 // static
 void SessionControllerClient::DoLockScreen() {
   if (!CanLockScreen())
     return;
 
@@ skipping 62 matching lines @@
 void SessionControllerClient::ConnectToSessionControllerAndSetClient() {
   content::ServiceManagerConnection::GetForProcess()
       ->GetConnector()
       ->BindInterface(ash_util::GetAshServiceName(), &session_controller_);
 
   // Set as |session_controller_|'s client.
   session_controller_->SetClient(binding_.CreateInterfacePtrAndBind());
 }
 
 void SessionControllerClient::SendSessionInfoIfChanged() {
+  SessionManager* const session_manager = SessionManager::Get();
+
   ash::mojom::SessionInfoPtr info = ash::mojom::SessionInfo::New();
-  info->max_users = kMaxUsers;
+  info->max_users = session_manager->GetMaximumNumberOfUserSessions();
   info->can_lock_screen = CanLockScreen();
   info->should_lock_screen_automatically = ShouldLockScreenAutomatically();
   info->add_user_session_policy = GetAddUserSessionPolicy();
-  info->state = session_manager::SessionManager::Get()->session_state();
+  info->state = session_manager->session_state();
 
   if (info != last_sent_session_info_) {
     last_sent_session_info_ = info->Clone();
     session_controller_->SetSessionInfo(std::move(info));
   }
 }
 
 void SessionControllerClient::SendUserSession(const User& user) {
   session_controller_->UpdateUserSession(UserToUserSession(user));
 }
 
 void SessionControllerClient::SendUserSessionOrder() {
   UserManager* const user_manager = UserManager::Get();
 
   const UserList logged_in_users = user_manager->GetLoggedInUsers();
   std::vector<uint32_t> user_session_ids;
   for (auto* user : user_manager->GetLRULoggedInUsers())
     user_session_ids.push_back(GetSessionId(user));
 
   session_controller_->SetUserSessionOrder(user_session_ids);
 }