chrome/browser/sync/sync_error_notifier_ash.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/sync/sync_error_notifier_ash.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

« ash/system/tray/system_tray_delegate.cc ('K') | « chrome/browser/signin/signin_error_notifier_ash.cc ('k') | chrome/browser/ui/ash/chrome_shell_content_state_chromeos.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/sync_error_notifier_ash.cc

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

index 420513857da19aa1af4b7d1df2ee199952217ec8..128a33a2a549d356a2d569d4a40a305bcbf24095 100644

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

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

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

#include "chrome/common/url_constants.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

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

#include "grit/theme_resources.h"

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

#include "ui/base/resource/resource_bundle.h"

@@ -165,7 +166,8 @@ void SyncErrorNotifier::OnErrorChanged() {

kProfileSyncNotificationId);

// Set |profile_id| for multi-user notification blocker.

- notifier_id.profile_id = multi_user_util::GetUserIDFromProfile(profile_);

+ notifier_id.profile_id =

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

// Add a new notification.

Notification notification(