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 133dc40221c93f45fdf9c69842e207ea98dc7a42..d46035c0e91841ab5209f6e45b8b9ee33f39686c 100644 |
--- a/chrome/browser/notifications/desktop_notification_service.h |
+++ b/chrome/browser/notifications/desktop_notification_service.h |
@@ -16,9 +16,9 @@ |
#include "base/prefs/pref_member.h" |
#include "base/strings/string16.h" |
#include "chrome/browser/content_settings/content_settings_provider.h" |
+#include "chrome/browser/content_settings/permission_context_base.h" |
#include "chrome/browser/notifications/extension_welcome_notification.h" |
#include "chrome/common/content_settings.h" |
-#include "components/keyed_service/core/keyed_service.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "third_party/WebKit/public/web/WebNotificationPresenter.h" |
@@ -48,7 +48,7 @@ class PrefRegistrySyncable; |
// The DesktopNotificationService is an object, owned by the Profile, |
// which provides the creation of desktop "toasts" to web pages and workers. |
-class DesktopNotificationService : public KeyedService, |
+class DesktopNotificationService : public PermissionContextBase, |
public content::NotificationObserver { |
public: |
// Register profile-specific prefs of notifications. |
@@ -58,12 +58,6 @@ class DesktopNotificationService : public KeyedService, |
NotificationUIManager* ui_manager); |
virtual ~DesktopNotificationService(); |
- // Requests permission for a given origin. |callback| is run when the UI |
- // finishes. |
- void RequestPermission(const GURL& origin, |
- content::RenderFrameHost* render_frame_host, |
- const base::Closure& callback); |
- |
// Show a desktop notification. If |cancel_callback| is non-null, it's set to |
// a callback which can be used to cancel the notification. |
void ShowDesktopNotification( |
@@ -72,10 +66,6 @@ class DesktopNotificationService : public KeyedService, |
content::DesktopNotificationDelegate* delegate, |
base::Closure* cancel_callback); |
- // Methods to setup and modify permission preferences. |
- void GrantPermission(const GURL& origin); |
- void DenyPermission(const GURL& origin); |
- |
// Creates a data:xxxx URL which contains the full HTML for a notification |
// using supplied icon, title, and text, run through a template which contains |
// the standard formatting for notifications. |
@@ -99,27 +89,6 @@ class DesktopNotificationService : public KeyedService, |
NotificationDelegate* delegate, |
Profile* profile); |
- // The default content setting determines how to handle origins that haven't |
- // been allowed or denied yet. If |provider_id| is not NULL, the id of the |
- // provider which provided the default setting is assigned to it. |
- ContentSetting GetDefaultContentSetting(std::string* provider_id); |
- void SetDefaultContentSetting(ContentSetting setting); |
- |
- // NOTE: This should only be called on the UI thread. |
- void ResetToDefaultContentSetting(); |
- |
- // Returns all notifications settings. |settings| is cleared before |
- // notifications setting are passed to it. |
- void GetNotificationsSettings(ContentSettingsForOneType* settings); |
- |
- // Clears the notifications setting for the given pattern. |
- void ClearSetting(const ContentSettingsPattern& pattern); |
- |
- // Clears the sets of explicitly allowed and denied origins. |
- void ResetAllOrigins(); |
- |
- ContentSetting GetContentSetting(const GURL& origin); |
- |
// Returns true if the notifier with |notifier_id| is allowed to send |
// notifications. |
bool IsNotifierEnabled(const message_center::NotifierId& notifier_id); |
@@ -139,9 +108,6 @@ class DesktopNotificationService : public KeyedService, |
base::string16 DisplayNameForOriginInProcessId(const GURL& origin, |
int process_id); |
- // Notifies the observers when permissions settings change. |
- void NotifySettingsChange(); |
- |
NotificationUIManager* GetUIManager(); |
// Called when the string list pref has been changed. |