Bug 385065 - protocol handling dialog. r=cbiesinger (forgot to fix two nits)
authorsdwilsh@shawnwilsher.com
Wed, 25 Jul 2007 23:44:43 -0700
changeset 4028 9f2781b3783efd534d2b3ab954efb70269d22103
parent 4027 f082da59fce208be6b5c23893646254d853f85d8
child 4029 7b6c93a5f977c78faf9ffe4a0a966af6be865c6d
push id1
push userbsmedberg@mozilla.com
push dateThu, 20 Mar 2008 16:49:24 +0000
treeherdermozilla-central@61007906a1f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscbiesinger
bugs385065
milestone1.9a7pre
Bug 385065 - protocol handling dialog. r=cbiesinger (forgot to fix two nits)
uriloader/exthandler/nsExternalHelperAppService.cpp
uriloader/exthandler/nsExternalProtocolHandler.cpp
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -1201,17 +1201,17 @@ static const char kExternalWarningDefaul
 
 NS_IMETHODIMP 
 nsExternalHelperAppService::LoadURI(nsIURI *aURI,
                                     nsIInterfaceRequestor *aWindowContext)
 {
   NS_ENSURE_ARG_POINTER(aURI);
 
   nsCAutoString scheme;
-  (void)aURI->GetScheme(scheme);
+  aURI->GetScheme(scheme);
   if (scheme.IsEmpty())
     return NS_OK; // must have a scheme
 
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   if (!prefs)
     return NS_OK; // deny if we can't check prefs
 
   // Deny load if the prefs say to do so
--- a/uriloader/exthandler/nsExternalProtocolHandler.cpp
+++ b/uriloader/exthandler/nsExternalProtocolHandler.cpp
@@ -183,17 +183,17 @@ nsresult nsExtProtocolChannel::OpenURL()
 #ifdef DEBUG
     nsCAutoString urlScheme;
     mUrl->GetScheme(urlScheme);
     PRBool haveHandler = PR_FALSE;
     extProtService->ExternalProtocolHandlerExists(urlScheme.get(), &haveHandler);
     NS_ASSERTION(haveHandler, "Why do we have a channel for this url if we don't support the protocol?");
 #endif
 
-    rv = extProtService->LoadURI(mUrl, nsnull);
+    rv = extProtService->LoadURI(mUrl, mCallbacks);
   }
 
   // Drop notification callbacks to prevent cycles.
   mCallbacks = 0;
 
   return rv;
 }