From b8fd343863502bff8358f4d09325a1ca757b3543 Mon Sep 17 00:00:00 2001
From: SHIMODA Hiroshi <shimoda@clear-code.com>
Date: Mon, 12 Dec 2011 18:39:46 +0900
Subject: [PATCH] unity fastRestoreTreeStructure to onWindowStateRestored

---
 modules/browser.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/browser.js b/modules/browser.js
index 37b15953..b1e3292e 100644
--- a/modules/browser.js
+++ b/modules/browser.js
@@ -2277,12 +2277,9 @@ TreeStyleTabBrowser.prototype = {
  
 	onWindowStateRestored : function TSTBrowser_onWindowStateRestored() 
 	{
-		if (this.window.__SS_tabsToRestore && this.window.__SS_tabsToRestore > 1)
-			this.fastRestoreTreeStructure();
-	},
- 
-	fastRestoreTreeStructure : function TSTBrowser_fastRestoreTreeStructure() 
-	{
+		if (!this.window.__SS_tabsToRestore || this.window.__SS_tabsToRestore <= 1)
+			return;
+
 		var level = this.getTreePref('fastRestoreTree.level');
 		if (level <= this.kFAST_RESTORE_NONE)
 			return;
@@ -2592,8 +2589,7 @@ TreeStyleTabBrowser.prototype = {
 			this.updateInvertedTabContentsOrder(tabs);
 
 		/**
-		 * gBrowser.adthis._changeTabbarPosition(position);
-		 dTab() resets gBrowser._lastRelatedTab.owner
+		 * gBrowser.addTab() resets gBrowser._lastRelatedTab.owner
 		 * when a new background tab is opened from the current tab,
 		 * but it will fail with TST because gBrowser.moveTab() (called
 		 * by TST) clears gBrowser._lastRelatedTab.