chrome/browser/notifications/profile_notification.cc - Issue 1428213004: This CL replaces std::string user_id in ash/* 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/notifications/profile_notification.cc

Issue 1428213004: This CL replaces std::string user_id in ash/* with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review. 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/notifications/message_center_notifications_unittest.cc ('k') | chrome/browser/signin/signin_error_notifier_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/profile_notification.cc

diff --git a/chrome/browser/notifications/profile_notification.cc b/chrome/browser/notifications/profile_notification.cc

index 8c1b7ac83cd2d498346221eb1b6a469e93add97f..1109b796f14ad6cd66412930302362ab933512bb 100644

--- a/chrome/browser/notifications/profile_notification.cc

+++ b/chrome/browser/notifications/profile_notification.cc

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

#include "base/strings/stringprintf.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"

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

// static

std::string ProfileNotification::GetProfileNotificationId(

@@ -30,7 +31,8 @@ ProfileNotification::ProfileNotification(Profile* profile,

notification) {

DCHECK(profile);

#if defined(OS_CHROMEOS)

- notification_.set_profile_id(multi_user_util::GetUserIDFromProfile(profile));

+ notification_.set_profile_id(

+ multi_user_util::GetAccountIdFromProfile(profile).GetUserEmail());

#endif

}