Backout changesets 24d45fb71421, 8d3475475a0b, 84c0fbc1cf1d and b7d269a291b6 for possible zooming (bug 685541) and panning regressions (bug 685540)
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 08 Sep 2011 11:49:01 -0400
changeset 76714 4be2da039559773ee412fce9aa22c007718a4cb3
parent 76713 2bd109e6766f6f563321f7c4efdfe1a57964ec2d
child 76715 a73f7a3b85a5b1b2e3e4e19ee7e90bdbf7d9001e
child 76736 b2664107f9766671f4c4d19a1143e56fc2236929
child 77056 cc669ae63634a25e03f44523e02816ea720c0579
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
bugs685541, 685540
milestone9.0a1
backs out24d45fb7142192c524b1e3ad2de317833b925bc2
8d3475475a0be3a6ff752e6f9d4cda7469734863
84c0fbc1cf1d72b08db5a7bca29a2e2696b51d24
b7d269a291b6f91a20958011d610cf8d443bd685
Backout changesets 24d45fb71421, 8d3475475a0b, 84c0fbc1cf1d and b7d269a291b6 for possible zooming (bug 685541) and panning regressions (bug 685540)
mobile/chrome/content/Util.js
mobile/chrome/content/browser-ui.js
mobile/chrome/content/browser.js
mobile/chrome/content/browser.xul
mobile/chrome/content/tabs.xml
mobile/themes/core/browser.css
mobile/themes/core/gingerbread/browser.css
mobile/themes/core/gingerbread/images/close-active-tablet-hdpi.png
mobile/themes/core/gingerbread/images/close-background-hdpi.png
mobile/themes/core/gingerbread/images/close-default-tablet-hdpi.png
mobile/themes/core/gingerbread/images/close-inactive-tab-tablet-hdpi.png
mobile/themes/core/gingerbread/images/newtab-default-tablet-hdpi.png
mobile/themes/core/honeycomb/browser.css
mobile/themes/core/honeycomb/images/close-active-hdpi.png
mobile/themes/core/honeycomb/images/close-active-tablet-hdpi.png
mobile/themes/core/honeycomb/images/close-background-hdpi.png
mobile/themes/core/honeycomb/images/close-default-hdpi.png
mobile/themes/core/honeycomb/images/close-default-tablet-hdpi.png
mobile/themes/core/honeycomb/images/close-inactive-tab-hdpi.png
mobile/themes/core/honeycomb/images/close-inactive-tab-tablet-hdpi.png
mobile/themes/core/honeycomb/images/newtab-default-hdpi.png
mobile/themes/core/honeycomb/images/newtab-default-tablet-hdpi.png
mobile/themes/core/images/close-active-tablet-hdpi.png
mobile/themes/core/images/close-background-hdpi.png
mobile/themes/core/images/close-default-tablet-hdpi.png
mobile/themes/core/images/close-inactive-tab-tablet-hdpi.png
mobile/themes/core/images/newtab-default-tablet-hdpi.png
mobile/themes/core/jar.mn
mobile/themes/core/tablet.css
--- a/mobile/chrome/content/Util.js
+++ b/mobile/chrome/content/Util.js
@@ -156,39 +156,25 @@ let Util = {
     Services.io.offline = false;
   },
 
   isParentProcess: function isInParentProcess() {
     let appInfo = Cc["@mozilla.org/xre/app-info;1"];
     return (!appInfo || appInfo.getService(Ci.nsIXULRuntime).processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);
   },
 
