| Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
| diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.cc b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
| index 33700e4d8071c18e8329f57bc8663b92bab8389a..8c47ad8f45b9288f9d8963af3cbbd0c4600f1d98 100644
|
| --- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
| +++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
|
| @@ -19,13 +19,12 @@
|
| #include "ui/base/models/simple_menu_model.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| -#include "ash/common/session/session_state_delegate.h" // nogncheck
|
| -#include "ash/common/wm_shell.h" // nogncheck
|
| #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
|
| #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "components/signin/core/account_id/account_id.h"
|
| #include "components/user_manager/user_info.h"
|
| +#include "components/user_manager/user_manager.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #endif
|
|
|
| @@ -155,10 +154,10 @@ void SystemMenuModelBuilder::AppendTeleportMenu(ui::SimpleMenuModel* model) {
|
| return;
|
|
|
| // To show the menu we need at least two logged in users.
|
| - ash::SessionStateDelegate* delegate =
|
| - ash::WmShell::Get()->GetSessionStateDelegate();
|
| - int logged_in_users = delegate->NumberOfLoggedInUsers();
|
| - if (logged_in_users <= 1)
|
| + user_manager::UserManager* user_manager = user_manager::UserManager::Get();
|
| + const user_manager::UserList logged_in_users =
|
| + user_manager->GetLRULoggedInUsers();
|
| + if (logged_in_users.size() <= 1u)
|
| return;
|
|
|
| // If this does not belong to a profile or there is no window, or the window
|
| @@ -173,9 +172,10 @@ void SystemMenuModelBuilder::AppendTeleportMenu(ui::SimpleMenuModel* model) {
|
| return;
|
|
|
| model->AddSeparator(ui::NORMAL_SEPARATOR);
|
| - DCHECK(logged_in_users <= 3);
|
| - for (int user_index = 1; user_index < logged_in_users; ++user_index) {
|
| - const user_manager::UserInfo* user_info = delegate->GetUserInfo(user_index);
|
| + DCHECK_LE(logged_in_users.size(), 3u);
|
| + for (size_t user_index = 1; user_index < logged_in_users.size();
|
| + ++user_index) {
|
| + const user_manager::UserInfo* user_info = logged_in_users[user_index];
|
| model->AddItem(
|
| user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2
|
| : IDC_VISIT_DESKTOP_OF_LRU_USER_3,
|
|
|