Chromium Code Reviews| Index: chrome/browser/notifications/desktop_notification_service.h |
| diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h |
| index d68e965b907291d3077f41bc67bf50b52981a363..fc34591a82bf371d1ad309035a82e47de90aa543 100644 |
| --- a/chrome/browser/notifications/desktop_notification_service.h |
| +++ b/chrome/browser/notifications/desktop_notification_service.h |
| @@ -101,18 +101,29 @@ class DesktopNotificationService : public PermissionContextBase |
| // Returns true if the notifier with |notifier_id| is allowed to send |
| // notifications. |
| - bool IsNotifierEnabled(const message_center::NotifierId& notifier_id); |
| + bool IsNotifierEnabled(const message_center::NotifierId& notifier_id) const; |
| // Updates the availability of the notifier. |
| void SetNotifierEnabled(const message_center::NotifierId& notifier_id, |
| bool enabled); |
| private: |
| + FRIEND_TEST_ALL_PREFIXES(DesktopNotificationServiceTest, |
| + TestOriginDisplayName); |
| // Returns a display name for an origin in the process id, to be used in |
| // permission infobar or on the frame of the notification toast. Different |
| // from the origin itself when dealing with extensions. |
| base::string16 DisplayNameForOriginInProcessId(const GURL& origin, |
| - int process_id); |
| + int process_id) const; |
| + |
| +#if defined(ENABLE_EXTENSIONS) |
| + bool ExtensionDisplayName(const GURL& origin, |
| + int process_id, |
| + base::string16* out) const; |
| +#endif |
| + |
| + static base::string16 OriginDisplayName(const GURL& origin, |
| + std::string languages); |
|
Peter Beverloo
2014/10/18 09:31:02
const std::string&
dewittj
2014/10/29 16:21:25
I don't think we want to return a string reference
|
| // Called when the string list pref has been changed. |
| void OnStringListPrefChanged( |