Merge mozilla-central to autoland.
authorCosmin Sabou <csabou@mozilla.com>
Wed, 28 Nov 2018 00:12:05 +0200
changeset 504818 54e6db47c59eecfccc644236eb86255d903fcb79
parent 504817 193a2a5ad0e6148fa266929af17ff2d897af9f12 (current diff)
parent 504796 204cda7581188cfc8c8ef11dce4680dadf2b43bb (diff)
child 504819 74216c81fc8d385d94e1f7ea6b0c2377aca65953
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland.
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -725,21 +725,22 @@ xmlns="http://www.w3.org/1999/xhtml"
                customizable="true"
                mode="icons"
 #ifdef MENUBAR_CAN_AUTOHIDE
                toolbarname="&menubarCmd.label;"
                accesskey="&menubarCmd.accesskey;"
                autohide="true"
 #endif
                context="toolbar-context-menu">
-        <toolbaritem id="menubar-items" align="start" flex="1">
+        <toolbaritem id="menubar-items" align="center">
 # The entire main menubar is placed into browser-menubar.inc, so that it can be
 # shared with other top level windows in macWindow.inc.xul.
 #include browser-menubar.inc
         </toolbaritem>
+        <spacer flex="1" />
 #include titlebar-items.inc.xul
       </toolbar>
 
       <toolbar id="TabsToolbar"
                class="browser-toolbar titlebar-color"
                fullscreentoolbar="true"
                customizable="true"
                customizationtarget="TabsToolbar-customization-target"
--- a/browser/base/content/titlebar-items.inc.xul
+++ b/browser/base/content/titlebar-items.inc.xul
@@ -1,11 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<hbox class="titlebar-buttonbox-container" skipintoolbarset="true">
+<hbox class="titlebar-buttonbox-container">
   <hbox class="titlebar-buttonbox titlebar-color">
     <toolbarbutton class="titlebar-button titlebar-min" oncommand="window.minimize();"/>
     <toolbarbutton class="titlebar-button titlebar-max" oncommand="onTitlebarMaxClick();"/>
     <toolbarbutton class="titlebar-button titlebar-close" command="cmd_closeWindow"/>
   </hbox>
 </hbox>