chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc - Issue 890293002: Fixing crash upon window manager creation

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 890293002: Fixing crash upon window manager creation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed Created 5 years, 11 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:

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 a1e33623948441cc3ed240f42a3a36422be95cca..497ebe47cc6053192409ddf8c55a4e6fb528b66a 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

@@ -42,11 +42,13 @@ MultiUserWindowManager* MultiUserWindowManager::CreateInstance() {

ash::MultiProfileUMA::SESSION_SINGLE_USER_MODE;

if (!g_instance &&

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

- g_instance =

+ MultiUserWindowManagerChromeOS* manager =

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

->session_state_delegate()

->GetUserInfo(0)

->GetUserID());

+ g_instance = manager;

+ manager->Init();

multi_user_mode_ = MULTI_PROFILE_MODE_SEPARATED;

mode = ash::MultiProfileUMA::SESSION_SEPARATE_DESKTOP_MODE;

} else if (ash::Shell::GetInstance()->delegate()->IsMultiProfilesEnabled()) {