From 52b959c954ed45f51b95669d5572d2493ef396bb Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Sat, 26 Dec 2009 03:34:13 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=B0=97=E3=81=AB=E5=BE=A9=E5=85=83?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=BF=E3=83=96=E3=81=AE=E6=95=B0=E3=81=8C?=
 =?UTF-8?q?=E5=A4=9A=E3=81=84=E6=99=82=E3=81=AF=E3=80=81=E5=BE=A9=E5=85=83?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E5=89=8D=E3=81=AB=E7=A2=BA=E8=AA=8D=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@5644 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/treestyletabbrowser.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index e60cc3b5..2a6c1e24 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -2170,7 +2170,7 @@ TreeStyleTabBrowser.prototype = {
 	},
 	_clearRedirectionTableTimer : null,
  
-	restoreClosedSet : function(aId, aRestoredTab)
+	restoreClosedSet : function TSTBrowser_restoreClosedSet(aId, aRestoredTab)
 	{
 		if (
 			this.useTMPSessionAPI ||
@@ -2195,6 +2195,11 @@ TreeStyleTabBrowser.prototype = {
 			(
 				indexes.length+1 < count &&
 				this.getTreePref('undoCloseTabSubtree.onlyFullSet')
+			) ||
+			(
+				'_confirmOpenInTabs' in PlacesUIUtils &&
+				PlacesUIUtils._confirmOpenInTabs &&
+				!PlacesUIUtils._confirmOpenInTabs(indexes.length)
 			)
 			)
 			return;
@@ -2209,11 +2214,9 @@ TreeStyleTabBrowser.prototype = {
 			undoCloseTab(aIndex - (offset++));
 		});
 
-		if (aRestoredTab) {
-			window.setTimeout(function(aSelf) {
-				aSelf.mTabBrowser.selectedTab = aRestoredTab;
-			}, 0, this);
-		}
+		window.setTimeout(function(aSelf, aNextFocused) {
+			aSelf.mTabBrowser.selectedTab = aNextFocused;
+		}, 0, this, aRestoredTab || aSelf.mTabBrowser.selectedTab);
 
 		this.startRendering();
 		this._restoringClosedSet = false;