-  isTablet: function isTablet(options) {
-    let forceUpdate = options && 'forceUpdate' in options && options.forceUpdate;
-
-    if ('_isTablet' in this && !forceUpdate)
-      return this._isTablet;
-
-    let tabletPref = Services.prefs.getIntPref("browser.ui.layout.tablet");
-
-    // Act according to user prefs if tablet mode has been
-    // explicitly disabled or enabled.
-    if (tabletPref == 0)
-      return this._isTablet = false;
-    else if (tabletPref == 1)
-      return this._isTablet = true;
-
+  isTablet: function isTablet() {
     let dpi = this.displayDPI;
     if (dpi <= 96)
-      return this._isTablet = (window.innerWidth > 1024);
+      return (window.innerWidth > 1024);
 
     // See the tablet_panel_minwidth from mobile/themes/core/defines.inc
     let tablet_panel_minwidth = 124;
     let dpmm = 25.4 * window.innerWidth / dpi;
-    return this._isTablet = (dpmm >= tablet_panel_minwidth);
+    return (dpmm >= tablet_panel_minwidth);
   },
 
   isPortrait: function isPortrait() {
 #ifdef MOZ_PLATFORM_MAEMO
     return (screen.width <= screen.height);
 #elifdef ANDROID
     return (screen.width <= screen.height);
 #else
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -181,18 +181,16 @@ var BrowserUI = {
 
   _toolbarLocked: 0,
 
   isToolbarLocked: function isToolbarLocked() {
     return this._toolbarLocked;
   },
 
   lockToolbar: function lockToolbar() {
-    if (Util.isTablet())
-      return;
     this._toolbarLocked++;
     document.getElementById("toolbar-moveable-container").top = "0";
     if (this._toolbarLocked == 1)
       Browser.forceChromeReflow();
   },
 
   unlockToolbar: function unlockToolbar() {
     if (!this._toolbarLocked)
@@ -376,16 +374,21 @@ var BrowserUI = {
   get toolbarH() {
     if (!this._toolbarH) {
       let toolbar = document.getElementById("toolbar-main");
       this._toolbarH = toolbar.boxObject.height;
     }
     return this._toolbarH;
   },
 
+  get sidebarW() {
+    delete this._sidebarW;
+    return this._sidebarW = Elements.controls.getBoundingClientRect().width;
+  },
+
   sizeControls: function(windowW, windowH) {
     // tabs
     document.getElementById("tabs").resize();
     AwesomeScreen.doResize(windowW, windowH);
 
     // content navigator helper
     document.getElementById("content-navigator").contentHasChanged();
   },
@@ -544,37 +547,21 @@ var BrowserUI = {
   },
 
   observe: function observe(aSubject, aTopic, aData) {
     if (aTopic == "nsPref:changed" && aData == "browser.ui.layout.tablet")
       this.updateTabletLayout();
   },
 
   updateTabletLayout: function updateTabletLayout() {
-    if (Util.isTablet({ forceUpdate: true })) {
-      this.unlockToolbar();
+    let tabletPref = Services.prefs.getIntPref("browser.ui.layout.tablet");
+    if (tabletPref == 1 || (tabletPref == -1 && Util.isTablet()))
       Elements.urlbarState.setAttribute("tablet", "true");
-    } else {
+    else
       Elements.urlbarState.removeAttribute("tablet");
-    }
-
-    // Tablet mode changes the size of the thumbnails
-    // in the tabs container. Hence we have to force a
-    // thumbnail update on all tabs.
-    setTimeout(function(self) {
-      self._updateAllTabThumbnails();
-    }, 0, this);
-  },
-
-  _updateAllTabThumbnails: function() {
-    let tabs = Browser.tabs;
-
-    tabs.forEach(function(tab) {
-      tab.updateThumbnail({ force: true });
-    });
   },
 
   update: function(aState) {
     let browser = Browser.selectedBrowser;
 
     switch (aState) {
       case TOOLBARSTATE_LOADED:
         this._updateToolbar();
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -1033,17 +1033,17 @@ var Browser = {
         snappedX = -ritevis * ritew * dirVal;
       }
     }
 
     return Math.round(snappedX);
   },
 
   tryFloatToolbar: function tryFloatToolbar(dx, dy) {
-    if (this.floatedWhileDragging || Util.isTablet())
+    if (this.floatedWhileDragging)
       return;
 
     let [leftvis, ritevis, leftw, ritew] = Browser.computeSidebarVisibility(dx, dy);
     if (leftvis > 0 || ritevis > 0) {
       BrowserUI.lockToolbar();
       this.floatedWhileDragging = true;
     }
   },
@@ -1284,17 +1284,17 @@ Browser.MainDragger.prototype = {
     return { x: true, y: true };
   },
 
   dragStart: function dragStart(clientX, clientY, target, scroller) {
     let browser = getBrowser();
     let bcr = browser.getBoundingClientRect();
     this._contentView = browser.getViewAt(clientX - bcr.left, clientY - bcr.top);
     this._stopAtSidebar = 0;
-    this._panToolbars = !Util.isTablet();
+    this._panToolbars = !Elements.urlbarState.getAttribute("tablet");
     if (this._sidebarTimeout) {
       clearTimeout(this._sidebarTimeout);
       this._sidebarTimeout = null;
     }
   },
 
   dragStop: function dragStop(dx, dy, scroller) {
     if (this._contentView && this._contentView._updateCacheViewport)
@@ -1903,17 +1903,17 @@ const ContentTouchHandler = {
     let bcr = browser.getBoundingClientRect();
     let rect = new Rect(0, 0, window.innerWidth, window.innerHeight);
     rect.restrictTo(Rect.fromRect(bcr));
 
     // Check if the user touched near to one of the edges of the browser area
     // or if the urlbar is showing
     this.canCancelPan = (aX >= rect.left + kSafetyX) && (aX <= rect.right - kSafetyX) &&
                         (aY >= rect.top  + kSafetyY) &&
-                        (bcr.top == 0 || Util.isTablet());
+                        (bcr.top == 0 || Elements.urlbarState.getAttribute("tablet"));
   },
 
   tapDown: function tapDown(aX, aY) {
     let browser = getBrowser();
     browser.focus();
 
     // if the page might capture touch events, we give it the option
     this.updateCanCancel(aX, aY);
@@ -2892,16 +2892,17 @@ Tab.prototype = {
   _createBrowser: function _createBrowser(aURI, aInsertBefore) {
     if (this._browser)
       throw "Browser already exists";
 
     // Create a notification box around the browser
     let notification = this._notification = document.createElement("notificationbox");
     notification.classList.add("inputHandler");
 
+    // Create the browser using the current width the dynamically size the height
     let browser = this._browser = document.createElement("browser");
     browser.setAttribute("class", "viewable-width viewable-height");
     this._chromeTab.linkedBrowser = browser;
 
     browser.setAttribute("type", "content");
 
     let useRemote = Services.prefs.getBoolPref("browser.tabs.remote");
     let useLocal = Util.isLocalScheme(aURI);
@@ -3145,28 +3146,25 @@ function rendererFactory(aBrowser, aCanv
 
 /* ViewableAreaObserver is an helper object where width/height represents the
  * size of the currently viewable area in pixels. This is use instead of
  * window.innerHeight/innerWidth because some keyboards does not resize the
  * window but floats over it.
  */
 var ViewableAreaObserver = {
   get width() {
-    let width = this._width || window.innerWidth;
-    if (Util.isTablet()) {
-      let sidebarWidth = Math.round(Elements.tabs.getBoundingClientRect().width);
-      width -= sidebarWidth;
-    }
-    return width;
+    return this._width || window.innerWidth;
   },
 
   get height() {
     let height = (this._height || window.innerHeight);
-    if (Util.isTablet())
-      height -= BrowserUI.toolbarH;
+    if (Elements.urlbarState.getAttribute("tablet")) {
+      let toolbarHeight = Math.round(document.getElementById("toolbar-main").getBoundingClientRect().height);
+      height -= toolbarHeight;
+    }
     return height;
   },
 
   _isKeyboardOpened: true,
   get isKeyboardOpened() {
     return this._isKeyboardOpened;
   },
 
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -193,32 +193,32 @@
     <key id="key_newTab" key="t" modifiers="accel" command="cmd_newTab"/>
     <key id="key_closeTab" key="w" modifiers="accel" command="cmd_closeTab"/>
     <key id="key_undoCloseTab" key="t" modifiers="accel,shift" command="cmd_undoCloseTab"/>
   </keyset>
 
   <stack flex="1" id="stack">
     <scrollbox id="controls-scrollbox" style="overflow: hidden; -moz-box-orient: horizontal; position: relative;" flex="1" observes="bcast_urlbarState">
       <vbox id="tabs-sidebar" class="sidebar" observes="bcast_uidiscovery">
-        <spacer class="toolbar-height" id="tabs-spacer" observes="bcast_urlbarState"/>
+        <spacer class="toolbar-height"/>
         <!-- Left toolbar -->
-        <vbox id="tabs-container" class="panel-dark" flex="1" observes="bcast_urlbarState">
-          <vbox id="tabs" flex="1" observes="bcast_urlbarState"
+        <vbox id="tabs-container" class="panel-dark" flex="1">
+          <vbox id="tabs" flex="1"
                 onselect="BrowserUI.selectTab(this);"
                 onreloadtab="BrowserUI.undoCloseTab()"
                 onclosetab="BrowserUI.closeTab(this)"
                 onclosereloadtab="this._container.removeTab(this)"/>
           <hbox id="tabs-controls">
-            <toolbarbutton id="newtab-button" class="button-control" command="cmd_newTab" observes="bcast_urlbarState"/>
+            <toolbarbutton id="newtab-button" class="button-control" command="cmd_newTab"/>
           </hbox>
         </vbox>
       </vbox>
 
       <!-- Page Area -->
-      <stack id="page-stack" observes="bcast_urlbarState">
+      <stack>
         <scrollbox id="page-scrollbox">
           <vbox>
             <!-- Main Toolbar -->
             <box id="toolbar-container" class="panel-dark toolbar-height">
               <box id="toolbar-moveable-container" observes="bcast_uidiscovery">
                 <toolbar id="toolbar-main" class="panel-dark viewable-width" observes="bcast_urlbarState">
                   <toolbarbutton id="tool-back2" class="tool-back button-actionbar" command="cmd_back"/>
                   <toolbarbutton id="tool-forward2" class="tool-forward button-actionbar" command="cmd_forward"/>
--- a/mobile/chrome/content/tabs.xml
+++ b/mobile/chrome/content/tabs.xml
@@ -2,71 +2,31 @@
 
 <bindings
     xmlns="http://www.mozilla.org/xbl"
     xmlns:xbl="http://www.mozilla.org/xbl"
     xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <binding id="documenttab">
-    <content observes="bcast_urlbarState">
+    <content>
       <xul:stack anonid="page" class="documenttab-container" flex="1">
-        <html:canvas anonid="thumbnail" class="documenttab-thumbnail" left="0" moz-opaque="true" empty="true"
-          onclick="document.getBindingParent(this)._onClick()" observes="bcast_urlbarState"/>
-        <xul:hbox anonid="reload" class="documenttab-reload" left="0" top="0" onclick="document.getBindingParent(this)._onUndo();" observes="bcast_urlbarState"/>
-        <xul:hbox anonid="close-container" class="documenttab-close-container" top="0" align="center" onclick="document.getBindingParent(this)._onClose()" observes="bcast_urlbarState">
-          <xul:image anonid="close" class="documenttab-close" mousethrough="always" observes="bcast_urlbarState"/>
+        <html:canvas anonid="thumbnail" class="documenttab-thumbnail" left="0" width="104" height="65" moz-opaque="true" empty="true"
+          onclick="document.getBindingParent(this)._onClick()"/>
+        <xul:hbox class="documenttab-reload" left="0" top="0" width="104" height="65" onclick="document.getBindingParent(this)._onUndo();"/>
+        <xul:hbox class="documenttab-close-container" start="-16" top="0" height="65" width="55" align="center" onclick="document.getBindingParent(this)._onClose()">
+          <xul:image anonid="close" class="documenttab-close" mousethrough="always"/>
         </xul:hbox>
       </xul:stack>
     </content>
 
     <implementation>
       <field name="ignoreUndo">false</field>
-      <field name="thumbnail" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "thumbnail");</field>
-      <field name="_reload" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "reload");</field>
-      <field name="_closeContainer" readonly="true">document.getAnonymousElementByAttribute(this, "anonid", "close-container");</field>
-      <field name="_container" readonly="true">this.parentNode.parentNode;</field>
-
-      <constructor>
-        <![CDATA[
-          this.updateTabletLayout(this.thumbnail);
-        ]]>
-      </constructor>
-
-      <method name="updateTabletLayout">
-        <parameter name="thumbnail"/>
-        <body>
-          <![CDATA[
-            let tabWidth, tabHeight, closeWidth, closeHeight;
-
-            if (Util.isTablet()) {
-              tabWidth = 176;
-              tabHeight = 110;
-              closeWidth = 41;
-              closeHeight = 117;
-            } else {
-              tabWidth = 104;
-              tabHeight = 65;
-              closeWidth = 55;
-              closeHeight = 65;
-            }
-
-            if (tabWidth != thumbnail.width) {
-              let reload = this._reload;
-              let closeContainer = this._closeContainer;
-
-              thumbnail.width = reload.width = tabWidth;
-              thumbnail.height = reload.height = tabHeight;
-              closeContainer.width = closeWidth;
-              closeContainer.height = closeHeight;
-            }
-          ]]>
-        </body>
-      </method>
-
+      <field name="thumbnail">document.getAnonymousElementByAttribute(this, "anonid", "thumbnail");</field>
+      <field name="_container">this.parentNode.parentNode;</field>
       <method name="_onClick">
         <body>
           <![CDATA[
             this._container.selectedTab = this;
 
             let selectFn = new Function("event", this._container.parentNode.getAttribute("onselect"));
             selectFn.call(this);
           ]]>
@@ -96,28 +56,24 @@
 
       <method name="updateThumbnail">
         <parameter name="browser"/>
         <parameter name="width"/>
         <parameter name="height"/>
         <body>
           <![CDATA[
             let thumbnail = this.thumbnail;
-            // Ensure the thumbnail will have the correct
-            // dimensions for tablet and phone modes
-            this.updateTabletLayout(thumbnail);
-
             if (browser.currentURI.spec == "about:blank") {
               thumbnail.setAttribute("empty", "true");
               return;
             }
             thumbnail.removeAttribute("empty");
 
-            const tabWidth = thumbnail.width;
-            const tabHeight = thumbnail.height;
+            const tabWidth = 104;
+            const tabHeight = 65;
 
             let ratio = tabHeight / tabWidth;
             if (browser.contentDocumentWidth > 0)
               width = Math.min(width, browser.contentDocumentWidth);
 
             if (browser.contentDocumentHeight > 0)
               height = Math.min(height, browser.contentDocumentHeight);
 
--- a/mobile/themes/core/browser.css
+++ b/mobile/themes/core/browser.css
@@ -981,17 +981,16 @@ documenttab[selected="true"] {
 documenttab:hover:active > stack > .documenttab-thumbnail,
 documenttab[selected="true"] > stack > .documenttab-thumbnail {
   opacity: 1.0;
 }
 
 .documenttab-close-container {
   position: relative;
   left: -16px;
-  -moz-margin-start: -16px;
   -moz-margin-end: 49px;
 }
 
 .documenttab-close {
   width: 40px;
   height: 40px;
   list-style-image: url("chrome://browser/skin/images/close-inactive-tab-hdpi.png");
 }
@@ -1571,16 +1570,56 @@ setting {
   from { -moz-transform: translateX(0); }
   10% { -moz-transform: translateX(-moz-calc(-121px - @border_width_large@ - 2*@padding_normal@)); }
   45% { -moz-transform: translateX(-moz-calc(-121px - @border_width_large@ - 2*@padding_normal@)); }
   55% { -moz-transform: translateX(@sidebar_width_minimum@); }
   90% { -moz-transform: translateX(@sidebar_width_minimum@); }
   to { -moz-transform: translateX(0); }
 }
 
+/* Tablet mode */
+
+.spacer-actionbar,
+.button-actionbar {
+  visibility: collapse;
+}
+
+.button-actionbar[disabled="true"] {
+  opacity: 0.5;
+}
+
+.button-actionbar:hover:active {
+  background-color: #8db8d8;
+}
+
+#toolbar-main[tablet="true"] > .spacer-actionbar,
+#toolbar-main[tablet="true"] > .button-actionbar {
+  visibility: visible;
+}
+
+#controls-scrollbox[tablet="true"] > #controls-sidebar {
+  visibility: collapse;
+}
+
+#controls-scrollbox[tablet="true"] > #tabs-sidebar {
+  border: none;
+  position: fixed;
+  top: -moz-calc(@touch_button_xlarge@ + @margin_normal@);
+  visibility: collapse;
+}
+#controls-scrollbox[tablet="true"] > #tabs-sidebar:-moz-locale-dir(ltr) {
+  right: 0;
+}
+#controls-scrollbox[tablet="true"] > #tabs-sidebar:-moz-locale-dir(rtl) {
+  left: 0;
+}
+#controls-scrollbox[tablet="true"] > #tabs-sidebar[open] {
+  visibility: visible;
+}
+
 /* Text selection handles */
 
 #selectionhandle-start,
 #selectionhandle-end {
   min-width: 35px !important;
   width: 35px !important;
   padding: 0 !important;
   margin: 0 !important;
@@ -1596,11 +1635,9 @@ setting {
 
 @media (min-width: @tablet_panel_minwidth@) {
   #awesome-panels {
     -moz-box-shadow: 0px 0px @shadow_width_small@ black;
   }
   #search-engines-popup {
     max-width: -moz-calc(@tablet_panel_minwidth@);
   }
-}
-
-%include tablet.css
+}
\ No newline at end of file
--- a/mobile/themes/core/gingerbread/browser.css
+++ b/mobile/themes/core/gingerbread/browser.css
@@ -930,17 +930,16 @@ documenttab[selected="true"] {
 documenttab:hover:active > stack > .documenttab-thumbnail,
 documenttab[selected="true"] > stack > .documenttab-thumbnail {
   opacity: 1.0;
 }
 
 .documenttab-close-container {
   position: relative;
   left: -16px;
-  -moz-margin-start: -16px;
   -moz-margin-end: 49px;
 }
 
 .documenttab-close {
   width: 40px;
   height: 40px;
   list-style-image: url("chrome://browser/skin/images/close-inactive-tab-hdpi.png");
 }
@@ -1541,16 +1540,56 @@ setting {
   from { -moz-transform: translateX(0); }
   10% { -moz-transform: translateX(-moz-calc(-121px - @border_width_large@ - 2*@padding_normal@)); }
   45% { -moz-transform: translateX(-moz-calc(-121px - @border_width_large@ - 2*@padding_normal@)); }
   55% { -moz-transform: translateX(@sidebar_width_minimum@); }
   90% { -moz-transform: translateX(@sidebar_width_minimum@); }
   to { -moz-transform: translateX(0); }
 }
 
+/* Tablet mode */
+
+.spacer-actionbar,
+.button-actionbar {
+  visibility: collapse;
+}
+
+.button-actionbar[disabled="true"] {
+  opacity: 0.5;
+}
+
+.button-actionbar:hover:active {
+  background-color: #8db8d8;
+}
+
+#toolbar-main[tablet="true"] > .spacer-actionbar,
+#toolbar-main[tablet="true"] > .button-actionbar {
+  visibility: visible;
+}
+
+#controls-scrollbox[tablet="true"] > #controls-sidebar {
+  visibility: collapse;
+}
+
+#controls-scrollbox[tablet="true"] > #tabs-sidebar {
+  border: none;
+  position: fixed;
+  top: -moz-calc(@touch_button_xlarge@ + @margin_normal@);
+  visibility: collapse;
+}
+#controls-scrollbox[tablet="true"] > #tabs-sidebar:-moz-locale-dir(ltr) {
+  right: 0;
+}
+#controls-scrollbox[tablet="true"] > #tabs-sidebar:-moz-locale-dir(rtl) {
+  left: 0;
+}
+#controls-scrollbox[tablet="true"] > #tabs-sidebar[open] {
+  visibility: visible;
+}
+
 /* Text selection handles */
 
 #selectionhandle-start,
 #selectionhandle-end {
   min-width: 35px !important;
   width: 35px !important;
   padding: 0 !important;
   margin: 0 !important;
