Make Devtools function without WebExtensions

This commit is contained in:
NTD 2018-02-11 06:57:08 -05:00 committed by Roy Tam
commit 0bb0cadab7
2 changed files with 8 additions and 1 deletions

View file

@ -61,9 +61,12 @@ DevToolsModules(
'stylesheets.js',
'timeline.js',
'webaudio.js',
'webbrowser.js',
'webconsole.js',
'webextension.js',
'webgl.js',
'worker.js',
)
FINAL_TARGET_PP_FILES.chrome.devtools.modules.devtools.server.actors += [
'webbrowser.js',
]

View file

@ -30,7 +30,9 @@ 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,
@ -982,6 +984,7 @@ TabActor.prototype = {
return null;
},
#ifdef MOZ_WEBEXTENSIONS
/**
* Getter for the WebExtensions ContentScript globals related to the
* current tab content's DOM window.
@ -994,6 +997,7 @@ TabActor.prototype = {
return [];
},
#endif
/**
* Getter for the list of all content DOM windows in this tabActor