Bug 1373109 - Don't call MaybeCloseWindow twice when diverting. r=mconley, a=lizzard
authorBlake Kaplan <mrbkap@gmail.com>
Tue, 20 Jun 2017 17:37:24 -0700
changeset 414115 34751b9bda2b7e2fe0c6f6e0d44cff079e604919
parent 414114 8678aff96ccbd53e80137cc5951916b3b3cab26e
child 414116 9e6af0875ed66e39d42f9327f769473dfe695049
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley, lizzard
bugs1373109
milestone55.0
Bug 1373109 - Don't call MaybeCloseWindow twice when diverting. r=mconley, a=lizzard nsExternalHelperAppService::OnStartRequest calls MaybeCloseWindow unconditionally after it finishes looking at the request headers. The call from DidDivertRequest is redundant (and possibly left over from when we didn't call OnStartRequest properly). MozReview-Commit-ID: Cm5YhCt5XLY
uriloader/exthandler/nsExternalHelperAppService.cpp
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -1282,17 +1282,16 @@ nsExternalAppHandler::~nsExternalAppHand
 }
 
 void
 nsExternalAppHandler::DidDivertRequest(nsIRequest *request)
 {
   MOZ_ASSERT(XRE_IsContentProcess(), "in child process");
   // Remove our request from the child loadGroup
   RetargetLoadNotifications(request);
-  MaybeCloseWindow();
 }
 
 NS_IMETHODIMP nsExternalAppHandler::SetWebProgressListener(nsIWebProgressListener2 * aWebProgressListener)
 {
   // This is always called by nsHelperDlg.js. Go ahead and register the
   // progress listener. At this point, we don't have mTransfer.
   mDialogProgressListener = aWebProgressListener;
   return NS_OK;