Bug 1177310 - Add quit-application-granted to AsyncShutdown parent process phases. r?Yoric draft
authorMike Conley <mconley@mozilla.com>
Fri, 13 Nov 2015 14:47:13 -0500
changeset 308821 466999ae27f8a052f305fea29881c2f54844fba4
parent 308820 22209f97cf227b7c64aee9677bc95705392f6902
child 308822 6fa5635fdb12407c239697125556ef5d01acc29d
child 308823 f308df03fdb87a6481decc0fd973714435ab8281
push id7531
push usermconley@mozilla.com
push dateFri, 13 Nov 2015 22:48:42 +0000
reviewersYoric
bugs1177310
milestone45.0a1
Bug 1177310 - Add quit-application-granted to AsyncShutdown parent process phases. r?Yoric
toolkit/components/asyncshutdown/AsyncShutdown.jsm
--- a/toolkit/components/asyncshutdown/AsyncShutdown.jsm
+++ b/toolkit/components/asyncshutdown/AsyncShutdown.jsm
@@ -983,16 +983,21 @@ Barrier.prototype = Object.freeze({
 // mechanisms, we register a few phases here.
 
 // Parent process
 this.AsyncShutdown.profileChangeTeardown = getPhase("profile-change-teardown");
 this.AsyncShutdown.profileBeforeChange = getPhase("profile-before-change");
 this.AsyncShutdown.placesClosingInternalConnection = getPhase("places-will-close-connection");
 this.AsyncShutdown.sendTelemetry = getPhase("profile-before-change2");
 
+// Notifications that fire in the parent and content process, but should
+// only have phases in the parent process.
+if (!isContent) {
+  this.AsyncShutdown.quitApplicationGranted = getPhase("quit-application-granted");
+}
 
 // Content process
 if (isContent) {
   this.AsyncShutdown.contentChildShutdown = getPhase("content-child-shutdown");
 }
 
 // All processes
 this.AsyncShutdown.webWorkersShutdown = getPhase("web-workers-shutdown");