[Mac] Improve the appearance of the unified toolbar in conversation windows.

im/content/instantbird.xul

@@ -161,6 +161,9 @@
     </menupopup>
   </popupset>
 
+#ifdef XP_MACOSX
+  <windowdragbox id="unified-toolbar"/>
+#endif
   <tabconversation id="conversations" flex="1"
                    contenttooltip="aHTMLTooltip"
                    contentcontextmenu="contentAreaContextMenu"/>

im/themes/jar.mn

@@ -72,7 +72,6 @@ instantbird.jar:
 #ifdef XP_UNIX
 #ifdef XP_MACOSX
 	skin/classic/instantbird/tabbrowser.css                         (tabbrowser-pinstripe/tabbrowser.css)
-	skin/classic/instantbird/unified.xml                            (tabbrowser-pinstripe/unified.xml)
 	skin/classic/instantbird/tabbrowser/newtab.png			(tabbrowser-pinstripe/newtab.png)
 	skin/classic/instantbird/tabbrowser/tab-arrow-left.png		(tabbrowser-pinstripe/tab-arrow-left.png)
 	skin/classic/instantbird/tabbrowser/tab-arrow-right.png		(tabbrowser-pinstripe/tab-arrow-right.png)

im/themes/tabbrowser-pinstripe/tabbrowser.css

@@ -52,10 +52,15 @@ statusbarpanel#statusbar-display {
 }
 
 #convWindow {
-  -moz-binding: url("chrome://instantbird/skin/unified.xml#unifiedWindow");
+  -moz-appearance: none;
   background-color: #eeeeee;
 }
 
+#unified-toolbar {
+  height: 1px;
+  -moz-appearance: -moz-mac-unified-toolbar;
+}
+
 /* ----- INACTIVE WINDOW ----- */
 
 .tabs-newtab-button > .toolbarbutton-icon:-moz-window-inactive {
@@ -72,7 +77,7 @@ statusbarpanel#statusbar-display {
 }
 
 .tabbrowser-tab[selected="true"]:-moz-window-inactive {
-  background-color: #CACACA;
+  background-color: -moz-mac-chrome-inactive;
 }
 
 /* ::::: tabbrowser ::::: */
@@ -127,7 +132,7 @@ tabbrowser > tabbox {
   -moz-border-bottom-colors: rgba(0, 0, 0, .1) rgba(0, 0, 0, .2);
   -moz-border-right-colors: rgba(0, 0, 0, .1) rgba(0, 0, 0, .2);
   background-image: none;
-  background-color: #969696;
+  background-color: -moz-mac-chrome-active;
 }
 
 .tabbrowser-tab[selected="true"]:focus > .tab-text {

im/themes/tabbrowser-pinstripe/unified.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE bindings>
-
-<bindings id="unifiedBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-  <binding id="unifiedWindow">
-    <content activetitlebarcolor="#969696" inactivetitlebarcolor="#CACACA"/>
-  </binding>
-</bindings>