diff --git a/mozilla/network/module/nsINetService.h b/mozilla/network/module/nsINetService.h index d02a97a4a4d..c95aab8af4b 100644 --- a/mozilla/network/module/nsINetService.h +++ b/mozilla/network/module/nsINetService.h @@ -106,12 +106,27 @@ struct nsINetService : public nsISupports NS_IMETHOD SetCookieString(nsIURL *aURL, const nsString& aCookie)=0; #ifdef SingleSignon + NS_IMETHOD SI_DisplaySignonInfoAsHTML()=0; NS_IMETHOD SI_RememberSignonData (char* URLName, LO_FormSubmitData *submit)=0; NS_IMETHOD SI_RestoreSignonData (char* URLNAME, char* name, char** value)=0; #endif +#ifdef CookieManagement + NS_IMETHOD NET_DisplayCookieInfoAsHTML()=0; +#ifdef PrivacySiteInfo + NS_IMETHOD NET_DisplayCookieInfoOfSiteAsHTML(char * URLName)=0; + NS_IMETHOD NET_CookiePermission(char* URLName, PRInt32* permission)=0; + NS_IMETHOD NET_CookieCount(char* URLName, PRInt32* count)=0; +#endif +#endif + + NS_IMETHOD NET_AnonymizeCookies()=0; + NS_IMETHOD NET_UnanonymizeCookies()=0; + NS_IMETHOD SI_AnonymizeSignons()=0; + NS_IMETHOD SI_UnanonymizeSignons()=0; + /** * Get the http proxy used for http transactions. * diff --git a/mozilla/network/module/nsNetService.cpp b/mozilla/network/module/nsNetService.cpp index d3475aad2ca..07eaaab46d9 100644 --- a/mozilla/network/module/nsNetService.cpp +++ b/mozilla/network/module/nsNetService.cpp @@ -617,6 +617,12 @@ nsNetlibService::SetCookieString(nsIURL *aURL, const nsString& aCookie) } #ifdef SingleSignon +NS_IMETHODIMP +nsNetlibService::SI_DisplaySignonInfoAsHTML(){ + ::SI_DisplaySignonInfoAsHTML(NULL); + return NS_OK; +} + NS_IMETHODIMP nsNetlibService::SI_RememberSignonData (char* URLName, LO_FormSubmitData *submit) { @@ -633,6 +639,58 @@ nsNetlibService::SI_RestoreSignonData #endif +#ifdef CookieManagement +NS_IMETHODIMP +nsNetlibService::NET_DisplayCookieInfoAsHTML(){ + ::NET_DisplayCookieInfoAsHTML(NULL); + return NS_OK; +} + +#ifdef PrivacySiteInfo +NS_IMETHODIMP +nsNetlibService::NET_DisplayCookieInfoOfSiteAsHTML(char * URLName){ + ::NET_DisplayCookieInfoOfSiteAsHTML(NULL, URLName); + return NS_OK; +} +NS_IMETHODIMP +nsNetlibService::NET_CookiePermission(char* URLName, PRInt32* permission){ + *permission = ::NET_CookiePermission(URLName); + return NS_OK; +} + +NS_IMETHODIMP +nsNetlibService::NET_CookieCount(char* URLName, PRInt32* count){ + *count = ::NET_CookieCount(URLName); + return NS_OK; +} + +#endif +#endif + +NS_IMETHODIMP +nsNetlibService::NET_AnonymizeCookies(){ + ::NET_AnonymizeCookies(); + return NS_OK; +} + +NS_IMETHODIMP +nsNetlibService::NET_UnanonymizeCookies(){ + ::NET_UnanonymizeCookies(); + return NS_OK; +} + +NS_IMETHODIMP +nsNetlibService::SI_AnonymizeSignons(){ + ::SI_AnonymizeSignons(); + return NS_OK; +} + +NS_IMETHODIMP +nsNetlibService::SI_UnanonymizeSignons(){ + ::SI_UnanonymizeSignons(); + return NS_OK; +} + NS_IMETHODIMP nsNetlibService::GetProxyHTTP(nsString& aProxyHTTP) { char *proxy = nsnull; diff --git a/mozilla/network/module/nsNetService.h b/mozilla/network/module/nsNetService.h index c8ea384918f..cff69e51429 100644 --- a/mozilla/network/module/nsNetService.h +++ b/mozilla/network/module/nsNetService.h @@ -50,12 +50,27 @@ public: NS_IMETHOD SetCookieString(nsIURL *aURL, const nsString& aCookie); #ifdef SingleSignon + NS_IMETHOD SI_DisplaySignonInfoAsHTML(); NS_IMETHOD SI_RememberSignonData (char* URLName, LO_FormSubmitData *submit); NS_IMETHOD SI_RestoreSignonData (char* URLNAME, char* name, char** value); #endif +#ifdef CookieManagement + NS_IMETHOD NET_DisplayCookieInfoAsHTML(); +#ifdef PrivacySiteInfo + NS_IMETHOD NET_DisplayCookieInfoOfSiteAsHTML(char * URLName); + NS_IMETHOD NET_CookiePermission(char* URLName, PRInt32* permission); + NS_IMETHOD NET_CookieCount(char* URLName, PRInt32* count); +#endif +#endif + + NS_IMETHOD NET_AnonymizeCookies(); + NS_IMETHOD NET_UnanonymizeCookies(); + NS_IMETHOD SI_AnonymizeSignons(); + NS_IMETHOD SI_UnanonymizeSignons(); + NS_IMETHOD GetProxyHTTP(nsString& aProxyHTTP); NS_IMETHOD SetProxyHTTP(nsString& aProxyHTTP); NS_IMETHOD GetHTTPOneOne(PRBool& aOneOne);