New confirm dialog for xpinstall. Fixes bug #17506. r=dougt

xpinstall/src/nsXPInstallManager.cpp

@@ -35,6 +35,7 @@
 #include "nsIBufferInputStream.h"
 #include "nsIInputStream.h"
 #include "nsIStreamListener.h"
+#include "nsICommonDialogs.h"
 
 #include "nsISoftwareUpdate.h"
 #include "nsSoftwareUpdateIIDs.h"
@@ -46,6 +47,7 @@
 #include "nsSpecialSystemDirectory.h"
 #include "nsFileStream.h"
 #include "nsProxyObjectManager.h"
+#include "nsIDOMWindow.h"
 
 #include "nsIAppShellComponentImpl.h"
 #include "nsIPrompt.h"
@@ -55,6 +57,9 @@ static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
 static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID);
 static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
 
+static NS_DEFINE_CID(kCommonDialogsCID, NS_CommonDialog_CID);
+static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID);
+
 #define XPINSTALL_BUNDLE_URL "chrome://xpinstall/locale/xpinstall.properties"
 
 nsXPInstallManager::nsXPInstallManager()
@@ -132,6 +137,9 @@ NS_IMETHODIMP
 nsXPInstallManager::InitManager(nsXPITriggerInfo* aTriggers)
 {
     nsresult rv = NS_OK;
+    nsCOMPtr<nsIDialogParamBlock> ioParamBlock;
+    PRBool OKtoInstall = PR_FALSE;
+
     mTriggers = aTriggers;
 
     if ( !mTriggers || mTriggers->Size() == 0 )
@@ -142,54 +150,63 @@ nsXPInstallManager::InitManager(nsXPITriggerInfo* aTriggers)
     }
 
     //-----------------------------------------------------
-    // confirm that install is OK... use stock Confirm()
+    // Create the nsIDialogParamBlock to pass the trigger
-    // dialog for now, later we'll want a fancier one.
+    // list to the dialog
     //-----------------------------------------------------
-    PRBool OKtoInstall = PR_FALSE;
+    rv = nsComponentManager::CreateInstance(kDialogParamBlockCID,
+                                            nsnull,
+                                            nsIDialogParamBlock::GetIID(),
+                                            getter_AddRefs(ioParamBlock));
 
-    NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv );
+    
     if ( NS_SUCCEEDED( rv ) ) 
     {
-        nsCOMPtr<nsIWebShellWindow> wbwin;
+      
-        rv = appShell->GetHiddenWindow(getter_AddRefs(wbwin));
+      LoadDialogWithNames(ioParamBlock);
-        if ( NS_SUCCEEDED(rv) )
+
+      // Now do the stuff to create a window and pass the JS args to it.
+      NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv );
+      if ( NS_SUCCEEDED( rv ) ) 
+      {
+        nsCOMPtr<nsIDOMWindow> hiddenWindow;
+        JSContext* jsContext;
+        rv = appShell->GetHiddenWindowAndJSContext( getter_AddRefs(hiddenWindow), &jsContext);
+        if (NS_SUCCEEDED(rv))
         {
-            nsCOMPtr<nsIPrompt> prompt( do_QueryInterface(wbwin, &rv) );
+          void* stackPtr;
-            if ( NS_SUCCEEDED(rv) && prompt )
+          jsval *argv = JS_PushArguments( jsContext,
+                                          &stackPtr,
+                                          "sss%ip",
+                                          "chrome://xpinstall/content/institems.xul",
+                                          "_blank",
+                                          "chrome,modal",
+                                          (const nsIID*)(&nsIDialogParamBlock::GetIID()),
+                                          (nsISupports*)ioParamBlock);
+          if (argv)
+          {
+            nsCOMPtr<nsIDOMWindow> newWindow;
+            rv = hiddenWindow->OpenDialog( jsContext,
+                                           argv,
+                                           4,
+                                           getter_AddRefs( newWindow));
+            if (NS_SUCCEEDED(rv))
             {
-                PRBool bStrBdlSuccess = PR_FALSE;
+              JS_PopArguments( jsContext, stackPtr);
-                nsString rsrcName = "ShouldWeInstallMsg";
 
-                if (mStringBundle)
+              //Now get which button was pressed from the ParamBlock
-                {
+              PRInt32 buttonPressed = 0;
-                    const PRUnichar* ucRsrcName = rsrcName.GetUnicode();
+              ioParamBlock->GetInt( nsICommonDialogs::eButtonPressed, &buttonPressed );
-                    PRUnichar* ucRsrcVal = nsnull;
+              OKtoInstall = buttonPressed ? PR_FALSE : PR_TRUE;
-                    rv = mStringBundle->GetStringFromName(ucRsrcName, &ucRsrcVal);
-                    if (NS_SUCCEEDED(rv) && ucRsrcVal)
-                    {
-                        prompt->Confirm( ucRsrcVal, &OKtoInstall);
-                        nsCRT::free(ucRsrcVal);
-                        bStrBdlSuccess = PR_TRUE;
-                    }
-                }
-
-                /* failover to default english strings */
-                if (!bStrBdlSuccess)
-                {
-                    char *cResName = rsrcName.ToNewCString();
-                    nsString resVal = nsInstallResources::GetDefaultVal(cResName);
-
-                    if (!resVal.IsEmpty())
-                        prompt->Confirm( resVal.GetUnicode(), &OKtoInstall );
-
-                    if (cResName)
-                        Recycle(cResName);
-                }
             }
+          }
+          else
+          {
+            rv = NS_ERROR_FAILURE; // fix, better error code??
+          }
         }
+      }
     }
 
