chrome/browser/chromeos/file_system_provider/notification_manager.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/chromeos/file_system_provider/notification_manager.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/chromeos/extensions/wallpaper_private_api_unittest.cc ('k') | chrome/browser/feedback/show_feedback_page.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_system_provider/notification_manager.cc

diff --git a/chrome/browser/chromeos/file_system_provider/notification_manager.cc b/chrome/browser/chromeos/file_system_provider/notification_manager.cc

index 2a40d42daa2f9c86361397c612f3f758554904bd..44b3b3c3a022cd66a6d3a71f34bc8b4476679895 100644

--- a/chrome/browser/chromeos/file_system_provider/notification_manager.cc

+++ b/chrome/browser/chromeos/file_system_provider/notification_manager.cc

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

#include "chrome/browser/extensions/app_icon_loader_impl.h"

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

#include "chrome/grit/generated_resources.h"

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

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

#include "ui/message_center/message_center.h"

#include "ui/message_center/notification.h"

@@ -118,7 +119,8 @@ NotificationManager::CreateNotification() {

message_center::NotifierId notifier_id(

message_center::NotifierId::SYSTEM_COMPONENT,

file_system_info_.mount_path().value());

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

+ notifier_id.profile_id =

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

scoped_ptr<message_center::Notification> notification(

new message_center::Notification(