Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet.

chrome/browser/notifications/notification_options_menu_model.cc

 // Copyright (c) 2011 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/notification_options_menu_model.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 99 matching lines @@
     NOTREACHED();
 }
 
 NotificationOptionsMenuModel::NotificationOptionsMenuModel(Balloon* balloon)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       balloon_(balloon) {
   const Notification& notification = balloon->notification();
   const GURL& origin = notification.origin_url();
 
   if (origin.SchemeIs(chrome::kExtensionScheme)) {
-    ExtensionService* ext_service =
+    ExtensionService* extension_service =
         balloon_->profile()->GetExtensionService();
-    const Extension* extension = ext_service->GetExtensionByURL(origin);
+    const Extension* extension =
+        extension_service->extensions()->GetExtensionOrAppByURL(
+            ExtensionURLInfo(origin));
     // We get back no extension here when we show the notification after
     // the extension has crashed.
     if (extension) {
       const string16 disable_label = l10n_util::GetStringUTF16(
           IDS_EXTENSIONS_DISABLE);
       AddItem(kToggleExtensionCommand, disable_label);
     }
   } else {
     const string16 disable_label = l10n_util::GetStringFUTF16(
         IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE,
@@ skipping 25 matching lines @@
   // TODO(tfarina,johnnyg): Remove this code if we decide to close notifications
   // after permissions are revoked.
   if (command_id == kTogglePermissionCommand ||
       command_id == kToggleExtensionCommand) {
     const Notification& notification = balloon_->notification();
     const GURL& origin = notification.origin_url();
 
     DesktopNotificationService* service =
         DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());
     if (origin.SchemeIs(chrome::kExtensionScheme)) {
-      ExtensionService* ext_service =
+      ExtensionService* extension_service =
           balloon_->profile()->GetExtensionService();
-      const Extension* extension = ext_service->GetExtensionByURL(origin);
+      const Extension* extension =
+          extension_service->extensions()->GetExtensionOrAppByURL(
+              ExtensionURLInfo(origin));
       if (extension) {
         return l10n_util::GetStringUTF16(
-            ext_service->IsExtensionEnabled(extension->id()) ?
+            extension_service->IsExtensionEnabled(extension->id()) ?
                 IDS_EXTENSIONS_DISABLE :
                 IDS_EXTENSIONS_ENABLE);
       }
     } else {
       if (service->GetContentSetting(origin) == CONTENT_SETTING_ALLOW) {
         return l10n_util::GetStringFUTF16(
             IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE,
             notification.display_source());
       } else {
         return l10n_util::GetStringFUTF16(
@@ skipping 21 matching lines @@
 
 bool NotificationOptionsMenuModel::GetAcceleratorForCommandId(
     int /* command_id */, ui::Accelerator* /* accelerator */) {
   // Currently no accelerators.
   return false;
 }
 
 void NotificationOptionsMenuModel::ExecuteCommand(int command_id) {
   DesktopNotificationService* service =
       DesktopNotificationServiceFactory::GetForProfile(balloon_->profile());
-  ExtensionService* ext_service =
+  ExtensionService* extension_service =
       balloon_->profile()->GetExtensionService();
   const GURL& origin = balloon_->notification().origin_url();
   switch (command_id) {
     case kTogglePermissionCommand:
       if (service->GetContentSetting(origin) == CONTENT_SETTING_ALLOW)
         service->DenyPermission(origin);
       else
         service->GrantPermission(origin);
       break;
     case kToggleExtensionCommand: {
-      const Extension* extension = ext_service->GetExtensionByURL(origin);
+      const Extension* extension =
+          extension_service->extensions()->GetExtensionOrAppByURL(
+              ExtensionURLInfo(origin));
       if (extension) {
         const std::string& id = extension->id();
-        if (ext_service->IsExtensionEnabled(id))
-          ext_service->DisableExtension(id);
+        if (extension_service->IsExtensionEnabled(id))
+          extension_service->DisableExtension(id);
         else
-          ext_service->EnableExtension(id);
+          extension_service->EnableExtension(id);
       }
       break;
     }
     case kOpenContentSettingsCommand: {
       Browser* browser =
           BrowserList::GetLastActiveWithProfile(balloon_->profile());
       if (!browser) {
         // It is possible that there is no browser window (e.g. when there are
         // background pages, or for a chrome frame process on windows).
         browser = Browser::Create(balloon_->profile());
       }
       browser->ShowContentSettingsPage(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }