зеркало из https://github.com/mozilla/pjs.git
Merge bug 246014 from the aviary branch, splitting nsIXULChromeRegistry into a separate piece for seamonkey-only methods. Original Firefox patch r=bryner sr=ben seamonkey merge r+sr=jst
This commit is contained in:
Родитель
80d7b26a42
Коммит
f502828c43
|
@ -98,7 +98,7 @@ nsPrefWindow.prototype =
|
|||
try
|
||||
{
|
||||
this.pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getBranch(null);
|
||||
this.chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService(Components.interfaces.nsIXULChromeRegistry);
|
||||
this.chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService(Components.interfaces.nsIChromeRegistrySea);
|
||||
this.observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
||||
}
|
||||
catch(e)
|
||||
|
|
|
@ -44,9 +44,8 @@ var gShowDescription = true;
|
|||
var gData;
|
||||
|
||||
try {
|
||||
var chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService();
|
||||
if (chromeRegistry)
|
||||
chromeRegistry = chromeRegistry.QueryInterface(Components.interfaces.nsIXULChromeRegistry);
|
||||
var chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].
|
||||
getService(Components.interfaces.nsIChromeRegistrySea);
|
||||
}
|
||||
catch(e) {}
|
||||
|
||||
|
@ -108,9 +107,8 @@ function applySkin()
|
|||
if (theme == data.name) return;
|
||||
|
||||
try {
|
||||
var reg = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService();
|
||||
if (reg)
|
||||
reg = reg.QueryInterface(Components.interfaces.nsIXULChromeRegistry);
|
||||
var reg = Components.classes["@mozilla.org/chrome/chrome-registry;1"].
|
||||
getService(Components.interfaces.nsIChromeRegistrySea);
|
||||
}
|
||||
catch(e) {}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче