Merge last green changeset from mozilla-inbound to mozilla-central

browser/base/Makefile.in

@@ -83,6 +83,3 @@ endif
 ifneq (,$(filter windows gtk2, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DMENUBAR_CAN_AUTOHIDE=1
 endif
-
-libs::
-	$(NSINSTALL) $(srcdir)/content/tabview/modules/* $(FINAL_TARGET)/modules/tabview

browser/base/content/aboutDialog.xul

@@ -67,7 +67,8 @@
 #else
         title="&aboutDialog.title;"
 #endif
-        aria-describedby="version distribution distributionId"
+        role="dialog"
+        aria-describedby="version distribution distributionId communityDesc contributeDesc trademark"
         >
 
   <script type="application/javascript" src="chrome://browser/content/aboutDialog.js"/>
@@ -80,7 +81,7 @@
         <label id="distribution" class="text-blurb"/>
         <label id="distributionId" class="text-blurb"/>
 
-        <vbox id="detailsBox" aria-describedby="communityDesc contributeDesc">
+        <vbox id="detailsBox">
           <vbox id="updateBox">
 #ifdef MOZ_UPDATER
             <deck id="updateDeck" orient="vertical">

browser/base/content/browser-tabview.js

@@ -93,10 +93,9 @@ let TabView = {
   // ----------
   init: function TabView_init() {
     // disable the ToggleTabView command for popup windows
-    if (!window.toolbar.visible) {
-      goSetCommandEnabled("Browser:ToggleTabView", false);
+    goSetCommandEnabled("Browser:ToggleTabView", window.toolbar.visible);
+    if (!window.toolbar.visible)
       return;
-    }
 
     if (this._initialized)
       return;

browser/base/content/test/Makefile.in

@@ -40,10 +40,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = browser/base/content/test
 
-DIRS += \
-		tabview \
-		$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 

browser/base/jar.mn

@@ -49,10 +49,6 @@ browser.jar:
         content/browser/sanitizeDialog.css            (content/sanitizeDialog.css)
 *       content/browser/tabbrowser.css                (content/tabbrowser.css)
 *       content/browser/tabbrowser.xml                (content/tabbrowser.xml)
-        content/browser/tabview.css                   (content/tabview/tabview.css)
-*       content/browser/tabview.js                    (content/tabview/tabview.js)
-        content/browser/tabview.html                  (content/tabview/tabview.html)
-        content/browser/tabview-content.js            (content/tabview/content.js)
 *       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
 *       content/browser/utilityOverlay.js             (content/utilityOverlay.js)
 *       content/browser/web-panels.js                 (content/web-panels.js)

browser/components/Makefile.in

@@ -70,6 +70,7 @@ PARALLEL_DIRS = \
   sessionstore \
   shell \
   sidebar/src \
+  tabview \
   migration \
   $(NULL)
 

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_searchbar.js

@@ -41,15 +41,23 @@
 function test() {
   // initialization
   waitForExplicitFinish();
-  gPrefService.setBoolPref("browser.privatebrowsing.keep_current_session", true);
   let pb = Cc["@mozilla.org/privatebrowsing;1"].
            getService(Ci.nsIPrivateBrowsingService);
 
-  // fill in the search bar with something
+  // fill in the search bar with something, twice to populate undo history
   const kTestSearchString = "privatebrowsing";
   let searchBar = BrowserSearch.searchBar;
+  searchBar.value = kTestSearchString + "foo";
   searchBar.value = kTestSearchString;
 
+  gPrefService.setBoolPref("browser.privatebrowsing.keep_current_session", true);
+
+  registerCleanupFunction(function () {
+    searchBar.textbox.reset();
+
+    gPrefService.clearUserPref("browser.privatebrowsing.keep_current_session");
+  });
+
   // enter private browsing mode
   pb.privateBrowsingEnabled = true;
 
@@ -85,8 +93,6 @@ function test() {
     gBrowser.removeTab(gBrowser.selectedTab);
     pb.privateBrowsingEnabled = false;
 
-    // cleanup
-    gPrefService.clearUserPref("browser.privatebrowsing.keep_current_session");
     finish();
   }, true);
 }

browser/components/tabview/Makefile.in

@@ -0,0 +1,53 @@
+#
+# ***** 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 Places code
+#
+# The Initial Developer of the Original Code is
+# Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Brett Wilson <brettw@gmail.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 *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ifdef ENABLE_TESTS
+	DIRS += test
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+libs::
+	$(NSINSTALL) $(srcdir)/modules/* $(FINAL_TARGET)/modules/tabview

browser/components/tabview/jar.mn

@@ -0,0 +1,5 @@
+browser.jar:
+        content/browser/tabview.css                   (tabview.css)
+*       content/browser/tabview.js                    (tabview.js)
+        content/browser/tabview.html                  (tabview.html)
+        content/browser/tabview-content.js            (content.js)

browser/components/tabview/test/Makefile.in

@@ -34,11 +34,11 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/base/content/test/tabview
+relativesrcdir  = browser/components/tabview/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk

browser/components/tabview/test/browser_tabview_bug589324.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const DUMMY_PAGE_URL = "http://mochi.test:8888/browser/browser/base/content/test/tabview/dummy_page.html";
+const DUMMY_PAGE_URL = "http://mochi.test:8888/browser/browser/components/tabview/test/dummy_page.html";
 const DUMMY_PAGE_URL_2 = "http://mochi.test:8888/";
 
 let state = {

browser/components/tabview/test/browser_tabview_bug595020.js

@@ -0,0 +1,39 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
+
+let stateStartup = {windows:[
+  {tabs:[{entries:[{url:"about:home"}]}], extData:{"tabview-last-session-group-name":"title"}}
+]};
+
+function test() {
+  let assertWindowTitle = function (win, title) {
+    let browser = win.gBrowser.tabs[0].linkedBrowser;
+    let winTitle = win.gBrowser.getWindowTitleForBrowser(browser);
+
+    info('window title is: "' + winTitle + '"');
+    is(winTitle.indexOf(title), 0, "title starts with '" + title + "'");
+  };
+
+  let testGroupNameChange = function (win) {
+    showTabView(function () {
+      let cw = win.TabView.getContentWindow();
+      let groupItem = cw.GroupItems.groupItems[0];
+      groupItem.setTitle("new-title");
+
+      hideTabView(function () {
+        assertWindowTitle(win, "new-title");
+        finish();
+      }, win);
+    }, win);
+  };
+
+  waitForExplicitFinish();
+
+  newWindowWithState(stateStartup, function (win) {
+    registerCleanupFunction(function () win.close());
+    assertWindowTitle(win, "title");
+    testGroupNameChange(win);
+  });
+}

browser/components/tabview/test/browser_tabview_bug597248.js

@@ -16,8 +16,8 @@ function test() {
 function setupOne(win) {
   win.TabView.firstUseExperienced = true;
 
-  win.gBrowser.addTab("http://mochi.test:8888/browser/browser/base/content/test/tabview/search1.html");
-  win.gBrowser.addTab("http://mochi.test:8888/browser/browser/base/content/test/tabview/dummy_page.html");
+  win.gBrowser.addTab("http://mochi.test:8888/browser/browser/components/tabview/test/search1.html");
+  win.gBrowser.addTab("http://mochi.test:8888/browser/browser/components/tabview/test/dummy_page.html");
 
   afterAllTabsLoaded(function () setupTwo(win), win);
 }

browser/components/tabview/test/browser_tabview_bug600645.js

@@ -68,5 +68,5 @@ function onTabViewWindowLoaded() {
   newTab.addEventListener("error", errorHandler, false);
 
   newTab.linkedBrowser.loadURI(
-    "http://mochi.test:8888/browser/browser/base/content/test/tabview/test_bug600645.html");
+    "http://mochi.test:8888/browser/browser/components/tabview/test/test_bug600645.html");
 }

browser/components/tabview/test/browser_tabview_bug608037.js

@@ -8,7 +8,7 @@ function test() {
   waitForExplicitFinish();
 
   tabOne = gBrowser.addTab("http://mochi.test:8888/");
-  tabTwo = gBrowser.addTab("http://mochi.test:8888/browser/browser/base/content/test/tabview/dummy_page.html");
+  tabTwo = gBrowser.addTab("http://mochi.test:8888/browser/browser/components/tabview/test/dummy_page.html");
 
   afterAllTabsLoaded(function () {
     // make sure the tab one is selected because undoCloseTab() would remove