Bug 601111 - Use Maemo back-button on desktop [r=vingtetung ui-r=beltzner]
authorMark Finkle <mfinkle@mozilla.com>
Fri, 01 Oct 2010 10:56:56 -0400
changeset 66768 1f38ed5cc8d5407fc2ba64f6e97139cd9e2a940d
parent 66767 d87b30c0647d5167d0dd424b9691a940e868dbae
child 66769 1ab14c62101bcebae79cba4ac69d317ebd08ccac
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvingtetung, beltzner
bugs601111
Bug 601111 - Use Maemo back-button on desktop [r=vingtetung ui-r=beltzner]
mobile/chrome/content/browser.xul
mobile/themes/core/browser.css
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -256,17 +256,17 @@
                              clickSelectsAll="true"/>
                     <hbox id="urlbar-icons" observes="bcast_urlbarState">
                       <toolbarbutton id="tool-reload" class="urlbar-cap-button"
                                      oncommand="CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload' : 'cmd_reload');"/>
                       <toolbarbutton id="tool-stop" class="urlbar-cap-button" command="cmd_stop"/>
                       <toolbarbutton id="tool-search" class="urlbar-cap-button" command="cmd_opensearch"/>
                     </hbox>
                   </hbox>
-#ifdef MOZ_PLATFORM_MAEMO
+#ifndef ANDROID
                   <toolbarbutton id="tool-app-close" class="urlbar-button button-image" command="cmd_close"/>
 #endif
                 </toolbar>
               </box>
             </box>
 
             <notificationbox id="notifications" class="window-width"/>
 
@@ -372,17 +372,17 @@
     </vbox>
 
     <vbox id="panel-container" class="panel-dark window-width window-height" style="-moz-stack-sizing: ignore" left="10000" hidden="true">
       <hbox id="panel-controls" oncommand="BrowserUI.switchPane(event.target.getAttribute('linkedpanel'));">
         <toolbarbutton id="tool-preferences" type="radio" group="1" checked="true" class="panel-button button-image" linkedpanel="prefs-container"/>
         <toolbarbutton id="tool-downloads" type="radio" group="1" class="panel-button button-image" linkedpanel="downloads-container"/>
         <toolbarbutton id="tool-addons" type="radio" group="1" class="panel-button button-image" linkedpanel="addons-container"/>
         <toolbarbutton id="tool-console" type="radio" group="1" hidden="true" class="panel-button button-image" linkedpanel="console-container"/>
-#ifdef MOZ_PLATFORM_MAEMO
+#ifndef ANDROID
         <spacer flex="1"/>
         <toolbarbutton id="tool-panel-close" class="button-image" command="cmd_panel"/>
 #endif
       </hbox>
       <vbox flex="1">
         <hbox class="panel-header" align="center" flex="1">
           <label id="panel-header" value="&prefsHeader.label;"/>
         </hbox>
--- a/mobile/themes/core/browser.css
+++ b/mobile/themes/core/browser.css
@@ -50,18 +50,18 @@
 }
 
 /* main toolbar buttons */
 toolbarbutton.urlbar-button {
   /* space out the buttons a bit horizontally */
   -moz-margin-start: 8px; /* core spacing */
 }
 
-%ifdef MOZ_PLATFORM_MAEMO
-/* MAEMO only */
+%ifndef ANDROID
+/* MAEMO (and desktop) 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 */
   -moz-margin-start: -8px; /* force the button to go to the edge */
   -moz-padding-start: 8px !important; /* re-center the image */
   min-width: 72px !important; /* 72, not 64 to make up for the negative margin */
   min-height: 72px !important; /* 72, not 64 to make up for the negative margin */
   visibility: collapse;
@@ -73,17 +73,17 @@ toolbarbutton.urlbar-button {
   background-color: #8db8d8 !important;
   -moz-border-radius-bottomright: 6px;
 }
 
 #toolbar-main[fullscreen="true"] #tool-app-switch:not(:-moz-system-metric(maemo-classic)) {
   visibility: visible;
 }
 
-/* MAEMO only */
+/* MAEMO (and desktop) 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 */
   -moz-margin-end: -8px; /* force the button to go to the edge */
   -moz-padding-end: 8px !important; /* re-center the image */
   min-width: 72px !important; /* 72, not 64 to make up for the negative margin */
   min-height: 72px !important; /* 72, not 64 to make up for the negative margin */
   visibility: collapse;
@@ -389,18 +389,18 @@ toolbarbutton.page-button {
 #tool-panel-open:not([disabled="true"]):hover:active {
   list-style-image: url("chrome://browser/skin/images/settings-active-64.png");
 }
 
 #tool-panel-open:not([disabled="true"]):hover:active:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/images/settings-active-rtl-64.png");
 }
 
-%ifdef MOZ_PLATFORM_MAEMO
-/* MAEMO only */
+%ifndef ANDROID
+/* MAEMO (and desktop) only */
 #tool-panel-close {
   -moz-margin-end: -8px; /* force the button to go to the edge */
   -moz-padding-end: 8px !important; /* re-center the image */
   min-width: 72px !important; /* 72, not 64 to make up for the negative margin */
   min-height: 72px !important; /* 72, not 64 to make up for the negative margin */
   list-style-image: url("chrome://browser/skin/images/task-back-40.png");
 }