chrome/browser/chromeos/net/onc_utils.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/chromeos/net/onc_utils.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/chromeos/login/users/supervised_user_manager_impl.cc ('K') | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('k') | chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h » ('j') | chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/onc_utils.cc

diff --git a/chrome/browser/chromeos/net/onc_utils.cc b/chrome/browser/chromeos/net/onc_utils.cc

index 2e4194ebb039778d872526c2587c20675a7dfae4..c82b22e53a9912c83aa94cfcfe77b8d6cda89547 100644

--- a/chrome/browser/chromeos/net/onc_utils.cc

+++ b/chrome/browser/chromeos/net/onc_utils.cc

@@ -161,7 +161,7 @@ class UserStringSubstitution : public chromeos::onc::StringSubstitution {

if (placeholder == ::onc::substitutes::kLoginIDField)

*substitute = user_->GetAccountName(false);

else if (placeholder == ::onc::substitutes::kEmailField)

- *substitute = user_->email();

+ *substitute = user_->GetUserID().GetUserEmail();

else

return false;

return true;