| 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 4ef69fdcac361126d570584c7d738654a3a666db..95a6cb46a92b9607e2b3dab46c7e9f300e7e78df 100644
|
| --- a/chrome/browser/notifications/desktop_notification_service.h
|
| +++ b/chrome/browser/notifications/desktop_notification_service.h
|
| @@ -13,9 +13,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/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/browser/profiles/profile_keyed_service.h"
|
| #include "chrome/common/content_settings.h"
|
| #include "content/common/notification_observer.h"
|
| @@ -123,8 +121,6 @@ class DesktopNotificationService : public NotificationObserver,
|
| // Clears the sets of explicitly allowed and denied origins.
|
| void ResetAllOrigins();
|
|
|
| - static void RegisterUserPrefs(PrefService* user_prefs);
|
| -
|
| ContentSetting GetContentSetting(const GURL& origin);
|
|
|
| // Checks to see if a given origin has permission to create desktop
|
| @@ -137,8 +133,6 @@ class DesktopNotificationService : public NotificationObserver,
|
| void StartObserving();
|
| void StopObserving();
|
|
|
| - void OnPrefsChanged(const std::string& pref_name);
|
| -
|
| // Takes a notification object and shows it in the UI.
|
| void ShowNotification(const Notification& notification);
|
|
|
| @@ -161,9 +155,6 @@ class DesktopNotificationService : public NotificationObserver,
|
| // UI for desktop toasts.
|
| NotificationUIManager* ui_manager_;
|
|
|
| - scoped_ptr<content_settings::NotificationProvider> provider_;
|
| -
|
| - PrefChangeRegistrar prefs_registrar_;
|
| NotificationRegistrar notification_registrar_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);
|
|
|