chrome/browser/ui/ash/user_accounts_delegate_chromeos.cc - Issue 398753004: [cros] Move User class to user_manager component.

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/user_accounts_delegate_chromeos.cc

Issue 398753004: [cros] Move User class to user_manager component. (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:

Index: chrome/browser/ui/ash/user_accounts_delegate_chromeos.cc

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

index 90b9f4204f79fd07f06dcb798236862ce1c972d0..13aa1158ae0f8cfbfefdb2067026c6ce0424d56f 100644

--- a/chrome/browser/ui/ash/user_accounts_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/user_accounts_delegate_chromeos.cc

@@ -54,7 +54,8 @@ UserAccountsDelegateChromeOS::GetSecondaryAccountIds() {

std::string UserAccountsDelegateChromeOS::GetAccountDisplayName(

const std::string& account_id) {

- User* user = ProfileHelper::Get()->GetUserByProfile(user_profile_);

+ user_manager::User* user =

+ ProfileHelper::Get()->GetUserByProfile(user_profile_);

if (gaia::AreEmailsSame(user->email(), account_id) &&

!user->display_email().empty())

return user->display_email();