-
     // --- create and open the progress dialog
     if (NS_SUCCEEDED(rv) && OKtoInstall)
     {
@@ -381,6 +398,59 @@ void nsXPInstallManager::Shutdown()
     NS_RELEASE_THIS();
 }
 
+/*-----------------------------------------------------
+** LoadDialogWithNames loads the param block for the 
+** javascript/xul dialog with the list of modules to 
+** be installed and their source locations
+**----------------------------------------------------*/
+void nsXPInstallManager::LoadDialogWithNames(nsIDialogParamBlock* ioParamBlock)
+{
+
+    nsXPITriggerItem *triggerItem;
+    nsString moduleName, URL;
+    PRInt32 offset = 0;
+    PRUint32 i=0, paramIndex=0;
+
+    ioParamBlock->SetInt(nsICommonDialogs::eNumberButtons,2); //set the Ok and Cancel buttons
+
+    for (i=0; i < mTriggers->Size(); i++)
+    {
+        triggerItem = mTriggers->Get(i);
+    
+        //Check to see if this trigger item has a pretty name
+        if((moduleName = triggerItem->mName) != "")
+        {
+            ioParamBlock->SetString(paramIndex, moduleName.ToNewUnicode());
+            paramIndex++;
+            URL = triggerItem->mURL;
+            offset = URL.RFind("/");
+            if (offset != -1)
+            {
+                URL.Cut(offset + 1, URL.mLength - 1);
+                ioParamBlock->SetString(paramIndex, URL.ToNewUnicode());
+            }
+            paramIndex++;
+        }
+        else
+        {
+            //triggerItem does not have a pretty name so parse the url for the file name
+            //then use that as the pretty name
+            moduleName = triggerItem->mURL;
+            URL = triggerItem->mURL;
+            offset = moduleName.RFind("/");
+            if (offset != -1)
+            {
+                moduleName.Cut(0, offset + 1);
+                ioParamBlock->SetString(paramIndex, moduleName.ToNewUnicode());
+                paramIndex++;
+                URL.Cut(offset + 1, URL.mLength - 1); 
+                ioParamBlock->SetString(paramIndex, URL.ToNewUnicode());
+            }
+            paramIndex++;
+        }
+    }
+}
+
 
 NS_IMETHODIMP
 nsXPInstallManager::OnStartRequest(nsIChannel* channel, nsISupports *ctxt)

xpinstall/src/nsXPInstallManager.h

@@ -48,6 +48,7 @@
 #include "nsIProgressEventSink.h"
 #include "nsIInterfaceRequestor.h"
 
+#include "nsIDialogParamBlock.h"
 
 
 class nsXPInstallManager : public nsIXPINotifier, 
@@ -86,6 +87,7 @@ class nsXPInstallManager : public nsIXPINotifier,
     private:
         nsresult DownloadNext();
         void     Shutdown();
+        void     LoadDialogWithNames(nsIDialogParamBlock* ioParamBlock);
         
         nsXPITriggerInfo*   mTriggers;
         nsXPITriggerItem*   mItem;