Remove notifications when apps and OTR Profiles are removed.

chrome/browser/notifications/desktop_notification_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 22 matching lines @@
 class WebContents;
 struct ShowDesktopNotificationHostMsgParams;
 }
 
 namespace gfx {
 class Image;
 }
 
 // The DesktopNotificationService is an object, owned by the Profile,
 // which provides the creation of desktop "toasts" to web pages and workers.
-class DesktopNotificationService : public content::NotificationObserver,
-                                   public ProfileKeyedService {
+class DesktopNotificationService : public ProfileKeyedService {
  public:
   enum DesktopNotificationSource {
     PageNotification,
     WorkerNotification
   };
 
   // Register profile-specific prefs of notifications.
   static void RegisterUserPrefs(PrefRegistrySyncable* prefs);
 
   DesktopNotificationService(Profile* profile,
@@ skipping 21 matching lines @@
   // removed from the screen.  If it hasn't been shown yet, it won't be
   // shown.
   bool CancelDesktopNotification(int process_id,
                                  int route_id,
                                  int notification_id);
 
   // Methods to setup and modify permission preferences.
   void GrantPermission(const GURL& origin);
   void DenyPermission(const GURL& origin);
 
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // 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.
   static string16 CreateDataUrl(const GURL& icon_url,
                                 const string16& title,
                                 const string16& body,
                                 WebKit::WebTextDirection dir);
 
   // Creates a data:xxxx URL which contains the full HTML for a notification
   // using resource template which contains the standard formatting for
@@ skipping 53 matching lines @@
       HasPermission(const GURL& origin);
 
   // Returns true if the extension of the specified |id| is allowed to send
   // notifications.
   bool IsExtensionEnabled(const std::string& id);
 
   // Updates the availability of the extension to send notifications.
   void SetExtensionEnabled(const std::string& id, bool enabled);
 
  private:
-  void StartObserving();
-  void StopObserving();
-
   // Takes a notification object and shows it in the UI.
   void ShowNotification(const Notification& notification);
 
   // 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.
   string16 DisplayNameForOrigin(const GURL& origin);
 
   // Notifies the observers when permissions settings change.
   void NotifySettingsChange();
 
   NotificationUIManager* GetUIManager();
 
   // Called when the disabled_extension_id pref has been changed.
   void OnDisabledExtensionIdsChanged();
 
   // The profile which owns this object.
   Profile* profile_;
 
   // Non-owned pointer to the notification manager which manages the
   // UI for desktop toasts.
   NotificationUIManager* ui_manager_;
 
-  content::NotificationRegistrar notification_registrar_;
-
   // Prefs listener for disabled_extension_id.
   StringListPrefMember disabled_extension_id_pref_;
 
   // On-memory data for the availability of extensions.
   std::set<std::string> disabled_extension_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_