Merge remote-tracking branch 'origin/master' into custom

devtools/client/framework/dev-edition-promo/dev-edition-promo.css

@@ -21,11 +21,7 @@ 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

devtools/client/framework/toolbox-process-window.js

@@ -142,16 +142,6 @@ 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) {