diff options
| -rw-r--r-- | application/palemoon/base/content/utilityOverlay.js | 12 | ||||
| -rw-r--r-- | browser/components/preferences/jar.mn | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/application/palemoon/base/content/utilityOverlay.js b/application/palemoon/base/content/utilityOverlay.js index 633cb8853f..c4cd87f606 100644 --- a/application/palemoon/base/content/utilityOverlay.js +++ b/application/palemoon/base/content/utilityOverlay.js @@ -9,6 +9,9 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm"); Components.utils.import("resource:///modules/RecentWindow.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "ShellService", + "resource:///modules/ShellService.jsm"); + XPCOMUtils.defineLazyGetter(this, "BROWSER_NEW_TAB_URL", function () { const PREF = "browser.newtab.url"; @@ -448,15 +451,10 @@ function gatherTextUnder ( root ) return text; } +// This function exists for legacy reasons. function getShellService() { - var shell = null; - try { - shell = Components.classes["@mozilla.org/browser/shell-service;1"] - .getService(Components.interfaces.nsIShellService); - } catch (e) { - } - return shell; + return ShellService; } function isBidiEnabled() { diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn index c0d34da7f4..f83809b038 100644 --- a/browser/components/preferences/jar.mn +++ b/browser/components/preferences/jar.mn @@ -6,7 +6,7 @@ browser.jar: content/browser/preferences/applicationManager.xul content/browser/preferences/applicationManager.js content/browser/preferences/blocklists.xul - content/browser/preferences/blocklists.js +* content/browser/preferences/blocklists.js * content/browser/preferences/colors.xul * content/browser/preferences/cookies.xul content/browser/preferences/cookies.js |