@@ -1559,9 +1598,16 @@ setting {
 #selectionhandle-start {
   list-style-image: url("chrome://browser/skin/images/handle-start.png");
 }
 
 #selectionhandle-end {
   list-style-image: url("chrome://browser/skin/images/handle-end.png");
 }
 
-%include ../tablet.css
+@media (min-width: @tablet_panel_minwidth@) {
+  #awesome-panels {
+    -moz-box-shadow: 0px 0px @shadow_width_small@ black;
+  }
+  #search-engines-popup {
+    max-width: -moz-calc(@tablet_panel_minwidth@);
+  }
+}
deleted file mode 100644
index 1e616b6698a5fc77fbf709cf62af43e7aeb949df..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 478e9c85e270e51428f181c423d04d5aa448eadb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1e616b6698a5fc77fbf709cf62af43e7aeb949df..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fd8e46b0c15e533f5c6360a659fbddc5a386b7fa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1d9d1ae2308f8adcb70fddb823b04e25b12d456a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/themes/core/honeycomb/browser.css
+++ b/mobile/themes/core/honeycomb/browser.css
@@ -32,17 +32,16 @@
  * 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 ***** */
 
 %filter substitution
 %include defines.inc
-%define honeycomb 1
 
 /* main toolbar (URL bar) -------------------------------------------------- */
 #toolbar-main {
   -moz-appearance: none;
   -moz-box-align: center;
   padding: 0;
   background: @color_toolbar_background@;
   border: none;
