chrome/browser/sync/sync_ui_util.cc - Issue 1412813003: 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/sync/sync_ui_util.cc

Issue 1412813003: 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: Fix Win GN build. Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_service.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/sync_ui_util.cc

diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc

index ca2e8ecec0efc9700c3e37c4b2f0891c55182d71..5c55de96ab14e5850c78aff8d2bb27cee3a52486 100644

--- a/chrome/browser/sync/sync_ui_util.cc

+++ b/chrome/browser/sync/sync_ui_util.cc

@@ -35,6 +35,7 @@

#include "ui/base/l10n/l10n_util.h"

#if defined(OS_CHROMEOS)

+#include "components/signin/core/account_id/account_id.h"

#include "components/user_manager/user_manager.h"

#endif // defined(OS_CHROMEOS)

@@ -63,7 +64,7 @@ base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,

// On CrOS user email is sanitized and then passed to the signin manager.

// Original email (containing dots) is stored as "display email".

user_display_name = user_manager::UserManager::Get()->GetUserDisplayEmail(

- user_display_name);

+ AccountId::FromUserEmail(user_display_name));

}

#endif // defined(OS_CHROMEOS)