rendered paste bodydiff -r 5588c9796f0b browser/base/Makefile.in--- a/browser/base/Makefile.in Tue Sep 14 20:23:33 2010 +1200+++ b/browser/base/Makefile.in Tue Sep 14 13:12:01 2010 +0200@@ -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 5588c9796f0b browser/base/content/browser-menubar.inc--- a/browser/base/content/browser-menubar.inc Tue Sep 14 20:23:33 2010 +1200+++ b/browser/base/content/browser-menubar.inc Tue Sep 14 13:12:01 2010 +0200@@ -208,10 +208,12 @@ <menu id="view-menu" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;"> <menupopup id="menu_viewPopup">+#ifdef MOZ_TAB_VIEW <menuitem id="menu_tabview" label="&showTabView2.label;" accesskey="&showTabView2.accesskey;" command="Browser:ToggleTabView"/>+#endif <menu id="viewToolbarsMenu" label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;">diff -r edf05b298094 browser/base/content/browser-sets.inc--- a/browser/base/content/browser-sets.inc Thu Sep 30 12:35:34 2010 -0700+++ b/browser/base/content/browser-sets.inc Thu Sep 30 23:33:49 2010 +0200@@ -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 5588c9796f0b browser/base/content/browser.js--- a/browser/base/content/browser.js Tue Sep 14 20:23:33 2010 +1200+++ b/browser/base/content/browser.js Tue Sep 14 13:12:01 2010 +0200@@ -178,7 +178,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@@ -1580,7 +1582,9 @@ gSyncUI.init(); #endif +#ifdef MOZ_TAB_VIEW TabView.init();+#endif // Enable Inspector? let enabled = gPrefService.getBoolPref(InspectorUI.prefEnabledName);@@ -6960,8 +6964,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 5588c9796f0b browser/base/content/browser.xul--- a/browser/base/content/browser.xul Tue Sep 14 20:23:33 2010 +1200+++ b/browser/base/content/browser.xul Tue Sep 14 13:12:01 2010 +0200@@ -126,6 +126,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"@@ -136,6 +137,7 @@ </menupopup> </menu> <menuseparator/>+#endif <menuitem id="context_bookmarkAllTabs" label="&bookmarkAllTabs.label;" accesskey="&bookmarkAllTabs.accesskey;"@@ -779,8 +781,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"@@ -1107,7 +1111,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"@@ -1141,12 +1149,14 @@ position="after_end"/> </toolbarbutton> +#ifdef MOZ_TAB_VIEW <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional" label="&tabViewButton2.label;" command="Browser:ToggleTabView" tooltiptext="&tabViewButton2.tooltip;" removable="true" observes="tabviewGroupsNumber"/>+#endif <toolbarbutton id="tabs-closebutton" class="close-button tabs-closebutton"@@ -1318,10 +1328,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 5588c9796f0b browser/base/content/tabbrowser.xml--- a/browser/base/content/tabbrowser.xml Tue Sep 14 20:23:33 2010 +1200+++ b/browser/base/content/tabbrowser.xml Tue Sep 14 13:12:01 2010 +0200@@ -747,6 +747,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@@ -755,6 +756,9 @@ else { this.ownerDocument.title = this.getWindowTitleForBrowser(this.mCurrentBrowser); }+#else+ this.ownerDocument.title = this.getWindowTitleForBrowser(this.mCurrentBrowser);+#endif ]]> </body> </method>diff -r 5588c9796f0b browser/base/content/test/Makefile.in--- a/browser/base/content/test/Makefile.in Tue Sep 14 20:23:33 2010 +1200+++ b/browser/base/content/test/Makefile.in Tue Sep 14 13:12:01 2010 +0200@@ -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 5588c9796f0b browser/base/jar.mn--- a/browser/base/jar.mn Tue Sep 14 20:23:33 2010 +1200+++ b/browser/base/jar.mn Tue Sep 14 13:12:01 2010 +0200@@ -48,9 +48,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 5588c9796f0b browser/confvars.sh--- a/browser/confvars.sh Tue Sep 14 20:23:33 2010 +1200+++ b/browser/confvars.sh Tue Sep 14 13:12:01 2010 +0200@@ -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=\ No newline at end of filediff -r 602b5dd047a6 browser/themes/gnomestripe/browser/jar.mn--- a/browser/themes/gnomestripe/browser/jar.mn Tue Oct 12 11:09:06 2010 +0300+++ b/browser/themes/gnomestripe/browser/jar.mn Tue Oct 12 11:34:01 2010 +0200@@ -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 5588c9796f0b browser/themes/pinstripe/browser/jar.mn--- a/browser/themes/pinstripe/browser/jar.mn Tue Sep 14 20:23:33 2010 +1200+++ b/browser/themes/pinstripe/browser/jar.mn Tue Sep 14 13:12:01 2010 +0200@@ -116,6 +116,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)@@ -123,6 +124,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 5588c9796f0b browser/themes/winstripe/browser/jar.mn--- a/browser/themes/winstripe/browser/jar.mn Tue Sep 14 20:23:33 2010 +1200+++ b/browser/themes/winstripe/browser/jar.mn Tue Sep 14 13:12:01 2010 +0200@@ -95,6 +95,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/new-tab.png (tabview/new-tab.png)@@ -102,6 +103,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.png@@ -211,6 +213,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/new-tab.png (tabview/new-tab.png)@@ -218,6 +221,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-16-throbber.png skin/classic/aero/browser/sync-16.pngdiff -r 5588c9796f0b config/autoconf.mk.in--- a/config/autoconf.mk.in Tue Sep 14 20:23:33 2010 +1200+++ b/config/autoconf.mk.in Tue Sep 14 13:12:01 2010 +0200@@ -670,6 +670,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 5588c9796f0b configure.in--- a/configure.in Tue Sep 14 20:23:33 2010 +1200+++ b/configure.in Tue Sep 14 13:12:01 2010 +0200@@ -8697,6 +8697,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=