Changed function declarations of nsIDocumentLoaderObserver to use the XPIDL macro instead of the inline versions.

webshell/tests/viewer/nsBrowserWindow.h

@@ -26,6 +26,7 @@
 #include "nsWebBrowserChrome.h"
 
 
+#include "nsIWebBrowser.h"
 #include "nsIBrowserWindow.h"
 #include "nsIStreamListener.h"
 #include "nsIProgressEventSink.h"
@@ -111,28 +112,7 @@ public:
   NS_IMETHOD GetContentWebShell(nsIWebShell **aResult);
 
   // nsIDocumentLoaderObserver
-  NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, 
-                                 nsIURI* aURL, 
-                                 const char* aCommand);
-  NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader,
-                               nsIChannel* channel,
-                               nsresult aStatus);
-  NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader,
-                            nsIChannel* channel);
-  NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader,
-                               nsIChannel* channel,
-                               PRUint32 aProgress, 
-                               PRUint32 aProgressMax);
-  NS_IMETHOD OnStatusURLLoad(nsIDocumentLoader* loader,
-                             nsIChannel* channel,
-                             nsString& aMsg);
-  NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader,
-                          nsIChannel* channel,
-                          nsresult aStatus);
-  NS_IMETHOD HandleUnknownContentType( nsIDocumentLoader* loader,
-                                       nsIChannel* channel,
-                                       const char *aContentType,
-                                       const char *aCommand );
+  NS_DECL_NSIDOCUMENTLOADEROBSERVER
 
   // nsIProgressEventSink
   NS_DECL_NSIPROGRESSEVENTSINK
@@ -241,6 +221,7 @@ public:
 
   nsIWidget* mWindow;
   nsIDocShell* mDocShell;
+  nsCOMPtr<nsIWebBrowser> mWebBrowser;
 
   nsFileSpec mOpenFileDirectory;