summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications/desktop_notification_service.h
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 12:13:27 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 12:13:27 +0000
commit765b0b8f41d907deac31bdf8edcb3f57c9f9e9b4 (patch)
tree629770df749d2892ab054a98b2aba84495d24966 /chrome/browser/notifications/desktop_notification_service.h
parent1a40dd7f41286f3d8220a3711ff7f89cf7b4efe5 (diff)
downloadchromium_src-765b0b8f41d907deac31bdf8edcb3f57c9f9e9b4.zip
chromium_src-765b0b8f41d907deac31bdf8edcb3f57c9f9e9b4.tar.gz
chromium_src-765b0b8f41d907deac31bdf8edcb3f57c9f9e9b4.tar.bz2
First step of integrating notifications content settings to the host content settings map:
Add a content settings provider for notifications content settings. BUG=63656 TEST=desktop_notification_service_unittest.cc Review URL: http://codereview.chromium.org/6672025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notification_service.h')
-rw-r--r--chrome/browser/notifications/desktop_notification_service.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h
index a939946..398a65c 100644
--- a/chrome/browser/notifications/desktop_notification_service.h
+++ b/chrome/browser/notifications/desktop_notification_service.h
@@ -11,7 +11,10 @@
#include "base/basictypes.h"
#include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
#include "base/string16.h"
+#include "chrome/browser/content_settings/content_settings_notification_provider.h"
+#include "chrome/browser/content_settings/content_settings_provider.h"
#include "chrome/browser/prefs/pref_change_registrar.h"
#include "chrome/common/content_settings.h"
#include "content/common/notification_observer.h"
@@ -127,9 +130,6 @@ class DesktopNotificationService : public NotificationObserver {
// Takes a notification object and shows it in the UI.
void ShowNotification(const Notification& notification);
- // Save a permission change to the profile.
- void PersistPermissionChange(const GURL& origin, bool is_allowed);
-
// Returns a display name for an origin, to be used in permission infobar
// or on the frame of the notification toast. Different from the origin
// itself when dealing with extensions.
@@ -149,6 +149,9 @@ class DesktopNotificationService : public NotificationObserver {
// UI for desktop toasts.
NotificationUIManager* ui_manager_;
+ scoped_ptr<content_settings::NotificationProvider> provider_;
+ scoped_ptr<content_settings::NotificationDefaultProvider> default_provider_;
+
PrefChangeRegistrar prefs_registrar_;
NotificationRegistrar notification_registrar_;