diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2018-04-09 21:06:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 21:06:20 -0400 |
| commit | df185f9fbe2a2a1f8d3bbf713b5ce04c504d8bf7 (patch) | |
| tree | ca2855b3294916843048ede24ecbc29a85a26407 | |
| parent | c1852a54a598950f01c877875af39e4c31c55455 (diff) | |
| parent | fc249d76a47628be6ef6aa259db7358bfe37ebf6 (diff) | |
| download | UXP-df185f9fbe2a2a1f8d3bbf713b5ce04c504d8bf7.tar UXP-df185f9fbe2a2a1f8d3bbf713b5ce04c504d8bf7.tar.gz UXP-df185f9fbe2a2a1f8d3bbf713b5ce04c504d8bf7.tar.lz UXP-df185f9fbe2a2a1f8d3bbf713b5ce04c504d8bf7.tar.xz UXP-df185f9fbe2a2a1f8d3bbf713b5ce04c504d8bf7.zip | |
Merge pull request #111 from janekptacijarabaci/pm_devtools_2_paths
[PALEMOON] [DevTools] Fix some paths with ToolboxProcess.jsm and Console.jsm (deprecated)
| -rw-r--r-- | application/palemoon/components/sessionstore/_SessionFile.jsm | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/extensions/content/extensions.js | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/extensions/internal/XPIProvider.jsm | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/application/palemoon/components/sessionstore/_SessionFile.jsm b/application/palemoon/components/sessionstore/_SessionFile.jsm index 7e1b05f74..e949112f2 100644 --- a/application/palemoon/components/sessionstore/_SessionFile.jsm +++ b/application/palemoon/components/sessionstore/_SessionFile.jsm @@ -41,7 +41,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/Console.jsm"); + "resource://gre/modules/Console.jsm"); // An encoder to UTF-8. XPCOMUtils.defineLazyGetter(this, "gEncoder", function () { diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index 1d8d5bb0a..6f2a47482 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -19,7 +19,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); XPCOMUtils.defineLazyGetter(this, "BrowserToolboxProcess", function () { - return Cu.import("resource://gre/modules/devtools/ToolboxProcess.jsm", {}). + return Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm", {}). BrowserToolboxProcess; }); diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 54b86edc4..d5f1ab5dd 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -37,9 +37,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task", XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "BrowserToolboxProcess", - "resource://gre/modules/devtools/ToolboxProcess.jsm"); + "resource://devtools/client/framework/ToolboxProcess.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ConsoleAPI", - "resource://gre/modules/devtools/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyServiceGetter(this, "Blocklist", "@mozilla.org/extensions/blocklist;1", @@ -2082,7 +2082,7 @@ this.XPIProvider = { Services.prefs.addObserver(PREF_EM_MIN_COMPAT_APP_VERSION, this, false); Services.prefs.addObserver(PREF_EM_MIN_COMPAT_PLATFORM_VERSION, this, false); Services.obs.addObserver(this, NOTIFICATION_FLUSH_PERMISSIONS, false); - if (Cu.isModuleLoaded("resource://gre/modules/devtools/ToolboxProcess.jsm")) { + if (Cu.isModuleLoaded("resource://devtools/client/framework/ToolboxProcess.jsm")) { // If BrowserToolboxProcess is already loaded, set the boolean to true // and do whatever is needed this._toolboxProcessLoaded = true; |