Don't use sheet for the about box on Mac OS X. b=222364 r=joshmoz r=mconnor

browser/base/content/aboutDialog.xul

@@ -49,9 +49,16 @@
 <dialog xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="aboutDialog"
-        buttons="accept,extra2" 
         onload="init(event);" onunload="uninit(event);"
-        title="&aboutDialog.title;" creditslabel="&copyright;" aboutlabel="&aboutLink;" 
+#ifdef XP_MACOSX
+        buttons="extra2"
+        align="end"
+#else
+        title="&aboutDialog.title;"
+        buttons="accept,extra2"
+#endif
+        creditslabel="&copyright;"
+        aboutlabel="&aboutLink;" 
         style="width: 299px">
     
   <script type="application/x-javascript" src="chrome://browser/content/aboutDialog.js"/>
@@ -75,5 +82,14 @@
   </deck>
   <separator class="groove" id="groove"/>
 
+# manually add Cmd+W until we add a menubar on mac
+#ifdef XP_MACOSX
+  <keyset id="mainKeyset">
+    <key id="keyClose"
+         modifiers="accel"
+         key="&cmdClose.macKey;"
+         oncommand="window.close();"/>
+  </keyset>
+#endif
 </dialog>
 

browser/base/content/browser.js

@@ -2756,7 +2756,12 @@ function OpenBrowserWindow()
 
 function openAboutDialog()
 {
+#ifdef XP_MACOSX
+  // XXXmano: define minimizable=no although it does nothing on OS X (see Bug 287162); remove this comment once Bug 287162 is fixed...
+  window.open("chrome://browser/content/aboutDialog.xul", "About", "centerscreen,chrome,resizable=no, minimizable=no");
+#else
   window.openDialog("chrome://browser/content/aboutDialog.xul", "About", "modal,centerscreen,chrome,resizable=no");
+#endif
 }
 
 function BrowserCustomizeToolbar()

browser/locales/en-US/chrome/browser/aboutDialog.dtd

@@ -6,3 +6,4 @@
                                  Firefox logos are trademarks of the Mozilla Foundation.  All rights 
                                  reserved. Some trademark rights used under license from The 
                                  Charlton Company.">
+<!ENTITY cmdClose.macKey        "W">