Merge m-c to fx-team on a CLOSED TREE.

2013-09-17 20:27:03 -04:00
parent 70ee9a9612 1771d76dc1
commit 50485497e9
533 changed files with 7714 additions and 2821 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -187,8 +187,6 @@
 #include "nsIWebBrowserFind.h"
 #include "nsIWidget.h"

-static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,
-                     NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
 static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);

 #if defined(DEBUG_bryner) || defined(DEBUG_chb)