mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 15:52:07 +00:00
Bug 379138: use a less generic contract ID for FUEL, r=mfinkle
This commit is contained in:
parent
34d7d5a358
commit
e970aad7df
@ -61,17 +61,17 @@ Console.prototype = {
|
||||
},
|
||||
|
||||
open : function cs_open() {
|
||||
var wMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
|
||||
.getService(Components.interfaces.nsIWindowMediator);
|
||||
var console = wMediator.getMostRecentWindow("global:console");
|
||||
if (!console) {
|
||||
var wWatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
|
||||
.getService(Components.interfaces.nsIWindowWatcher);
|
||||
wWatch.openWindow(null, "chrome://global/content/console.xul", "_blank",
|
||||
"chrome,dialog=no,all", cmdLine);
|
||||
} else {
|
||||
// console was already open
|
||||
console.focus();
|
||||
var wMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
|
||||
.getService(Components.interfaces.nsIWindowMediator);
|
||||
var console = wMediator.getMostRecentWindow("global:console");
|
||||
if (!console) {
|
||||
var wWatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
|
||||
.getService(Components.interfaces.nsIWindowWatcher);
|
||||
wWatch.openWindow(null, "chrome://global/content/console.xul", "_blank",
|
||||
"chrome,dialog=no,all", cmdLine);
|
||||
} else {
|
||||
// console was already open
|
||||
console.focus();
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -400,8 +400,8 @@ function Extension(aItem) {
|
||||
this._firstRun = true;
|
||||
}
|
||||
|
||||
var os = Components.classes["@mozilla.org/observer-service;1"]
|
||||
.getService(Components.interfaces.nsIObserverService);
|
||||
var os = Components.classes["@mozilla.org/observer-service;1"]
|
||||
.getService(Components.interfaces.nsIObserverService);
|
||||
os.addObserver(this, "em-action-requested", false);
|
||||
|
||||
var self = this;
|
||||
@ -413,8 +413,8 @@ function Extension(aItem) {
|
||||
Extension.prototype = {
|
||||
// cleanup observer so we don't leak
|
||||
_shutdown: function ext_shutdown() {
|
||||
var os = Components.classes["@mozilla.org/observer-service;1"]
|
||||
.getService(Components.interfaces.nsIObserverService);
|
||||
var os = Components.classes["@mozilla.org/observer-service;1"]
|
||||
.getService(Components.interfaces.nsIObserverService);
|
||||
os.removeObserver(this, "em-action-requested");
|
||||
|
||||
this._prefs = null;
|
||||
@ -423,15 +423,15 @@ Extension.prototype = {
|
||||
},
|
||||
|
||||
// for nsIObserver
|
||||
observe: function ext_observe(aSubject, aTopic, aData)
|
||||
{
|
||||
if ((aData == "item-uninstalled") &&
|
||||
(aSubject instanceof nsIUpdateItem) &&
|
||||
(aSubject.id == this._item.id))
|
||||
{
|
||||
observe: function ext_observe(aSubject, aTopic, aData)
|
||||
{
|
||||
if ((aData == "item-uninstalled") &&
|
||||
(aSubject instanceof nsIUpdateItem) &&
|
||||
(aSubject.id == this._item.id))
|
||||
{
|
||||
this._events.dispatch("uninstall", this._item.id);
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
get id() {
|
||||
return this._item.id;
|
||||
@ -516,7 +516,7 @@ Extensions.prototype = {
|
||||
|
||||
const CLASS_ID = Components.ID("fe74cf80-aa2d-11db-abbd-0800200c9a66");
|
||||
const CLASS_NAME = "Application wrapper";
|
||||
const CONTRACT_ID = "@mozilla.org/application;1";
|
||||
const CONTRACT_ID = "@mozilla.org/fuel/application;1";
|
||||
|
||||
//=================================================
|
||||
// Application constructor
|
||||
|
Loading…
Reference in New Issue
Block a user