Bug 283660 - The new preferences window can't be closed on OS X (and doesn't have a collapse toolbar button) r=ben

git-svn-id: svn://10.0.0.236/trunk@170131 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/browser/base/content/browser.js

@@ -3699,7 +3699,7 @@ function asyncFocusSearchBox(event)
 function openPreferences()
 {
   var instantApply = gPrefService.getBoolPref("browser.preferences.instantApply");
-  var features = "chrome,titlebar,centerscreen" + (instantApply ? "" : ",modal");
+  var features = "chrome,titlebar,toolbar,centerscreen" + (instantApply ? ",dialog=no" : ",modal");
 
   var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                      .getService(Components.interfaces.nsIWindowMediator);

mozilla/toolkit/content/widgets/preferences.xml

@@ -401,7 +401,7 @@
 #else
              xul:title="&preferencesDefaultTitleMac.title;">
 #endif
-      <xul:radiogroup anonid="selector" orient="horizontal" class="paneSelector"/>
+      <xul:radiogroup anonid="selector" orient="horizontal" class="paneSelector chromeclass-toolbar"/>
       <xul:hbox flex="1" class="paneDeckContainer">
         <xul:deck anonid="paneDeck" flex="1">
           <children includes="prefpane"/>

mozilla/toolkit/content/xul.css

@@ -992,6 +992,12 @@ radio[pane] {
   -moz-appearance: none;
   -moz-box-align: center;
 }
+
+prefwindow[chromehidden~="toolbar"] .chromeclass-toolbar
+{
+  display: none;
+}
+
 /********** expander ********/
 
 expander {