From 01200acccd594e91d8966f212a19f814521a9b26 Mon Sep 17 00:00:00 2001
From: SHIMODA Hiroshi <shimoda@clear-code.com>
Date: Thu, 26 May 2011 11:09:19 +0900
Subject: [PATCH] load TreeStyleTabWindow and TreeStyleTabBrowser constructors
 in the main window

---
 content/treestyletab/treestyletab.xul               | 13 +++++++------
 content/treestyletab/windowHelper.js                |  6 +++---
 .../treestyletab/{hacks.js => windowHelperHacks.js} |  0
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename content/treestyletab/{hacks.js => windowHelperHacks.js} (100%)

diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index 6210c421..48739527 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -12,14 +12,15 @@
 <script src="res/UninstallationListener.js" type="application/javascript"/>
 
 <script type="application/javascript"><![CDATA[
-(function() {
-	var ns = {};
-	Components.utils.import('resource://treestyletab-modules/window.js', ns);
-	new ns.TreeStyleTabWindow(window);
-})();
+
+Components.utils.import('resource://treestyletab-modules/window.js');
+Components.utils.import('resource://treestyletab-modules/browser.js');
+new TreeStyleTabWindow(window);
+
 ]]></script>
+
 <script src="windowHelper.js" type="application/javascript"/>
-<script src="hacks.js" type="application/javascript"/>
+<script src="windowHelperHacks.js" type="application/javascript"/>
 
 <script src="bookmarksOverlay.js" type="application/javascript"/>
 <script src="bookmarksOverlayEditable.js" type="application/javascript"/>
diff --git a/content/treestyletab/windowHelper.js b/content/treestyletab/windowHelper.js
index 6bf2ad74..7f06f6a9 100644
--- a/content/treestyletab/windowHelper.js
+++ b/content/treestyletab/windowHelper.js
@@ -56,18 +56,18 @@ var TreeStyleTabWindowHelper = {
 			);
 		}
 
-		this.overrideExtensionsPreInit(); // hacks.js
+		this.overrideExtensionsPreInit(); // windowHelperHacks.js
 	},
  
 	onBeforeBrowserInit : function TSTWH_onBeforeBrowserInit() 
 	{
-		this.overrideExtensionsBeforeBrowserInit(); // hacks.js
+		this.overrideExtensionsBeforeBrowserInit(); // windowHelperHacks.js
 		this.overrideGlobalFunctions();
 	},
  
 	onAfterBrowserInit : function TSTWH_onAfterBrowserInit() 
 	{
-		this.overrideExtensionsAfterBrowserInit(); // hacks.js
+		this.overrideExtensionsAfterBrowserInit(); // windowHelperHacks.js
 	},
 	
 	updateTabDNDObserver : function TSTWH_updateTabDNDObserver(aObserver) 
diff --git a/content/treestyletab/hacks.js b/content/treestyletab/windowHelperHacks.js
similarity index 100%
rename from content/treestyletab/hacks.js
rename to content/treestyletab/windowHelperHacks.js