chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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/webui/chromeos/ui_account_tweaks.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« chrome/browser/profiles/profile_window.cc ('K') | « chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.cc ('k') | chrome/browser/ui/webui/flags_ui.cc » ('j') | components/user_manager/user_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc

diff --git a/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc b/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc

index 3e1727b77e9e6aa32c811f21ea0c80e26640773e..a5a23761e3410c4aea9073dc661fdd2ae87c41ef 100644

--- a/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc

+++ b/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc

@@ -21,9 +21,10 @@ void AddAccountUITweaksLocalizedValues(

std::string owner_email;

CrosSettings::Get()->GetString(kDeviceOwner, &owner_email);

+ const user_manager::UserID owner_id(std::string() /* gaia_id */, owner_email);

// Translate owner's email to the display email.

std::string display_email =

- user_manager::UserManager::Get()->GetUserDisplayEmail(owner_email);

+ user_manager::UserManager::Get()->GetUserDisplayEmail(owner_id);

localized_strings->SetString("ownerUserId", display_email);

localized_strings->SetBoolean("currentUserIsOwner",