Backed out changeset 9b96bcff860b from bug 436304 - Implement All Tabs panel

with previews and search.

browser/app/profile/firefox.js

@@ -339,7 +339,7 @@ pref("browser.tabs.closeButtons", 1);
 // false  return to the adjacent tab (old default)
 pref("browser.tabs.selectOwnerOnClose", true);
 
-pref("browser.ctrlTab.previews", true);
+pref("browser.ctrlTab.mostRecentlyUsed", true);
 pref("browser.ctrlTab.recentlyUsedLimit", 7);
 
 // Default bookmark sorting

browser/base/content/browser-tabPreviews.js

@@ -43,19 +43,19 @@
  */
 var tabPreviews = {
   aspectRatio: 0.5625, // 16:9
-  init: function tabPreviews__init() {
+  init: function () {
     this.width = Math.ceil(screen.availWidth / 5);
     this.height = Math.round(this.width * this.aspectRatio);
 
     gBrowser.tabContainer.addEventListener("TabSelect", this, false);
     gBrowser.tabContainer.addEventListener("SSTabRestored", this, false);
   },
-  uninit: function tabPreviews__uninit() {
+  uninit: function () {
     gBrowser.tabContainer.removeEventListener("TabSelect", this, false);
     gBrowser.tabContainer.removeEventListener("SSTabRestored", this, false);
     this._selectedTab = null;
   },
-  get: function tabPreviews__get(aTab) {
+  get: function (aTab) {
     if (aTab.__thumbnail_lastURI &&
         aTab.__thumbnail_lastURI != aTab.linkedBrowser.currentURI.spec) {
       aTab.__thumbnail = null;
@@ -63,7 +63,7 @@ var tabPreviews = {
     }
     return aTab.__thumbnail || this.capture(aTab, !aTab.hasAttribute("busy"));
   },
-  capture: function tabPreviews__capture(aTab, aStore) {
+  capture: function (aTab, aStore) {
     var thumbnail = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
     thumbnail.mozOpaque = true;
     thumbnail.height = this.height;
@@ -83,7 +83,7 @@ var tabPreviews = {
     }
     return thumbnail;
   },
-  handleEvent: function tabPreviews__handleEvent(event) {
+  handleEvent: function (event) {
     switch (event.type) {
       case "TabSelect":
         if (this._selectedTab &&
@@ -117,9 +117,9 @@ var ctrlTab = {
     delete this.panel;
     return this.panel = document.getElementById("ctrlTab-panel");
   },
-  get searchField () {
-    delete this.searchField;
-    return this.searchField = document.getElementById("ctrlTab-search");
+  get label () {
+    delete this.label;
+    return this.label = document.getElementById("ctrlTab-label");
   },
   get pagesBar () {
     delete this.pagesBar;
@@ -138,13 +138,7 @@ var ctrlTab = {
     delete this.closeCharCode;
     return this.closeCharCode = document.getElementById("key_close")
                                         .getAttribute("key")
-                                        .toLocaleLowerCase().charCodeAt(0);
-  },
-  get findCharCode () {
-    delete this.findCharCode;
-    return this.findCharCode = document.getElementById("key_find")
-                                       .getAttribute("key")
-                                       .toLocaleLowerCase().charCodeAt(0);
+                                        .toLowerCase().charCodeAt(0);
   },
   get recentlyUsedLimit () {
     delete this.recentlyUsedLimit;
@@ -153,20 +147,10 @@ var ctrlTab = {
   selectedIndex: 0,
   get selected () this.thumbnails.item(this.selectedIndex),
   get isOpen   () this.panel.state == "open" || this.panel.state == "showing",
-  get tabCount () this.tabList.length,
-
-  get sticky () this.panel.hasAttribute("sticky"),
-  set sticky (val) {
-    if (val)
-      this.panel.setAttribute("sticky", "true");
-    else
-      this.panel.removeAttribute("sticky");
-    return val;
-  },
-
-  get pages () Math.ceil(this.tabCount / this.thumbnails.length),
-  get page  () this._page || 0,
-  set page  (page) {
+  get tabCount () gBrowser.mTabs.length - (this._closing ? 1 : 0),
+  get pages    () Math.ceil(this.tabCount / this.thumbnails.length),
+  get page     () this._page || 0,
+  set page (page) {
     if (page < 0)
       page = this.pages - 1;
     else if (page >= this.pages)
@@ -181,19 +165,12 @@ var ctrlTab = {
     this.updatePreviews();
     return page;
   },
-
   get tabList () {
-    if (this._tabList)
-      return this._tabList;
-
     var list = Array.slice(gBrowser.mTabs);
-
     if (this._closing)
       this.detachTab(this._closing, list);
-
     for (let i = 0; i < gBrowser.tabContainer.selectedIndex; i++)
       list.push(list.shift());
-
     if (!this._useTabBarOrder && this.recentlyUsedLimit != 0) {
       let recentlyUsedTabs = this._recentlyUsedTabs;
       if (this.recentlyUsedLimit > 0)
@@ -203,38 +180,9 @@ var ctrlTab = {
         list.unshift(recentlyUsedTabs[i]);
       }
     }
-
-    if (this.searchField.value) {
-      list = list.filter(function (tab) {
-        let lowerCaseLabel, uri;
-        for (let i = 0; i < this.length; i++) {
-          if (tab.label.indexOf(this[i]) != -1)
-            continue;
-
-          if (!lowerCaseLabel)
-            lowerCaseLabel = tab.label.toLocaleLowerCase();
-          if (lowerCaseLabel.indexOf(this[i]) != -1)
-            continue;
-
-          if (!uri) {
-            uri = tab.linkedBrowser.currentURI.spec;
-            try {
-              uri = decodeURI(uri);
-            } catch (e) {}
-          }
-          if (uri.indexOf(this[i]) != -1)
-            continue;
-
-          return false;
-        }
-        return true;
-      }, this.searchField.value.split(/\s+/g));
-    }
-
-    return this._tabList = list;
+    return list;
   },
-
-  init: function ctrlTab__init() {
+  init: function () {
     if (this._recentlyUsedTabs)
       return;
     this._recentlyUsedTabs = [gBrowser.selectedTab];
@@ -244,16 +192,10 @@ var ctrlTab = {
     tabContainer.addEventListener("TabSelect", this, false);
     tabContainer.addEventListener("TabClose", this, false);
 
-    this._handleCtrlTab =
-      gPrefService.getBoolPref("browser.ctrlTab.previews") &&
-      (!gPrefService.prefHasUserValue("browser.ctrlTab.disallowForScreenReaders") ||
-       !gPrefService.getBoolPref("browser.ctrlTab.disallowForScreenReaders"));
-    if (this._handleCtrlTab)
-      gBrowser.mTabBox.handleCtrlTab = false;
+    gBrowser.mTabBox.handleCtrlTab = false;
     document.addEventListener("keypress", this, false);
   },
-
-  uninit: function ctrlTab__uninit() {
+  uninit: function () {
     this._recentlyUsedTabs = null;
 
     var tabContainer = gBrowser.tabContainer;
@@ -262,23 +204,10 @@ var ctrlTab = {
     tabContainer.removeEventListener("TabClose", this, false);
 
     this.panel.removeEventListener("popuphiding", this, false);
-    this.panel.removeEventListener("popupshown", this, false);
-    this.panel.removeEventListener("popuphidden", this, false);
     document.removeEventListener("keypress", this, false);
-    if (this._handleCtrlTab)
-      gBrowser.mTabBox.handleCtrlTab = true;
+    gBrowser.mTabBox.handleCtrlTab = true;
   },
-
-  search: function ctrlTab__search() {
-    if (this.isOpen) {
-      this._tabList = null;
-      this.buildPagesBar();
-      this.goToPage(0, 0);
-      this.updatePreviews();
-    }
-  },
-
-  buildPagesBar: function ctrlTab__buildPagesBar() {
+  buildPagesBar: function () {
     var pages = this.pages;
     if (pages == 1)
       pages = 0;
@@ -291,9 +220,9 @@ var ctrlTab = {
       this.pagesBar.appendChild(pointer);
     }
   },
-
-  goToPage: function ctrlTab__goToPage(aPage, aIndex) {
-    this.page = aPage;
+  goToPage: function (aPage, aIndex) {
+    if (this.page != aPage)
+      this.page = aPage;
     this.selected.removeAttribute("selected");
     if (aIndex) {
       this.selectedIndex = aIndex;
@@ -304,14 +233,13 @@ var ctrlTab = {
     }
     this.updateSelected();
   },
-
-  updatePreviews: function ctrlTab__updatePreviews() {
+  updatePreviews: function () {
     var tabs = this.tabList;
     var offset = this.page * this.thumbnails.length;
     for (let i = 0; i < this.thumbnails.length; i++)
       this.updatePreview(this.thumbnails[i], tabs[i + offset]);
   },
-  updatePreview: function ctrlTab__updatePreview(aThumbnail, aTab) {
+  updatePreview: function (aThumbnail, aTab) {
     do {
       if (aThumbnail._tab) {
         if (aThumbnail._tab == aTab)
@@ -328,22 +256,14 @@ var ctrlTab = {
     if (aTab) {
       aThumbnail.appendChild(tabPreviews.get(aTab));
       aThumbnail.setAttribute("valid", "true");
-      aThumbnail.setAttribute("label", aTab.label);
-      aThumbnail.setAttribute("crop", aTab.crop);
     } else {
-      let placeholder = document.createElement("hbox");
-      placeholder.height = tabPreviews.height;
-      aThumbnail.appendChild(placeholder);
       aThumbnail.removeAttribute("valid");
-      aThumbnail.setAttribute("label", "placeholder");
     }
     aThumbnail.width = tabPreviews.width;
+    aThumbnail.height = tabPreviews.height;
   },
-
-  tabAttrModified: function ctrlTab__tabAttrModified(aTab, aAttrName) {
+  tabAttrModified: function (aTab, aAttrName) {
     switch (aAttrName) {
-      case "label":
-      case "crop":
       case "busy":
         for (let i = this.thumbnails.length - 1; i >= 0; i--) {
           if (this.thumbnails[i]._tab == aTab) {
@@ -352,10 +272,14 @@ var ctrlTab = {
           }
         }
         break;
+      case "label":
+      case "crop":
+        if (this.selected._tab == aTab)
+          this.label[aAttrName == "label" ? "value" : aAttrName] = aTab[aAttrName];
+        break;
     }
   },
-
-  advanceSelected: function ctrlTab__advanceSelected() {
+  advanceSelected: function () {
     this.selected.removeAttribute("selected");
 
     this.selectedIndex += this.invertDirection ? -1 : 1;
@@ -370,20 +294,40 @@ var ctrlTab = {
     }
     this.updateSelected();
   },
-
-  updateSelected: function ctrlTab__updateSelected() {
-    if (this.tabCount)
-      this.selected.setAttribute("selected", "true");
+  updateSelected: function () {
+    var thumbnail = this.selected;
+    thumbnail.setAttribute("selected", "true");
+    this.label.value = thumbnail._tab.label;
+    this.label.crop = thumbnail._tab.crop;
+    var url = thumbnail._tab.linkedBrowser.currentURI.spec;
+    if (url == "about:blank") {
+      // XXXhack: Passing a space here (and not "")
+      // to make sure the browser implementation would
+      // still consider it a hovered link.
+      url = " ";
+    } else {
+      try {
+        url = decodeURI(url);
+      } catch (e) {}
+    }
+    XULBrowserWindow.setOverLink(url, null);
   },
-
-  selectThumbnail: function ctrlTab__selectThumbnail(aThumbnail) {
-    if (this.tabCount) {
-      this._tabToSelect = (aThumbnail || this.selected)._tab;
-      this.panel.hidePopup();
+  thumbnailClick: function (event) {
+    switch (event.button) {
+      case 0:
+        this.selectThumbnail(event.currentTarget);
+        break;
+      case 1:
+        gBrowser.removeTab(event.currentTarget._tab);
+        break;
     }
   },
-
-  attachTab: function ctrlTab__attachTab(aTab, aPos) {
+  selectThumbnail: function (aThumbnail) {
+    var selectedTab = (aThumbnail || this.selected)._tab;
+    this.panel.hidePopup();
+    gBrowser.selectedTab = selectedTab;
+  },
+  attachTab: function (aTab, aPos) {
     if (aPos == 0)
       this._recentlyUsedTabs.unshift(aTab);
     else if (aPos)
@@ -391,19 +335,15 @@ var ctrlTab = {
     else
       this._recentlyUsedTabs.push(aTab);
   },
-  detachTab: function ctrlTab__detachTab(aTab, aTabs) {
+  detachTab: function (aTab, aTabs) {
     var tabs = aTabs || this._recentlyUsedTabs;
     var i = tabs.indexOf(aTab);
     if (i >= 0)
       tabs.splice(i, 1);
   },
-
-  open: function ctrlTab__open(aSticky) {
-    if (this.isOpen && this.sticky) {
-      this.panel.hidePopup();
-      return;
-    }
-    this.sticky = !!aSticky;
+  open: function () {
+    if (window.allTabs)
+      allTabs.close();
 
     this._deferOnTabSelect = [];
     if (this.invertDirection)
@@ -414,50 +354,31 @@ var ctrlTab = {
 
     document.addEventListener("keyup", this, false);
     document.addEventListener("keydown", this, false);
-    this.panel.addEventListener("popupshown", this, false);
     this.panel.addEventListener("popuphiding", this, false);
-    this.panel.addEventListener("popuphidden", this, false);
-    this._prevFocus = document.commandDispatcher.focusedElement ||
-                      document.commandDispatcher.focusedWindow;
     this.panel.hidden = false;
-    this.panel.width = screen.availWidth * .85;
-    this.panel.popupBoxObject.setConsumeRollupEvent(Ci.nsIPopupBoxObject.ROLLUP_CONSUME);
+    this.panel.width = screen.availWidth * .9;
     this.panel.openPopupAtScreen(screen.availLeft + (screen.availWidth - this.panel.width) / 2,
-                                 screen.availTop + screen.availHeight * .12,
+                                 screen.availTop + screen.availHeight * .1,
                                  false);
     this.buildPagesBar();
     this.selectedIndex = 0;
     this.page = 0;
     this.advanceSelected();
   },
-
-  onKeyPress: function ctrlTab__onKeyPress(event) {
+  onKeyPress: function (event) {
     var isOpen = this.isOpen;
-
-    if (isOpen && event.target == this.searchField)
-      return;
-
-    if (isOpen) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
-
+    var propagate = !isOpen;
     switch (event.keyCode) {
       case event.DOM_VK_TAB:
-        if ((event.ctrlKey || this.sticky) && !event.altKey && !event.metaKey) {
+        if (event.ctrlKey && !event.altKey && !event.metaKey) {
+          propagate = false;
           this.invertDirection = event.shiftKey;
-          if (isOpen) {
+          if (isOpen)
             this.advanceSelected();
-          } else if (this._handleCtrlTab) {
-            event.preventDefault();
-            event.stopPropagation();
-            if (gBrowser.mTabs.length > 2) {
-              this.open();
-            } else if (gBrowser.mTabs.length == 2) {
-              gBrowser.selectedTab = gBrowser.selectedTab.nextSibling ||
-                                     gBrowser.selectedTab.previousSibling;
-            }
-          }
+          else if (this.tabCount == 2)
+            gBrowser.selectedTab = this.tabList[1];
+          else if (this.tabCount > 2)
+            this.open();
         }
         break;
       case event.DOM_VK_UP:
@@ -514,28 +435,20 @@ var ctrlTab = {
         if (isOpen)
           this.goToPage(this.page + 1);
         break;
-      case event.DOM_VK_RETURN:
-        if (isOpen && this.sticky)
-          this.selectThumbnail();
-        break;
       case event.DOM_VK_ESCAPE:
         if (isOpen)
           this.panel.hidePopup();
         break;
       default:
-        if (isOpen && event.ctrlKey) {
-          switch (event.charCode) {
-            case this.closeCharCode:
-              gBrowser.removeTab(this.selected._tab);
-              break;
-            case this.findCharCode:
-              this.searchField.focus();
-              break;
-          }
-        }
+        if (isOpen && event.charCode == this.closeCharCode)
+          gBrowser.removeTab(this.selected._tab);
+    }
+    if (!propagate) {
+      event.stopPropagation();
+      event.preventDefault();
     }
   },
-  onPopupHiding: function ctrlTab__onPopupHiding() {
+  onPopupHiding: function () {
     gBrowser.mTabBox.handleCtrlPageUpDown = this._tabBarHandlesCtrlPageUpDown;
     document.removeEventListener("keyup", this, false);
     document.removeEventListener("keydown", this, false);
@@ -548,25 +461,23 @@ var ctrlTab = {
       this.updatePreview(thumbnail, null);
     }, this);
 
-    this.searchField.value = "";
     this.invertDirection = false;
     this._useTabBarOrder = false;
+    this.label.value = "";
+    XULBrowserWindow.setOverLink("", null);
     this._page = null;
-    this._tabList = null;
 
     this._deferOnTabSelect.forEach(this.onTabSelect, this);
     this._deferOnTabSelect = null;
   },
-  onTabSelect: function ctrlTab__onTabSelect(aTab) {
+  onTabSelect: function (aTab) {
     if (aTab.parentNode) {
       this.detachTab(aTab);
       this.attachTab(aTab, 0);
     }
   },
-
-  removeClosingTabFromUI: function ctrlTab__removeClosingTabFromUI(aTab) {
+  removeClosingTabFromUI: function (aTab) {
     this._closing = aTab;
-    this._tabList = null;
     if (this.tabCount == 1) {
       this.panel.hidePopup();
     } else {
@@ -579,8 +490,7 @@ var ctrlTab = {
     }
     this._closing = null;
   },
-
-  handleEvent: function ctrlTab__handleEvent(event) {
+  handleEvent: function (event) {
     switch (event.type) {
       case "DOMAttrModified":
         this.tabAttrModified(event.target, event.attrName);
@@ -605,35 +515,15 @@ var ctrlTab = {
         break;
       case "keydown":
       case "keyup":
-        if (event.target == this.searchField &&
-            (event.keyCode == event.DOM_VK_RETURN ||
-             event.keyCode == event.DOM_VK_ESCAPE))
-          this.panel.focus();
-        if (!this.sticky &&
-            event.type == "keyup" &&
-            event.keyCode == event.DOM_VK_CONTROL)
+        // the panel is open; don't propagate any key events
+        event.stopPropagation();
+        event.preventDefault();
+        if (event.type == "keyup" && event.keyCode == event.DOM_VK_CONTROL)
           this.selectThumbnail();
         break;
-      case "popupshown":
-        if (this.sticky)
-          this.searchField.focus();
-        else
-          this.panel.focus();
-        break;
       case "popuphiding":
         this.onPopupHiding();
         break;
-      case "popuphidden":
-        this._prevFocus.focus();
-        this._prevFocus = null;
-        if (this._tabToSelect) {
-          gBrowser.selectedTab = this._tabToSelect;
-          this._tabToSelect = null;
-        }
-        // Destroy the widget in order to prevent outdated content
-        // when re-opening the panel.
-        this.panel.hidden = true;
-        break;
     }
   }
 };

browser/base/content/browser-tabPreviews.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-# -*- Mode: HTML -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org browser.
-#
-# The Initial Developer of the Original Code is Mozilla.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Dão Gottwald <dao@mozilla.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-<bindings id="tabPreviews"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-  <binding id="ctrlTab-thumbnail">
-    <content align="center">
-      <children/>
-      <xul:label xbl:inherits="value=label,crop"/>
-    </content>
-    <handlers>
-      <handler event="click" button="0" action="ctrlTab.selectThumbnail(this);"/>
-      <handler event="click" button="1" action="gBrowser.removeTab(this._tab);"/>
-    </handlers>
-  </binding>
-</bindings>

browser/base/content/browser.css

@@ -98,20 +98,6 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
 }
 
 /* Tab Previews */
-.ctrlTab-thumbnail {
-  -moz-binding: url("chrome://browser/content/browser-tabPreviews.xml#ctrlTab-thumbnail");
-  -moz-user-focus: normal;
-}
-
 .ctrlTab-thumbnail:not([valid]) {
   visibility: hidden;
 }
-
-#ctrlTab-pages {
-  display: block;
-  text-align: center;
-}
- 
-.ctrlTab-pagePointer {
-  display: inline-block;
-}

browser/base/content/browser.js

@@ -1260,7 +1260,10 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
   gBrowser.addEventListener("command", BrowserOnCommand, false);
 
   tabPreviews.init();
-  ctrlTab.init();
+  if ((!gPrefService.prefHasUserValue("browser.ctrlTab.disallowForScreenReaders") ||
+       !gPrefService.getBoolPref("browser.ctrlTab.disallowForScreenReaders")) &&
+       gPrefService.getBoolPref("browser.ctrlTab.mostRecentlyUsed"))
+    ctrlTab.init();
 
   // Initialize the microsummary service by retrieving it, prompting its factory
   // to create its singleton, whose constructor initializes the service.

browser/base/content/browser.xul

@@ -233,33 +233,27 @@
       <label crop="center" flex="1" class="tooltip-label"/>
     </tooltip>
 
-    <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true"
+    <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" noautofocus="true" level="top"
 #ifdef XP_WIN
 # XXX bug 457997
       noautohide="true"
 #endif
     >
-      <hbox pack="center">
-        <textbox id="ctrlTab-search"
-                 type="search"
-                 emptytext="&ctrlTab.search.emptyText;"
-                 oncommand="ctrlTab.search();"
-                 onfocus="ctrlTab.sticky = true;"/>
+      <label id="ctrlTab-label" flex="1"/>
+      <hbox class="ctrlTab-row">
+        <hbox flex="1" pack="center"><hbox class="ctrlTab-thumbnail" onclick="ctrlTab.thumbnailClick(event);"/></hbox>
+        <hbox class="ctrlTab-thumbnail" onclick="ctrlTab.thumbnailClick(event);"/>
+        <hbox flex="1" pack="center"><hbox class="ctrlTab-thumbnail" onclick="ctrlTab.thumbnailClick(event);"/></hbox>
       </hbox>
       <hbox class="ctrlTab-row">
-        <hbox flex="1" pack="center"><vbox class="ctrlTab-thumbnail"/></hbox>
-        <vbox class="ctrlTab-thumbnail"/>
-        <hbox flex="1" pack="center"><vbox class="ctrlTab-thumbnail"/></hbox>
+        <hbox flex="1" pack="center"><hbox class="ctrlTab-thumbnail" onclick="ctrlTab.thumbnailClick(event);"/></hbox>
+        <hbox class="ctrlTab-thumbnail" onclick="ctrlTab.thumbnailClick(event);"/>
+        <hbox flex="1" pack="center"><hbox class="ctrlTab-thumbnail" onclick="ctrlTab.thumbnailClick(event);"/></hbox>
       </hbox>
       <hbox class="ctrlTab-row">
-        <hbox flex="1" pack="center"><vbox class="ctrlTab-thumbnail"/></hbox>
-        <vbox class="ctrlTab-thumbnail"/>
-        <hbox flex="1" pack="center"><vbox class="ctrlTab-thumbnail"/></hbox>
-      </hbox>
-      <hbox class="ctrlTab-row">
-        <hbox flex="1" pack="center"><vbox class="ctrlTab-thumbnail"/></hbox>
-        <vbox class="ctrlTab-thumbnail"/>
-        <hbox flex="1" pack="center"><vbox class="ctrlTab-thumbnail"/></hbox>
+        <hbox flex="1" pack="center"><hbox class="ctrlTab-thumbnail" onclick="ctrlTab.thumbnailClick(event);"/></hbox>
+        <hbox class="ctrlTab-thumbnail" onclick="ctrlTab.thumbnailClick(event);"/>
+        <hbox flex="1" pack="center"><hbox class="ctrlTab-thumbnail" onclick="ctrlTab.thumbnailClick(event);"/></hbox>
       </hbox>
       <hbox id="ctrlTab-pages"/>
     </panel>

browser/base/content/tabbrowser.css

@@ -12,6 +12,10 @@
 }
 %endif
 
+.tabs-alltabs-popup {
+  -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-alltabs-popup");
+}
+
 .tab-close-button, .tabs-closebutton {
   -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-close-tab-button");
 }

browser/base/content/tabbrowser.xml

@@ -2736,10 +2736,13 @@
                              command="cmd_newNavigatorTab" chromedir="&locale.dir;"
                              tooltiptext="&newTabButton.tooltip;"/>
           <xul:stack align="center" pack="end" chromedir="&locale.dir;">
+            <xul:hbox flex="1" class="tabs-alltabs-box" anonid="alltabs-box"/>
             <xul:hbox flex="1" class="tabs-alltabs-box-animate" anonid="alltabs-box-animate"/>
-            <xul:toolbarbutton class="tabs-alltabs-button" anonid="alltabs-button"
-                               tooltiptext="&listAllTabs.label;"
-                               oncommand="ctrlTab.open(true);"/>
+            <xul:toolbarbutton class="tabs-alltabs-button" type="menu" anonid="alltabs-button"
+                               tooltipstring="&listAllTabs.label;">
+              <xul:menupopup class="tabs-alltabs-popup" anonid="alltabs-popup"
+                             position="after_end"/>
+            </xul:toolbarbutton>
           </xul:stack>
 #ifdef XP_MACOSX
           <xul:hbox anonid="tabstrip-closebutton" class="tabs-closebutton-box" align="center" pack="end" chromedir="&locale.dir;">
@@ -2932,6 +2935,11 @@
         ]]></body>
       </method>
 
+      <field name="mAllTabsPopup">
+        document.getAnonymousElementByAttribute(this, 
+                                                "anonid", "alltabs-popup");
+      </field>
+
       <field name="mAllTabsBoxAnimate">
         document.getAnonymousElementByAttribute(this, 
                                                 "anonid",
@@ -2944,6 +2952,11 @@
       </field>
 #endif
 
+      <field name="mAllTabsButton">
+        document.getAnonymousElementByAttribute(this, 
+                                                "anonid", "alltabs-button");
+      </field>
+
       <field name="_animateTimer">null</field>
       <field name="_animateStep">-1</field>
       <field name="_animateDelay">25</field>
@@ -3036,6 +3049,226 @@
     </implementation>
     <handlers>
       <handler event="TabSelect" action="this._handleTabSelect();"/>
+      <handler event="mouseover"><![CDATA[
+        if (event.originalTarget == this.mAllTabsButton) {
+          this.mAllTabsButton
+              .setAttribute("tooltiptext",
+                            this.mAllTabsButton.getAttribute("tooltipstring"));
+        }
+        else
+          this.mAllTabsButton.removeAttribute("tooltiptext");
+      ]]></handler>
+    </handlers>
+  </binding>
+
+  <!-- alltabs-popup binding
+       This binding relies on the structure of the tabbrowser binding.
+       Therefore it should only be used as a child of the tabs element.
+       This binding is exposed as a pseudo-public-API so themes can customize
+       the tabbar appearance without having to be scriptable
+       (see globalBindings.xml in Pinstripe for example).
+  -->
+  <binding id="tabbrowser-alltabs-popup"
+           extends="chrome://global/content/bindings/popup.xml#popup">
+    <implementation implements="nsIDOMEventListener">
+      <field name="_xulWindow">
+        null
+      </field>
+
+      <constructor><![CDATA[
+        // We cannot cache the XULBrowserWindow object itself since it might
+        // be set after this binding is constructed.
+        try {
+          this._xulWindow = 
+            window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                  .getInterface(Components.interfaces.nsIWebNavigation)
+                  .QueryInterface(Components.interfaces.nsIDocShellTreeItem)
+                  .treeOwner
+                  .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                  .getInterface(Components.interfaces.nsIXULWindow);
+        }
+        catch(ex) { }
+      ]]></constructor>
+
+      <method name="_menuItemOnCommand">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          var tabcontainer = document.getBindingParent(this);
+          tabcontainer.selectedItem = aEvent.target.tab;
+        ]]></body>
+      </method>
+
+      <method name="_tabOnAttrModified">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          var menuItem = aEvent.target.mCorrespondingMenuitem;
+          if (menuItem) {
+            var attrName = aEvent.attrName;
+            switch (attrName) {
+              case "label":
+              case "crop":
+              case "busy":
+              case "image":
+              case "selected":
+                if (aEvent.attrChange == aEvent.REMOVAL)
+                  menuItem.removeAttribute(attrName);
+                else
+                  menuItem.setAttribute(attrName, aEvent.newValue);
+            }
+          }
+        ]]></body>
+      </method>
+
+      <method name="_tabOnTabClose">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          var menuItem = aEvent.target.mCorrespondingMenuitem;
+          if (menuItem)
+            this.removeChild(menuItem);
+        ]]></body>
+      </method>
+
+      <method name="handleEvent">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          if (!aEvent.isTrusted)
+            return;
+
+          switch (aEvent.type) {
+            case "command":
+              this._menuItemOnCommand(aEvent);
+              break;
+            case "DOMAttrModified":
+              this._tabOnAttrModified(aEvent);
+              break;
+            case "TabClose":
+              this._tabOnTabClose(aEvent);
+              break;
+            case "TabOpen":
+              this._createTabMenuItem(aEvent.originalTarget);
+              break;
+            case "scroll":
+              this._updateTabsVisibilityStatus();
+              break;
+          }
+        ]]></body>
+      </method>
+
+      <method name="_updateTabsVisibilityStatus">
+        <body><![CDATA[
+          var tabContainer = document.getBindingParent(this);
+          // We don't want menu item decoration unless there is overflow.
+          if (tabContainer.getAttribute("overflow") != "true")
+            return;
+
+          var tabstripBO = tabContainer.mTabstrip.scrollBoxObject;
+          for (var i = 0; i < this.childNodes.length; i++) {
+            var curTabBO = this.childNodes[i].tab.boxObject;
+            if (curTabBO.screenX >= tabstripBO.screenX &&
+                curTabBO.screenX + curTabBO.width <= tabstripBO.screenX + tabstripBO.width)
+              this.childNodes[i].setAttribute("tabIsVisible", "true"); 
+            else
+              this.childNodes[i].removeAttribute("tabIsVisible");
+          }
+        ]]></body>
+      </method>
+
+      <method name="_createTabMenuItem">
+        <parameter name="aTab"/>
+        <body><![CDATA[
+          var menuItem = document.createElementNS(
+            "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", 
+            "menuitem");
+
+          menuItem.setAttribute("class", "menuitem-iconic alltabs-item");
+
+          menuItem.setAttribute("label", aTab.label);
+          menuItem.setAttribute("crop", aTab.getAttribute("crop"));
+          menuItem.setAttribute("image", aTab.getAttribute("image"));
+
+          if (aTab.hasAttribute("busy"))
+            menuItem.setAttribute("busy", aTab.getAttribute("busy"));
+          if (aTab.selected)
+            menuItem.setAttribute("selected", "true");
+
+          // Keep some attributes of the menuitem in sync with its
+          // corresponding tab (e.g. the tab label)
+          aTab.mCorrespondingMenuitem = menuItem;
+          aTab.addEventListener("DOMAttrModified", this, false);
+          aTab.addEventListener("TabClose", this, false);
+          menuItem.tab = aTab;
+          menuItem.addEventListener("command", this, false);
+
+          this.appendChild(menuItem);
+          return menuItem;
+        ]]></body>
+      </method>
+    </implementation>
+
+    <handlers>
+      <handler event="popupshowing">
+      <![CDATA[
+        // set up the menu popup
+        var tabcontainer = document.getBindingParent(this);
+        var tabs = tabcontainer.childNodes;
+
+        // Listen for changes in the tab bar.
+        var tabbrowser = document.getBindingParent(tabcontainer);
+        tabbrowser.addEventListener("TabOpen", this, false);
+        tabcontainer.mTabstrip.addEventListener("scroll", this, false);
+
+        // if an animation is in progress and the user
+        // clicks on the "all tabs" button, stop the animation
+        tabcontainer._stopAnimation();
+
+        for (var i = 0; i < tabs.length; i++) {
+          this._createTabMenuItem(tabs[i]);
+        }
+        this._updateTabsVisibilityStatus();
+      ]]></handler>
+
+      <handler event="popuphiding">
+      <![CDATA[
+        // clear out the menu popup and remove the listeners
+        while (this.hasChildNodes()) {
+          var menuItem = this.lastChild;
+          menuItem.removeEventListener("command", this, false);
+          menuItem.tab.removeEventListener("DOMAttrModified", this, false);
+          menuItem.tab.removeEventListener("TabClose", this, false);
+          menuItem.tab.mCorrespondingMenuitem = null;
+          this.removeChild(menuItem);
+        }
+        var tabcontainer = document.getBindingParent(this);
+        tabcontainer.mTabstrip.removeEventListener("scroll", this, false);
+        document.getBindingParent(tabcontainer).removeEventListener("TabOpen", this, false);
+      ]]></handler>
+
+      <handler event="DOMMenuItemActive">
+      <![CDATA[
+        if (!this._xulWindow || !this._xulWindow.XULBrowserWindow)
+          return;
+
+        var tab = event.target.tab;
+        if (tab) {
+          var statusText = tab.linkedBrowser.currentURI.spec;
+          if (statusText == "about:blank") {
+            // XXXhack: Passing a space here (and not "")
+            // to make sure the the browser implementation would
+            // still consider it a hovered link.
+            statusText = " ";
+          }
+
+          this._xulWindow.XULBrowserWindow.setOverLink(statusText, null);
+        }
+      ]]></handler>
+
+      <handler event="DOMMenuItemInactive">
+      <![CDATA[
+        if (!this._xulWindow || !this._xulWindow.XULBrowserWindow)
+          return;
+
+        this._xulWindow.XULBrowserWindow.setOverLink("", null);
+      ]]></handler>
     </handlers>
   </binding>
 
@@ -3124,6 +3357,7 @@
 
     <implementation>
       <field name="mOverCloseButton">false</field>
+      <field name="mCorrespondingMenuitem">null</field>
     </implementation>
 
     <handlers>

browser/base/content/test/browser_ctrlTab.js

@@ -113,6 +113,9 @@ function test() {
       ok(ctrlTab.panel.state == "showing" || ctrlTab.panel.state == "open",
          "With " + tabCount + " tabs open, Ctrl+Tab opens the preview panel");
 
+      is(ctrlTab.label.value, gBrowser.mTabs[expectedIndex].label,
+         "Preview panel displays label of expected tab");
+
       releaseCtrl();
 
       ok(ctrlTab.panel.state == "hiding" || ctrlTab.panel.state == "closed",

browser/base/jar.mn

@@ -22,7 +22,6 @@ browser.jar:
 *       content/browser/browser.css                   (content/browser.css)
 *       content/browser/browser.js                    (content/browser.js)
 *       content/browser/browser.xul                   (content/browser.xul)
-*       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
 *       content/browser/credits.xhtml                 (content/credits.xhtml)
 *       content/browser/EULA.js                       (content/EULA.js)
 *       content/browser/EULA.xhtml                    (content/EULA.xhtml)

browser/locales/en-US/chrome/browser/browser.dtd

@@ -426,5 +426,3 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity.moreInfoLinkText "More Information…">
 
 <!ENTITY downloadMonitor2.tooltip "Click to open downloads window">
-
-<!ENTITY ctrlTab.search.emptyText "Search Tabs">

browser/themes/gnomestripe/browser/browser.css

@@ -1300,9 +1300,22 @@ tabpanels {
   opacity: 0.0;
 }
 
+/* All tabs menupopup */
+.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
+}
+
 .tabs-alltabs-button > .toolbarbutton-icon {
-  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
-  margin: 2px 0 2px;
+   margin: 0px;
 }
 
 /* Sidebar */
@@ -1359,41 +1372,37 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
 }
 
 /* ::::: Ctrl-Tab Panel ::::: */
-#ctrlTab-panel {
-  padding-top: 15px;
-}
-
-#ctrlTab-search {
-  margin: 0 0 15px;
+#ctrlTab-label {
+  font-weight: bold;
+  font-size: 1.5em;
+  text-align: center;
+  margin-top: 1em;
+  margin-bottom: 1.5em;
 }
 
 .ctrlTab-thumbnail {
-  margin-bottom: 15px;
-  cursor: pointer;
+  margin-bottom: 40px;
+  -moz-box-shadow: 1px 2px 3px ThreeDShadow;
 }
  
-.ctrlTab-thumbnail > html|canvas {
-  border: 1px solid ThreeDShadow;
-  margin: -1px;
+.ctrlTab-thumbnail[selected="true"] {
+  -moz-box-shadow: 1px 2px 3px ThreeDShadow, 0 0 10px Highlight, 0 0 20px Highlight, 0 0 25px Highlight, 0 0 30px Highlight;
 }
  
-.ctrlTab-thumbnail[selected="true"] ,
-.ctrlTab-thumbnail:hover {
-  background: Highlight;
-  color: HighlightText;
-  -moz-box-shadow: 0 0 2px Highlight, 0 0 2px Highlight, 0 0 3px Highlight, 0 0 4px Highlight, 0 0 10px Highlight, 0 0 15px Highlight;
+#ctrlTab-pages {
+  display: block;
+  text-align: center;
 }
  
 .ctrlTab-pagePointer {
+  display: inline-block;
   margin: 0 1em 1em;
   width: 1.5em;
   height: 1.5em;
   -moz-border-radius: .75em;
   background: ThreeDShadow;
-  cursor: pointer;
 }
 
 .ctrlTab-pagePointer[selected="true"] {
   background: ThreeDDarkShadow;
-  cursor: default;
 }

browser/themes/gnomestripe/browser/jar.mn

@@ -64,7 +64,6 @@ classic.jar:
   skin/classic/browser/preferences/Options.png        (preferences/Options.png)
 * skin/classic/browser/preferences/preferences.css    (preferences/preferences.css)
   skin/classic/browser/preferences/applications.css   (preferences/applications.css)
-  skin/classic/browser/tabbrowser/alltabs.png          (tabbrowser/alltabs.png)
   skin/classic/browser/tabbrowser/newtab.png           (tabbrowser/newtab.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
   icon.png

browser/themes/pinstripe/browser/browser.css

@@ -1748,6 +1748,10 @@ tabbrowser > tabbox > tabpanels {
  * New Tab & All Tabs Buttons
  */
 
+.tabs-alltabs-box {
+  margin: 0;
+}
+
 .tabs-newtab-button ,
 .tabs-alltabs-button {
   -moz-border-start: 2px solid;
@@ -1769,11 +1773,13 @@ tabbrowser > tabbox > tabpanels {
   background-color: rgba(0,0,0,0.10);
 }
 .tabs-newtab-button:hover:active,
-.tabs-alltabs-button:hover:active {
+.tabs-alltabs-button:hover:active,
+.tabs-alltabs-button[open="true"] {
   background-color: rgba(0,0,0,0.20);
 }
 
 .tabs-newtab-button > .toolbarbutton-text ,
+.tabs-alltabs-button > .toolbarbutton-menu-dropmarker ,
 .tabs-alltabs-button > .toolbarbutton-text {
   display: none;
 }
@@ -1790,6 +1796,22 @@ tabbrowser > tabbox > tabpanels {
   opacity: 0.0;
 }
 
+/**
+ * All Tabs Menupopup 
+ */
+
+.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/tree/item.png");
+}
+
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
+}
+
 .tabs-closebutton {
   padding-right: 4px;
   list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
@@ -2121,53 +2143,45 @@ tabpanels.plain {
   margin-left: -1px;
 }
 
-.KUI-panel[level="top"] ,
-#ctrlTab-panel:not([sticky]) {
+.KUI-panel[level="top"] {
   background-color: rgba(68, 68, 68, .5);
   -moz-window-shadow: none;
 }
 
 /* ::::: Ctrl-Tab Panel ::::: */
-#ctrlTab-panel {
-  padding-top: 20px;
-  font-size: 1.2em;
-  text-shadow: 0 0 3px black, 0 0 3px black, 0 0 3px black;
-}
-
-#ctrlTab-search {
-  margin: 0 0 20px;
+#ctrlTab-label {
+  font-weight: bold;
+  font-size: 1.5em;
+  text-align: center;
+  margin-top: 1em;
+  margin-bottom: 1.5em;
+  text-shadow: black 0 0 1em;
 }
 
 .ctrlTab-thumbnail {
-  margin-bottom: 20px;
-  cursor: pointer;
-  font-weight: bold;
+  margin-bottom: 40px;
+  -moz-box-shadow: 1px 2px 3px black;
 }
 
-.ctrlTab-thumbnail > html|canvas {
-  border: 2px solid white;
-  margin: -2px;
+.ctrlTab-thumbnail[selected="true"] {
+  -moz-box-shadow: 1px 2px 3px black, 0 0 10px white, 0 0 20px rgb(50, 170, 255), 0 0 30px rgb(50, 170, 255);
 }
 
-.ctrlTab-thumbnail[selected="true"] ,
-.ctrlTab-thumbnail:hover {
-  background: Highlight;
-  color: HighlightText;
-  -moz-box-shadow: 0 0 2px Highlight, 0 0 2px Highlight, 0 0 3px Highlight, 0 0 4px Highlight, 0 0 10px Highlight, 0 0 20px white;
-  text-shadow: 0 0 3px transparent;
+#ctrlTab-pages {
+  display: block;
+  text-align: center;
 }
 
 .ctrlTab-pagePointer {
+  display: inline-block;
   margin: 0 1em 1em;
   width: 1.5em;
   height: 1.5em;
   -moz-border-radius: .75em;
   background: rgba(0, 0, 0, .5);
   border: 1px solid rgba(255, 255, 255, .3);
-  cursor: pointer;
 }
 
 .ctrlTab-pagePointer[selected="true"] {
   background: rgba(255, 255, 255, .6);
-  cursor: default;
 }

browser/themes/winstripe/browser/browser-aero.css

@@ -87,8 +87,12 @@
   -moz-appearance: -moz-win-glass;
   -moz-border-radius: 0;
   border: none;
-  font: "Segoe UI", window;
-  font-weight: normal;
-  color: black;
-  text-shadow: white -1px -1px .5em, white -1px 1px .5em, white 1px 1px .5em, white 1px -1px .5em;
+}
+
+#ctrlTab-label:-moz-system-metric(windows-compositor) {
+  font: Segoe UI, window;
+  font-weight: normal;
+  font-size: 1.5em;
+  color: black;
+  text-shadow: white -1px -1px 9px, white -1px 1px 9px, white 1px 1px 9px, white 1px -1px 9px;
 }

browser/themes/winstripe/browser/browser.css

@@ -1523,14 +1523,13 @@ tabpanels {
 }
 
 .tabs-newtab-button > .toolbarbutton-text,
-.tabs-alltabs-button > .toolbarbutton-text {
+.tabs-alltabs-button > .toolbarbutton-text,
+.tabs-alltabs-button > .toolbarbutton-icon {
   display: none;
 }
 
-.tabs-alltabs-button > .toolbarbutton-icon {
-  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
-  margin: 6px 0 4px;
-  -moz-image-region: auto;
+.tabs-alltabs-button > .toolbarbutton-menu-dropmarker {
+  margin: 2px 1px 2px 0px;
 }
 
 .tabs-alltabs-box-animate {
@@ -1546,6 +1545,20 @@ stack[chromedir="rtl"] > hbox > .tabs-alltabs-box-animate {
   background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png");
 }
 
+/* All tabs menupopup */
+.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
+}
+
 /* Tabstrip close button */
 .tabs-closebutton {
   -moz-appearance: none;
@@ -1987,53 +2000,45 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   margin-left: -1px;
 }
 
-.KUI-panel[level="top"] ,
-#ctrlTab-panel:not([sticky]) {
+.KUI-panel[level="top"] {
   background-color: rgba(68, 68, 68, .5);
   -moz-window-shadow: none;
 }
 
 /* ::::: Ctrl-Tab Panel ::::: */
-#ctrlTab-panel {
-  padding-top: 20px;
-  font-size: 1.2em;
-  text-shadow: 0 0 3px black, 0 0 3px black, 0 0 3px black;
-}
-
-#ctrlTab-search {
-  margin: 0 0 20px;
+#ctrlTab-label {
+  font-weight: bold;
+  font-size: 1.5em;
+  text-align: center;
+  margin-top: 1em;
+  margin-bottom: 1.5em;
+  text-shadow: black 0 0 1em;
 }
 
 .ctrlTab-thumbnail {
-  margin-bottom: 20px;
-  cursor: pointer;
-  font-weight: bold;
+  margin-bottom: 40px;
+  -moz-box-shadow: 1px 2px 3px black;
 }
 
-.ctrlTab-thumbnail > html|canvas {
-  border: 2px solid white;
-  margin: -2px;
+.ctrlTab-thumbnail[selected="true"] {
+  -moz-box-shadow: 1px 2px 3px black, 0 0 10px white, 0 0 20px rgb(50, 170, 255), 0 0 30px rgb(50, 170, 255);
 }
 
-.ctrlTab-thumbnail[selected="true"] ,
-.ctrlTab-thumbnail:hover {
-  background: Highlight;
-  color: HighlightText;
-  -moz-box-shadow: 0 0 2px Highlight, 0 0 2px Highlight, 0 0 3px Highlight, 0 0 4px Highlight, 0 0 10px Highlight, 0 0 20px white;
-  text-shadow: 0 0 3px transparent;
+#ctrlTab-pages {
+  display: block;
+  text-align: center;
 }
 
 .ctrlTab-pagePointer {
+  display: inline-block;
   margin: 0 1em 1em;
   width: 1.5em;
   height: 1.5em;
   -moz-border-radius: .75em;
   background: rgba(0, 0, 0, .5);
   border: 1px solid rgba(255, 255, 255, .3);
-  cursor: pointer;
 }
 
 .ctrlTab-pagePointer[selected="true"] {
   background: rgba(255, 255, 255, .6);
-  cursor: default;
 }

browser/themes/winstripe/browser/jar.mn

@@ -81,7 +81,6 @@ classic.jar:
         skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
         skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
         skin/classic/browser/preferences/applications.css            (preferences/applications.css)
-        skin/classic/browser/tabbrowser/alltabs.png                             (tabbrowser/alltabs.png)
         skin/classic/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png        (tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png)
         skin/classic/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png      (tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png)
         skin/classic/browser/tabbrowser/newtab.png                              (tabbrowser/newtab.png)
@@ -177,7 +176,6 @@ classic.jar:
         skin/classic/aero/browser/preferences/saveFile.png           (preferences/saveFile-aero.png)
         skin/classic/aero/browser/preferences/preferences.css        (preferences/preferences.css)
         skin/classic/aero/browser/preferences/applications.css       (preferences/applications.css)
-        skin/classic/aero/browser/tabbrowser/alltabs.png                        (tabbrowser/alltabs.png)
         skin/classic/aero/browser/tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png   (tabbrowser/alltabs-box-overflow-end-bkgnd-animate.png)
         skin/classic/aero/browser/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png (tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png)
         skin/classic/aero/browser/tabbrowser/newtab.png                         (tabbrowser/newtab-aero.png)