From 2f31eb7d431fd8a79798cbf67b51d3f4afc6925e Mon Sep 17 00:00:00 2001
From: "mscott%netscape.com"
 <mscott%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 17 Jun 2000 23:04:53 +0000
Subject: [PATCH] Bug #38374 --> more updates for external helper application
 support. (NOT PART OF THE BUILD) code review will come when this is done and
 gets turned on.

Add support for nsPIExternalAppLauncher. Call back to the OS app service to launch the app once we are done
saving the file to a temp file.


git-svn-id: svn://10.0.0.236/trunk@72502 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../exthandler/nsExternalHelperAppService.cpp | 26 ++++++++++++++++---
 .../exthandler/nsExternalHelperAppService.h   | 13 ++++++----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
index f926c54ee9b..7f16768dda4 100644
--- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -28,6 +28,7 @@
 #include "nsXPIDLString.h"
 #include "nsMemory.h"
 #include "nsIStreamListener.h"
+#include "nsCExternalHelperApp.h" // contains progids for the helper app service
 
 NS_IMPL_THREADSAFE_ADDREF(nsExternalHelperAppService)
 NS_IMPL_THREADSAFE_RELEASE(nsExternalHelperAppService)
@@ -35,6 +36,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsExternalHelperAppService)
 NS_INTERFACE_MAP_BEGIN(nsExternalHelperAppService)
    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIExternalHelperAppService)
    NS_INTERFACE_MAP_ENTRY(nsIExternalHelperAppService)
+   NS_INTERFACE_MAP_ENTRY(nsPIExternalAppLauncher)
 NS_INTERFACE_MAP_END_THREADSAFE
 
 nsExternalHelperAppService::nsExternalHelperAppService()
@@ -58,12 +60,20 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const char *aMimeContentType
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-nsExternalAppHandler * nsExternalHelperAppService::CreateNewExternalHandler()
+NS_IMETHODIMP nsExternalHelperAppService::LaunchAppWithTempFile(nsIFile * aTempFile, nsISupports * aAppCookie)
+{
+  // this method should only be implemented by each OS specific implementation of this service.
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+nsExternalAppHandler * nsExternalHelperAppService::CreateNewExternalHandler(nsISupports * aAppCookie)
 {
   nsExternalAppHandler* handler = nsnull;
   NS_NEWXPCOM(handler, nsExternalAppHandler);
   // add any XP intialization code for an external handler that we may need here...
   // right now we don't have any but i bet we will before we are done.
+
+  handler->Init(aAppCookie);
   return handler;
 }
 
@@ -155,6 +165,8 @@ NS_IMETHODIMP nsExternalAppHandler::OnDataAvailable(nsIChannel * aChannel, nsISu
 NS_IMETHODIMP nsExternalAppHandler::OnStopRequest(nsIChannel * aChannel, nsISupports *aCtxt, 
                                                 nsresult aStatus, const PRUnichar * errorMsg)
 {
+  nsresult rv = NS_OK;
+
   // go ahead and execute the application passing in our temp file as an argument
   // this may involve us calling back into the OS external app service to make the call
   // for actually launching the helper app. It'd be great if nsIFile::spawn could be made to work
@@ -164,11 +176,17 @@ NS_IMETHODIMP nsExternalAppHandler::OnStopRequest(nsIChannel * aChannel, nsISupp
   if (mOutStream)
     mOutStream->Close();
 
-  return NS_OK;
+  nsCOMPtr<nsPIExternalAppLauncher> helperAppService (do_GetService(NS_EXTERNALHELPERAPPSERVICE_PROGID));
+  if (helperAppService)
+  {
+    rv = helperAppService->LaunchAppWithTempFile(mTempFile, mExternalApplication);
+  }
+
+  return rv;
 }
 
-nsresult nsExternalAppHandler::Init(nsIFile * aExternalApplication)
+nsresult nsExternalAppHandler::Init(nsISupports * aAppCookie)
 {
-  mExternalApplication = aExternalApplication;
+  mExternalApplication = aAppCookie;
   return NS_OK;
 }
diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.h b/mozilla/uriloader/exthandler/nsExternalHelperAppService.h
index c36ea8f2258..86211b9a8c2 100644
--- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.h
+++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.h
@@ -32,16 +32,19 @@
 
 class nsExternalAppHandler;
 
-class nsExternalHelperAppService : public nsIExternalHelperAppService
+class nsExternalHelperAppService : public nsIExternalHelperAppService, nsPIExternalAppLauncher
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIEXTERNALHELPERAPPSERVICE
+  NS_DECL_NSPIEXTERNALAPPLAUNCHER
 
   nsExternalHelperAppService();
   virtual ~nsExternalHelperAppService();
 
-  virtual nsExternalAppHandler * CreateNewExternalHandler();
+  // create an external app handler and bind it with a cookie that came from the OS specific
+  // helper app service subclass.
+  virtual nsExternalAppHandler * CreateNewExternalHandler(nsISupports * aAppCookie);
 
 protected:
 
@@ -67,13 +70,13 @@ public:
   nsExternalAppHandler();
   virtual ~nsExternalAppHandler();
 
-  // initialize the handler with an nsIFile that represents the external
+  // initialize the handler with a cookie that represents the external
   // application associated with this handler.
-  virtual nsresult Init(nsIFile * aExternalApplication);
+  virtual nsresult Init(nsISupports * aExternalApplicationCookie);
 
 protected:
   nsCOMPtr<nsIFile> mTempFile;
-  nsCOMPtr<nsIFile> mExternalApplication;
+  nsCOMPtr<nsISupports> mExternalApplication;
   nsCOMPtr<nsIOutputStream> mOutStream; // output stream to the temp file...
 
   char * mDataBuffer;