Backed out changeset 6a894530a99b (bug 1355764) for Win7 browser_roundedWindow_newWindow.js failures on a CLOSED TREE.

browser/themes/linux/moz.build

@@ -8,6 +8,4 @@ DIRS += ['communicator']
 
 JAR_MANIFESTS += ['jar.mn']
 
-DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
-
 include('../tab-svgs.mozbuild')

browser/themes/osx/browser.css

@@ -6,6 +6,7 @@
 
 %include shared.inc
 %define toolbarButtonPressed :hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"])
+%define windowButtonMarginTop 11px
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
@@ -14,6 +15,7 @@
 %include ../shared/browser.inc.css
 
 :root {
+  --space-above-tabbar: 9px;
   --tabs-toolbar-color: #333;
 
   --toolbarbutton-vertical-text-padding: calc(var(--toolbarbutton-inner-padding) + 1px);
@@ -21,8 +23,6 @@
 %ifdef MOZ_PHOTON_THEME
   --toolbarbutton-border-radius: 4px;
 %else
-  --space-above-tabbar: 9px;
-
   --toolbarbutton-border-radius: 3px;
 
   --toolbarbutton-hover-background: hsla(0,0%,100%,.1) linear-gradient(hsla(0,0%,100%,.3), hsla(0,0%,100%,.1)) padding-box;
@@ -134,11 +134,7 @@ toolbar:-moz-lwtheme {
  * tabstrip can overlap it.
  */
 #main-window[tabsintitlebar] > #titlebar {
-%ifndef MOZ_PHOTON_THEME
   min-height: calc(var(--tab-min-height) + var(--space-above-tabbar) - var(--tab-toolbar-navbar-overlap));
-%else
-  min-height: calc(var(--tab-min-height) - var(--tab-toolbar-navbar-overlap));
-%endif
 }
 
 /**
@@ -150,11 +146,7 @@ toolbar:-moz-lwtheme {
 
 #main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
 #main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button {
-%ifdef MOZ_PHOTON_THEME
-  margin-top: 6px;
-%else
-  margin-top: 11px;
-%endif
+  margin-top: @windowButtonMarginTop@;
 }
 
 #main-window:not([tabsintitlebar]) > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
@@ -1543,11 +1535,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   text-shadow: @loweredShadow@;
 }
 
-%ifndef MOZ_PHOTON_THEME
 #navigator-toolbox[inFullscreen] > #TabsToolbar {
   padding-top: var(--space-above-tabbar);
 }
-%endif
+
 #tabbrowser-tabs {
   -moz-box-align: stretch;
 }
@@ -2219,9 +2210,7 @@ html|*.addon-webext-perm-list {
 }
 
 #TabsToolbar > .private-browsing-indicator {
-%ifndef MOZ_PHOTON_THEME
   transform: translateY(calc(-1 * var(--space-above-tabbar)));
-%endif
   /* We offset by 38px for mask graphic, plus 4px to account for the
    * margin-left, which sums to 42px.
    */

browser/themes/osx/compacttheme.css

@@ -28,13 +28,12 @@
   background: var(--chrome-background-color);
 }
 
-%ifndef MOZ_PHOTON_THEME
 /* Resize things so that the native titlebar is in line with the tabs */
 #main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
 #main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button {
   margin-top: 6px;
 }
-%endif
+
 /* Prevent the hover styling from on the identity icon from overlapping the
    urlbar border. */
 #identity-box {

browser/themes/shared/browser.inc.css

@@ -3,19 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %ifdef MOZ_PHOTON_THEME
-%ifdef CAN_DRAW_IN_TITLEBAR
-/* Add space for dragging the window */
-%ifdef MENUBAR_CAN_AUTOHIDE
-:root[tabsintitlebar] #toolbar-menubar[autohide=true] ~ #TabsToolbar {
-  padding-inline-start: 40px;
-}
-%else
-:root[tabsintitlebar] #TabsToolbar {
-  padding-inline-start: 40px;
-}
-%endif
-%endif
-
 /* Go button */
 .urlbar-go-button {
   padding: 0 3px;

browser/themes/shared/compacttheme.inc.css

@@ -9,9 +9,7 @@
 :root {
   --tab-toolbar-navbar-overlap: 0px;
   --navbar-tab-toolbar-highlight-overlap: 0px;
-%ifndef MOZ_PHOTON_THEME
   --space-above-tabbar: 0px;
-%endif
   --toolbarbutton-text-shadow: none;
   --backbutton-urlbar-overlap: 0px;
   /* 18px icon + 2 * 5px padding + 1 * 1px border */
@@ -100,13 +98,12 @@ toolbar:-moz-lwtheme-darktext {
   --toolbarbutton-checkedhover-backgroundcolor: #d7d7d8;
 }
 
-%ifndef MOZ_PHOTON_THEME
 /* Give some space to drag the window around while customizing
    (normal space to left and right of tabs doesn't work in this case) */
 #main-window[tabsintitlebar][customizing] {
   --space-above-tabbar: 9px;
 }
-%endif
+
 /* Override @tabCurveHalfWidth@ and @tabCurveWidth@.  XXX: Switch to a CSS variable once the perf is sorted out - bug 1088771 */
 .tab-background-middle {
   border-left-width: 0;

browser/themes/windows/browser-aero.css

@@ -338,12 +338,11 @@
     }
   }
 
-%ifndef MOZ_PHOTON_THEME
   #main-window[sizemode=normal] #TabsToolbar {
     padding-left: 1px;
     padding-right: 1px;
   }
-%endif
+
   #appcontent:not(:-moz-lwtheme) {
     background-color: -moz-dialog;
   }

browser/themes/windows/browser.css

@@ -17,13 +17,13 @@
 :root {
   --titlebar-text-color: inherit;
 
+  --space-above-tabbar: 15px;
+
   --toolbarbutton-vertical-text-padding: calc(var(--toolbarbutton-inner-padding) - 1px);
 
 %ifdef MOZ_PHOTON_THEME
   --toolbarbutton-border-radius: 2px;
 %else
-  --space-above-tabbar: 15px;
-
   --toolbarbutton-border-radius: 1px;
 
   --toolbarbutton-hover-background: rgba(0,0,0,.1);
@@ -89,7 +89,6 @@ toolbar[brighttext] {
   display: none;
 }
 
-%ifndef MOZ_PHOTON_THEME
 /* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
    toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
    of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
@@ -102,7 +101,7 @@ toolbar[brighttext] {
 #main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen]) #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar {
   margin-top: var(--space-above-tabbar);
 }
-%endif
+
 #navigator-toolbox,
 #navigator-toolbox > toolbar {
   -moz-appearance: none;

browser/themes/windows/compacttheme.css

@@ -72,11 +72,10 @@
 
 @media (-moz-os-version: windows-win7),
        (-moz-os-version: windows-win8) {
-%ifndef MOZ_PHOTON_THEME
   :root {
     --space-above-tabbar: 15px;
   }
-%endif
+
   /* It'd be nice if there was an element in the scrollbox's inner content
      that collapsed to the current width of the tabs. Since there isn't we
      need to handle overflowing and non-overflowing tabs separately.

browser/themes/windows/moz.build

@@ -9,6 +9,5 @@ DIRS += ['communicator']
 JAR_MANIFESTS += ['jar.mn']
 
 DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
-DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
 
 include('../tab-svgs.mozbuild')