Bug 587267 - Display the Firefox button when in TabView; r=dao approval2.0=gavin.sharp
authorFrank Yan <fyan@mozilla.com>
Mon, 16 Aug 2010 16:33:32 -0400
changeset 50682 e81d421e99ed024616d790d2c8b0b1b479402632
parent 50681 a2c829756d9939261d5dec1da162c163455f7323
child 50683 d773ca26da83c85fc4a1097d6f2cc43cd209308a
push idunknown
push userunknown
push dateunknown
reviewersdao
bugs587267
milestone2.0b4pre
Bug 587267 - Display the Firefox button when in TabView; r=dao approval2.0=gavin.sharp
browser/base/content/browser.xul
browser/base/content/tabview/ui.js
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -97,20 +97,17 @@
 
 #ifdef MOZ_SAFE_BROWSING
 <script type="application/javascript" src="chrome://browser/content/safebrowsing/sb-loader.js"/>
 #endif
 <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
 <script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
 
-<deck flex="1" id="tab-view-deck">
-<vbox flex="1">
-
-# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the 
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
 # browser-sets.inc file for sharing with hiddenWindow.xul.
 #include browser-sets.inc
 
   <popupset id="mainPopupSet">
     <menupopup id="tabContextMenu"
                onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);"
                onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
       <menu id="context_tabViewMenu" class="menu-iconic" label="&moveTabTo.label;"
@@ -588,16 +585,19 @@
                   label="&quitApplicationCmd.label;"
 #endif
                   command="cmd_quitApplication"/>
       </menupopup>
     </button>
   </hbox>
 #endif
 
+<deck flex="1" id="tab-view-deck">
+<vbox flex="1">
+
   <toolbox id="navigator-toolbox"
            defaultmode="icons" mode="icons"
 #ifdef WINCE
            defaulticonsize="small" iconsize="small"
 #endif
 #ifdef XP_WIN
            tabsontop="true"
 #endif
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -303,17 +303,17 @@ var UIManager = {
 
     this._reorderTabItemsOnShow.forEach(function(groupItem) {
       groupItem.reorderTabItemsBasedOnTabOrder();
     });
     this._reorderTabItemsOnShow = [];
 
 #ifdef XP_WIN
     // Restore the full height when showing TabView
-    gTabViewFrame.style.marginTop = "22px";
+    gTabViewFrame.style.marginTop = "";
 #endif
     gTabViewDeck.selectedIndex = 1;
     gTabViewFrame.contentWindow.focus();
 
     gBrowser.updateTitlebar();
 #ifdef XP_MACOSX
     this._setActiveTitleColor(true);
 #endif