chrome/browser/ui/views/frame/system_menu_model_builder.cc - Issue 2450183002: Rename UserInfo method GetEmail to GetDisplayEmail.

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/ui/views/frame/system_menu_model_builder.cc

Issue 2450183002: Rename UserInfo method GetEmail to GetDisplayEmail. (Closed)

Patch Set: Fixed build in a dependent CL. Created 4 years, 1 month 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc ('k') | components/user_manager/empty_user_info.h » ('j') | components/user_manager/empty_user_info.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"	5 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "build/build_config.h"	9 #include "build/build_config.h"

10 #include "chrome/app/chrome_command_ids.h"	10 #include "chrome/app/chrome_command_ids.h"

(...skipping 161 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
172 !manager->GetWindowOwner(window).is_valid())	172 !manager->GetWindowOwner(window).is_valid())

173 return;	173 return;

174	174

175 model->AddSeparator(ui::NORMAL_SEPARATOR);	175 model->AddSeparator(ui::NORMAL_SEPARATOR);

176 DCHECK(logged_in_users <= 3);	176 DCHECK(logged_in_users <= 3);

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

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

179 model->AddItem(	179 model->AddItem(

180 user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2	180 user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2

181 : IDC_VISIT_DESKTOP_OF_LRU_USER_3,	181 : IDC_VISIT_DESKTOP_OF_LRU_USER_3,

182 l10n_util::GetStringFUTF16(IDS_VISIT_DESKTOP_OF_LRU_USER,	182 l10n_util::GetStringFUTF16(

183 user_info->GetDisplayName(),	183 IDS_VISIT_DESKTOP_OF_LRU_USER, user_info->GetDisplayName(),

184 base::ASCIIToUTF16(user_info->GetEmail())));	184 base::ASCIIToUTF16(user_info->GetDisplayEmail())));

185 }	185 }

186 #endif	186 #endif

187 }	187 }

OLD	NEW