| Index: chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
|
| index 932c5046e868fba05fbae60d8136885805d7cd1c..3eb3a9f3a2c8a3871767420f7b12d871810c3946 100644
|
| --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
|
| @@ -5,8 +5,8 @@
|
| #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h"
|
|
|
| #include "ash/common/session/session_state_delegate.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/multi_profile_uma.h"
|
| -#include "ash/shell.h"
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| @@ -69,7 +69,7 @@ std::unique_ptr<ui::MenuModel> CreateMultiUserContextMenu(
|
| aura::Window* window) {
|
| std::unique_ptr<ui::MenuModel> model;
|
| ash::SessionStateDelegate* delegate =
|
| - ash::Shell::GetInstance()->session_state_delegate();
|
| + ash::WmShell::Get()->GetSessionStateDelegate();
|
| if (!delegate)
|
| return model;
|
|
|
| @@ -118,8 +118,8 @@ void ExecuteVisitDesktopCommand(int command_id, aura::Window* window) {
|
| // When running the multi user mode on Chrome OS, windows can "visit"
|
| // another user's desktop.
|
| const AccountId account_id =
|
| - ash::Shell::GetInstance()
|
| - ->session_state_delegate()
|
| + ash::WmShell::Get()
|
| + ->GetSessionStateDelegate()
|
| ->GetUserInfo(IDC_VISIT_DESKTOP_OF_LRU_USER_2 == command_id ? 1
|
| : 2)
|
| ->GetAccountId();
|
|
|