corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 385087: use XPCOMUtils to provide XPCOM glue in content pref service; checking in again now that bug 180380 has resolved the leak issues

Browse Source 
r=sayrer
This commit is contained in:
2007-07-11 12:04:04 -07:00
parent d8800f4c92
commit de34c81c66
1 changed files with 25 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
toolkit/components/contentprefs/src/nsContentPrefService.js
View File

@@ -39,9 +39,22 @@ const Cc = Components.classes;
const Cr = Components.results;
const Cu = Components.utils;
function ContentPrefService() {}
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
function ContentPrefService() {
this._init();
}
ContentPrefService.prototype = {
//**************************************************************************//
// XPCOM Plumbing
classDescription: "Content Pref Service",
classID: Components.ID("{e6a3f533-4ffa-4615-8eb4-d4e72d883fa7}"),
contractID: "@mozilla.org/content-pref/service;1",
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPrefService]),
//**************************************************************************//
// Convenience Getters
@@ -93,18 +106,6 @@ ContentPrefService.prototype = {
},
//**************************************************************************//
// nsISupports
_interfaces: [Ci.nsIContentPrefService, Ci.nsISupports],
QueryInterface: function ContentPrefService_QueryInterface(aIID) {
if (!this._interfaces.some( function(v) { return aIID.equals(v) } ))
throw Cr.NS_ERROR_NO_INTERFACE;
return this;
},
//**************************************************************************//
// nsIObserver
@@ -840,17 +841,13 @@ ContentPrefService.prototype = {
function HostnameGrouper() {}
HostnameGrouper.prototype = {
//**************************************************************************//
// nsISupports
_interfaces: [Ci.nsIContentURIGrouper, Ci.nsISupports],
QueryInterface: function HostnameGrouper_QueryInterface(aIID) {
if (!this._interfaces.some( function(v) { return aIID.equals(v) } ))
throw Components.results.NS_ERROR_NO_INTERFACE;
return this;
},
// XPCOM Plumbing
classDescription: "Hostname Grouper",
classID: Components.ID("{8df290ae-dcaa-4c11-98a5-2429a4dc97bb}"),
contractID: "@mozilla.org/content-pref/hostname-grouper;1",
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentURIGrouper]),
//**************************************************************************//
@@ -896,70 +893,10 @@ HostnameGrouper.prototype = {
};
var gModule = {
registerSelf: function(aComponentManager, aFileSpec, aLocation, aType) {
aComponentManager = aComponentManager.QueryInterface(Ci.nsIComponentRegistrar);
for (var key in this._objects) {
var obj = this._objects[key];
aComponentManager.registerFactoryLocation(obj.CID,
obj.className,
obj.contractID,
aFileSpec,
aLocation,
aType);
}
},
unregisterSelf: function(aComponentManager, aFileSpec, aLocation) {},
//****************************************************************************//
// XPCOM Plumbing
getClassObject: function(aComponentManager, aCID, aIID) {
if (!aIID.equals(Components.interfaces.nsIFactory))
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
for (var key in this._objects) {
if (aCID.equals(this._objects[key].CID))
return this._objects[key].factory;
}
throw Components.results.NS_ERROR_NO_INTERFACE;
},
_objects: {
service: {
CID : Components.ID("{e6a3f533-4ffa-4615-8eb4-d4e72d883fa7}"),
contractID : "@mozilla.org/content-pref/service;1",
className : "Content Pref Service",
factory : ContentPrefServiceFactory = {
createInstance: function(aOuter, aIID) {
if (aOuter != null)
throw Components.results.NS_ERROR_NO_AGGREGATION;
var service = new ContentPrefService();
service._init();
return service.QueryInterface(aIID);
}
}
},
grouper: {
CID : Components.ID("{8df290ae-dcaa-4c11-98a5-2429a4dc97bb}"),
contractID : "@mozilla.org/content-pref/hostname-grouper;1",
className : "Hostname Grouper",
factory : HostnameGrouperFactory = {
createInstance: function(aOuter, aIID) {
if (aOuter != null)
throw Components.results.NS_ERROR_NO_AGGREGATION;
var grouper = new HostnameGrouper();
return grouper.QueryInterface(aIID);
}
}
}
},
canUnload: function(aComponentManager) {
return true;
}
};
function NSGetModule(aComponentManager, aFileSpec) {
return gModule;
var components = [ContentPrefService, HostnameGrouper];
function NSGetModule(compMgr, fileSpec) {
return XPCOMUtils.generateModule(components);
}