From f4f01b8b907f49e1bb9f649252fb2e2004a01ab9 Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de" <cbiesinger%web.de>
Date: Fri, 16 Jan 2004 18:22:55 +0000
Subject: [PATCH] 230970 nsExternalAppHandler needs no virtual functions also,
 w/o bug: nsExternalHelperAppService doesn't require threadsafe addref/release
 r=bzbarsky sr=darin

---
 .../exthandler/nsExternalHelperAppService.cpp  |  2 +-
 .../exthandler/nsExternalHelperAppService.h    | 18 +++++++++---------
 .../exthandler/nsExternalProtocolHandler.h     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
index 95cf08694f0..19577838bbc 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -386,7 +386,7 @@ static nsDefaultMimeTypeEntry nonDecodableExtensions [] = {
   { APPLICATION_COMPRESS, "Z" }
 };
 
-NS_IMPL_THREADSAFE_ISUPPORTS6(
+NS_IMPL_ISUPPORTS6(
   nsExternalHelperAppService,
   nsIExternalHelperAppService,
   nsPIExternalAppLauncher,
diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h
index bd10aa7302e..54ab5fd7cba 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.h
+++ b/uriloader/exthandler/nsExternalHelperAppService.h
@@ -288,13 +288,13 @@ public:
   NS_DECL_NSIOBSERVER
 
   nsExternalAppHandler();
-  virtual ~nsExternalAppHandler();
+  ~nsExternalAppHandler();
 
-  virtual nsresult Init(nsIMIMEInfo * aMIMEInfo, const char * aFileExtension,
-                        nsISupports * aWindowContext,
-                        const nsAString& aFilename,
-                        PRBool aIsAttachment,
-                        nsExternalHelperAppService *aHelperAppService);
+  nsresult Init(nsIMIMEInfo * aMIMEInfo, const char * aFileExtension,
+                nsISupports * aWindowContext,
+                const nsAString& aFilename,
+                PRBool aIsAttachment,
+                nsExternalHelperAppService *aHelperAppService);
 
 protected:
   nsCOMPtr<nsIFile> mTempFile;
@@ -394,10 +394,10 @@ protected:
   
   /**
    * Helper routine to ensure mSuggestedFileName is "correct";
-   * the base class implementation ensures that mSuggestedFileName has
-   * mTempFileExtension as extension;
+   * this ensures that mTempFileExtension only contains an extension when it
+   * is different from mSuggestedFileName's extension.
    */
-  virtual void EnsureSuggestedFileName();
+  void EnsureSuggestedFileName();
 
   typedef enum { kReadError, kWriteError, kLaunchError } ErrorType;
   /**
diff --git a/uriloader/exthandler/nsExternalProtocolHandler.h b/uriloader/exthandler/nsExternalProtocolHandler.h
index f2891475704..a33f4b4d52a 100644
--- a/uriloader/exthandler/nsExternalProtocolHandler.h
+++ b/uriloader/exthandler/nsExternalProtocolHandler.h
@@ -39,7 +39,7 @@ public:
 	NS_DECL_NSIEXTERNALPROTOCOLHANDLER
 
 	nsExternalProtocolHandler();
-	virtual ~nsExternalProtocolHandler();
+	~nsExternalProtocolHandler();
 
 protected:
   // helper function