Merge pull request #108 from janekptacijarabaci/devtools_browser_cleanUp_followUp_3

[DevTools] Use preprocessing for: a global variable "gDevTools" and the context menu - a function "Inspect Element"

3 files changed, 5 insertions, 1 deletions

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index 51b14d152..3061cccdd 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -456,12 +456,14 @@
                     oncommand="gContextMenu.openPasswordManager();"/>
         </menupopup>
       </menu>
+#ifdef MOZ_DEVTOOLS
       <menuseparator id="inspect-separator" hidden="true"/>
       <menuitem id="context-inspect"
                 hidden="true"
                 label="&inspectContextMenu.label;"
                 accesskey="&inspectContextMenu.accesskey;"
                 oncommand="gContextMenu.inspectNode();"/>
+#endif
       <menuseparator id="context-media-eme-separator" hidden="true"/>
       <menuitem id="context-media-eme-learnmore"
                 class="menuitem-iconic"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index daa3ebfb6..9cc5c54ab 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -53,8 +53,10 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
   ["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"],
   ["Weave", "resource://services-sync/main.js"],
   ["fxAccounts", "resource://gre/modules/FxAccounts.jsm"],
+#ifdef MOZ_DEVTOOLS
   // Note: Do not delete! It is used for: base/content/nsContextMenu.js
   ["gDevTools", "resource://devtools/client/framework/gDevTools.jsm"],
+#endif
   ["webrtcUI", "resource:///modules/webrtcUI.jsm", ]
 ].forEach(([name, resource]) => XPCOMUtils.defineLazyModuleGetter(this, name, resource));
 
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index a65c77338..9cbfe7c15 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -67,7 +67,7 @@ browser.jar:
         content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
         content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
 *       content/browser/browser.css                   (content/browser.css)
-        content/browser/browser.js                    (content/browser.js)
+*       content/browser/browser.js                    (content/browser.js)
 *       content/browser/browser.xul                   (content/browser.xul)
         content/browser/browser-addons.js             (content/browser-addons.js)
         content/browser/browser-captivePortal.js      (content/browser-captivePortal.js)