165955 - build changes for phoenix due to forking history, r=bryner, sr=hyatt

embedding/browser/webBrowser/Makefile.in

@@ -37,6 +37,8 @@ REQUIRES	= xpcom \
 		  js \
 		  necko \
 		  uriloader \
+		  history \
+		  browsercomps \
 		  shistory \
 		  webshell \
 		  windowwatcher \

embedding/browser/webBrowser/nsWebBrowser.cpp

@@ -66,6 +66,10 @@
 // PSM2 includes
 #include "nsISecureBrowserUI.h"
 
+#ifdef MOZ_PHOENIX
+#include "nsBrowserCompsCID.h"
+#endif
+
 static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID);
 static NS_DEFINE_CID(kChildCID, NS_CHILD_CID);
 static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);

xpfe/browser/src/Makefile.in

@@ -50,6 +50,10 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  $(NULL)
 
+ifdef MOZ_PHOENIX
+REQUIRES += browsercomps history
+endif
+
 CPPSRCS		= \
 		nsBrowserInstance.cpp \
 		nsBrowserStatusFilter.cpp \

xpfe/browser/src/nsBrowserInstance.cpp

@@ -102,6 +102,10 @@
 #include "nsFileStream.h"
 #include "nsIProxyObjectManager.h" 
 
+#ifdef MOZ_PHOENIX
+#include "nsBrowserCompsCID.h"
+#endif
+
 #include "nsBrowserStatusFilter.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserStatusFilter)