From 8f6d3dab81c7f8f97ef197e26ab9439b09735b8f Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 11 Feb 2018 06:57:08 -0500
Subject: Make Devtools function without WebExtensions

---
 devtools/server/actors/moz.build     | 5 ++++-
 devtools/server/actors/webbrowser.js | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'devtools/server')

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
-- 
cgit v1.2.3