Merge branch 'bookmark-context' of github.com:kendallcorner/multi-account-containers into bookmark-context

src/js/background/assignManager.js

@@ -143,7 +143,6 @@ const assignManager = {
     const userContextId = this.getUserContextIdFromCookieStore(tab);
     if (!siteSettings
         || userContextId === siteSettings.userContextId
-        || tab.incognito
         || this.storageArea.isExempted(options.url, tab.id)) {
       return {};
     }
@@ -353,11 +352,9 @@ const assignManager = {
 
   isTabPermittedAssign(tab) {
     // Ensure we are not an important about url
-    // Ensure we are not in incognito mode
     const url = new URL(tab.url);
     if (url.protocol === "about:"
-        || url.protocol === "moz-extension:"
-        || tab.incognito) {
+        || url.protocol === "moz-extension:") {
       return false;
     }
     return true;

src/js/background/backgroundLogic.js

@@ -52,6 +52,7 @@ const backgroundLogic = {
     let url = options.url || undefined;
     const userContextId = ("userContextId" in options) ? options.userContextId : 0;
     const active = ("nofocus" in options) ? options.nofocus : true;
+    const discarded = ("noload" in options) ? options.noload : false;
 
     const cookieStoreId = backgroundLogic.cookieStoreId(userContextId);
     // Autofocus url bar will happen in 54: https://bugzilla.mozilla.org/show_bug.cgi?id=1295072
@@ -68,6 +69,7 @@ const backgroundLogic = {
     return browser.tabs.create({
       url,
       active,
+      discarded,
       pinned: options.pinned || false,
       cookieStoreId
     });
@@ -310,6 +312,7 @@ const backgroundLogic = {
         userContextId: userContextId,
         url: object.url,
         nofocus: options.nofocus || false,
+        noload: true,
         pinned: object.pinned,
       }));
     }

src/js/background/badge.js

@@ -2,22 +2,17 @@ const MAJOR_VERSIONS = ["2.3.0", "2.4.0"];
 const badge = {
   async init() {
     const currentWindow = await browser.windows.getCurrent();
-    this.displayBrowserActionBadge(currentWindow.incognito);
-  },
-
-  disableAddon(tabId) {
-    browser.browserAction.disable(tabId);
-    browser.browserAction.setTitle({ tabId, title: "Containers disabled in Private Browsing Mode" });
+    this.displayBrowserActionBadge(currentWindow);
   },
 
   async displayBrowserActionBadge() {
     const extensionInfo = await backgroundLogic.getExtensionInfo();
-    const storage = await browser.storage.local.get({browserActionBadgesClicked: []});
+    const storage = await browser.storage.local.get({ browserActionBadgesClicked: [] });
 
     if (MAJOR_VERSIONS.indexOf(extensionInfo.version) > -1 &&
-        storage.browserActionBadgesClicked.indexOf(extensionInfo.version) < 0) {
-      browser.browserAction.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"});
-      browser.browserAction.setBadgeText({text: "NEW"});
+      storage.browserActionBadgesClicked.indexOf(extensionInfo.version) < 0) {
+      browser.browserAction.setBadgeBackgroundColor({ color: "rgba(0,217,0,255)" });
+      browser.browserAction.setBadgeText({ text: "NEW" });
     }
   }
 };

src/js/background/messageHandler.js

@@ -144,9 +144,6 @@ const messageHandler = {
     }, {urls: ["<all_urls>"], types: ["main_frame"]});
 
     browser.tabs.onCreated.addListener((tab) => {
-      if (tab.incognito) {
-        badge.disableAddon(tab.id);
-      }
       // lets remember the last tab created so we can close it if it looks like a redirect
       this.lastCreatedTab = tab;
       if (tab.cookieStoreId) {