From e70b38df5f409339d0ae0113533423127d36499b Mon Sep 17 00:00:00 2001
From: "locka%iol.ie" <locka%iol.ie>
Date: Wed, 28 Apr 1999 20:02:52 +0000
Subject: [PATCH] approved: leaf@mozilla.org

---
 webshell/embed/ActiveX/WebShellContainer.cpp | 47 ++++++++++----------
 webshell/embed/ActiveX/WebShellContainer.h   | 14 +++---
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/webshell/embed/ActiveX/WebShellContainer.cpp b/webshell/embed/ActiveX/WebShellContainer.cpp
index 827a7fdbca13..e6777aaa5df8 100644
--- a/webshell/embed/ActiveX/WebShellContainer.cpp
+++ b/webshell/embed/ActiveX/WebShellContainer.cpp
@@ -340,15 +340,16 @@ CWebShellContainer::OnStopBinding(nsIURL* aURL, nsresult aStatus, const PRUnicha
 // nsIDocumentLoaderObserver implementation 
 
 
-NS_IMETHODIMP 
-CWebShellContainer::OnStartDocumentLoad(nsIURL* aURL, const char* aCommand) 
+
+NS_IMETHODIMP
+CWebShellContainer::OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURL* aURL, const char* aCommand)
 { 
 	return NS_OK; 
 } 
 
 // we need this to fire the document complete 
-NS_IMETHODIMP 
-CWebShellContainer::OnEndDocumentLoad(nsIURL *aUrl, PRInt32 aStatus) 
+NS_IMETHODIMP
+CWebShellContainer::OnEndDocumentLoad(nsIDocumentLoader* loader, nsIURL *aUrl, PRInt32 aStatus)
 {
 	PRUnichar* wString = nsnull;    
 
@@ -371,37 +372,35 @@ CWebShellContainer::OnEndDocumentLoad(nsIURL *aUrl, PRInt32 aStatus)
 	return NS_OK; 
 } 
 
+NS_IMETHODIMP
+CWebShellContainer::OnStartURLLoad(nsIDocumentLoader* loader, nsIURL* aURL, const char* aContentType, nsIContentViewer* aViewer)
+{ 
+	return NS_OK; 
+} 
+
+NS_IMETHODIMP
+CWebShellContainer::OnProgressURLLoad(nsIDocumentLoader* loader, nsIURL* aURL, PRUint32 aProgress, PRUint32 aProgressMax)
+{ 
+	return NS_OK; 
+} 
+
 // we don't care about these. 
-NS_IMETHODIMP 
-CWebShellContainer::OnStartURLLoad(nsIURL* aURL, const char* aContentType, nsIContentViewer* aViewer) 
+NS_IMETHODIMP
+CWebShellContainer::OnStatusURLLoad(nsIDocumentLoader* loader, nsIURL* aURL, nsString& aMsg)
 { 
 	return NS_OK; 
 } 
 
 
-NS_IMETHODIMP 
-CWebShellContainer::OnProgressURLLoad(nsIURL* aURL, PRUint32 aProgress, PRUint32 aProgressMax) 
-{ 
+NS_IMETHODIMP
+CWebShellContainer::OnEndURLLoad(nsIDocumentLoader* loader, nsIURL* aURL, PRInt32 aStatus)
+{
 	return NS_OK; 
 } 
 
 
 NS_IMETHODIMP 
-CWebShellContainer::OnStatusURLLoad(nsIURL* aURL, nsString& aMsg) 
-{ 
-	return NS_OK; 
-} 
-
-
-NS_IMETHODIMP 
-CWebShellContainer::OnEndURLLoad(nsIURL* aURL, PRInt32 aStatus) 
-{ 
-	return NS_OK; 
-} 
-
-
-NS_IMETHODIMP 
-CWebShellContainer::HandleUnknownContentType( nsIURL *aURL, const char *aContentType, const char *aCommand ) 
+CWebShellContainer::HandleUnknownContentType(nsIDocumentLoader* loader, nsIURL *aURL, const char *aContentType, const char *aCommand ) 
 { 
 	return NS_OK; 
 } 
\ No newline at end of file
diff --git a/webshell/embed/ActiveX/WebShellContainer.h b/webshell/embed/ActiveX/WebShellContainer.h
index d112bff5f9a9..3b2697753e95 100644
--- a/webshell/embed/ActiveX/WebShellContainer.h
+++ b/webshell/embed/ActiveX/WebShellContainer.h
@@ -67,13 +67,13 @@ public:
     NS_IMETHOD OnStopBinding(nsIURL* aURL, nsresult aStatus, const PRUnichar* aMsg);
 
 	// nsIDocumentLoaderObserver 
-	NS_IMETHOD OnStartDocumentLoad(nsIURL* aURL, const char* aCommand);
-	NS_IMETHOD OnEndDocumentLoad(nsIURL *aUrl, PRInt32 aStatus); 
-	NS_IMETHOD OnStartURLLoad(nsIURL* aURL, const char* aContentType, nsIContentViewer* aViewer);   
-	NS_IMETHOD OnProgressURLLoad(nsIURL* aURL, PRUint32 aProgress, PRUint32 aProgressMax); 
-	NS_IMETHOD OnStatusURLLoad(nsIURL* aURL, nsString& aMsg); 
-	NS_IMETHOD OnEndURLLoad(nsIURL* aURL, PRInt32 aStatus); 
-	NS_IMETHOD HandleUnknownContentType( nsIURL *aURL,const char *aContentType,const char *aCommand );		
+	NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURL* aURL, const char* aCommand);
+	NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader, nsIURL *aUrl, PRInt32 aStatus);
+	NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader, nsIURL* aURL, const char* aContentType, nsIContentViewer* aViewer);
+	NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader, nsIURL* aURL, PRUint32 aProgress, PRUint32 aProgressMax);
+	NS_IMETHOD OnStatusURLLoad(nsIDocumentLoader* loader, nsIURL* aURL, nsString& aMsg);
+	NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader, nsIURL* aURL, PRInt32 aStatus);
+	NS_IMETHOD HandleUnknownContentType(nsIDocumentLoader* loader, nsIURL *aURL,const char *aContentType,const char *aCommand );		
 };
 
 #endif