chrome/browser/supervised_user/supervised_user_service.cc - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

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/supervised_user/supervised_user_service.cc

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

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

Index: chrome/browser/supervised_user/supervised_user_service.cc

diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc

index 0df5660035af85fb7ef9413e6452ff8c1f1b02aa..38104ccd1b470eaee6773c58ed0f62b1f5a00029 100644

--- a/chrome/browser/supervised_user/supervised_user_service.cc

+++ b/chrome/browser/supervised_user/supervised_user_service.cc

@@ -851,7 +851,7 @@

// The active user can be NULL in unit tests.

if (user_manager::UserManager::Get()->GetActiveUser()) {

return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName(

- user_manager::UserManager::Get()->GetActiveUser()->GetAccountId()));

+ user_manager::UserManager::Get()->GetActiveUser()->GetUserID()));

}

return std::string();

#else

« no previous file with comments | « chrome/browser/supervised_user/chromeos/manager_password_service.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »