Bug 475920 - Make customizable menubars work without regressing OSX; r=stefanh sr=neil a-seamonkey2.0a3=kairo

suite/browser/fullScreen.js

@@ -42,7 +42,6 @@ var FullScreen =
   {
     var show = window.fullScreen;
     // show/hide all menubars, toolbars, and statusbars (except the full screen toolbar)
-    this.showXULChrome("menubar", show);
     this.showXULChrome("toolbar", show);
     this.showXULChrome("statusbar", show);
 

suite/browser/navigator.xul

@@ -151,7 +151,16 @@
   <toolbox id="navigator-toolbox" class="toolbox-top" deferattached="true"
            mode="full" defaultmode="full">
     <!-- Menu -->
-    <menubar id="main-menubar" persist="collapsed" grippytooltiptext="&menuBar.tooltip;"/>
+    <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar"
+             persist="collapsed" grippytooltiptext="&menuBar.tooltip;" customizable="true"
+             defaultset="menubar-items"
+             mode="icons" iconsize="small"
+             defaultmode="icons" defaulticonsize="small"
+             context="toolbar-context-menu">
+      <toolbaritem id="menubar-items" class="menubar-items" align="center">
+        <menubar id="main-menubar"/>
+      </toolbaritem>
+    </toolbar>
 
     <toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar" persist="collapsed" 
              grippytooltiptext="&navigationToolbar.tooltip;"

suite/common/bindings/toolbar.xml

@@ -271,6 +271,10 @@
     </implementation>
   </binding>
 
+  <binding id="grippytoolbar-menubar"
+           extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar"
+           display="xul:menubar"/>
+
   <binding id="grippymenubar" extends="chrome://global/content/bindings/toolbar.xml#menubar">
     <content>
       <xul:hbox flex="1" class="toolbar-box">

suite/common/communicator.css

@@ -62,6 +62,7 @@ toolbox[xpfe="false"] {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbox");
 }
 
+toolbar[xpfe="false"][type="menubar"],
 toolbar[xpfe="false"] {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
 }
@@ -101,6 +102,10 @@ toolbar {
   -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar");
 }
 
+toolbar[type="menubar"] {
+  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-menubar");
+}
+
 toolbargrippy {
   -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#toolbargrippy");
 }

suite/themes/classic/communicator/mac/toolbar.css

@@ -52,7 +52,7 @@ toolbar {
   border-bottom: 1px solid rgba(0,0,0,0.35);
 }
 
-toolbar:not([nowindowdrag="true"]) {
+toolbar:not([nowindowdrag="true"]):not([type="menubar"]) {
   -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-drag");
 }