chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc - Issue 379803004: Move UserInfo to user_manager.

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_context_menu_chromeos.cc

Issue 379803004: Move UserInfo to user_manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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/chromeos/login/users/user.h ('k') | chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 09a52f2d1c4590a48fd0786a8fe6096d61295e00..a10e61b18be4ba3cf288d77e81c604cd1a409e83 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

@@ -87,7 +87,8 @@ scoped_ptr<ui::MenuModel> CreateMultiUserContextMenu(aura::Window* window) {

new chromeos::MultiUserContextMenuChromeos(window);

model.reset(menu);

for (int user_index = 1; user_index < logged_in_users; ++user_index) {

- const ash::UserInfo* user_info = delegate->GetUserInfo(user_index);

+ const user_manager::UserInfo* user_info =

+ delegate->GetUserInfo(user_index);

menu->AddItem(user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2

: IDC_VISIT_DESKTOP_OF_LRU_USER_3,

l10n_util::GetStringFUTF16(