mozilla-central: changeset 88018:55be076aa554ad1d559cf0f412d2b95562a03be7

author	Dão Gottwald <dao@mozilla.com>
	Thu, 01 Mar 2012 00:35:24 +0100
changeset 88018	55be076aa554ad1d559cf0f412d2b95562a03be7
parent 88017	4e0b2de5f2cbb9acf4e868e6dc1f86326ff1576a
child 88019	d3bf0c140b25c7a66f07049552260d2cff09a5e3
push id	22167
push user	mak77@bonardo.net
push date	Thu, 01 Mar 2012 13:28:21 +0000
treeherder	mozilla-central@04caf36509e7 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	gavin
bugs	731553
milestone	13.0a1
first release with	nightly linux32 3a7b9e61c263 / 13.0a1 / 20120302031112 / files nightly linux64 3a7b9e61c263 / 13.0a1 / 20120302031112 / files nightly mac 3a7b9e61c263 / 13.0a1 / 20120302031112 / files nightly win32 3a7b9e61c263 / 13.0a1 / 20120302031112 / files nightly win64 3a7b9e61c263 / 13.0a1 / 20120302031112 / files
last release without	nightly linux32 30b4f99a137c / 13.0a1 / 20120229031108 / files nightly linux64 30b4f99a137c / 13.0a1 / 20120229031108 / files nightly mac 30b4f99a137c / 13.0a1 / 20120229031108 / files nightly win32 30b4f99a137c / 13.0a1 / 20120229031108 / files nightly win64 30b4f99a137c / 13.0a1 / 20120229031108 / files

--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1413,17 +1413,19 @@
           ]]>
         </body>
       </method>
 
       <method name="warnAboutClosingTabs">
       <parameter name="aAll"/>
       <body>
         <![CDATA[
-          var tabsToClose = (aAll ? this.tabs.length : this.visibleTabs.length - 1)
+          var tabsToClose = (aAll ?
+                               this.tabs.length - this._removingTabs.length :
+                               this.visibleTabs.length - 1)
                             - gBrowser._numPinnedTabs;
           if (tabsToClose <= 1)
             return true;
 
           const pref = "browser.tabs.warnOnClose";
           var shouldPrompt = Services.prefs.getBoolPref(pref);
 
           if (!shouldPrompt)