Issue #1829 - Revert “Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.”

This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.

This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740.

3 files changed, 15 insertions, 1 deletions

diff --git a/devtools/client/framework/dev-edition-promo/dev-edition-promo.css b/devtools/client/framework/dev-edition-promo/dev-edition-promo.css
index b4d6383825..01489fd47f 100644
--- a/devtools/client/framework/dev-edition-promo/dev-edition-promo.css
+++ b/devtools/client/framework/dev-edition-promo/dev-edition-promo.css
@@ -21,10 +21,14 @@ window {
  * depend on. Must style font-size to target linux.
  */
 %ifdef XP_UNIX
+%ifndef XP_MACOSX
   font-size: 13px;
 %else
   font-size: 15px;
 %endif
+%else
+  font-size: 15px;
+%endif
   line-height: 19px;
   min-height: 100px;
 }
diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js
index 87b3efa438..82edabe9c6 100644
--- a/devtools/client/framework/toolbox-process-window.js
+++ b/devtools/client/framework/toolbox-process-window.js
@@ -142,6 +142,16 @@ function evaluateTestScript(script, toolbox) {
 function bindToolboxHandlers() {
   gToolbox.once("destroyed", quitApp);
   window.addEventListener("unload", onUnload);
+
+#ifdef XP_MACOSX
+  // Badge the dock icon to differentiate this process from the main application process.
+  updateBadgeText(false);
+
+  // Once the debugger panel opens listen for thread pause / resume.
+  gToolbox.getPanelWhenReady("jsdebugger").then(panel => {
+    setupThreadListeners(panel);
+  });
+#endif
 }
 
 function setupThreadListeners(panel) {
diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
index 9951e7e3dc..763a59fbd6 100644
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -110,7 +110,7 @@ devtools.jar:
     content/framework/toolbox-init.js (framework/toolbox-init.js)
     content/framework/options-panel.css (framework/options-panel.css)
     content/framework/toolbox-process-window.xul (framework/toolbox-process-window.xul)
-    content/framework/toolbox-process-window.js (framework/toolbox-process-window.js)
+*   content/framework/toolbox-process-window.js (framework/toolbox-process-window.js)
     content/framework/dev-edition-promo/dev-edition-promo.xul (framework/dev-edition-promo/dev-edition-promo.xul)
 *   content/framework/dev-edition-promo/dev-edition-promo.css (framework/dev-edition-promo/dev-edition-promo.css)
     content/framework/dev-edition-promo/dev-edition-logo.png (framework/dev-edition-promo/dev-edition-logo.png)