Bug 594614 - Remove the option to hide the tab strip if the suer has a single tab.
☠☠ backed out by 55dbe8aad0bf ☠ ☠
authorShawn Wilsher <sdwilsh@shawnwilsher.com>
Sun, 27 Mar 2011 19:11:44 -0400
changeset 64044 7395f456cf4bb17d9f3da40e05dd893bedf0dca0
parent 64043 b0cbb2028bbfde1956b2fdb25a1b6f0a3d802451
child 64045 a4a1307fc4e1dd08051dbce67125f28b4f9c9c5d
push idunknown
push userunknown
push dateunknown
bugs594614
milestone2.2a1pre
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 594614 - Remove the option to hide the tab strip if the suer has a single tab. r=gavin ui-r=ux
browser/components/preferences/tabs.js
browser/components/preferences/tabs.xul
browser/locales/en-US/chrome/browser/preferences/tabs.dtd
--- a/browser/components/preferences/tabs.js
+++ b/browser/components/preferences/tabs.js
@@ -43,19 +43,16 @@ var gTabsPane = {
    * Preferences:
    *
    * browser.link.open_newwindow
    * - determines where pages which would open in a new window are opened:
    *     0 opens such links in the default window,
    *     1 opens such links in the most recent window or tab,
    *     2 opens such links in a new window,
    *     3 opens such links in a new tab
-   * browser.tabs.autoHide
-   * - true if the tab bar is hidden when only one tab is open, false to always
-   *   show it
    * browser.tabs.loadInBackground
    * - true if display should switch to a new tab which has been opened from a
    *   link, false if display shouldn't switch
    * browser.tabs.warnOnClose
    * - true if when closing a window with multiple tabs the user is warned and
    *   allowed to cancel the action, false to just close the window
    * browser.tabs.warnOnOpen
    * - true if the user should be warned if he attempts to open a lot of tabs at
--- a/browser/components/preferences/tabs.xul
+++ b/browser/components/preferences/tabs.xul
@@ -52,17 +52,16 @@
   <prefpane id="paneTabs"
 #ifdef XP_WIN
             onpaneload="gTabsPane.init();"
 #endif
             helpTopic="prefs-tabs">
 
     <preferences id="tabsPreferences">
       <preference id="browser.link.open_newwindow"     name="browser.link.open_newwindow"     type="int"/>
-      <preference id="browser.tabs.autoHide"           name="browser.tabs.autoHide"           type="bool" inverted="true"/>
       <preference id="browser.tabs.loadInBackground"   name="browser.tabs.loadInBackground"   type="bool" inverted="true"/>
       <preference id="browser.tabs.warnOnClose"        name="browser.tabs.warnOnClose"        type="bool"/>
       <preference id="browser.tabs.warnOnOpen"         name="browser.tabs.warnOnOpen"         type="bool"/>
 #ifdef XP_WIN
       <preference id="browser.taskbar.previews.enable" name="browser.taskbar.previews.enable" type="bool"/>
 #endif
     </preferences>
     
@@ -77,19 +76,16 @@
                 onsyncfrompreference="return gTabsPane.readLinkTarget();"
                 onsynctopreference="return gTabsPane.writeLinkTarget();"/>
       <checkbox id="warnCloseMultiple" label="&warnCloseMultipleTabs.label;"
                 accesskey="&warnCloseMultipleTabs.accesskey;"
                 preference="browser.tabs.warnOnClose"/>
       <checkbox id="warnOpenMany" label="&warnOpenManyTabs.label;"
                 accesskey="&warnOpenManyTabs.accesskey;"
                 preference="browser.tabs.warnOnOpen"/>
-      <checkbox id="showTabBar" label="&showTabBar.label;"
-                accesskey="&showTabBar.accesskey;"
-                preference="browser.tabs.autoHide"/>
       <checkbox id="switchToNewTabs" label="&switchToNewTabs.label;"
                 accesskey="&switchToNewTabs.accesskey;"
                 preference="browser.tabs.loadInBackground"/>
 #ifdef XP_WIN
       <checkbox id="showTabsInTaskbar" label="&showTabsInTaskbar.label;"
                 accesskey="&showTabsInTaskbar.accesskey;"
                 preference="browser.taskbar.previews.enable"/>
 #endif
--- a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
@@ -2,16 +2,13 @@
 <!ENTITY newWindowsAsTabs.accesskey   "t">
 
 <!ENTITY warnCloseMultipleTabs.label  "Warn me when closing multiple tabs">
 <!ENTITY warnCloseMultipleTabs.accesskey  "m">
 
 <!ENTITY warnOpenManyTabs.label       "Warn me when opening multiple tabs might slow down &brandShortName;">
 <!ENTITY warnOpenManyTabs.accesskey   "o">
 
-<!ENTITY showTabBar.label             "Always show the tab bar">
-<!ENTITY showTabBar.accesskey         "b">
-
 <!ENTITY switchToNewTabs.label        "When I open a link in a new tab, switch to it immediately">
 <!ENTITY switchToNewTabs.accesskey    "s">
 
 <!ENTITY showTabsInTaskbar.label          "Show tab previews in the Windows taskbar">
 <!ENTITY showTabsInTaskbar.accesskey      "k">