Backed out changeset 326f890f61a5 (bug 647540) for mass test bustage.

CLOSED TREE

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);

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;
 }
 

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"

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);

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;