Bug 568791 rename NS_IHELPERAPPLAUNCHERDLG_CONTRACTID to NS_HELPERAPPLAUNCHERDLG_CONTRACTID
authortimeless@mozdev.org
Fri, 28 May 2010 14:37:09 +0300
changeset 47253 af944c061dfee00006bfc665618e5546d94c8d3d
parent 47252 90cceb9bed898233ed75d03128fef1d486d4791a
child 47254 84599af3f0c8efbf26042b9292438ff11262a358
push idunknown
push userunknown
push dateunknown
bugs568791
milestone2.0b2pre
Bug 568791 rename NS_IHELPERAPPLAUNCHERDLG_CONTRACTID to NS_HELPERAPPLAUNCHERDLG_CONTRACTID r=biesi
uriloader/exthandler/nsExternalHelperAppService.cpp
uriloader/exthandler/nsIHelperAppLauncherDialog.idl
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -1604,17 +1604,17 @@ NS_IMETHODIMP nsExternalAppHandler::OnSt
   
   if (alwaysAsk)
   {
     // do this first! make sure we don't try to take an action until the user tells us what they want to do
     // with it...
     mReceivedDispositionInfo = PR_FALSE; 
 
     // invoke the dialog!!!!! use mWindowContext as the window context parameter for the dialog request
-    mDialog = do_CreateInstance( NS_IHELPERAPPLAUNCHERDLG_CONTRACTID, &rv );
+    mDialog = do_CreateInstance( NS_HELPERAPPLAUNCHERDLG_CONTRACTID, &rv );
     NS_ENSURE_SUCCESS(rv, rv);
 
     // this will create a reference cycle (the dialog holds a reference to us as
     // nsIHelperAppLauncher), which will be broken in Cancel or
     // CreateProgressListener.
     rv = mDialog->Show( this, mWindowContext, mReason );
 
     // what do we do if the dialog failed? I guess we should call Cancel and abort the load....
@@ -2027,17 +2027,17 @@ nsresult nsExternalAppHandler::PromptFor
 {
   // invoke the dialog!!!!! use mWindowContext as the window context parameter for the dialog request
   // Convert to use file picker? No, then embeddors could not do any sort of
   // "AutoDownload" w/o showing a prompt
   nsresult rv = NS_OK;
   if (!mDialog)
   {
     // Get helper app launcher dialog.
-    mDialog = do_CreateInstance( NS_IHELPERAPPLAUNCHERDLG_CONTRACTID, &rv );
+    mDialog = do_CreateInstance( NS_HELPERAPPLAUNCHERDLG_CONTRACTID, &rv );
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   // we want to explicitly unescape aDefaultFile b4 passing into the dialog. we can't unescape
   // it because the dialog is implemented by a JS component which doesn't have a window so no unescape routine is defined...
 
   // Now, be sure to keep |this| alive, and the dialog
   // If we don't do this, users that close the helper app dialog while the file
--- a/uriloader/exthandler/nsIHelperAppLauncherDialog.idl
+++ b/uriloader/exthandler/nsIHelperAppLauncherDialog.idl
@@ -110,11 +110,11 @@ interface nsIHelperAppLauncherDialog : n
                                    in nsISupports aWindowContext, 
                                    in wstring aDefaultFileName, 
                                    in wstring aSuggestedFileExtension,
                                    in boolean aForcePrompt);
 };
 
 
 %{C++
-#define NS_IHELPERAPPLAUNCHERDLG_CONTRACTID    "@mozilla.org/helperapplauncherdialog;1"
+#define NS_HELPERAPPLAUNCHERDLG_CONTRACTID    "@mozilla.org/helperapplauncherdialog;1"
 #define NS_IHELPERAPPLAUNCHERDLG_CLASSNAME "Mozilla Helper App Launcher Confirmation Dialog"
 %}