| 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 5e172b82cc9bcd7b710fef980a33d53530c2808b..b40ea322a4ac62867253b9ea29eb27943307b489 100644
|
| --- a/chrome/browser/notifications/desktop_notification_service.h
|
| +++ b/chrome/browser/notifications/desktop_notification_service.h
|
| @@ -96,18 +96,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,
|
| + const std::string& languages);
|
|
|
| // Called when the string list pref has been changed.
|
| void OnStringListPrefChanged(
|
|
|