rendered paste bodydiff -r fe1263a246bd browser/base/Makefile.in--- a/browser/base/Makefile.in Mon Oct 18 16:29:37 2010 +0300+++ b/browser/base/Makefile.in Sun Oct 31 15:52:18 2010 +0100@@ -85,5 +85,7 @@ DEFINES += -DMENUBAR_CAN_AUTOHIDE=1 endif +ifdef MOZ_TAB_VIEW libs:: $(NSINSTALL) $(srcdir)/content/tabview/modules/* $(FINAL_TARGET)/modules/tabview+endifdiff -r fe1263a246bd browser/base/content/browser-menubar.inc--- a/browser/base/content/browser-menubar.inc Mon Oct 18 16:29:37 2010 +0300+++ b/browser/base/content/browser-menubar.inc Sun Oct 31 15:52:18 2010 +0100@@ -209,11 +209,13 @@ <menu id="view-menu" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;"> <menupopup id="menu_viewPopup">+#ifdef MOZ_TAB_VIEW <menuitem id="menu_tabview" key="key_tabview" label="&viewTabGroups.label;" accesskey="&viewTabGroups.accesskey;" command="Browser:ToggleTabView"/>+#endif <menu id="viewToolbarsMenu" label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;">diff -r fe1263a246bd browser/base/content/browser-sets.inc--- a/browser/base/content/browser-sets.inc Mon Oct 18 16:29:37 2010 +0300+++ b/browser/base/content/browser-sets.inc Sun Oct 31 15:52:18 2010 +0100@@ -116,9 +116,11 @@ <command id="Browser:NextTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(1, true);"/> <command id="Browser:PrevTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(-1, true);"/> <command id="Browser:ShowAllTabs" oncommand="allTabs.open();"/>+#ifdef MOZ_TAB_VIEW <command id="Browser:ToggleTabView" oncommand="TabView.toggle();"/> <command id="Browser:ShowTabView" oncommand="TabView.show();"/> <command id="Browser:HideTabView" oncommand="TabView.hide();"/> +#endif <command id="cmd_fullZoomReduce" oncommand="FullZoom.reduce()"/> <command id="cmd_fullZoomEnlarge" oncommand="FullZoom.enlarge()"/> <command id="cmd_fullZoomReset" oncommand="FullZoom.reset()"/>diff -r fe1263a246bd browser/base/content/browser.js--- a/browser/base/content/browser.js Mon Oct 18 16:29:37 2010 +0300+++ b/browser/base/content/browser.js Sun Oct 31 15:52:18 2010 +0100@@ -180,7 +180,9 @@ #include inspector.js #include browser-places.js #include browser-tabPreviews.js+#ifdef MOZ_TAB_VIEW #include browser-tabview.js+#endif #ifdef MOZ_SERVICES_SYNC #include browser-syncui.js@@ -1558,7 +1560,9 @@ gSyncUI.init(); #endif +#ifdef MOZ_TAB_VIEW TabView.init();+#endif // Enable Inspector? let enabled = gPrefService.getBoolPref(InspectorUI.prefEnabledName);@@ -6809,8 +6813,10 @@ this._command = document.getElementById("Browser:BookmarkAllTabs"); gBrowser.tabContainer.addEventListener("TabOpen", this, true); gBrowser.tabContainer.addEventListener("TabClose", this, true);+#ifdef MOZ_TAB_VIEW gBrowser.tabContainer.addEventListener("TabShow", this, true); gBrowser.tabContainer.addEventListener("TabHide", this, true);+#endif this._updateCommandState(); }, diff -r fe1263a246bd browser/base/content/browser.xul--- a/browser/base/content/browser.xul Mon Oct 18 16:29:37 2010 +0300+++ b/browser/base/content/browser.xul Sun Oct 31 15:52:18 2010 +0100@@ -123,6 +123,7 @@ <menuitem id="context_unpinTab" label="&unpinAppTab.label;" hidden="true" accesskey="&unpinAppTab.accesskey;" oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>+#ifdef MOZ_TAB_VIEW <menu id="context_tabViewMenu" label="&moveToGroup.label;" accesskey="&moveToGroup.accesskey;"> <menupopup id="context_tabViewMenuPopup"@@ -132,6 +133,7 @@ oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/> </menupopup> </menu>+#endif <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" accesskey="&moveToNewWindow.accesskey;" tbattr="tabbrowser-multiple"@@ -818,8 +820,10 @@ </vbox> #endif +#ifdef MOZ_TAB_VIEW <deck flex="1" id="tab-view-deck"> <vbox flex="1">+#endif <toolbox id="navigator-toolbox" defaultmode="icons" mode="icons"@@ -1125,7 +1129,11 @@ iconsize="small" defaulticonsize="small" lockiconsize="true" aria-label="&tabsToolbar.label;" context="toolbar-context-menu"+#ifdef MOZ_TAB_VIEW defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton"+#else+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"+#endif collapsed="true"> <tabs id="tabbrowser-tabs"@@ -1159,12 +1167,14 @@ position="after_end"/> </toolbarbutton> +#ifdef MOZ_TAB_VIEW <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional" label="&tabGroupsButton.label;" command="Browser:ToggleTabView" tooltiptext="&tabGroupsButton.tooltip;" removable="true" observes="tabviewGroupsNumber"/>+#endif <toolbarbutton id="tabs-closebutton" class="close-button tabs-closebutton"@@ -1320,10 +1330,12 @@ </svg:svg> #endif +#ifdef MOZ_TAB_VIEW </vbox> # <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck. # Introducing the iframe dynamically, as needed, was found to be better than # starting with an empty iframe here in browser.xul from a Ts standpoint. </deck>+#endif </window>diff -r fe1263a246bd browser/base/content/tabbrowser.xml--- a/browser/base/content/tabbrowser.xml Mon Oct 18 16:29:37 2010 +0300+++ b/browser/base/content/tabbrowser.xml Sun Oct 31 15:52:18 2010 +0100@@ -718,6 +718,7 @@ <method name="updateTitlebar"> <body> <![CDATA[+#ifdef MOZ_TAB_VIEW if (window.TabView && TabView.isVisible()) { // ToDo: this will be removed when we gain ability to draw to the menu bar. // Bug 586175@@ -726,6 +727,9 @@ else { this.ownerDocument.title = this.getWindowTitleForBrowser(this.mCurrentBrowser); }+#else+ this.ownerDocument.title = this.getWindowTitleForBrowser(this.mCurrentBrowser);+#endif ]]> </body> </method>diff -r fe1263a246bd browser/base/content/test/Makefile.in--- a/browser/base/content/test/Makefile.in Mon Oct 18 16:29:37 2010 +0300+++ b/browser/base/content/test/Makefile.in Sun Oct 31 15:52:18 2010 +0100@@ -40,11 +40,13 @@ VPATH = @srcdir@ relativesrcdir = browser/base/content/test -DIRS += tabview- include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk +ifdef MOZ_TAB_VIEW+DIRS += tabview+endif+ _TEST_FILES = \ test_feed_discovery.html \ feed_discovery.html \diff -r fe1263a246bd browser/base/jar.mn--- a/browser/base/jar.mn Mon Oct 18 16:29:37 2010 +0300+++ b/browser/base/jar.mn Sun Oct 31 15:52:18 2010 +0100@@ -47,9 +47,11 @@ content/browser/sanitizeDialog.css (content/sanitizeDialog.css) * content/browser/tabbrowser.css (content/tabbrowser.css) * content/browser/tabbrowser.xml (content/tabbrowser.xml)+#ifdef MOZ_TAB_VIEW content/browser/tabview.css (content/tabview/tabview.css) * content/browser/tabview.js (content/tabview/tabview.js) content/browser/tabview.html (content/tabview/tabview.html)+#endif * content/browser/urlbarBindings.xml (content/urlbarBindings.xml) * content/browser/utilityOverlay.js (content/utilityOverlay.js) * content/browser/web-panels.js (content/web-panels.js)diff -r fe1263a246bd browser/confvars.sh--- a/browser/confvars.sh Mon Oct 18 16:29:37 2010 +0300+++ b/browser/confvars.sh Sun Oct 31 15:52:18 2010 +0100@@ -52,3 +52,4 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh MOZ_BRANDING_DIRECTORY=browser/branding/nightly MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/firefox+MOZ_TAB_VIEW=diff -r fe1263a246bd browser/themes/gnomestripe/browser/jar.mn--- a/browser/themes/gnomestripe/browser/jar.mn Mon Oct 18 16:29:37 2010 +0300+++ b/browser/themes/gnomestripe/browser/jar.mn Sun Oct 31 15:52:18 2010 +0100@@ -77,6 +77,7 @@ skin/classic/browser/tabbrowser/loading.png (tabbrowser/loading.png) skin/classic/browser/tabbrowser/tab.png (tabbrowser/tab.png) skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)+#ifdef MOZ_TAB_VIEW skin/classic/browser/tabview/edit-light.png (tabview/edit-light.png) skin/classic/browser/tabview/edit.png (tabview/edit.png) skin/classic/browser/tabview/new-tab.png (tabview/new-tab.png)@@ -84,6 +85,7 @@ skin/classic/browser/tabview/stack-expander.png (tabview/stack-expander.png) skin/classic/browser/tabview/tabview.png (tabview/tabview.png) skin/classic/browser/tabview/tabview.css (tabview/tabview.css)+#endif #ifdef MOZ_SERVICES_SYNC skin/classic/browser/sync-16-throbber.png skin/classic/browser/sync-16.pngdiff -r fe1263a246bd browser/themes/pinstripe/browser/jar.mn--- a/browser/themes/pinstripe/browser/jar.mn Mon Oct 18 16:29:37 2010 +0300+++ b/browser/themes/pinstripe/browser/jar.mn Sun Oct 31 15:52:18 2010 +0100@@ -112,6 +112,7 @@ skin/classic/browser/tabbrowser/tabbrowser-tabs-bkgnd.png (tabbrowser/tabbrowser-tabs-bkgnd.png) skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) skin/classic/browser/tabbrowser/tab-bkgnd.png (tabbrowser/tab-bkgnd.png)+#ifdef MOZ_TAB_VIEW skin/classic/browser/tabview/edit-light.png (tabview/edit-light.png) skin/classic/browser/tabview/edit.png (tabview/edit.png) skin/classic/browser/tabview/new-tab.png (tabview/new-tab.png)@@ -119,6 +120,7 @@ skin/classic/browser/tabview/stack-expander.png (tabview/stack-expander.png) skin/classic/browser/tabview/tabview.png (tabview/tabview.png) skin/classic/browser/tabview/tabview.css (tabview/tabview.css)+#endif #ifdef MOZ_SERVICES_SYNC skin/classic/browser/sync-throbber.png skin/classic/browser/sync-16.pngdiff -r fe1263a246bd browser/themes/winstripe/browser/jar.mn--- a/browser/themes/winstripe/browser/jar.mn Mon Oct 18 16:29:37 2010 +0300+++ b/browser/themes/winstripe/browser/jar.mn Sun Oct 31 15:52:18 2010 +0100@@ -92,6 +92,7 @@ skin/classic/browser/tabbrowser/tab.png (tabbrowser/tab.png) skin/classic/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png) skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)+#ifdef MOZ_TAB_VIEW skin/classic/browser/tabview/edit-light.png (tabview/edit-light.png) skin/classic/browser/tabview/edit.png (tabview/edit.png) skin/classic/browser/tabview/grain.png (tabview/grain.png)@@ -100,6 +101,7 @@ skin/classic/browser/tabview/stack-expander.png (tabview/stack-expander.png) skin/classic/browser/tabview/tabview.png (tabview/tabview.png) skin/classic/browser/tabview/tabview.css (tabview/tabview.css)+#endif #ifdef MOZ_SERVICES_SYNC skin/classic/browser/sync-throbber.png skin/classic/browser/sync-16.png@@ -206,6 +208,7 @@ skin/classic/aero/browser/tabbrowser/tab.png (tabbrowser/tab.png) skin/classic/aero/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png) skin/classic/aero/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)+#ifdef MOZ_TAB_VIEW skin/classic/aero/browser/tabview/edit-light.png (tabview/edit-light.png) skin/classic/aero/browser/tabview/edit.png (tabview/edit.png) skin/classic/aero/browser/tabview/grain.png (tabview/grain.png)@@ -214,6 +217,7 @@ skin/classic/aero/browser/tabview/stack-expander.png (tabview/stack-expander.png) skin/classic/aero/browser/tabview/tabview.png (tabview/tabview.png) skin/classic/aero/browser/tabview/tabview.css (tabview/tabview.css)+#endif #ifdef MOZ_SERVICES_SYNC skin/classic/aero/browser/sync-throbber.png skin/classic/aero/browser/sync-16.pngdiff -r fe1263a246bd config/autoconf.mk.in--- a/config/autoconf.mk.in Mon Oct 18 16:29:37 2010 +0300+++ b/config/autoconf.mk.in Sun Oct 31 15:52:18 2010 +0100@@ -680,6 +680,8 @@ MOZ_SERVICES_SYNC = @MOZ_SERVICES_SYNC@ +MOZ_TAB_VIEW = @MOZ_TAB_VIEW@+ MOZ_OFFICIAL_BRANDING = @MOZ_OFFICIAL_BRANDING@ HAVE_CLOCK_MONOTONIC = @HAVE_CLOCK_MONOTONIC@diff -r fe1263a246bd configure.in--- a/configure.in Mon Oct 18 16:29:37 2010 +0300+++ b/configure.in Sun Oct 31 15:52:18 2010 +0100@@ -8795,6 +8795,12 @@ AC_DEFINE(MOZ_SERVICES_SYNC) fi +dnl Build TabView if required+AC_SUBST(MOZ_TAB_VIEW)+if test -n "$MOZ_TAB_VIEW"; then+ AC_DEFINE(MOZ_TAB_VIEW)+fi+ dnl ======================================================== if test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=