Hook up extension apps notification permission, take two

chrome/browser/notifications/desktop_notification_service.h

 // Copyright (c) 2009 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 "base/basictypes.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 
 class NotificationUIManager;
 class NotificationsPrefsCache;
 class PrefService;
 class Profile;
 class Task;
 
 // The DesktopNotificationService is an object, owned by the Profile,
 // which provides the creation of desktop "toasts" to web pages and workers.
-class DesktopNotificationService : public NotificationObserver {
+class DesktopNotificationService {
  public:
   enum DesktopNotificationSource {
     PageNotification,
     WorkerNotification
   };
 
   DesktopNotificationService(Profile* profile,
                              NotificationUIManager* ui_manager);
   virtual ~DesktopNotificationService();
 
@@ skipping 29 matching lines @@
   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);
 
   NotificationsPrefsCache* prefs_cache() { return prefs_cache_; }
 
-  // NotificationObserver interface.
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
   // 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);
  private:
   void InitPrefs();
 
   // 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.
   std::wstring DisplayNameForOrigin(const GURL& origin);
 
   // The profile which owns this object.
   Profile* profile_;
 
   // A cache of preferences which is accessible only on the IO thread
   // to service synchronous IPCs.
   scoped_refptr<NotificationsPrefsCache> prefs_cache_;
 
   // Non-owned pointer to the notification manager which manages the
   // UI for desktop toasts.
   NotificationUIManager* ui_manager_;
 
-  // Connection to the service providing the other kind of notifications.
-  NotificationRegistrar notification_registrar_;
-
   DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_