Bug 625676 - Disable Close and TaskSwitcher buttons on Maemo6 [r=mark.finkle]
authorOleg Romashin <romaxa@gmail.com>
Sat, 15 Jan 2011 11:40:52 +0200
changeset 67262 b425f5cc2d47acfb98fc521d37c2a6f4f4a73e5a
parent 67261 5041d320a15c5b824a4254487386b1d3f61ab4f2
child 67263 24d8b81da5ef7b0b55811e9eb83ec47a60ba2f24
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)
reviewersmark
bugs625676
Bug 625676 - Disable Close and TaskSwitcher buttons on Maemo6 [r=mark.finkle]
mobile/chrome/content/browser.xul
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -213,18 +213,20 @@
       <stack class="window-width window-height">
         <scrollbox id="page-scrollbox" class="window-width window-height">
           <vbox>
             <!-- Main Toolbar -->
             <box id="toolbar-container" class="panel-dark toolbar-height">
               <box id="toolbar-moveable-container">
                 <toolbar id="toolbar-main" class="panel-dark window-width">
 #ifdef MOZ_PLATFORM_MAEMO
+#if MOZ_PLATFORM_MAEMO != 6
                   <toolbarbutton id="tool-app-switch" oncommand="BrowserUI.switchTask();"/>
 #endif
+#endif
                   <hbox id="urlbar-container" flex="1" observes="bcast_urlbarState">
                     <box id="identity-box" class="urlbar-cap-button"
                          onclick="getIdentityHandler().handleIdentityButtonEvent(event);"
                          onkeypress="getIdentityHandler().handleIdentityButtonEvent(event);">
                       <box id="urlbar-image-box" mousethrough="always">
                         <image id="urlbar-throbber"/>
                         <image id="urlbar-favicon" hidden="true"/>
                       </box>
@@ -249,18 +251,20 @@
                              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>