diff --git a/webshell/embed/ActiveX/WebShellContainer.cpp b/webshell/embed/ActiveX/WebShellContainer.cpp index 7e127cc79945..bb76b0e793a4 100644 --- a/webshell/embed/ActiveX/WebShellContainer.cpp +++ b/webshell/embed/ActiveX/WebShellContainer.cpp @@ -445,11 +445,7 @@ 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)); @@ -482,11 +478,7 @@ 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)); diff --git a/webshell/embed/ActiveX/WebShellContainer.h b/webshell/embed/ActiveX/WebShellContainer.h index b8dea51989a7..f0b8037c3ba3 100644 --- a/webshell/embed/ActiveX/WebShellContainer.h +++ b/webshell/embed/ActiveX/WebShellContainer.h @@ -83,12 +83,12 @@ 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); NS_IMETHOD OnStatus(nsIURI* aURL, const PRUnichar* aMsg); NS_IMETHOD OnStopRequest(nsIURI* aURL, nsresult aStatus, const PRUnichar* aMsg); +#ifdef NECKO // nsIDocumentLoaderObserver NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aCommand); @@ -99,11 +99,6 @@ 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);