Hook up extension apps notification permission, take two

chrome/browser/notifications/desktop_notification_service.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/notifications/desktop_notification_service.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
@@ skipping 176 matching lines @@
   bool action_taken_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationPermissionInfoBarDelegate);
 };
 
 DesktopNotificationService::DesktopNotificationService(Profile* profile,
     NotificationUIManager* ui_manager)
     : profile_(profile),
       ui_manager_(ui_manager) {
   InitPrefs();
-
-  // Listen for new extension installations so we can cache permissions.
-  notification_registrar_.Add(this,
-    NotificationType::EXTENSION_LOADED,
-    Source<Profile>(profile_));
 }
 
 DesktopNotificationService::~DesktopNotificationService() {
 }
 
 // Initialize the cache with the allowed and denied origins, or
 // create the preferences if they don't exist yet.
 void DesktopNotificationService::InitPrefs() {
   PrefService* prefs = profile_->GetPrefs();
   const ListValue* allowed_sites = NULL;
   const ListValue* denied_sites = NULL;
 
   if (!profile_->IsOffTheRecord()) {
     if (!prefs->FindPreference(prefs::kDesktopNotificationAllowedOrigins))
       prefs->RegisterListPref(prefs::kDesktopNotificationAllowedOrigins);
     allowed_sites = prefs->GetList(prefs::kDesktopNotificationAllowedOrigins);
 
     if (!prefs->FindPreference(prefs::kDesktopNotificationDeniedOrigins))
       prefs->RegisterListPref(prefs::kDesktopNotificationDeniedOrigins);
     denied_sites = prefs->GetList(prefs::kDesktopNotificationDeniedOrigins);
   }
 
   prefs_cache_ = new NotificationsPrefsCache(allowed_sites, denied_sites);
-
-  ExtensionsService* ext_service = profile_->GetExtensionsService();
-  if (ext_service) {
-    const ExtensionList* extensions = ext_service->extensions();
-    for (ExtensionList::const_iterator iter = extensions->begin();
-         iter != extensions->end(); ++iter) {
-      if ((*iter)->HasApiPermission(Extension::kNotificationPermission)) {
-        prefs_cache_->CacheAllowedOrigin((*iter)->url());
-      }
-    }
-  }
-
   prefs_cache_->set_is_initialized(true);
 }
 
-void DesktopNotificationService::Observe(NotificationType type,
-                                         const NotificationSource& source,
-                                         const NotificationDetails& details) {
-  if (type != NotificationType::EXTENSION_LOADED) {
-    NOTREACHED();
-    return;
-  }
-
-  Details<Extension> extension = static_cast<Details<Extension> >(details);
-  if (extension->HasApiPermission(Extension::kNotificationPermission)) {
-    GrantPermission(extension->url());
-  }
-}
-
 void DesktopNotificationService::GrantPermission(const GURL& origin) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   PersistPermissionChange(origin, true);
 
   // Schedule a cache update on the IO thread.
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(
           prefs_cache_.get(), &NotificationsPrefsCache::CacheAllowedOrigin,
           origin));
@@ skipping 104 matching lines @@
   if (origin.SchemeIs(chrome::kExtensionScheme)) {
     ExtensionsService* ext_service = profile_->GetExtensionsService();
     if (ext_service) {
       Extension* extension = ext_service->GetExtensionByURL(origin);
       if (extension)
         return ASCIIToWide(extension->name());
     }
   }
   return UTF8ToWide(origin.spec());
 }