Auto send users to sites they assigned to a container. Fixes #306

index.js

@@ -117,7 +117,7 @@ const ContainerService = {
   _identitiesState: {},
   _windowMap: new Map(),
   _containerWasEnabled: false,
-  _onThemeChangedCallback: null,
+  _onBackgroundConnectCallback: null,
 
   init(installation, reason) {
     // If we are just been installed, we must store some information for the
@@ -260,7 +260,7 @@ const ContainerService = {
         }
       });
 
-      this.registerThemeConnection(api);
+      this.registerBackgroundConnection(api);
     }).catch(() => {
       throw new Error("WebExtension startup failed. Unable to continue.");
     });
@@ -307,28 +307,28 @@ const ContainerService = {
     Services.obs.addObserver(this, "lightweight-theme-changed", false);
   },
 
-  registerThemeConnection(api) {
-    // This is only used for theme notifications
+  registerBackgroundConnection(api) {
+    // This is only used for theme and container deletion notifications
     api.browser.runtime.onConnect.addListener((port) => {
-      this.onThemeChanged((theme, topic) => {
+      this._onBackgroundConnectCallback = (message, topic) => {
         port.postMessage({
           type: topic,
-          theme
+          message
         });
-      });
+      };
     });
   },
 
-  triggerThemeChanged(theme, topic) {
-    if (this._onThemeChangedCallback) {
-      this._onThemeChangedCallback(theme, topic);
+  triggerBackgroundCallback(message, topic) {
+    if (this._onBackgroundConnectCallback) {
+      this._onBackgroundConnectCallback(message, topic);
     }
   },
 
   observe(subject, topic) {
     if (topic === "lightweight-theme-changed") {
       this.getTheme().then((theme) => {
-        this.triggerThemeChanged(theme, topic);
+        this.triggerBackgroundCallback(theme, topic);
       }).catch(() => {
         throw new Error("Unable to get theme");
       });
@@ -346,10 +346,6 @@ const ContainerService = {
     });
   },
 
-  onThemeChanged(callback) {
-    this._onThemeChangedCallback = callback;
-  },
-
   // utility methods
 
   _containerTabCount(userContextId) {
@@ -960,12 +956,13 @@ const ContainerService = {
   },
 
   removeIdentity(args) {
+    const eventName = "delete-container";
     if (!("userContextId" in args)) {
       return Promise.reject("removeIdentity must be called with userContextId argument.");
     }
 
     this.sendTelemetryPayload({
-      "event": "delete-container",
+      "event": eventName,
       "userContextId": args.userContextId
     });
 
@@ -976,6 +973,7 @@ const ContainerService = {
 
     return this._closeTabs(tabsToClose).then(() => {
       const removed = ContextualIdentityProxy.remove(args.userContextId);
+      this.triggerBackgroundCallback({userContextId: args.userContextId}, eventName);
       this._forgetIdentity(args.userContextId);
       return this._refreshNeeded().then(() => removed );
     });