Bug 593452 - Remove the Maemo back button from the toolbar for Android [r=mbrubeck]

mobile/chrome/content/browser.xul

@@ -263,7 +263,9 @@
                       <toolbarbutton id="tool-go" class="urlbar-cap-button" command="cmd_go"/>
                     </hbox>
                   </hbox>
+#ifdef MOZ_PLATFORM_MAEMO
                   <toolbarbutton id="tool-app-close" class="urlbar-button button-image" command="cmd_close"/>
+#endif
                 </toolbar>
               </box>
             </box>

mobile/themes/core/browser.css

@@ -60,6 +60,8 @@ toolbarbutton.urlbar-button {
   -moz-margin-start: 8px; /* core spacing */
 }
 
+%ifdef MOZ_PLATFORM_MAEMO
+/* MAEMO only */
 #tool-app-switch {
   margin-top: -8px; /* force the button to go to the edge */
   margin-bottom: -8px; /* force the button to go to the edge */
@@ -81,6 +83,7 @@ toolbarbutton.urlbar-button {
   visibility: visible;
 }
 
+/* MAEMO only */
 #tool-app-close {
   margin-top: -8px; /* force the button to go to the edge */
   margin-bottom: -8px; /* force the button to go to the edge */
@@ -116,6 +119,7 @@ toolbarbutton.urlbar-button {
 #toolbar-main[dialog="true"] #tool-app-close:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/images/task-back-rtl-40.png");
 }
+%endif
 
 /* URL bar cap buttons */
 toolbarbutton.urlbar-cap-button {

mobile/themes/core/jar.mn

@@ -10,7 +10,7 @@ chrome.jar:
   skin/firstRun.css                         (firstRun.css)
   skin/header.css                           (header.css)
   skin/platform.css                         (platform.css)
-  skin/browser.css                          (browser.css)
+* skin/browser.css                          (browser.css)
   skin/notification.css                     (notification.css)
 % override chrome://global/skin/about.css chrome://browser/skin/about.css