Bug 855370 - Remove the ability to not 'Always show the tab bar'. r=dao, ui-r=limi

2013-03-27 20:54:59 -04:00 · 2013-03-27 20:54:59 -04:00 · eec68b9946
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@ -401,7 +401,6 @@ pref("browser.link.open_newwindow.disabled_in_fullscreen", false);
 #endif

 // Tabbed browser
-pref("browser.tabs.autoHide", false);
 pref("browser.tabs.closeWindowWithLastTab", true);
 pref("browser.tabs.insertRelatedAfterCurrent", true);
 pref("browser.tabs.warnOnClose", true);
@ -975,7 +974,6 @@ pref("services.sync.prefs.sync.browser.search.update", true);
 pref("services.sync.prefs.sync.browser.sessionstore.restore_on_demand", true);
 pref("services.sync.prefs.sync.browser.startup.homepage", true);
 pref("services.sync.prefs.sync.browser.startup.page", true);
-pref("services.sync.prefs.sync.browser.tabs.autoHide", true);
 pref("services.sync.prefs.sync.browser.tabs.closeButtons", true);
 pref("services.sync.prefs.sync.browser.tabs.loadInBackground", true);
 pref("services.sync.prefs.sync.browser.tabs.warnOnClose", true);
--- a/browser/base/content/browser-fullScreen.js
+++ b/browser/base/content/browser-fullScreen.js
@ -566,14 +566,9 @@ var FullScreen = {

    // In tabs-on-top mode, move window controls to the tab bar,
    // and in tabs-on-bottom mode, move them back to the navigation toolbar.
-    // When there is a chance the tab bar may be collapsed, put window
-    // controls on nav bar.
    var fullscreenctls = document.getElementById("window-controls");
    var navbar = document.getElementById("nav-bar");
-    var ctlsOnTabbar = window.toolbar.visible &&
-                       (navbar.collapsed ||
-                          (TabsOnTop.enabled &&
-                           !gPrefService.getBoolPref("browser.tabs.autoHide")));
+    var ctlsOnTabbar = window.toolbar.visible && (navbar.collapsed || TabsOnTop.enabled);
    if (fullscreenctls.parentNode == navbar && ctlsOnTabbar) {
      fullscreenctls.removeAttribute("flex");
      document.getElementById("TabsToolbar").appendChild(fullscreenctls);
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@ -6551,9 +6551,7 @@ function convertFromUnicode(charset, str)
 function undoCloseTab(aIndex) {
  // wallpaper patch to prevent an unnecessary blank tab (bug 343895)
  var blankTabToRemove = null;
-  if (gBrowser.tabs.length == 1 &&
-      !gPrefService.getBoolPref("browser.tabs.autoHide") &&
-      isTabEmpty(gBrowser.selectedTab))
+  if (gBrowser.tabs.length == 1 && isTabEmpty(gBrowser.selectedTab))
    blankTabToRemove = gBrowser.selectedTab;

  var tab = null;
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@ -3041,9 +3041,6 @@
              this.tabContainer.mCloseButtons = Services.prefs.getIntPref(data);
              this.tabContainer.adjustTabstrip();
              break;
-            case "browser.tabs.autoHide":
-              this.tabContainer.updateVisibility();
-              break;
            case "browser.tabs.closeWindowWithLastTab":
              this.tabContainer._closeWindowWithLastTab = Services.prefs.getBoolPref(data);
              this.tabContainer.adjustTabstrip();
@ -3121,8 +3118,7 @@
      <method name="updateVisibility">
        <body><![CDATA[
          if (this.childNodes.length - this.tabbrowser._removingTabs.length == 1)
-            this.visible = window.toolbar.visible &&
-                           !Services.prefs.getBoolPref("browser.tabs.autoHide");
+            this.visible = window.toolbar.visible;
          else
            this.visible = true;
        ]]></body>
--- a/browser/components/preferences/in-content/tabs.js
+++ b/browser/components/preferences/in-content/tabs.js
@ -12,9 +12,6 @@ var gTabsPane = {
   *     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
--- a/browser/components/preferences/in-content/tabs.xul
+++ b/browser/components/preferences/in-content/tabs.xul
@ -9,10 +9,6 @@
  <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"
@ -58,11 +54,6 @@
          preference="browser.tabs.warnOnOpen"
          class="indent"/>

-<checkbox id="showTabBar" label="&showTabBar.label;"
-          data-category="paneTabs" hidden="true"
-          accesskey="&showTabBar.accesskey;"
-          preference="browser.tabs.autoHide"
-          class="indent"/>

 <checkbox id="restoreOnDemand" label="&restoreTabsOnDemand.label;"
          data-category="paneTabs" hidden="true"
--- a/browser/components/preferences/tabs.js
+++ b/browser/components/preferences/tabs.js
@ -13,9 +13,6 @@ var gTabsPane = {
   *     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
--- a/browser/components/preferences/tabs.xul
+++ b/browser/components/preferences/tabs.xul
@ -23,7 +23,6 @@

    <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"/>
@ -49,9 +48,6 @@
      <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="restoreOnDemand" label="&restoreTabsOnDemand.label;"
                accesskey="&restoreTabsOnDemand.accesskey;"
                preference="browser.sessionstore.restore_on_demand"/>
--- a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
@ -11,9 +11,6 @@
 <!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 restoreTabsOnDemand.label        "Don’t load tabs until selected">
 <!ENTITY restoreTabsOnDemand.accesskey    "l">