diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-11 07:03:16 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-11 07:03:16 -0500 |
| commit | 203eb0f61a09372310a2a8fb57e169cb3f47800b (patch) | |
| tree | 8490329d3dae4de3c7ffd127bce1f65fdc009abd /devtools/server | |
| parent | e45706ca3acbb6530419433212becc61d5953a2d (diff) | |
| parent | 8f6d3dab81c7f8f97ef197e26ab9439b09735b8f (diff) | |
| download | UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.tar UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.tar.gz UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.tar.lz UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.tar.xz UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.zip | |
Merge branch 'ext-work'FF_Checkpoint_1
Diffstat (limited to 'devtools/server')
| -rw-r--r-- | devtools/server/actors/moz.build | 5 | ||||
| -rw-r--r-- | devtools/server/actors/webbrowser.js | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/devtools/server/actors/moz.build b/devtools/server/actors/moz.build index 5980876e2..ddefc3e9e 100644 --- a/devtools/server/actors/moz.build +++ b/devtools/server/actors/moz.build @@ -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', +]
\ No newline at end of file diff --git a/devtools/server/actors/webbrowser.js b/devtools/server/actors/webbrowser.js index 0edcdc187..1808895b1 100644 --- a/devtools/server/actors/webbrowser.js +++ b/devtools/server/actors/webbrowser.js @@ -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 |