Fixed more build bustage...

webshell/embed/ActiveX/WebShellContainer.cpp

@@ -444,9 +444,12 @@ CWebShellContainer::CreatePopup(nsIDOMElement* aElement, nsIDOMElement* aPopupCo
 ///////////////////////////////////////////////////////////////////////////////
 // nsIStreamObserver implementation
 
-
 NS_IMETHODIMP
+#ifdef NECKO
 CWebShellContainer::OnStartRequest(nsIURI* aURL, const char *aContentType)
+#else
+CWebShellContainer::OnStartBinding(nsIURI* aURL, const char *aContentType)
+#endif
 {
 	USES_CONVERSION;
 	NG_TRACE(_T("CWebShellContainer::OnStartRequest(..., \"%s\")\n"), A2CT(aContentType));
@@ -479,7 +482,11 @@ CWebShellContainer::OnStatus(nsIURI* aURL, const PRUnichar* aMsg)
 
 
 NS_IMETHODIMP
+#ifdef NECKO
 CWebShellContainer::OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg)
+#else
+CWebShellContainer::OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg)
+#endif
 {
 	USES_CONVERSION;
 	NG_TRACE(_T("CWebShellContainer::OnStopRequest(..., %d, \"%s\")\n"), (int) aStatus, W2T((PRUnichar *) aMsg));

webshell/embed/ActiveX/WebShellContainer.h

@@ -83,6 +83,7 @@ public:
 						 const nsString& aPopupAlignment,
                          nsIDOMWindow* aWindow, nsIDOMWindow** outPopup);
 
+#ifdef NECKO
 	// nsIStreamObserver
     NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType);
     NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax);
@@ -90,7 +91,6 @@ public:
     NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg);
 
 	// nsIDocumentLoaderObserver 
-#ifdef NECKO
 	NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aCommand);
 	NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, nsIChannel* channel, PRInt32 aStatus, nsIDocumentLoaderObserver* aObserver);
 	NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, const char* aContentType, nsIContentViewer* aViewer);
@@ -99,6 +99,12 @@ public:
 	NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, PRInt32 aStatus);
 	NS_IMETHOD HandleUnknownContentType(nsIDocumentLoader* loader, nsIChannel* channel, const char *aContentType,const char *aCommand );		
 #else
+	// nsIStreamObserver
+    NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
+    NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax);
+    NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg);
+    NS_IMETHOD OnStopBinding(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg);
+
 	NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aCommand);
 	NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, nsIURI *aUrl, PRInt32 aStatus, nsIDocumentLoaderObserver* aObserver);
 	NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aContentType, nsIContentViewer* aViewer);