diff options
Diffstat (limited to 'devtools/server')
-rw-r--r-- | devtools/server/actors/moz.build | 2 | ||||
-rw-r--r-- | devtools/server/actors/webbrowser.js | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/devtools/server/actors/moz.build b/devtools/server/actors/moz.build index ddefc3e9e..085d003cf 100644 --- a/devtools/server/actors/moz.build +++ b/devtools/server/actors/moz.build @@ -67,6 +67,6 @@ DevToolsModules( 'worker.js', ) -FINAL_TARGET_PP_FILES.chrome.devtools.modules.devtools.server.actors += [ +FINAL_TARGET_FILES.chrome.devtools.modules.devtools.server.actors += [ 'webbrowser.js', ]
\ No newline at end of file diff --git a/devtools/server/actors/webbrowser.js b/devtools/server/actors/webbrowser.js index dffe49b91..e7981e163 100644 --- a/devtools/server/actors/webbrowser.js +++ b/devtools/server/actors/webbrowser.js @@ -30,9 +30,6 @@ loader.lazyRequireGetter(this, "WorkerActorList", "devtools/server/actors/worker loader.lazyRequireGetter(this, "ServiceWorkerRegistrationActorList", "devtools/server/actors/worker", true); loader.lazyRequireGetter(this, "ProcessActorList", "devtools/server/actors/process", true); loader.lazyImporter(this, "AddonManager", "resource://gre/modules/AddonManager.jsm"); -#ifdef MOZ_WEBEXTENSIONS -loader.lazyImporter(this, "ExtensionContent", "resource://gre/modules/ExtensionContent.jsm"); -#endif // Assumptions on events module: // events needs to be dispatched synchronously, @@ -984,21 +981,6 @@ TabActor.prototype = { return null; }, -#ifdef MOZ_WEBEXTENSIONS - /** - * Getter for the WebExtensions ContentScript globals related to the - * current tab content's DOM window. - */ - get webextensionsContentScriptGlobals() { - // Ignore xpcshell runtime which spawn TabActors without a window. - if (this.window) { - return ExtensionContent.getContentScriptGlobalsForWindow(this.window); - } - - return []; - }, -#endif - /** * Getter for the list of all content DOM windows in this tabActor * @return {Array} |