Add sidebar close button.

browser/base/content/browser.js

@@ -3227,8 +3227,11 @@ nsBrowserContentListener.prototype =
 }
 
 function toggleSidebar(aCommandID) {
-  var elt = document.getElementById(aCommandID);
   var sidebarBox = document.getElementById("sidebar-box");
+  if (!aCommandID)
+    aCommandID = sidebarBox.getAttribute("sidebarcommand");
+
+  var elt = document.getElementById(aCommandID);
   var sidebar = document.getElementById("sidebar");
   var sidebarTitle = document.getElementById("sidebar-title");
   var sidebarSplitter = document.getElementById("sidebar-splitter");

toolkit/skin/win/browser.css

@@ -30,22 +30,4 @@ tabpanels {
 
 tab[busy] > .tab-icon {
   list-style-image: url("chrome://communicator/skin/icons/loading.gif");
-}
-
-/* ::::: close button ::::: */
-
-.tabs-closebutton {
-  margin: 0px 4px;
-  padding: 1px 2px 2px 2px;
-  border: none;
-  list-style-image: url("chrome://browser/skin/close.png");
-  -moz-image-region: rect(0px 20px 20px 0px);
-}
-
-.tabs-closebutton:hover {
-  -moz-image-region: rect(0px 50px 20px 30px);
-}
-
-.tabs-closebutton:hover:active {
-  -moz-image-region: rect(0px 110px 20px 90px);
-}
+}

toolkit/skin/win/global.css

@@ -139,8 +139,8 @@ statusbarpanel {
 
 /* XXXBlake yeah, shoot me -- these don't belong here.  I'll move them later. */
 
-sidebarheader {
-  height: 23px;
+sidebarheader {  
+  min-height: 25px;
   background-color: -moz-Dialog;
   -moz-appearance: toolbox;
   border-bottom: 1px solid ThreeDShadow;