Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/notifications/profile_notification.h" 5 #include "chrome/browser/notifications/profile_notification.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 8 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
9 #include "components/signin/core/account_id/account_id.h"
9 10
10 // static 11 // static
11 std::string ProfileNotification::GetProfileNotificationId( 12 std::string ProfileNotification::GetProfileNotificationId(
12 const std::string& delegate_id, 13 const std::string& delegate_id,
13 ProfileID profile_id) { 14 ProfileID profile_id) {
14 DCHECK(profile_id); 15 DCHECK(profile_id);
15 return base::StringPrintf("notification-ui-manager#%p#%s", 16 return base::StringPrintf("notification-ui-manager#%p#%s",
16 profile_id, // Each profile has its unique instance 17 profile_id, // Each profile has its unique instance
17 // including incognito profile. 18 // including incognito profile.
18 delegate_id.c_str()); 19 delegate_id.c_str());
19 } 20 }
20 21
21 ProfileNotification::ProfileNotification(Profile* profile, 22 ProfileNotification::ProfileNotification(Profile* profile,
22 const Notification& notification) 23 const Notification& notification)
23 : profile_id_(NotificationUIManager::GetProfileID(profile)), 24 : profile_id_(NotificationUIManager::GetProfileID(profile)),
24 notification_( 25 notification_(
25 // Uses Notification's copy constructor to assign the message center 26 // Uses Notification's copy constructor to assign the message center
26 // id, which should be unique for every profile + Notification pair. 27 // id, which should be unique for every profile + Notification pair.
27 GetProfileNotificationId( 28 GetProfileNotificationId(
28 notification.delegate_id(), 29 notification.delegate_id(),
29 NotificationUIManager::GetProfileID(profile)), 30 NotificationUIManager::GetProfileID(profile)),
30 notification) { 31 notification) {
31 DCHECK(profile); 32 DCHECK(profile);
32 #if defined(OS_CHROMEOS) 33 #if defined(OS_CHROMEOS)
33 notification_.set_profile_id(multi_user_util::GetUserIDFromProfile(profile)); 34 notification_.set_profile_id(
35 multi_user_util::GetAccountIdFromProfile(profile).GetUserEmail());
34 #endif 36 #endif
35 } 37 }
36 38
37 ProfileNotification::~ProfileNotification() {} 39 ProfileNotification::~ProfileNotification() {}
38 40
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698