Bug 1051862 Fix fallout from bug 983920 r=IanN
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sun, 31 Aug 2014 19:54:44 +0100
changeset 16544 cddcddb6f521251e01ceb0ab6adc3a0be8e508dc
parent 16543 b3c614a27da12c062c10cf90047c4038cdf047fa
child 16545 321bb7922713dca3223815b2ed0dbc0fff239208
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-esr52@b5a0add9fb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs1051862, 983920
Bug 1051862 Fix fallout from bug 983920 r=IanN
suite/common/public/moz.build
suite/common/public/nsISidebarPanel.idl
suite/common/src/nsSidebar.js
--- a/suite/common/public/moz.build
+++ b/suite/common/public/moz.build
@@ -1,15 +1,15 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
     'nsISessionStore.idl',
-    'nsISidebarPanel.idl',
+    'nsISidebar.idl',
     'nsISuiteDownloadManagerUI.idl',
     'nsISuiteGlue.idl',
 ]
 
 XPIDL_MODULE = 'suitecommon'
 
--- a/suite/common/public/nsISidebarPanel.idl
+++ b/suite/common/public/nsISidebarPanel.idl
@@ -7,16 +7,20 @@
 /*
 
   The Sidebar API for 3rd parties
 
 */
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(e0f4c5ee-2b35-4e99-81d2-ab956c4de0d1)]
-interface nsISidebarPanel : nsISupports
+[scriptable, uuid(97bfa970-8222-4c3f-bbe8-42141e4c7982)]
+interface nsISidebar : nsISupports
 {
     void addPanel(in DOMString aTitle, in DOMString aContentURL,
                   in DOMString aCustomizeURL);
     void addPersistentPanel(in DOMString aTitle, in DOMString aContentURL,
                             in DOMString aCustomizeURL);
+    void addSearchEngine(in DOMString engineURL, in DOMString iconURL,
+                         in DOMString suggestedTitle, in DOMString suggestedCategory);
+    void AddSearchProvider(in DOMString aDescriptionURL);
+    unsigned long IsSearchProviderInstalled(in DOMString aSearchURL);
 };
--- a/suite/common/src/nsSidebar.js
+++ b/suite/common/src/nsSidebar.js
@@ -21,18 +21,16 @@ const DEBUG = false; /* set to false to 
 const PANELS_RDF_FILE  = "UPnls"; /* directory services property to find panels.rdf */
 
 const SIDEBAR_CONTRACTID   = "@mozilla.org/sidebar;1";
 const SIDEBAR_CID      = Components.ID("{22117140-9c6e-11d3-aaf1-00805f8a4905}");
 const CONTAINER_CONTRACTID = "@mozilla.org/rdf/container;1";
 const NETSEARCH_CONTRACTID = "@mozilla.org/rdf/datasource;1?name=internetsearch"
 const nsISupports      = Components.interfaces.nsISupports;
 const nsISidebar       = Components.interfaces.nsISidebar;
-const nsISidebarPanel  = Components.interfaces.nsISidebarPanel;
-const nsISidebarExternal = Components.interfaces.nsISidebarExternal;
 const nsIRDFContainer  = Components.interfaces.nsIRDFContainer;
 const nsIProperties    = Components.interfaces.nsIProperties;
 const nsIFileURL       = Components.interfaces.nsIFileURL;
 const nsIRDFRemoteDataSource = Components.interfaces.nsIRDFRemoteDataSource;
 const nsIClassInfo     = Components.interfaces.nsIClassInfo;
 
 // File extension for Sherlock search plugin description files
 const SHERLOCK_FILE_EXT_REGEXP = /\.src$/i;
@@ -299,21 +297,21 @@ function (aSearchURL)
 {
   return 0;
 }
 
 nsSidebar.prototype.classInfo = XPCOMUtils.generateCI({
     classID: SIDEBAR_CID,
     contractID: SIDEBAR_CONTRACTID,
     classDescription: "Sidebar",
-    interfaces: [nsISidebar, nsISidebarPanel, nsISidebarExternal],
+    interfaces: [nsISidebar],
     flags: nsIClassInfo.DOM_OBJECT});
 
 nsSidebar.prototype.QueryInterface =
-    XPCOMUtils.generateQI([nsISidebar, nsISidebarPanel, nsISidebarExternal]);
+    XPCOMUtils.generateQI([nsISidebar]);
 
 nsSidebar.prototype.classID = SIDEBAR_CID;
 
 var NSGetFactory = XPCOMUtils.generateNSGetFactory([nsSidebar]);
 
 /* static functions */
 if (DEBUG)
     debug = function (s) { dump("-*- sidebar component: " + s + "\n"); }