trunk/src/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc - Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

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: trunk/src/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 8 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: trunk/src/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

===================================================================

--- trunk/src/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc (revision 267249)

+++ trunk/src/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc (working copy)

@@ -10,8 +10,7 @@

#if defined(OS_CHROMEOS)

#include "ash/ash_switches.h"

#include "ash/multi_profile_uma.h"

-#include "ash/session/session_state_delegate.h"

-#include "ash/session/user_info.h"

+#include "ash/session_state_delegate.h"

#include "ash/shell.h"

#include "ash/shell_delegate.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"

@@ -42,11 +41,8 @@

ash::MultiProfileUMA::SESSION_SINGLE_USER_MODE;

if (!g_instance &&

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

- g_instance =

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

- ->session_state_delegate()

- ->GetUserInfo(0)

- ->GetUserID());

+ g_instance = new MultiUserWindowManagerChromeOS(

+ ash::Shell::GetInstance()->session_state_delegate()->GetUserID(0));

multi_user_mode_ = MULTI_PROFILE_MODE_SEPARATED;

mode = ash::MultiProfileUMA::SESSION_SEPARATE_DESKTOP_MODE;

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