From efee74428c091c27cc823caf35fe827313cca1f5 Mon Sep 17 00:00:00 2001
From: "rpotts%netscape.com" <rpotts%netscape.com>
Date: Sat, 10 Oct 1998 04:34:35 +0000
Subject: [PATCH] renamed some enums which moved into
 mozilla/network/module/nsILoadAttribs.h

---
 webshell/public/nsIDocumentLoader.h |  2 +-
 webshell/public/nsIWebShell.h       | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/webshell/public/nsIDocumentLoader.h b/webshell/public/nsIDocumentLoader.h
index 8b08d8ee231b..a5dd9620eed5 100644
--- a/webshell/public/nsIDocumentLoader.h
+++ b/webshell/public/nsIDocumentLoader.h
@@ -73,7 +73,7 @@ public:
                             nsIPostData* aPostData = nsnull,
                             nsISupports* aExtraInfo = nsnull,
                             nsIStreamObserver* anObserver = nsnull,
-                            PRInt32 type = 0,
+                            nsURLReloadType type = nsURLReload,
                             const PRUint32 aLocalIP = 0) = 0;
 
     NS_IMETHOD Stop(void) = 0;
diff --git a/webshell/public/nsIWebShell.h b/webshell/public/nsIWebShell.h
index 6e56055f8a81..b4a0455c73e5 100644
--- a/webshell/public/nsIWebShell.h
+++ b/webshell/public/nsIWebShell.h
@@ -23,6 +23,7 @@
 #include "nsIWidget.h"
 #include "nsIScrollableView.h"
 #include "nsIContentViewerContainer.h"
+#include "nsILoadAttribs.h"
 
 class nsIFactory;
 class nsIPostData;
@@ -74,16 +75,6 @@ public:
   // Link traversing control
 };
 
-// Do not change the order of these. nsReload (normal/the first item) must
-// always be zero. If you add enumerations, change the range
-// check in nsNetService (OpenStream & OpenBlockingStream).
-typedef enum {
-  nsReload,
-  nsReloadBypassCache,
-  nsReloadBypassProxy,
-  nsReloadBypassCacheAndProxy
-} nsReloadType;
-
 // Return value from WillLoadURL
 #define NS_WEB_SHELL_CANCEL_URL_LOAD      0xC0E70000
 
@@ -152,10 +143,10 @@ public:
   NS_IMETHOD LoadURL(const PRUnichar *aURLSpec,
                      nsIPostData* aPostData=nsnull,
                      PRBool aModifyHistory=PR_TRUE,
-                     nsReloadType aType=nsReload,
+                     nsURLReloadType aType=nsURLReload,
                      const PRUint32 aLocalIP=0) = 0;
   NS_IMETHOD Stop(void) = 0;
-  NS_IMETHOD Reload(nsReloadType aType) = 0;
+  NS_IMETHOD Reload(nsURLReloadType aType) = 0;
   
   // History api's
   NS_IMETHOD Back() = 0;