chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc - Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

index ee399f8d9b1137ad97abe04ce62133555025a978..ea34fc03f23e028169e622b53f4c3cf99f5c1a76 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

@@ -6,6 +6,7 @@

#include "ash/common/ash_switches.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 "ash/shell_delegate.h"

@@ -41,8 +42,8 @@ MultiUserWindowManager* MultiUserWindowManager::CreateInstance() {

if (!g_instance &&

ash::Shell::GetInstance()->delegate()->IsMultiProfilesEnabled()) {

MultiUserWindowManagerChromeOS* manager =

- new MultiUserWindowManagerChromeOS(ash::Shell::GetInstance()

- ->session_state_delegate()

+ new MultiUserWindowManagerChromeOS(ash::WmShell::Get()

+ ->GetSessionStateDelegate()

->GetUserInfo(0)

->GetAccountId());

g_instance = manager;