Bug 524091 - Remove microsummaries support. (Browser changes)

browser/app/profile/firefox.js

@@ -347,10 +347,6 @@ pref("browser.search.update.log", false);
 // Check whether we need to perform engine updates every 6 hours
 pref("browser.search.update.interval", 21600);
 
-// Whether or not microsummary and generator updates are enabled
-pref("browser.microsummary.enabled", true);
-pref("browser.microsummary.updateGenerators", true);
-
 // enable search suggestions by default
 pref("browser.search.suggest.enabled", true);
 

browser/base/content/browser.js

@@ -1577,22 +1577,10 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
   gPrefService.addObserver(ctrlTab.prefName, ctrlTab, false);
   gPrefService.addObserver(allTabs.prefName, allTabs, false);
 
-  // Initialize the microsummary service by retrieving it, prompting its factory
-  // to create its singleton, whose constructor initializes the service.
-  // Started 4 seconds after delayedStartup (before the livemarks service below).
-  setTimeout(function() {
-    try {
-      Cc["@mozilla.org/microsummary/service;1"].getService(Ci.nsIMicrosummaryService);
-    } catch (ex) {
-      Components.utils.reportError("Failed to init microsummary service:\n" + ex);
-    }
-  }, 4000);
-
   // Delayed initialization of the livemarks update timer.
   // Livemark updates don't need to start until after bookmark UI
   // such as the toolbar has initialized. Starting 5 seconds after
-  // delayedStartup in order to stagger this after the microsummary
-  // service (see above) and before the download manager starts (see below).
+  // delayedStartup in order to stagger this before the download manager starts.
   setTimeout(function() PlacesUtils.livemarks.start(), 5000);
 
   // Initialize the download manager some time after the app starts so that

browser/components/sidebar/src/nsSidebar.js

@@ -231,31 +231,6 @@ function (aSearchURL)
   return 0;
 }
 
-nsSidebar.prototype.addMicrosummaryGenerator =
-function (generatorURL)
-{
-    debug("addMicrosummaryGenerator(" + generatorURL + ")");
-
-    if (!/^https?:/i.test(generatorURL))
-      return;
-
-    var stringBundle = srGetStrBundle("chrome://browser/locale/sidebar/sidebar.properties");
-    var titleMessage = stringBundle.GetStringFromName("addMicsumGenConfirmTitle");
-    var dialogMessage = stringBundle.formatStringFromName("addMicsumGenConfirmText", [generatorURL], 1);
-      
-    if (!this.promptService.confirm(null, titleMessage, dialogMessage))
-        return;
-
-    var ioService = Components.classes["@mozilla.org/network/io-service;1"].
-                    getService(Components.interfaces.nsIIOService);
-    var generatorURI = ioService.newURI(generatorURL, null, null);
-
-    var microsummaryService = Components.classes["@mozilla.org/microsummary/service;1"].
-                              getService(Components.interfaces.nsIMicrosummaryService);
-    if (microsummaryService)
-      microsummaryService.addGenerator(generatorURI);
-}
-
 // property of nsIClassInfo
 nsSidebar.prototype.flags = nsIClassInfo.DOM_OBJECT;
 

browser/installer/removed-files.in

@@ -77,6 +77,7 @@ components/xmlextras.xpt
 components/xpcom.xpt
 components/xpti.dat
 components/xptitemp.dat
+components/nsMicrosummaryService.js
 defaults/pref/all.js
 defaults/pref/bug259708.js
 defaults/pref/bug307259.js
@@ -875,7 +876,6 @@ xpicleanup@BIN_SUFFIX@
   components/nsLoginInfo.js
   components/nsLoginManager.js
   components/nsLoginManagerPrompter.js
-  components/nsMicrosummaryService.js
   components/nsPlacesAutoComplete.js
   components/nsPlacesDBFlush.js
   components/nsPlacesExpiration.js

browser/locales/en-US/chrome/browser/sidebar/sidebar.properties

@@ -1,2 +0,0 @@
-addMicsumGenConfirmTitle=Add Microsummary Generator
-addMicsumGenConfirmText=Add the following microsummary generator?\n\nSource: %S

browser/locales/jar.mn

@@ -67,7 +67,6 @@
     locale/browser/preferences/sync.dtd               (%chrome/browser/preferences/sync.dtd)
 #endif
     locale/browser/preferences/tabs.dtd               (%chrome/browser/preferences/tabs.dtd)
-    locale/browser/sidebar/sidebar.properties      (%chrome/browser/sidebar/sidebar.properties)
 #ifdef MOZ_SERVICES_SYNC
     locale/browser/syncBrand.dtd                (%chrome/browser/syncBrand.dtd)
     locale/browser/syncSetup.dtd                (%chrome/browser/syncSetup.dtd)

dom/interfaces/sidebar/nsISidebar.idl

@@ -44,7 +44,7 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(67cf6231-c303-4f7e-b9b1-a0e87772ecfd)]
+[scriptable, uuid(41a22fb6-39e2-45e1-95c5-7e8cea36575d)]
 interface nsISidebar : nsISupports
 {
     void addPanel(in wstring aTitle, in string aContentURL,
@@ -53,7 +53,6 @@ interface nsISidebar : nsISupports
                             in string aCustomizeURL);
     void addSearchEngine(in string engineURL, in string iconURL,
                          in wstring suggestedTitle, in wstring suggestedCategory);
-    void addMicrosummaryGenerator(in string generatorURL);
 };
 
 [scriptable, uuid(4350fb73-9305-41df-a669-11d26222d420)]