From 914582b88e41004c6241bdaa3b9211153769ddf9 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Dec 2014 15:49:07 -0500
Subject: [PATCH] Backed out changeset 326f890f61a5 (bug 647540) for mass test
 bustage. CLOSED TREE

---
 addon-sdk/source/lib/sdk/ui/toolbar/view.js       | 2 +-
 browser/base/content/browser.css                  | 2 +-
 browser/base/content/browser.xul                  | 3 ++-
 toolkit/components/printing/content/printUtils.js | 1 +
 toolkit/themes/osx/global/toolbar.css             | 4 ++++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addon-sdk/source/lib/sdk/ui/toolbar/view.js b/addon-sdk/source/lib/sdk/ui/toolbar/view.js
index ecd7904cb1f5..aefd0f20de7e 100644
--- a/addon-sdk/source/lib/sdk/ui/toolbar/view.js
+++ b/addon-sdk/source/lib/sdk/ui/toolbar/view.js
@@ -96,7 +96,7 @@ const addView = curry((options, {document}) => {
   view.setAttribute("mode", "icons");
   view.setAttribute("iconsize", "small");
   view.setAttribute("context", "toolbar-context-menu");
-  view.setAttribute("class", "chromeclass-toolbar");
+  view.setAttribute("class", "toolbar-primary chromeclass-toolbar");
 
   let label = document.createElementNS(XUL_NS, "label");
   label.setAttribute("value", options.title);
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 7fe4d7e3ad76..2e5a7cd34e7f 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -571,7 +571,7 @@ window[sizemode="maximized"] #content .notification-inner {
 
 /* Hide extension toolbars that neglected to set the proper class */
 window[chromehidden~="location"][chromehidden~="toolbar"] toolbar:not(.chromeclass-menubar),
-window[chromehidden~="toolbar"] toolbar:not(#nav-bar):not(#TabsToolbar):not(#print-preview-toolbar):not(.chromeclass-menubar) {
+window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-menubar) {
   display: none;
 }
 
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 3bb17d3647b1..0dbd35367516 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -634,6 +634,7 @@
     </toolbar>
 
     <toolbar id="TabsToolbar"
+             class="toolbar-primary"
              fullscreentoolbar="true"
              customizable="true"
              mode="icons"
@@ -719,7 +720,7 @@
            to the default placements of buttons in CustomizableUI.jsm, so the
            customization code doesn't get confused.
       -->
-    <toolbar id="nav-bar"
+    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
              aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="small"
diff --git a/toolkit/components/printing/content/printUtils.js b/toolkit/components/printing/content/printUtils.js
index 37c4b1a8a468..981cb4196555 100644
--- a/toolkit/components/printing/content/printUtils.js
+++ b/toolkit/components/printing/content/printUtils.js
@@ -474,6 +474,7 @@ var PrintUtils = {
       printPreviewTB = document.createElementNS(XUL_NS, "toolbar");
       printPreviewTB.setAttribute("printpreview", true);
       printPreviewTB.id = "print-preview-toolbar";
+      printPreviewTB.className = "toolbar-primary";
 
       let navToolbox = this._listener.getNavToolbox();
       navToolbox.parentNode.insertBefore(printPreviewTB, navToolbox);
diff --git a/toolkit/themes/osx/global/toolbar.css b/toolkit/themes/osx/global/toolbar.css
index 38614fb89857..04e90887121c 100644
--- a/toolkit/themes/osx/global/toolbar.css
+++ b/toolkit/themes/osx/global/toolbar.css
@@ -22,6 +22,10 @@ menubar {
   min-width: 1px;
 }
 
+.toolbar-primary {
+  min-height: 24px;
+}
+
 toolbarseparator {
   -moz-appearance: none;
   margin: 3px 4px;