Bug 1032790 - Add the "Close" button on permission dialogs also to OS X. r=jaws
authorRichard Marti <richard.marti@gmail.com>
Fri, 19 Sep 2014 16:06:03 +0200
changeset 219141 5513ebaf921af39a7c6a42ba990b2c6dfe838a34
parent 219140 f6e8cedffac135f0c9b0d49007af6687ec7580de
child 219142 81ffd30de127fc8230a64b1f7dc766fd40ad9f11
push id27956
push userkwierso@gmail.com
push dateFri, 12 Dec 2014 00:47:19 +0000
treeherdermozilla-central@32a2c5bd2f68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1032790
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1032790 - Add the "Close" button on permission dialogs also to OS X. r=jaws
browser/components/preferences/permissions.xul
browser/components/preferences/translation.xul
--- a/browser/components/preferences/permissions.xul
+++ b/browser/components/preferences/permissions.xul
@@ -68,15 +68,13 @@
               accesskey="&removepermission.accesskey;"
               icon="remove" label="&removepermission.label;"
               oncommand="gPermissionManager.onPermissionDeleted();"/>
       <button id="removeAllPermissions"
               icon="clear" label="&removeallpermissions.label;"
               accesskey="&removeallpermissions.accesskey;" 
               oncommand="gPermissionManager.onAllPermissionsDeleted();"/>
       <spacer flex="1"/>
-#ifndef XP_MACOSX
       <button oncommand="close();" icon="close"
               label="&button.close.label;" accesskey="&button.close.accesskey;"/>
-#endif
     </hbox>
   </hbox>
 </window>
--- a/browser/components/preferences/translation.xul
+++ b/browser/components/preferences/translation.xul
@@ -75,15 +75,13 @@
               accesskey="&removeSite.accesskey;"
               icon="remove" label="&removeSite.label;"
               oncommand="gTranslationExceptions.onSiteDeleted();"/>
       <button id="removeAllSites"
               icon="clear" label="&removeAllSites.label;"
               accesskey="&removeAllSites.accesskey;"
               oncommand="gTranslationExceptions.onAllSitesDeleted();"/>
       <spacer flex="1"/>
-#ifndef XP_MACOSX
       <button oncommand="close();" icon="close"
               label="&button.close.label;" accesskey="&button.close.accesskey;"/>
-#endif
     </hbox>
   </hbox>
 </window>