@@ -1014,17 +1013,16 @@ documenttab[selected="true"] {
 documenttab:hover:active > stack > .documenttab-thumbnail,
 documenttab[selected="true"] > stack > .documenttab-thumbnail {
   opacity: 1.0;
 }
 
 .documenttab-close-container {
   position: relative;
   left: -16px;
-  -moz-margin-start: -16px;
   -moz-margin-end: 49px;
 }
 
 .documenttab-close {
   width: 40px;
   height: 40px;
   list-style-image: url("chrome://browser/skin/images/close-inactive-tab-hdpi.png");
 }
@@ -1691,16 +1689,52 @@ setting {
   from { -moz-transform: translateX(0); }
   10% { -moz-transform: translateX(-moz-calc(-121px - @border_width_large@ - 2*@padding_normal@)); }
   45% { -moz-transform: translateX(-moz-calc(-121px - @border_width_large@ - 2*@padding_normal@)); }
   55% { -moz-transform: translateX(@sidebar_width_minimum@); }
   90% { -moz-transform: translateX(@sidebar_width_minimum@); }
   to { -moz-transform: translateX(0); }
 }
 
+/* Tablet mode */
+
+.spacer-actionbar,
+.button-actionbar {
+  visibility: collapse;
+}
+
+.button-actionbar[disabled="true"] {
+  opacity: 0.5;
+}
+
+#toolbar-main[tablet="true"] > .spacer-actionbar,
+#toolbar-main[tablet="true"] > .button-actionbar {
+  visibility: visible;
+}
+
+#controls-scrollbox[tablet="true"] > #controls-sidebar {
+  visibility: collapse;
+}
+
+#controls-scrollbox[tablet="true"] > #tabs-sidebar {
+  border: none;
+  position: fixed;
+  top: @touch_button_xlarge@;
+  visibility: collapse;
+}
+#controls-scrollbox[tablet="true"] > #tabs-sidebar:-moz-locale-dir(ltr) {
+  left: 0;
+}
+#controls-scrollbox[tablet="true"] > #tabs-sidebar:-moz-locale-dir(rtl) {
+  right: 0;
+}
+#controls-scrollbox[tablet="true"] > #tabs-sidebar[open] {
+  visibility: visible;
+}
+
 /* Text selection handles */
 
 #selectionhandle-start,
 #selectionhandle-end {
   min-width: 35px !important;
   width: 35px !important;
   padding: 0 !important;
   margin: 0 !important;
