Bug 638183 - Enable Back button for URL/awesome list view [r=mfinkle]
authorOleg Romashin <romaxa@gmail.com>
Wed, 02 Mar 2011 17:49:42 -0800
changeset 67462 e1334ed550300629ac71e86876108d0447d5b5cc
parent 67461 5325a102903f5d8d311fb18e2797271d34bc2504
child 67463 d1293b9736459b14fc21eba1a09bdbcb218d2f82
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)
reviewersmfinkle
bugs638183
Bug 638183 - Enable Back button for URL/awesome list view [r=mfinkle]
mobile/chrome/content/browser.xul
mobile/themes/core/browser.css
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -254,20 +254,18 @@
                              clickSelectsAll="true"/>
                     <hbox id="urlbar-icons" class="urlbar-cap-button" observes="bcast_urlbarState">
                       <toolbarbutton id="tool-reload" oncommand="CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload' : 'cmd_reload');"/>
                       <toolbarbutton id="tool-stop" command="cmd_stop"/>
                       <toolbarbutton id="tool-search" command="cmd_opensearch"/>
                     </hbox>
                   </hbox>
 #ifndef ANDROID
-#if MOZ_PLATFORM_MAEMO != 6
                   <toolbarbutton id="tool-app-close" class="urlbar-button" command="cmd_close"/>
 #endif
-#endif
                 </toolbar>
               </box>
             </box>
 
             <!-- Content viewport -->
             <vbox id="content-viewport" class="window-width window-height">
               <!-- Content viewport -->
               <stack>
--- a/mobile/themes/core/browser.css
+++ b/mobile/themes/core/browser.css
@@ -101,19 +101,21 @@ toolbarbutton.urlbar-button {
 #tool-app-close:hover:active:-moz-locale-dir(ltr) {
   -moz-border-radius-bottomleft: @border_radius_small@;
 }
 
 #tool-app-close:hover:active:-moz-locale-dir(rtl) {
   -moz-border-radius-bottomright: @border_radius_small@;
 }
 
+%if MOZ_PLATFORM_MAEMO != 6
 #toolbar-main[fullscreen="true"] #tool-app-close {
   visibility: visible;
 }
+%endif
 
 #toolbar-main[dialog="true"] #tool-app-close {
   visibility: visible;
   list-style-image: url("chrome://browser/skin/images/task-back-hdpi.png");
 }
 
 #toolbar-main[dialog="true"] #tool-app-close:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/images/task-back-rtl-hdpi.png");