Bug 897735 - Bump the nsIBlocklistService IID.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 14 Jan 2014 11:54:30 -0500
changeset 163308 8c0180723f67e61122da211c0d8243d557dd8233
parent 163307 c8e2cb87f6c163f7fbbc1fcd5cf9bb3565d2163b
child 163309 7eb8b5723256e60c228e16177e8cb253e802f27f
push idunknown
push userunknown
push dateunknown
bugs897735
milestone29.0a1
Bug 897735 - Bump the nsIBlocklistService IID. DONTBUILD CLOSED TREE
xpcom/system/nsIBlocklistService.idl
--- a/xpcom/system/nsIBlocklistService.idl
+++ b/xpcom/system/nsIBlocklistService.idl
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
 #include "nsISupports.idl"
 
 interface nsIPluginTag;
 interface nsIVariant;
 
-[scriptable, uuid(cbba15b8-316d-4ae6-8ed9-fe9cf8386730)]
+[scriptable, uuid(d463dfbb-89c4-4553-97af-b4fd8854e161)]
 interface nsIBlocklistService : nsISupports
 {
   // Indicates that the item does not appear in the blocklist.
   const unsigned long STATE_NOT_BLOCKED = 0;
   // Indicates that the item is in the blocklist but the problem is not severe
   // enough to warant forcibly blocking.
   const unsigned long STATE_SOFTBLOCKED = 1;
   // Indicates that the item should be blocked and never used.
@@ -24,48 +24,52 @@ interface nsIBlocklistService : nsISuppo
   const unsigned long STATE_OUTDATED    = 3;
   // Indicates that the item is vulnerable and there is an update.
   const unsigned long STATE_VULNERABLE_UPDATE_AVAILABLE = 4;
   // Indicates that the item is vulnerable and there is no update.
   const unsigned long STATE_VULNERABLE_NO_UPDATE = 5;
 
   /**
    * Determine if an item is blocklisted
-   * @param   addon
-   *          The addon item to be checked.
+   * @param   id
+   *          The ID of the item.
+   * @param   version
+   *          The item's version.
    * @param   appVersion
    *          The version of the application we are checking in the blocklist.
    *          If this parameter is null, the version of the running application
    *          is used.
    * @param   toolkitVersion
    *          The version of the toolkit we are checking in the blocklist.
    *          If this parameter is null, the version of the running toolkit
    *          is used.
    * @returns true if the item is compatible with this version of the
    *          application or this version of the toolkit, false, otherwise.
    */
-  boolean isAddonBlocklisted(in jsval addon,
+  boolean isAddonBlocklisted(in AString id, in AString version,
                              [optional] in AString appVersion,
                              [optional] in AString toolkitVersion);
 
   /**
    * Determine the blocklist state of an add-on
    * @param   id
-   *          The addon item to be checked.
+   *          The ID of the item.
+   * @param   version
+   *          The item's version.
    * @param   appVersion
    *          The version of the application we are checking in the blocklist.
    *          If this parameter is null, the version of the running application
    *          is used.
    * @param   toolkitVersion
    *          The version of the toolkit we are checking in the blocklist.
    *          If this parameter is null, the version of the running toolkit
    *          is used.
    * @returns The STATE constant.
    */
-  unsigned long getAddonBlocklistState(in jsval addon,
+  unsigned long getAddonBlocklistState(in AString id, in AString version,
                                        [optional] in AString appVersion,
                                        [optional] in AString toolkitVersion);
 
   /**
    * Determine the blocklist state of a plugin
    * @param   plugin
    *          The plugin to get the state for
    * @param   appVersion
@@ -79,21 +83,21 @@ interface nsIBlocklistService : nsISuppo
    * @returns The STATE constant.
    */
   unsigned long getPluginBlocklistState(in nsIPluginTag plugin,
                                         [optional] in AString appVersion,
                                         [optional] in AString toolkitVersion);
 
   /**
    * Determine the blocklist web page of an add-on.
-   * @param   addon
-   *          The addon item whose url is required.
+   * @param   id
+   *          The ID of the blocked add-on.
    * @returns The URL of the description page.
    */
-  AString getAddonBlocklistURL(in jsval addon,
+  AString getAddonBlocklistURL(in AString id, in AString version,
                               [optional] in AString appVersion,
                               [optional] in AString toolkitVersion);
 
   /**
    * Determine the blocklist web page of a plugin.
    * @param   plugin
    *          The blocked plugin that we are determining the web page for.
    * @returns The URL of the description page.
@@ -101,17 +105,17 @@ interface nsIBlocklistService : nsISuppo
   AString getPluginBlocklistURL(in nsIPluginTag plugin);
 };
 
 /**
  * nsIBlocklistPrompt is used, if available, by the default implementation of 
  * nsIBlocklistService to display a confirmation UI to the user before blocking
  * extensions/plugins.
  */
-[scriptable, uuid(36f97f40-b0c9-11df-94e2-0800200c9a66)]
+[scriptable, uuid(ba915921-b9c0-400d-8e4f-ca1b80c5699a)]
 interface nsIBlocklistPrompt : nsISupports
 {
   /**
    * Prompt the user about newly blocked addons. The prompt is then resposible
    * for soft-blocking any addons that need to be afterwards
    *
    * @param  aAddons
    *         An array of addons and plugins that are blocked. These are javascript