@@ -1775,10 +1809,8 @@ setting {
   }
   
   #search-engines-list > .action-button > .button-box > .button-text {
     text-align: start;
     font-size: @font_tiny@ !important;
   }
 
 }
-
-%include ../tablet.css
index 1f19cd10638b54797e21db629ef041bcedc54f17..935b7555e4d8aceb67a15f9eb137b6ddade69522
GIT binary patch
literal 2089
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
a+u~Z~7N52@r>ehM|L{VAh<}lrnEP*MYE8ue
deleted file mode 100644
index 1e616b6698a5fc77fbf709cf62af43e7aeb949df..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 478e9c85e270e51428f181c423d04d5aa448eadb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index 7e4b9f7d8d82e74551c48a938a16606d2d041901..3961ad1baaa1e26175cdf58f16e54b1801996206
GIT binary patch
literal 2221
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
H>{tH==@F&B
deleted file mode 100644
index 1e616b6698a5fc77fbf709cf62af43e7aeb949df..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index 77d71107fa1bc1016d6119bcbea054e9765fd36b..105d7852eddc5783d5936d836efcc94d08a38450
GIT binary patch
literal 2199
zc$}S9dsGu=7Dq(`C`hXyFKG-GL?Ou}n8!fCkVoM_5+G1P(n3fE2qBq}3=o1Y1uC#S
z)Pk(iB0{arwo<62g32NyA}R{D9(gEF*%p*{D+^kSJ7K}?+0)}6`<*j0-~I0IcVFMV
z=geP&`0tsU*_jy`8JYY0u|v@BF2iH80eu%PT~rtut&5d~h9lv;Ku`iJ@M0+(1L3s_
zm62h2`Dj&Qi5x<(F;JXL$-vDtHsi1|DFe5EFOSGmv7mUFpH2-4b^K6?PA;KKaX#Ky
zFD-}~P(X+nt5qZ_HK3M(Teb_Ld&4mShh2ssat4lRP+-G(L0A^7hOm3_M0W|1Lc~%4
zJV5rKQmJlO5)mL0h$I3)atEj&nFJDv*p-Dty{V<KU<jML;tQ1+xOfCnfdoQoYAQaJ
zjEB{61b|Mb8*GqB?kK`tlcq$(T6d+!Y1IN7(n!=Y6(WO`Sc5E%fs+vi4!4?uLdD~~
zHmuaF6bdaFK`T}f06dYPP!Lwp8YBdYeKT4Unx=vXA&>@6R!blh?(_#&Z>Ac6Xf&We
zEkiFwoXCbH$qGn`__G-}RD+kwq#%(@BLV=`gGeP2DKr3}aVaD^Kw@(!BqoQ$^;os>
zXIy|qp>U{d8k@vq0sx!q%cjyfEFwUmvRFipFLRaauhbx7r36~#%KpoxzL5*E)Q}i~
z)uAw)xY_|h@h}2w;$an*CG^1Z#1fg(ARDe{B~nN&OM#?ZHLSoc*B6xiiGMDQ%Kc;B
zbbv^wb7`o1CI#^I0B|c@>HkwR0vZhAf0||W2<<?__I2x{!t3FIl<35$(b4cx@(a<i
zvPC%Ih!BoNQpIY>=s)@UE5vbV8;GT8Nw**`BO~K>e>O8TytV1%kU$t`(;gf=T)tE}
zCEIiM?7I<<*Y^e9I81(e?Qn!OY%O~HrN$R?oVIVfBrG?N?;=5@KHm-Xaet1nj%heH
zb)z{m>B;opp5^Z$q{w2Q4J<?sRcvoh6LiTo?mQhdxR6#cqaSmy_{qa`$EOL;Ukr>7
zV!pgeTHMl)@l{9FxOdofQzBfsBwoPCaS6BYZUJ_K3)8XsfVBU+-RUJ(x2&A*+q4W7
zD$W1NG|dBDZ$*?xG!N(hFo2mh`XQQDSBr0nDw=i+$HbHjPbTuRnr+H}S<5_Lj;*A^
z7`88S)0$kjZmF)`(*il&$8=}*#+>XM+qJ0Kc_!0yU#P^j+*<k6tD77tG#kwS;@5q&
z^EQ)P$x9Y<!829AOeD;gI(FA}aRh_!&+7faG;%S1q%kP?>g?LA?(Xi}vwM5&`kb~G
z+Z$(mOt<6*j+%sK?RLYe)?}v4i=w{088%$LJL0){)==(!xz8{dJO}+f;9&d~?nUp-
zwsJ;B%GYCFVb&j1SiS`NFU)u*hDt1|e$5Z6(F_Hg+JcbQH=FA9SK2<eS4J;l@>MmB
zeW@iZ7vb#vpoE{!sZOXm=A(V@%sYNxy7+QD=}|Hor((mYz!t$nVaB0M`L&HbYZLrE
z>D}pN0{tsv)(5W+=5T67%<<pCc3$cNYwMm!&G0$J;eHRUyR};BODFnkAv{XI6dmGL
zulFKn&&tD&U>73Bk}2qEM@uJWy_;^Ncq9GX&WWZw`Vv=d=Q~lSVS!nLXcLlmt_hO}
zdB0z-T#bS`5PoR$g5I81{eX7VN4US@!imw#pZ%U-i&T}kE`~&o|J+Dh-*f&6+p#sy
zYD6@4<pgN8tP&N#4!K*$7&~gN4O)E2I$>2M%CN8M)-6qjcBQ4zk;;vys^77$NNe5Z
z-jpquT61>uC+5t>WRuUHJz7XQbc0*03AJ5DWu4y^`KUm0<>JL*!EpUOSx4j*i=<m`
z-|P_yAEZx-Dci?=^)BAZvni8yjz6ARa1K(vm78&(C1OYkeBFNCBWqFju&VoEtL|T4
z=}z8C1n;#?JG~m*b|Aa0oZ#&IvaxNw2MsuUfB!c(0vO~n9_Dhd>C+eWQ`xogpES1a
za(IvBSQNRYZkfrMhsOr>sj|as7%vtq?f7Ssif8^(GMpGoEGWBE<G?75CezfFZOzB$
z+Z@*bSrd;p@w>io=-ovtsVi%7izP*ZH17z%k4kb6tZUeC&*VDRrp=R)9eI_$sTR{Y
z?AGa^z2g)M2xA*{lsZh|WP2l+$;vRx=9h9tak(R-CiIRW{^oC8_FESe-1h1me6@J9
z=w_fm(4gz>trPBfCLd|6od^~~mJNmCkBc7H&pBtgsBTxQiqfmaQ?Gubm(-mV3BKvV
zJg?!`D;{|-9h6sU1Ig1(IV1B|ZOhxre))d-s|8cJ?}z`mG=AjNSW?s0qY0n9%|AN3
zHodpQw*1{VXS?~r%MnX2P9JO42=+GI-JWRL@BO3o(kOH{JR|I=H_hU$YdxY-M|pVU
zlM*uRob838LwR_((qRxbMFN^99}MI?z{UTbKeq)#+jJyzN5P$AB2PDY%mw3nQ&H>6
WZpY`{vq&`jPxy2A>>A(btbYSqEsN#=
deleted file mode 100644
index fd8e46b0c15e533f5c6360a659fbddc5a386b7fa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index e71e89cd79b51c9a0ba31ecafd73760dff9adc8f..aacf3b927b0da779ef18c830863e3109604c3b9f
GIT binary patch
literal 940
zc$@*O15^BoP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_0009&Nkl<ZSi|j@
z%}X0W7{;G>R(A~{HM9kxML{f-Ub1m*Py$kr-g;^2!9$^5`hk~<ZPiP!g$iOnE`|OD
z{RcdGDg_&j*+kJxDfA{3rC*}%OxBqmy0&XRG$tFYG!HBcJG<}vc;=mXnE@L5Peru`
zh?y3vHOBIiE$a#zGp&0;IkvoHzo`po%(RAys3n(OoURoz-hKI@Qp#CgvR_vP8Z)hn
z0In3geg|NH7>nfW^kh(u#;wGJl5(>gY+2A)yyp^tfmbh|-}1j785w;GqEOCGKMQ)n
z90beCK@xEF#q+5l&Ux5zoQUH%5zcv-7;CEsBmm^>^dvDBN%SU-!oH?*kkivsw>cLf
z*L4l0lm-Aqw9AOjS2}PuxAdpo9XBibhY__g#v%ZCSx5Vl{cI0X2ocKX^PycSo28VR
zlv3N3vKd6t`fivM1rR>WQJsiR?LkVVG${2qkAJtDDjoCA-TO0p?Mym#t-_66D>X)8
zj<yg{)OB5>2(n7)x}FWf=t6Q0fWE%Iu1R@xNPkXx$^-ZgAYa&5Y0j2iOaRc?*$F9S
z?KUX21K=~1>IvFW0KlV1V>XCdjvCCLlb!^CZvaGLU!^%)5_D&K`!-_?nZ@~=0pz3$
z;1d9@8^$bv3wz@UA-WHW!5wEXW?CEm`u}G!C3=$v5w+Nvg$FgvP+oA}B{*;AoOf`?
zF#&wxj$?ApI|S$Lg7YpfcS|a>I6suN(@%*g95b!qB1aix5h6NUOCDv?sq6a|jFotz
zl=`WZ`jO2nj2)>;Wf!O8R$?O2n>5n%bKF1mVGu=?QUUJW)CwR<M6K1t^;aoBXcGZi
zfSdr)86s)}(V42^{;g6QO~pG(fQ|whcbpqUq*W8wU!{sbWq^*RQXhtbid$DlgH#De
zPY9@z4Mzh8Z8+M<(FSNxQ;&wDwW#Q(WOa1~N~vRiR##UJul0o={Zoz-kpzJ8$D=b)
zz;Qq0k4I<xTz*Gg-7sc_5QF1mqci`2iPAe1x`m)y0M>L}p9OIGC|5UikPF}|fHjY6
zAIv6zk6!y60R0$2g$Mc3<Jy0b+n4Nb1`zSiDaY;T7J$vv-1|IEl70av>*|ML!s>?r
O0000<MNUMnLSTZipq)kl
deleted file mode 100644
index 1d9d1ae2308f8adcb70fddb823b04e25b12d456a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1e616b6698a5fc77fbf709cf62af43e7aeb949df..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 478e9c85e270e51428f181c423d04d5aa448eadb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1e616b6698a5fc77fbf709cf62af43e7aeb949df..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fd8e46b0c15e533f5c6360a659fbddc5a386b7fa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1d9d1ae2308f8adcb70fddb823b04e25b12d456a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/themes/core/jar.mn
+++ b/mobile/themes/core/jar.mn
@@ -85,17 +85,16 @@ chrome.jar:
   skin/images/panelrow-selected-hdpi.png    (images/panelrow-selected-hdpi.png)
   skin/images/forward-default-hdpi.png        (images/forward-default-hdpi.png)
   skin/images/downloads-default-hdpi.png      (images/downloads-default-hdpi.png)
   skin/images/settings-default-hdpi.png       (images/settings-default-hdpi.png)
   skin/images/preferences-default-hdpi.png    (images/preferences-default-hdpi.png)
   skin/images/row-header-bg.png             (images/row-header-bg.png)
   skin/images/console-default-hdpi.png        (images/console-default-hdpi.png)
   skin/images/newtab-default-hdpi.png         (images/newtab-default-hdpi.png)
-  skin/images/newtab-default-tablet-hdpi.png (images/newtab-default-tablet-hdpi.png)
   skin/images/tab-active-hdpi.png           (images/tab-active-hdpi.png)
   skin/images/tab-inactive-hdpi.png         (images/tab-inactive-hdpi.png)
   skin/images/tab-closed-hdpi.png           (images/tab-closed-hdpi.png)
   skin/images/tab-reopen-hdpi.png           (images/tab-reopen-hdpi.png)
   skin/images/remotetabs-48.png             (images/remotetabs-48.png)
   skin/images/remotetabs-32.png             (images/remotetabs-32.png)
   skin/images/mozilla-32.png                (images/mozilla-32.png)
   skin/images/toggle-on.png                 (images/toggle-on.png)
@@ -106,22 +105,18 @@ chrome.jar:
   skin/images/next-hdpi.png                 (images/next-hdpi.png)
   skin/images/next-disabled-hdpi.png        (images/next-disabled-hdpi.png)
   skin/images/identity-default-hdpi.png     (images/identity-default-hdpi.png)
   skin/images/identity-ssl-hdpi.png         (images/identity-ssl-hdpi.png)
   skin/images/identity-ev-hdpi.png          (images/identity-ev-hdpi.png)
   skin/images/unlocked-hdpi.png             (images/unlocked-hdpi.png)
   skin/images/locked-hdpi.png               (images/locked-hdpi.png)
   skin/images/close-default-hdpi.png        (images/close-default-hdpi.png)
-  skin/images/close-default-tablet-hdpi.png (images/close-default-tablet-hdpi.png)
   skin/images/close-active-hdpi.png         (images/close-active-hdpi.png)
-  skin/images/close-active-tablet-hdpi.png  (images/close-active-tablet-hdpi.png)
   skin/images/close-inactive-tab-hdpi.png   (images/close-inactive-tab-hdpi.png)
-  skin/images/close-inactive-tab-tablet-hdpi.png   (images/close-inactive-tab-tablet-hdpi.png)
-  skin/images/close-background-hdpi.png     (images/close-background-hdpi.png)
   skin/images/check-30.png                  (images/check-30.png)
   skin/images/search-glass-30.png           (images/search-glass-30.png)
   skin/images/search-clear-30.png           (images/search-clear-30.png)
   skin/images/section-expanded-16.png       (images/section-expanded-16.png)
   skin/images/section-collapsed-16.png      (images/section-collapsed-16.png)
   skin/images/task-switch-hdpi.png          (images/task-switch-hdpi.png)
   skin/images/task-close-hdpi.png           (images/task-close-hdpi.png)
   skin/images/task-back-hdpi.png            (images/task-back-hdpi.png)
@@ -214,17 +209,16 @@ chrome.jar:
   skin/gingerbread/images/bookmark-starred-hdpi.png     (gingerbread/images/bookmark-starred-hdpi.png)
   skin/gingerbread/images/forward-default-hdpi.png        (gingerbread/images/forward-default-hdpi.png)
   skin/gingerbread/images/downloads-default-hdpi.png      (gingerbread/images/downloads-default-hdpi.png)
   skin/gingerbread/images/settings-default-hdpi.png       (gingerbread/images/settings-default-hdpi.png)
   skin/gingerbread/images/preferences-default-hdpi.png    (gingerbread/images/preferences-default-hdpi.png)
   skin/gingerbread/images/row-header-bg.png             (gingerbread/images/row-header-bg.png)
   skin/gingerbread/images/console-default-hdpi.png        (gingerbread/images/console-default-hdpi.png)
   skin/gingerbread/images/newtab-default-hdpi.png         (gingerbread/images/newtab-default-hdpi.png)
-  skin/gingerbread/images/newtab-default-tablet-hdpi.png (gingerbread/images/newtab-default-tablet-hdpi.png)
   skin/gingerbread/images/tab-active-hdpi.png           (gingerbread/images/tab-active-hdpi.png)
   skin/gingerbread/images/tab-inactive-hdpi.png         (gingerbread/images/tab-inactive-hdpi.png)
   skin/gingerbread/images/tab-closed-hdpi.png           (gingerbread/images/tab-closed-hdpi.png)
   skin/gingerbread/images/tab-reopen-hdpi.png           (gingerbread/images/tab-reopen-hdpi.png)
   skin/gingerbread/images/remotetabs-48.png             (gingerbread/images/remotetabs-48.png)
   skin/gingerbread/images/remotetabs-32.png             (gingerbread/images/remotetabs-32.png)
   skin/gingerbread/images/mozilla-32.png                (images/mozilla-32.png)
   skin/gingerbread/images/toggle-on.png                 (gingerbread/images/toggle-on.png)
@@ -234,22 +228,18 @@ chrome.jar:
   skin/gingerbread/images/next-hdpi.png                 (gingerbread/images/next-hdpi.png)
   skin/gingerbread/images/next-disabled-hdpi.png        (gingerbread/images/next-disabled-hdpi.png)
   skin/gingerbread/images/identity-default-hdpi.png     (gingerbread/images/identity-default-hdpi.png)
   skin/gingerbread/images/identity-ssl-hdpi.png         (gingerbread/images/identity-ssl-hdpi.png)
   skin/gingerbread/images/identity-ev-hdpi.png          (gingerbread/images/identity-ev-hdpi.png)
   skin/gingerbread/images/unlocked-hdpi.png             (gingerbread/images/unlocked-hdpi.png)
   skin/gingerbread/images/locked-hdpi.png               (gingerbread/images/locked-hdpi.png)
   skin/gingerbread/images/close-default-hdpi.png        (gingerbread/images/close-default-hdpi.png)
-  skin/gingerbread/images/close-default-tablet-hdpi.png (gingerbread/images/close-default-tablet-hdpi.png)
   skin/gingerbread/images/close-active-hdpi.png         (gingerbread/images/close-active-hdpi.png)
-  skin/gingerbread/images/close-active-tablet-hdpi.png  (gingerbread/images/close-active-tablet-hdpi.png)
-  skin/gingerbread/images/close-background-hdpi.png     (gingerbread/images/close-background-hdpi.png)
   skin/gingerbread/images/close-inactive-tab-hdpi.png   (gingerbread/images/close-inactive-tab-hdpi.png)
-  skin/gingerbread/images/close-inactive-tab-tablet-hdpi.png   (gingerbread/images/close-inactive-tab-tablet-hdpi.png)
   skin/gingerbread/images/check-30.png                  (gingerbread/images/check-30.png)
   skin/gingerbread/images/search-glass-30.png           (gingerbread/images/search-glass-30.png)
   skin/gingerbread/images/search-clear-30.png           (gingerbread/images/search-clear-30.png)
   skin/gingerbread/images/section-expanded-16.png       (images/section-expanded-16.png)
   skin/gingerbread/images/section-collapsed-16.png      (images/section-collapsed-16.png)
   skin/gingerbread/images/task-switch-hdpi.png          (gingerbread/images/task-switch-hdpi.png)
   skin/gingerbread/images/task-close-hdpi.png           (gingerbread/images/task-close-hdpi.png)
   skin/gingerbread/images/task-back-hdpi.png            (gingerbread/images/task-back-hdpi.png)
@@ -344,17 +334,16 @@ chrome.jar:
   skin/honeycomb/images/panelrow-selected-hdpi.png    (honeycomb/images/panelrow-selected-hdpi.png)
   skin/honeycomb/images/forward-default-hdpi.png        (honeycomb/images/forward-default-hdpi.png)
   skin/honeycomb/images/downloads-default-hdpi.png      (honeycomb/images/downloads-default-hdpi.png)
   skin/honeycomb/images/settings-default-hdpi.png       (honeycomb/images/settings-default-hdpi.png)
   skin/honeycomb/images/preferences-default-hdpi.png    (honeycomb/images/preferences-default-hdpi.png)
   skin/honeycomb/images/row-header-bg.png             (honeycomb/images/row-header-bg.png)
   skin/honeycomb/images/console-default-hdpi.png        (honeycomb/images/console-default-hdpi.png)
   skin/honeycomb/images/newtab-default-hdpi.png         (honeycomb/images/newtab-default-hdpi.png)
-  skin/honeycomb/images/newtab-default-tablet-hdpi.png (honeycomb/images/newtab-default-tablet-hdpi.png)
   skin/honeycomb/images/tab-active-hdpi.png           (honeycomb/images/tab-active-hdpi.png)
   skin/honeycomb/images/tab-inactive-hdpi.png         (honeycomb/images/tab-inactive-hdpi.png)
   skin/honeycomb/images/tab-closed-hdpi.png           (honeycomb/images/tab-closed-hdpi.png)
   skin/honeycomb/images/tab-reopen-hdpi.png           (honeycomb/images/tab-reopen-hdpi.png)
   skin/honeycomb/images/remotetabs-48.png             (honeycomb/images/remotetabs-48.png)
   skin/honeycomb/images/remotetabs-32.png             (honeycomb/images/remotetabs-32.png)
   skin/honeycomb/images/mozilla-32.png                (images/mozilla-32.png)
   skin/honeycomb/images/toggle-on.png                 (honeycomb/images/toggle-on.png)
@@ -365,22 +354,18 @@ chrome.jar:
   skin/honeycomb/images/next-hdpi.png                 (honeycomb/images/next-hdpi.png)
   skin/honeycomb/images/next-disabled-hdpi.png        (honeycomb/images/next-disabled-hdpi.png)
   skin/honeycomb/images/identity-default-hdpi.png     (honeycomb/images/identity-default-hdpi.png)
   skin/honeycomb/images/identity-ssl-hdpi.png         (honeycomb/images/identity-ssl-hdpi.png)
   skin/honeycomb/images/identity-ev-hdpi.png          (honeycomb/images/identity-ev-hdpi.png)
   skin/honeycomb/images/unlocked-hdpi.png             (honeycomb/images/unlocked-hdpi.png)
   skin/honeycomb/images/locked-hdpi.png               (honeycomb/images/locked-hdpi.png)
   skin/honeycomb/images/close-default-hdpi.png        (honeycomb/images/close-default-hdpi.png)
-  skin/honeycomb/images/close-default-tablet-hdpi.png (honeycomb/images/close-default-tablet-hdpi.png)
   skin/honeycomb/images/close-active-hdpi.png         (honeycomb/images/close-active-hdpi.png)
-  skin/honeycomb/images/close-active-tablet-hdpi.png  (honeycomb/images/close-active-tablet-hdpi.png)
-  skin/honeycomb/images/close-background-hdpi.png     (honeycomb/images/close-background-hdpi.png)
   skin/honeycomb/images/close-inactive-tab-hdpi.png   (honeycomb/images/close-inactive-tab-hdpi.png)
-  skin/honeycomb/images/close-inactive-tab-tablet-hdpi.png   (honeycomb/images/close-inactive-tab-tablet-hdpi.png)
   skin/honeycomb/images/check-30.png                  (images/check-30.png)
   skin/honeycomb/images/check-selected-hdpi.png       (honeycomb/images/check-selected-hdpi.png)
   skin/honeycomb/images/check-unselected-hdpi.png     (honeycomb/images/check-unselected-hdpi.png)
   skin/honeycomb/images/search-glass-30.png           (honeycomb/images/search-glass-30.png)
   skin/honeycomb/images/search-clear-30.png           (honeycomb/images/search-clear-30.png)
   skin/honeycomb/images/section-expanded-16.png       (images/section-expanded-16.png)
   skin/honeycomb/images/section-collapsed-16.png      (images/section-collapsed-16.png)
   skin/honeycomb/images/task-switch-hdpi.png          (honeycomb/images/task-switch-hdpi.png)
deleted file mode 100644
--- a/mobile/themes/core/tablet.css
+++ /dev/null
@@ -1,134 +0,0 @@
-
-.spacer-actionbar,
-.button-actionbar {
-  visibility: collapse;
-}
-
-.button-actionbar[disabled="true"] {
-  opacity: 0.5;
-}
-
-%ifndef honeycomb
-.button-actionbar:hover:active {
-  background-color: #8db8d8;
-}
-%endif
-
-#toolbar-main[tablet="true"] > .spacer-actionbar,
-#toolbar-main[tablet="true"] > .button-actionbar {
-  visibility: visible;
-}
-#toolbar-main[tablet="true"] > #tool-tabs {
-  visibility: collapse;
-}
-
-#controls-scrollbox[tablet="true"] > #controls-sidebar {
-  visibility: collapse;
-}
-
-#tabs-spacer[tablet="true"]  {
-  visibility: collapse;
-}
-
-#tabs-container[tablet="true"] {
-  -moz-border-end: 0px;
-  background: #000;
-}
-
-#tabs[tablet="true"] > scrollbox {
-  max-width: 200px;
-}
-
-#tabs[tablet="true"] .tabs-list {
-  -moz-column-width: 200px;
-  -moz-padding-end: 0px;
-  -moz-padding-start: 0px;
-}
-
-documenttab[tablet="true"] {
-  width: 200px;
-  padding: @padding_xxnormal@;
-  -moz-margin-start: 0px;
-  background: none;
-}
-
-documenttab[tablet="true"][selected="true"] {
-  background: none;
-}
-
-.documenttab-thumbnail[tablet="true"] {
-  border-radius: @border_radius_tiny@;
-}
-
-.documenttab-close-container[tablet="true"] {
-  left: 0px;
-  -moz-margin-end: 0px;
-  -moz-margin-start: 135px;
-  -moz-box-pack: end;
-  -moz-box-align: center;
-}
-
-documenttab[selected="true"] > stack > .documenttab-close-container[tablet="true"] {
-  background: url("chrome://browser/skin/images/close-background-hdpi.png");
-  background-repeat: no-repeat;
-  background-position: right;
-  -moz-margin-end: -@padding_xxnormal@;
-  padding-right: 2px;
-}
-
-.documenttab-close[tablet="true"] {
-  width: 30px;
-  height: 44px;
-  list-style-image: url("chrome://browser/skin/images/close-inactive-tab-tablet-hdpi.png");
-}
-
-documenttab[selected="true"] > stack > hbox > .documenttab-close[tablet="true"] {
-  list-style-image: url("chrome://browser/skin/images/close-default-tablet-hdpi.png");
-}
-
-.documenttab-close-container:hover:active > .documenttab-close[tablet="true"] {
-  list-style-image: url("chrome://browser/skin/images/close-active-tablet-hdpi.png");
-}
-
-#newtab-button[tablet="true"] {
-  list-style-image: url("images/newtab-default-tablet-hdpi.png");
-}
-
-@media (@orientation@: portrait) {
-  #toolbar-main[tablet="true"] > #tool-tabs {
-    visibility: visible;
-  }
-
-  #controls-scrollbox[tablet="true"] > #tabs-sidebar {
-    border: none;
-%ifdef honeycomb
-    top: @touch_button_xlarge@;
-%else
-    top: -moz-calc(@touch_button_xlarge@ + @margin_normal@);
-%endif
-    visibility: collapse;
-  }
-
-  #controls-scrollbox[tablet="true"] > #tabs-sidebar:-moz-locale-dir(ltr) {
-    left: 0;
-  }
-  #controls-scrollbox[tablet="true"] > #tabs-sidebar:-moz-locale-dir(rtl) {
-    right: 0;
-  }
-
-  #controls-scrollbox[tablet="true"] > #tabs-sidebar[open] {
-    position: fixed;
-    visibility: visible;
-  }
-}
-
-%ifndef honeycomb
-@media (min-width: @tablet_panel_minwidth@) {
-  #awesome-panels {
-    -moz-box-shadow: 0px 0px @shadow_width_small@ black;
-  }
-  #search-engines-popup {
-    max-width: -moz-calc(@tablet_panel_minwidth@);
-  }
-}
-%endif