Bug 1397265 - Add a titlebar-placeholder on the right-hand side of the tabs. r=dao

MozReview-Commit-ID: 326Nz1XS4lD

--HG--
extra : rebase_source : 82d868b219f5f4e7a28ec922b4e987fb2b324804

browser/base/content/browser.css

@@ -240,6 +240,9 @@ window:not([chromehidden~="toolbar"]) #nav-bar[nonemptyoverflow] > .overflow-but
 
 
 %ifdef CAN_DRAW_IN_TITLEBAR
+%ifdef MENUBAR_CAN_AUTOHIDE
+#toolbar-menubar:not([autohide=true]) ~ #TabsToolbar > .titlebar-placeholder,
+%endif
 #main-window:not([chromemargin]) > #titlebar,
 #main-window[inFullscreen] > #titlebar,
 #main-window[inFullscreen] .titlebar-placeholder,

browser/base/content/browser.xul

@@ -634,7 +634,7 @@
 
 #ifdef CAN_DRAW_IN_TITLEBAR
       <hbox class="titlebar-placeholder" type="pre-tabs"
-              skipintoolbarset="true"/>
+            skipintoolbarset="true"/>
 #endif
 
       <tabs id="tabbrowser-tabs"
@@ -681,6 +681,12 @@
         </menupopup>
       </toolbarbutton>
 
+#ifdef CAN_DRAW_IN_TITLEBAR
+      <hbox class="titlebar-placeholder" type="post-tabs"
+            ordinal="1000"
+            skipintoolbarset="true"/>
+#endif
+
       <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
               ordinal="1000"
               aria-live="polite" skipintoolbarset="true"/>

browser/themes/shared/tabs.inc.css

@@ -528,21 +528,15 @@ tabbrowser {
 
 /* Tab separators */
 
-%ifdef CAN_DRAW_IN_TITLEBAR
+.titlebar-placeholder[type="pre-tabs"],
-/* Add space for dragging the window */
+.titlebar-placeholder[type="post-tabs"] {
-%ifdef MOZ_WIDGET_COCOA
-:root[tabsintitlebar]:not([sizemode=fullscreen]) .titlebar-placeholder[type="pre-tabs"]
-%elifdef MENUBAR_CAN_AUTOHIDE
-:root[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide=true] ~ #TabsToolbar > .titlebar-placeholder[type="pre-tabs"]
-%else
-:root[tabsintitlebar][sizemode=normal] #TabsToolbar > .titlebar-placeholder[type="pre-tabs"]
-%endif
-{
   width: 40px;
+}
+
+.titlebar-placeholder[type="pre-tabs"] {
   border-inline-end: 1px solid;
   opacity: 0.2;
 }
-%endif
 
 .tabbrowser-tab::after,
 .tabbrowser-tab::before {

browser/themes/windows/browser.css

@@ -296,10 +296,6 @@
   }
 }
 
-.titlebar-placeholder[type="caption-buttons"] {
-  margin-left: 22px; /* space needed for Aero Snap */
-}
-
 /* titlebar command buttons */
 
 #titlebar-min {