Merge pull request #1292 from jonathanKingston/fix-missing-favicon

Add in missing favicon. Fixes #1285
Merge pull request #1294 from jonathanKingston/badge-background-error
2018-12-05 12:41:43 -06:00 · 2018-12-05 09:09:34 -06:00 · 2018-12-05 08:48:50 -06:00 · 2018-12-05 08:47:02 -06:00 · 2018-10-21 22:33:08 +01:00 · 2018-10-21 22:22:48 +01:00
80 changed files with 1869 additions and 3490 deletions
@@ -1,3 +1 @@
-testpilot-metrics.js
-lib/shield/*.js
 lib/testpilot/*.js
@@ -13,7 +13,12 @@ module.exports = {
    "CustomizableUI": true,
    "CustomizableWidgets": true,
    "SessionStore": true,
-    "Services": true
+    "Services": true,
+    "Components": true,
+    "XPCOMUtils": true,
+    "OS": true,
+    "ADDON_UNINSTALL": true,
+    "ADDON_DISABLE": true
  },
  "plugins": [
    "promise",
@@ -0,0 +1,28 @@
+<!--
+  Feel free to ignore this Issue template if you just want to ask or suggest something. If you experience an Issue then please provide all asked informations.
+
+  Note: If "Firefox will: Never remember history" in the Firefox Preferences/Options under "Privacy & Security > History" is selected, then Multi-Account Containers will not work, since Containers aren't available in Private Windows.
+-->
+- Is "Firefox will: Never remember history" in the Firefox Preferences/Options under "Privacy & Security > History" selected? Yes/No:
+- Are you using Firefox in a Private Window? Yes/No:
+- Can you see a grayed out but ticked Checkbox with the description "Enable Container Tabs" in the Firefox Preferences/Options under "Tabs"? Yes/No:
+- Multi-Account Containers Version:
+- Operating System + Version:
+- Firefox Version:
+- Other installed Add-ons + Version + Enabled/Disabled-Status:
+<!-- To be able to Copy&Paste the full list of your Add-ons navigate to "about:support" and scroll down to "Extensions" -->
+
+
+### Actual behavior
+..
+
+### Expected behavior
+..
+
+### Steps to reproduce
+1. ..
+2. ..
+3. ..
+
+### Notes
+..
@@ -3,8 +3,12 @@ package-lock.json
 node_modules
 README.html
 *.xpi
-*.swp
-*.swo
+*.sw*
 .vimrc
 .env
 addon.env
+
+src/web-ext-artifacts/*
+
+# JetBrains IDE files
+.idea
@@ -3,6 +3,7 @@ docs/
 test/
 .npm/
 node_modules/
+bin/

 .env
 .eslintrc.js
@@ -14,6 +15,8 @@ node_modules/
 .stylelintrc
 .travis.yml
 *.xpi
+*.md
 .vimrc
 .DS_Store
 .gdb_history
+*.sw*
@@ -5,7 +5,7 @@

  "extends": "stylelint-config-standard",

-  "ignoreFiles": ["webextension/css/*.min.css"],
+  "ignoreFiles": ["src/css/*.min.css"],

  "rules": {
    "declaration-block-no-duplicate-properties": true,
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-    - "6.1"
+    - "lts/*"

 notifications:
    irc:
@@ -9,9 +9,9 @@ Everyone is welcome to contribute to containers. Reach out to team members if yo

 If you find a bug with containers, please file a issue.

-Check first if the bug might already exist: https://github.com/mozilla/testpilot-containers/issues
+Check first if the bug might already exist: https://github.com/mozilla/multi-account-containers/issues

-[Open an issue](https://github.com/mozilla/testpilot-containers/issues/new)
+[Open an issue](https://github.com/mozilla/multi-account-containers/issues/new)

 1. Visit about:support
 2. Click "Copy raw data to clipboard" and paste into the bug. Alternatively copy the following sections into the issue:
@@ -1,11 +1,8 @@
-# Containers Add-on
+# Multi-Account Containers

-[![Available on Test Pilot](https://img.shields.io/badge/available_on-Test_Pilot-0996F8.svg)](https://testpilot.firefox.com/experiments/containers)
+The Firefox Multi-Account Containers extension lets you carve out a separate box for each of your online lives – no more opening a different browser just to check your work email! [Learn More Here](https://blog.mozilla.org/firefox/introducing-firefox-multi-account-containers/)

-[Embedded Web Extension](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Embedded_WebExtensions) to build [Containers](https://blog.mozilla.org/tanvi/2016/06/16/contextual-identities-on-the-web/) as a Firefox [Test Pilot](https://testpilot.firefox.com/) Experiment and [Shield Study](https://wiki.mozilla.org/Firefox/Shield/Shield_Studies) to learn:
-
-* Will a general Firefox audience understand the Containers feature?
-* Is the UI as currently implemented in Nightly clear or discoverable?
+[Available on addons.mozilla.org](https://addons.mozilla.org/en-GB/firefox/addon/multi-account-containers/)

 For more info, see: 

@@ -16,73 +13,44 @@ For more info, see:
 ## Requirements

 * node 7+ (for jpm)
-* Firefox 53+
+* Firefox 57+


 ## Development
-### Development Environment

-Add-on development is better with [a particular  environment](https://developer.mozilla.org/en-US/Add-ons/Setting_up_extension_development_environment). One simple way to get that environment set up is to install the [DevPrefs add-on](https://addons.mozilla.org/en-US/firefox/addon/devprefs/). You can make a custom Firefox profile that includes the DevPrefs add-on, and use that profile when you run the code in this repository. 
-
-1. Make a new profile by running `/path/to/firefox -P`, which launches the profile editor. "Create Profile" -- name it whatever you wish (e.g. 'addon_dev') and store it in the default location. It's probably best to deselect the option to "Use without asking," since you probably don't want to use this as your default profile.
-
-2. Once you've created your profile, click "Start Firefox". A new instance of Firefox should launch. Go to Tools->Add-ons and search for "DevPrefs". Install it. Quit Firefox.
-
-3. Now you have a new, vanilla Firefox profile with the DevPrefs add-on installed. You can use your new profile with the code in _this_ repository like so:
-
-#### Run the `.xpi` file in an unbranded build
-Release & Beta channels do not allow un-signed add-ons, even with the DevPrefs. So, you must run the add-on in an [unbranded build](https://wiki.mozilla.org/Add-ons/Extension_Signing#Unbranded_Builds):
-
-1. Download and install an un-branded build of Firefox
-2. Download the latest `.xpi` from this repository's releases
-3. Run the un-branded build of Firefox with your DevPrefs profile
-4. Go to `about:addons`
-5. Click the gear, and select "Install Add-on From File..."
-6. Select the `.xpi` file
-
-#### Run the TxP experiment with `jpm`
-
-1. `git clone git@github.com:mozilla/testpilot-containers.git`
-2. `cd testpilot-containers`
-3. `npm install`
-4. `./node_modules/.bin/jpm run -p /Path/To/Firefox/Profiles/{junk}.addon_dev -b FirefoxBeta` (where FirefoxBeta might be: ~/<reponame>/obj-x86_64-pc-linux-gnu/dist/bin/firefox or ~/<downloadedFirefoxBeta>/firefox)
-
-Check out the [Browser Toolbox](https://developer.mozilla.org/en-US/docs/Tools/Browser_Toolbox) for more information about debugging add-on code.
-
-#### Run the shield study with `shield`
-
-1. `git clone git@github.com:mozilla/testpilot-containers.git`
-2. `cd testpilot-containers`
-3. `npm install`
-4. `npm install -g shield-study-cli`
-5. `shield run . -- --binary Nightly`
-
-### Building .xpi
-
-To build a local testpilot-containers.xpi, use the plain [`jpm
-xpi`](https://developer.mozilla.org/en-US/Add-ons/SDK/Tools/jpm#jpm_xpi) command,
-or run `npm run build`.
-
-#### Building a shield .xpi
-To build a local shield-study-containers.xpi, run `npm run build-shield`.
-
-### Signing an .xpi
-
-To sign an .xpi, use [`jpm
-sign`](https://developer.mozilla.org/en-US/Add-ons/SDK/Tools/jpm#jpm_sign)
-command.
-
-Note: You will need to be [an author on the AMO
-add-on](https://addons.mozilla.org/en-US/developers/addon/containers-experiment/ownership).
+1. `npm install`
+2. `./node_modules/.bin/web-ext run -s src/`

 ### Testing
 TBD

 ### Distributing
-TBD
+#### Make the new version
+
+1. Bump the version number in `package.json` and `manifest.json`
+2. Commit the version number bump
+3. Create a git tag for the version: `git tag <version>`
+4. Push the tag up to GitHub: `git push --tags`
+
+#### Publish to AMO
+
+1. `npm run-script build`
+2. [Upload the `.zip` to AMO](https://addons.mozilla.org/en-US/developers/addon/multi-account-containers/versions/submit/)
+
+#### Publish to GitHub
+Finally, we also publish the release to GitHub for those followers.
+
+1. Download the signed `.xpi` from [the addon versions page](https://addons.mozilla.org/en-US/developers/addon/multi-account-containers/versions)
+2. [Make the new release on
+   GitHub](https://github.com/mozilla/multi-account-containers/releases/new)
+   * Use the version number for "Tag version" and "Release title"
+   * Release notes: copy the output of `git log --no-merges --pretty=format:"%h %s" <previous-version>..<new-version>`
+   * Attach binaries: select the signed `.xpi` file

 ### Links

+Facebook & Twitter icons CC-Attrib https://fairheadcreative.com.
+
 - [Licence](./LICENSE.txt)
 - [Contributing](./CONTRIBUTING.md)
 - [Code Of Conduct](./CODE_OF_CONDUCT.md)
@@ -1,108 +1,3 @@
-/* HACK: Custom Container vars do not propigate correctly
-until the container tab is blurred and refocused,
-adding the data-identity-color with the default hex
-value, or chrome url path as an alternate selector mitiages this bug.*/
-[data-identity-color="blue"],
-[data-identity-color="#00a7e0"] {
-  --identity-tab-color: #37adff;
-  --identity-icon-color: #37adff;
-}
-
-[data-identity-color="turquoise"],
-[data-identity-color="#01bdad"] {
-  --identity-tab-color: #00c79a;
-  --identity-icon-color: #00c79a;
-}
-
-[data-identity-color="green"],
-[data-identity-color="#7dc14c"] {
-  --identity-tab-color: #51cd00;
-  --identity-icon-color:  #51cd00;
-}
-
-[data-identity-color="yellow"],
-[data-identity-color="#ffcb00"] {
-  --identity-tab-color: #ffcb00;
-  --identity-icon-color: #ffcb00;
-}
-
-[data-identity-color="orange"],
-[data-identity-color="#f89c24"] {
-  --identity-tab-color: #ff9f00;
-  --identity-icon-color: #ff9f00;
-}
-
-[data-identity-color="red"],
-[data-identity-color="#d92215"] {
-  --identity-tab-color: #ff613d;
-  --identity-icon-color: #ff613d;
-}
-
-[data-identity-color="pink"],
-[data-identity-color="#ee5195"] {
-  --identity-tab-color: #ff4bda;
-  --identity-icon-color: #ff4bda;
-}
-
-[data-identity-color="purple"],
-[data-identity-color="#7a2f7a"] {
-  --identity-tab-color: #af51f5;
-  --identity-icon-color: #af51f5;
-}
-
-[data-identity-icon="fingerprint"],
-[data-identity-icon="chrome://browser/skin/usercontext/personal.svg"] {
-  --identity-icon: url("/data/usercontext.svg#fingerprint");
-}
-
-[data-identity-icon="briefcase"],
-[data-identity-icon="chrome://browser/skin/usercontext/work.svg"] {
-  --identity-icon: url("/data/usercontext.svg#briefcase");
-}
-
-[data-identity-icon="dollar"],
-[data-identity-icon="chrome://browser/skin/usercontext/banking.svg"] {
-  --identity-icon: url("/data/usercontext.svg#dollar");
-}
-
-[data-identity-icon="cart"],
-[data-identity-icon="chrome://browser/skin/usercontext/cart.svg"],
-[data-identity-icon="chrome://browser/skin/usercontext/shopping.svg"] {
-  --identity-icon: url("/data/usercontext.svg#cart");
-}
-
-[data-identity-icon="circle"] {
-  --identity-icon: url("/data/usercontext.svg#circle");
-}
-
-[data-identity-icon="gift"] {
-  --identity-icon: url("/data/usercontext.svg#gift");
-}
-
-[data-identity-icon="vacation"] {
-  --identity-icon: url("/data/usercontext.svg#vacation");
-}
-
-[data-identity-icon="food"] {
-  --identity-icon: url("/data/usercontext.svg#food");
-}
-
-[data-identity-icon="fruit"] {
-  --identity-icon: url("/data/usercontext.svg#fruit");
-}
-
-[data-identity-icon="pet"] {
-  --identity-icon: url("/data/usercontext.svg#pet");
-}
-
-[data-identity-icon="tree"] {
-  --identity-icon: url("/data/usercontext.svg#tree");
-}
-
-[data-identity-icon="chill"] {
-  --identity-icon: url("/data/usercontext.svg#chill");
-}
-
 #userContext-indicator {
  height: 16px;
  list-style-image: none !important;
@@ -129,19 +24,6 @@ value, or chrome url path as an alternate selector mitiages this bug.*/
  display: none;
 }

-.userContext-icon,
-.menuitem-iconic[data-usercontextid] > .menu-iconic-left > .menu-iconic-icon,
-.subviewbutton[usercontextid] > .toolbarbutton-icon,
-#userContext-indicator {
-  background-image: var(--identity-icon) !important;
-  background-position: center center;
-  background-repeat: no-repeat;
-  background-size: contain;
-  fill: var(--identity-icon-color) !important;
-  filter: url(/img/filters.svg#fill);
-  filter: url(/data/filters.svg#fill);
-}
-
 /* containers experiment */

 /* reset nightly containers */
@@ -1,285 +0,0 @@
-# METRICS
-
-## Data Analysis
-The collected data will primarily be used to answer the following questions.
-Images are used for visualization and are not composed of actual data.
-
-### Do users install and run this?
-
-What is the overall engagement of the Containers experiment?
-**This is the standard Daily Active User (DAU) and Monthly Active User (MAU) analysis.**
-
-This captures data from the users who have the add-on installed, regardless of
-whether they are actively interacting with it.
-
-![](kpi-1.png)
-
-### Immediate Questions
-
-* Do people use the containers feature & how do people create new container tabs?
-  * Click to create new container tab
-    * \+ `entry-point` value: "tab-bar" or "pop-up"
-* Do people who use the containers feature continue to use it?
-  * Retention: opening a second container tab (second tab in the same container, or a tab in a second container?)
-* What containers do people use?
-  * userContextId
-    * \+ Number of tabs in the container (when should we measure this? on every tab open?)
-* Do people edit their containers?
-  * Click on "Edit Containers"
-  * Click to edit a single container
-    * Click "OK"
-  * Click to delete a single container
-    * Click "OK"
-  * Click to add a container
-    * Click "OK"
-* Do people sort the tabs?
-  * Click sort
-    * \+ Number of tabs when clicked
-  * Average number of container tabs when sort was clicked
-* Do users show and hide container tabs?
-  * Click hide
-    * \+ Number of tabs when clicked
-    * \+ Number of hidden containers when clicked
-  * Click show
-    * \+ Number of tabs when clicked
-    * \+ Number of shown containers when clicked
-* Do users move container tabs to new windows?
-  * Click move
-    * \+ Number of tabs when clicked
-  * Average number of container tabs when new window was clicked
-* How many containers do users have hidden at the same time? (when should we measure this? each time a container is hidden?)
-* Do users pin container tabs? (do we have existing Telemetry for pinning?)
-* Do users visit more pages in container tabs than non-container tabs?
-
-### Follow-up Questions
-
-What are some follow-up questions we anticipate we will ask based on any of the
-above answers/data?
-
-* What is the average lifespan of a container tab? Is that longer or shorter than a regular tab? (if we don't have data on the latter, the former probably isn't worth gathering data on since we will have nothing to compare it to).
-
-## Data Collection
-
-### Server Side
-There is currently no server side component to Containers.
-
-### Client Side
-Containers will use Test Pilot Telemetry with no batching of data.  Details
-of when pings are sent are below, along with examples of the `payload` portion
-of a `testpilottest` telemetry ping for each scenario.
-
-* The user shows the new tab menu
-
-```js
-  {
-    "uuid": <uuid>,
-    "event": "show-plus-button-menu",
-    "eventSource": ["plus-button"]
-  }
-```
-
-* The user clicks on a container name to open a tab in that container
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "clickedContainerTabCount": <number-of-tabs-in-the-container>,
-    "event": "open-tab",
-    "eventSource": ["tab-bar"|"pop-up"|"file-menu"|"alltabs-menu"|"plus-button"]
-  }
-```
-
-* The user clicks "Edit Containers" in the pop-up
-
-```js
-  {
-    "uuid": <uuid>,
-    "event": "edit-containers"
-  }
-```
-
-* The user clicks OK after clicking on a container edit icon in the pop-up
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "event": "edit-container"
-  }
-```
-
-* The user clicks OK after clicking on a container delete icon in the pop-up
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "event": "delete-container"
-  }
-```
-
-* The user clicks OK after clicking to add a container in the pop-up
-
-```js
-  {
-    "uuid": <uuid>,
-    "event": "add-container"
-  }
-```
-
-* The user clicks the sort button/icon in the pop-up
-
-```js
-  {
-    "uuid": <uuid>,
-    "event": "sort-tabs",
-    "shownContainersCount": <number-of-containers-with-tabs-shown>,
-    "totalContainerTabsCount": <number-of-all-container-tabs>,
-    "totalNonContainerTabsCount": <number-of-all-non-container-tabs>
-  }
-```
-
-* The user clicks "Hide these container tabs" in the popup
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "clickedContainerTabCount": <number-of-tabs-in-the-container>,
-    "event": "hide-tabs",
-    "hiddenContainersCount": <number-of-containers-with-tabs-hidden>,
-    "shownContainersCount": <number-of-containers-with-tabs-shown>,
-    "totalContainersCount": <number-of-containers-with-tabs-hidden-or-shown>
-  }
-```
-
-* The user clicks "Show these container tabs" in the popup
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "clickedContainerTabCount": <number-of-tabs-in-the-container>,
-    "event": "show-tabs",
-    "hiddenContainersCount": <number-of-containers-with-tabs-hidden>,
-    "shownContainersCount": <number-of-containers-with-tabs-shown>,
-    "totalContainersCount": <number-of-containers-with-tabs-hidden-or-shown>
-  }
-```
-
-* The user clicks "Move tabs to a new window" in the popup
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "clickedContainerTabCount": <number-of-tabs-in-the-container>,
-    "event": "move-tabs-to-window"
-  }
-```
-
-* When a user encounters the disabled "move" feature because of incompatible add-ons
-
-```js
-  {
-    "uuid": <uuid>,
-    "event": "incompatible-addons-detected"
-  }
-```
-
-* The user closes a tab
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "event": "page-requests-completed-per-tab",
-    "pageRequestCount": <pageRequestCount>
-  }
-```
-
-* The user goes idle
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "event": "page-requests-completed-per-activity",
-    "pageRequestCount": <pageRequestCount>
-  }
-```
-
-* The user chooses "Always Open in this Container" context menu option. (Note: We send two separate event names: one for assigning a site to a container, one for removing a site from a container.)
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "event": "[added|removed]-container-assignment"
-  }
-```
-
-* Firefox prompts the user to reload a site into a container after the user picked "Always Open in this Container".
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "event": "prompt-reload-page-in-container"
-  }
-```
-
-* The user clicks "Open in *assigned* container" to reload a site into a container after the user picked "Always Open in this Container".
-
-```js
-  {
-    "uuid": <uuid>,
-    "event": "click-to-reload-page-in-container"
-  }
-```
-
-* The user clicks "Open in *Current* container" to reload a site into a container after the user picked "Always Open in this Container".
-
-```js
-  {
-    "uuid": <uuid>,
-    "event": "click-to-reload-page-in-same-container"
-  }
-```
-
-* Firefox automatically reloads a site into a container after the user picked "Always Open in this Container".
-
-```js
-  {
-    "uuid": <uuid>,
-    "userContextId": <userContextId>,
-    "event": "auto-reload-page-in-container"
-  }
-```
-
-### A Redshift schema for the payload:
-
-```lua
-local schema = {
--   column name                    field type   length  attributes   field name
-    {"uuid",                        "VARCHAR",   255,    nil,         "Fields[payload.uuid]"},
-    {"userContextId",               "INTEGER",   255,    nil,         "Fields[payload.userContextId]"},
-    {"clickedContainerTabCount",    "INTEGER",   255,    nil,         "Fields[payload.clickedContainerTabCount]"},
-    {"eventSource",                 "VARCHAR",   255,    nil,         "Fields[payload.eventSource]"},
-    {"event",                       "VARCHAR",   255,    nil,         "Fields[payload.event]"},
-    {"pageRequestCount",            "INTEGER",   255,    nil,         "Fields[payload.pageRequestCount]"}
-    {"hiddenContainersCount",       "INTEGER",   255,    nil,         "Fields[payload.hiddenContainersCount]"},
-    {"shownContainersCount",        "INTEGER",   255,    nil,         "Fields[payload.shownContainersCount]"},
-    {"totalContainersCount",        "INTEGER",   255,    nil,         "Fields[payload.totalContainersCount]"},
-    {"totalContainerTabsCount",     "INTEGER",   255,    nil,         "Fields[payload.totalContainerTabsCount]"},
-    {"totalNonContainerTabsCount",  "INTEGER",   255,    nil,         "Fields[payload.totalNonContainerTabsCount]"}
-}
-```
-
-### Valid data should be enforced on the server side:
-
-* `eventSource` should be one of `tab-bar`, `pop-up`, `file-menu`, "alltabs-nmenu" or "plus-button".
-
-All Mozilla data is kept by default for 180 days and in accordance with our
-privacy policies.
@@ -1,930 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-const IDENTITY_COLORS = [
- { name: "blue", color: "#00a7e0" },
- { name: "turquoise", color: "#01bdad" },
- { name: "green", color: "#7dc14c" },
- { name: "yellow", color: "#ffcb00" },
- { name: "orange", color: "#f89c24" },
- { name: "red", color: "#d92215" },
- { name: "pink", color: "#ee5195" },
- { name: "purple", color: "#7a2f7a" },
-];
-
-const IDENTITY_ICONS = [
-  { name: "fingerprint", image: "chrome://browser/skin/usercontext/personal.svg" },
-  { name: "briefcase", image: "chrome://browser/skin/usercontext/work.svg" },
-  { name: "dollar", image: "chrome://browser/skin/usercontext/banking.svg" },
-  { name: "cart", image: "chrome://browser/skin/usercontext/shopping.svg" },
-  // All of these do not exist in gecko
-  { name: "gift", image: "gift" },
-  { name: "vacation", image: "vacation" },
-  { name: "food", image: "food" },
-  { name: "fruit", image: "fruit" },
-  { name: "pet", image: "pet" },
-  { name: "tree", image: "tree" },
-  { name: "chill", image: "chill" },
-  { name: "circle", image: "circle" },
-];
-
-const IDENTITY_COLORS_STANDARD = [
-  "blue", "orange", "green", "pink",
-];
-
-const IDENTITY_ICONS_STANDARD = [
-  "fingerprint", "briefcase", "dollar", "cart",
-];
-
-const PREFS = [
-  [ "privacy.userContext.enabled", true ],
-  [ "privacy.userContext.longPressBehavior", 2 ],
-  [ "privacy.userContext.ui.enabled", false ],
-  [ "privacy.usercontext.about_newtab_segregation.enabled", true ],
-];
-
-const { attachTo, detachFrom } = require("sdk/content/mod");
-const { Cu } = require("chrome");
-const { ContextualIdentityService } = require("resource://gre/modules/ContextualIdentityService.jsm");
-const Metrics = require("./testpilot-metrics");
-const { modelFor } = require("sdk/model/core");
-const prefService = require("sdk/preferences/service");
-const self = require("sdk/self");
-const { Services }  = require("resource://gre/modules/Services.jsm");
-const ss = require("sdk/simple-storage");
-const { study } = require("./study");
-const { Style } = require("sdk/stylesheet/style");
-const tabs = require("sdk/tabs");
-const uuid = require("sdk/util/uuid");
-const { viewFor } = require("sdk/view/core");
-const webExtension = require("sdk/webextension");
-const windows = require("sdk/windows");
-const windowUtils = require("sdk/window/utils");
-
-Cu.import("resource:///modules/CustomizableUI.jsm");
-Cu.import("resource:///modules/CustomizableWidgets.jsm");
-Cu.import("resource:///modules/sessionstore/SessionStore.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-
-// ContextualIdentityProxy
-const ContextualIdentityProxy = {
-  getIdentities() {
-    let response;
-    if ("getPublicIdentities" in ContextualIdentityService) {
-      response = ContextualIdentityService.getPublicIdentities();
-    } else {
-      response = ContextualIdentityService.getIdentities();
-    }
-
-    return response.map((identity) => {
-      return this._convert(identity);
-    });
-  },
-
-  getIdentityFromId(userContextId) {
-    let response;
-    if ("getPublicIdentityFromId" in ContextualIdentityService) {
-      response = ContextualIdentityService.getPublicIdentityFromId(userContextId);
-    } else {
-      response = ContextualIdentityService.getIdentityFromId(userContextId);
-    }
-    if (response) {
-      return this._convert(response);
-    }
-    return response;
-  },
-
-  _convert(identity) {
-    return {
-      name: ContextualIdentityService.getUserContextLabel(identity.userContextId),
-      icon: identity.icon,
-      color: identity.color,
-      userContextId: identity.userContextId,
-    };
-  },
-};
-
-// ----------------------------------------------------------------------------
-// ContainerService
-
-const ContainerService = {
-  _windowMap: new Map(),
-  _containerWasEnabled: false,
-  _onBackgroundConnectCallback: null,
-
-  async init(installation, reason) {
-    // If we are just been installed, we must store some information for the
-    // uninstallation. This object contains also a version number, in case we
-    // need to implement a migration in the future.
-    // In 1.1.1 and less we deleted savedConfiguration on upgrade so we need to rebuild
-    if (!("savedConfiguration" in ss.storage) ||
-        !("prefs" in ss.storage.savedConfiguration) ||
-        (installation && reason !== "upgrade")) {
-      let preInstalledIdentities = []; // eslint-disable-line prefer-const
-      ContextualIdentityProxy.getIdentities().forEach(identity => {
-        preInstalledIdentities.push(identity.userContextId);
-      });
-
-      const object = {
-        version: 1,
-        prefs: {},
-        metricsUUID: uuid.uuid().toString(),
-        preInstalledIdentities: preInstalledIdentities
-      };
-
-      PREFS.forEach(pref => {
-        object.prefs[pref[0]] = prefService.get(pref[0]);
-      });
-
-      ss.storage.savedConfiguration = object;
-
-      if (prefService.get("privacy.userContext.enabled") !== true) {
-        // Maybe rename the Banking container.
-        const identity = ContextualIdentityProxy.getIdentityFromId(3);
-        if (identity && identity.l10nID === "userContextBanking.label") {
-          ContextualIdentityService.update(identity.userContextId,
-                                         "Finance",
-                                         identity.icon,
-                                         identity.color);
-        }
-
-        // Let's create the default containers in case there are none.
-        if (ss.storage.savedConfiguration.preInstalledIdentities.length === 0) {
-          // Note: we have to create them in this way because there is no way to
-          // reuse the same ID and the localized strings.
-          ContextualIdentityService.create("Personal", "fingerprint", "blue");
-          ContextualIdentityService.create("Work", "briefcase", "orange");
-          ContextualIdentityService.create("Finance", "dollar", "green");
-          ContextualIdentityService.create("Shopping", "cart", "pink");
-        }
-      }
-    }
-
-    // TOCHECK should this run on all code
-    ContextualIdentityProxy.getIdentities().forEach(identity => {
-      const newIcon = this._fromIconToName(identity.icon);
-      const newColor = this._fromColorToName(identity.color);
-      if (newIcon !== identity.icon || newColor !== identity.color) {
-        ContextualIdentityService.update(identity.userContextId,
-                                       ContextualIdentityService.getUserContextLabel(identity.userContextId),
-                                       newIcon,
-                                       newColor);
-      }
-    });
-
-    // Let's see if containers were enabled before this addon.
-    this._containerWasEnabled =
-      ss.storage.savedConfiguration.prefs["privacy.userContext.enabled"];
-
-    // Enabling preferences
-
-    PREFS.forEach((pref) => {
-      prefService.set(pref[0], pref[1]);
-    });
-
-    this._metricsUUID = ss.storage.savedConfiguration.metricsUUID;
-
-    // Disabling the customizable container panel.
-    CustomizableUI.destroyWidget("containers-panelmenu");
-
-    tabs.on("open", tab => {
-      this._restyleTab(tab);
-    });
-
-    tabs.on("activate", tab => {
-      this._restyleActiveTab(tab).catch(() => {});
-      this._configureActiveWindows();
-    });
-
-    // Modify CSS and other stuff for each window.
-
-    this._configureWindows().catch(() => {});
-
-    windows.browserWindows.on("open", window => {
-      this._configureWindow(viewFor(window)).catch(() => {});
-    });
-
-    windows.browserWindows.on("close", window => {
-      this.closeWindow(viewFor(window));
-    });
-
-    // WebExtension startup
-
-    try {
-      const api = await webExtension.startup();
-      this.registerBackgroundConnection(api);
-    } catch (e) {
-      throw new Error("WebExtension startup failed. Unable to continue.");
-    }
-
-    this._sendEvent = new Metrics({
-      type: "sdk",
-      id: self.id,
-      version: self.version
-    }).sendEvent;
-
-    // Begin-Of-Hack
-    ContextualIdentityService.workaroundForCookieManager = function(method, userContextId) {
-      let identity = method.call(ContextualIdentityService, userContextId);
-      if (!identity && userContextId) {
-        identity = {
-          userContextId,
-          icon: "",
-          color: "",
-          name: "Pending to be deleted",
-          public: true,
-        };
-      }
-
-      return identity;
-    };
-
-    if (!this._oldGetIdentityFromId) {
-      this._oldGetIdentityFromId = ContextualIdentityService.getIdentityFromId;
-    }
-    ContextualIdentityService.getIdentityFromId = function(userContextId) {
-      return this.workaroundForCookieManager(ContainerService._oldGetIdentityFromId, userContextId);
-    };
-
-    if ("getPublicIdentityFromId" in ContextualIdentityService) {
-      if (!this._oldGetPublicIdentityFromId) {
-        this._oldGetPublicIdentityFromId = ContextualIdentityService.getPublicIdentityFromId;
-      }
-      ContextualIdentityService.getPublicIdentityFromId = function(userContextId) {
-        return this.workaroundForCookieManager(ContainerService._oldGetPublicIdentityFromId, userContextId);
-      };
-    }
-    // End-Of-Hack
-
-    if (self.id === "@shield-study-containers") {
-      study.startup(reason);
-      this.shieldStudyVariation = study.variation;
-    }
-  },
-
-  registerBackgroundConnection(api) {
-    // This is only used for theme notifications and new tab
-    api.browser.runtime.onConnect.addListener((port) => {
-      this._onBackgroundConnectCallback = (message, topic) => {
-        port.postMessage({
-          type: topic,
-          message
-        });
-      };
-    });
-  },
-
-  triggerBackgroundCallback(message, topic) {
-    if (this._onBackgroundConnectCallback) {
-      this._onBackgroundConnectCallback(message, topic);
-    }
-  },
-
-  // In FF 50-51, the icon is the full path, in 52 and following
-  // releases, we have IDs to be used with a svg file. In this function
-  // we map URLs to svg IDs.
-
-  // Helper methods for converting colors to names and names to colors.
-
-  _fromNameToColor(name) {
-    return this._fromNameOrColor(name, "color");
-  },
-
-  _fromColorToName(color) {
-    return this._fromNameOrColor(color, "name");
-  },
-
-  _fromNameOrColor(what, attribute) {
-    for (let color of IDENTITY_COLORS) { // eslint-disable-line prefer-const
-      if (what === color.color || what === color.name) {
-        return color[attribute];
-      }
-    }
-    return "";
-  },
-
-  // Helper methods for converting icons to names and names to icons.
-
-  _fromIconToName(icon) {
-    return this._fromNameOrIcon(icon, "name", "circle");
-  },
-
-  _fromNameOrIcon(what, attribute, defaultValue) {
-    for (let icon of IDENTITY_ICONS) { // eslint-disable-line prefer-const
-      if (what === icon.image || what === icon.name) {
-        return icon[attribute];
-      }
-    }
-    return defaultValue;
-  },
-
-  // Tab Helpers
-
-  _getUserContextIdFromTab(tab) {
-    return parseInt(viewFor(tab).getAttribute("usercontextid") || 0, 10);
-  },
-
-  _matchTabsByContainer(userContextId) {
-    const matchedTabs = [];
-    for (const tab of tabs) {
-      if (userContextId === this._getUserContextIdFromTab(tab)) {
-        matchedTabs.push(tab);
-      }
-    }
-    return matchedTabs;
-  },
-
-  async _closeTabs(tabsToClose) {
-    // We create a new tab only if the current operation closes all the
-    // existing ones.
-    if (tabs.length === tabsToClose.length) {
-      await this.openTab({});
-    }
-
-    for (const tab of tabsToClose) {
-      // after .close() window is null. Let's take it now.
-      const window = viewFor(tab.window);
-
-      tab.close();
-
-      // forget about this tab. 0 is the index of the forgotten tab and 0
-      // means the last one.
-      try {
-        SessionStore.forgetClosedTab(window, 0);
-      } catch (e) {} // eslint-disable-line no-empty
-    }
-  },
-
-  _recentBrowserWindow() {
-    const browserWin = windowUtils.getMostRecentBrowserWindow();
-
-    // This should not really happen.
-    if (!browserWin || !browserWin.gBrowser) {
-      return Promise.resolve(null);
-    }
-
-    return Promise.resolve(browserWin);
-  },
-
-  // Tabs management
-
-  openTab(args) {
-    return this.triggerBackgroundCallback(args, "open-tab");
-  },
-
-  // Identities management
-
-  queryIdentities() {
-    return new Promise(resolve => {
-      const identities = ContextualIdentityProxy.getIdentities();
-      resolve(identities);
-    });
-  },
-
-  // Styling the window
-
-  _configureWindows() {
-    const promises = [];
-    for (let window of windows.browserWindows) { // eslint-disable-line prefer-const
-      promises.push(this._configureWindow(viewFor(window)));
-    }
-    return Promise.all(promises);
-  },
-
-  _configureWindow(window) {
-    return this._getOrCreateContainerWindow(window).configure();
-  },
-
-  _configureActiveWindows() {
-    const promises = [];
-    for (let window of windows.browserWindows) { // eslint-disable-line prefer-const
-      promises.push(this._configureActiveWindow(viewFor(window)));
-    }
-    return Promise.all(promises);
-  },
-
-  _configureActiveWindow(window) {
-    return this._getOrCreateContainerWindow(window).configureActive();
-  },
-
-  closeWindow(window) {
-    this._windowMap.delete(window);
-  },
-
-  _getOrCreateContainerWindow(window) {
-    if (!(this._windowMap.has(window))) {
-      this._windowMap.set(window, new ContainerWindow(window));
-    }
-
-    return this._windowMap.get(window);
-  },
-
-  refreshNeeded() {
-    return this._configureWindows();
-  },
-
-  _restyleActiveTab(tab) {
-    if (!tab) {
-      return Promise.resolve(null);
-    }
-
-    const userContextId = ContainerService._getUserContextIdFromTab(tab);
-    const identity = ContextualIdentityProxy.getIdentityFromId(userContextId);
-    const hbox = viewFor(tab.window).document.getElementById("userContext-icons");
-
-    if (!identity) {
-      hbox.setAttribute("data-identity-color", "");
-      return Promise.resolve(null);
-    }
-
-    hbox.setAttribute("data-identity-color", identity.color);
-
-    const label = viewFor(tab.window).document.getElementById("userContext-label");
-    label.setAttribute("value", identity.name);
-    label.style.color = ContainerService._fromNameToColor(identity.color);
-
-    const indicator = viewFor(tab.window).document.getElementById("userContext-indicator");
-    indicator.setAttribute("data-identity-icon", identity.icon);
-    indicator.style.listStyleImage = "";
-
-    return this._restyleTab(tab);
-  },
-
-  _restyleTab(tab) {
-    if (!tab) {
-      return Promise.resolve(null);
-    }
-    const userContextId = ContainerService._getUserContextIdFromTab(tab);
-    const identity = ContextualIdentityProxy.getIdentityFromId(userContextId);
-    if (!identity) {
-      return Promise.resolve(null);
-    }
-    return Promise.resolve(viewFor(tab).setAttribute("data-identity-color", identity.color));
-  },
-
-  // Uninstallation
-  uninstall(reason) {
-    const data = ss.storage.savedConfiguration;
-    if (!data) {
-      throw new DOMError("ERROR - No saved configuration!!");
-    }
-
-    if (data.version !== 1) {
-      throw new DOMError("ERROR - Unknown version!!");
-    }
-
-    if (reason !== "upgrade") {
-      PREFS.forEach(pref => {
-        if (pref[0] in data.prefs) {
-          prefService.set(pref[0], data.prefs[pref[0]]);
-        }
-      });
-    }
-
-    // Note: We cannot go back renaming the Finance identity back to Banking:
-    // the locale system doesn't work with renamed containers.
-
-    // Restore the customizable container panel.
-    const widget = CustomizableWidgets.find(widget => widget.id === "containers-panelmenu");
-    if (widget) {
-      CustomizableUI.createWidget(widget);
-    }
-
-    for (let window of windows.browserWindows) { // eslint-disable-line prefer-const
-      // Let's close all the container tabs.
-      // Note: We cannot use _closeTabs() because at this point tab.window is
-      // null.
-      if (!this._containerWasEnabled && reason !== "upgrade") {
-        for (let tab of window.tabs) { // eslint-disable-line prefer-const
-          if (this._getUserContextIdFromTab(tab)) {
-            tab.close();
-            try {
-              SessionStore.forgetClosedTab(viewFor(window), 0);
-            } catch(e) {} // eslint-disable-line no-empty
-          }
-        }
-      }
-
-      this._getOrCreateContainerWindow(viewFor(window)).shutdown();
-    }
-
-    // all the configuration must go away now.
-    this._windowMap = new Map();
-
-    if (reason !== "upgrade") {
-      // Let's forget all the previous closed tabs.
-      this._forgetIdentity();
-
-      this._resetContainerToCentralIcons();
-
-      const preInstalledIdentities = data.preInstalledIdentities;
-      ContextualIdentityProxy.getIdentities().forEach(identity => {
-        if (!preInstalledIdentities.includes(identity.userContextId)) {
-          ContextualIdentityService.remove(identity.userContextId);
-        } else {
-          // Let's cleanup all the cookies for this container.
-          Services.obs.notifyObservers(null, "clear-origin-attributes-data",
-                                       JSON.stringify({ userContextId: identity.userContextId }));
-        }
-      });
-
-      // Let's delete the configuration.
-      delete ss.storage.savedConfiguration;
-    }
-
-    // Begin-Of-Hack
-    if (this._oldGetIdentityFromId) {
-      ContextualIdentityService.getIdentityFromId = this._oldGetIdentityFromId;
-    }
-
-    if (this._oldGetPublicIdentityFromId) {
-      ContextualIdentityService.getPublicIdentityFromId = this._oldGetPublicIdentityFromId;
-    }
-    // End-Of-Hack
-  },
-
-  forgetIdentityAndRefresh(args) {
-    this._forgetIdentity(args.userContextId);
-    return this.refreshNeeded();
-  },
-
-  _forgetIdentity(userContextId = 0) {
-    for (let window of windows.browserWindows) { // eslint-disable-line prefer-const
-      window = viewFor(window);
-      const closedTabData = JSON.parse(SessionStore.getClosedTabData(window));
-      for (let i = closedTabData.length - 1; i >= 0; --i) {
-        if (!closedTabData[i].state.userContextId) {
-          continue;
-        }
-
-        if (userContextId === 0 ||
-            closedTabData[i].state.userContextId === userContextId) {
-          try {
-            SessionStore.forgetClosedTab(window, i);
-          } catch(e) {} // eslint-disable-line no-empty
-        }
-      }
-    }
-  },
-};
-
-// ----------------------------------------------------------------------------
-// ContainerWindow
-
-// This object is used to configure a single window.
-function ContainerWindow(window) {
-  this._init(window);
-}
-
-ContainerWindow.prototype = {
-  _window: null,
-  _style: null,
-  _panelElement: null,
-  _timeoutStore: new Map(),
-  _elementCache: new Map(),
-  _tooltipCache: new Map(),
-  _tabsElement: null,
-
-  _init(window) {
-    this._window = window;
-    this._tabsElement = this._window.document.getElementById("tabbrowser-tabs");
-    this._style = Style({ uri: self.data.url("usercontext.css") });
-    this._plusButton = this._window.document.getAnonymousElementByAttribute(this._tabsElement, "anonid", "tabs-newtab-button");
-    this._overflowPlusButton = this._window.document.getElementById("new-tab-button");
-
-    // Only hack the normal plus button as the alltabs is done elsewhere
-    this.attachMenuEvent("plus-button", this._plusButton);
-
-    attachTo(this._style, this._window);
-  },
-
-  attachMenuEvent(source, button) {
-    const popup = button.querySelector(".new-tab-popup");
-    popup.addEventListener("popupshown", () => {
-      popup.querySelector("menuseparator").remove();
-      const popupMenuItems = [...popup.querySelectorAll("menuitem")];
-      popupMenuItems.forEach((item) => {
-        const userContextId = item.getAttribute("data-usercontextid");
-        if (!userContextId) {
-          item.remove();
-        }
-        item.setAttribute("command", "");
-        item.addEventListener("command", (e) => {
-          e.stopPropagation();
-          e.preventDefault();
-          ContainerService.openTab({
-            userContextId: userContextId,
-            source: source
-          });
-        });
-      });
-    });
-  },
-
-  configure() {
-    return Promise.all([
-      this._configureActiveTab(),
-      this._configureFileMenu(),
-      this._configureAllTabsMenu(),
-      this._configureTabStyle(),
-      this.configureActive(),
-    ]);
-  },
-
-  configureActive() {
-    return this._configureContextMenu();
-  },
-
-  _configureTabStyle() {
-    const promises = [];
-    for (let tab of modelFor(this._window).tabs) { // eslint-disable-line prefer-const
-      promises.push(ContainerService._restyleTab(tab));
-    }
-    return Promise.all(promises);
-  },
-
-  _configureActiveTab() {
-    const tab = modelFor(this._window).tabs.activeTab;
-    return ContainerService._restyleActiveTab(tab);
-  },
-
-  _configureFileMenu() {
-    return this._configureMenu("menu_newUserContext", null, e => {
-      const userContextId = parseInt(e.target.getAttribute("data-usercontextid"), 10);
-      ContainerService.openTab({
-        userContextId: userContextId,
-        source: "file-menu"
-      });
-    });
-  },
-
-  _configureAllTabsMenu() {
-    return this._configureMenu("alltabs_containersTab", null, e => {
-      const userContextId = parseInt(e.target.getAttribute("data-usercontextid"), 10);
-      ContainerService.showTabs({
-        userContextId,
-        nofocus: true,
-        window: this._window,
-      }).then(() => {
-        return ContainerService.openTab({
-          userContextId,
-          source: "alltabs-menu"
-        });
-      }).catch(() => {});
-    });
-  },
-
-  _configureContextMenu() {
-    return Promise.all([
-      this._configureMenu("context-openlinkinusercontext-menu",
-        () => {
-          // This userContextId is what we want to exclude.
-          const tab = modelFor(this._window).tabs.activeTab;
-          return ContainerService._getUserContextIdFromTab(tab);
-        },
-        e => {
-          // This is a super internal method. Hopefully it will be stable in the
-          // next FF releases.
-          this._window.gContextMenu.openLinkInTab(e);
-
-          const userContextId = parseInt(e.target.getAttribute("data-usercontextid"), 10);
-          ContainerService.showTabs({
-            userContextId,
-            nofocus: true,
-            window: this._window,
-          });
-        }
-      ),
-      this._configureContextMenuOpenLink(),
-    ]);
-  },
-
-  _configureContextMenuOpenLink() {
-    return new Promise(resolve => {
-      const self = this;
-      this._window.gSetUserContextIdAndClick = function(event) {
-        const tab = modelFor(self._window).tabs.activeTab;
-        const userContextId = ContainerService._getUserContextIdFromTab(tab);
-        event.target.setAttribute("data-usercontextid", userContextId);
-        self._window.gContextMenu.openLinkInTab(event);
-      };
-
-      let item = this._window.document.getElementById("context-openlinkincontainertab");
-      item.setAttribute("oncommand", "gSetUserContextIdAndClick(event)");
-
-      item = this._window.document.getElementById("context-openlinkintab");
-      item.setAttribute("oncommand", "gSetUserContextIdAndClick(event)");
-
-      resolve();
-    });
-  },
-
-  // Generic menu configuration.
-  _configureMenu(menuId, excludedContainerCb, clickCb) {
-    const menu = this._window.document.getElementById(menuId);
-    if (!this._disableElement(menu)) {
-      // Delete stale menu that isn't native elements
-      while (menu.firstChild) {
-        menu.removeChild(menu.firstChild);
-      }
-    }
-
-    const menupopup = this._window.document.createElementNS(XUL_NS, "menupopup");
-    menu.appendChild(menupopup);
-
-    menupopup.addEventListener("command", clickCb);
-    return this._createMenu(menupopup, excludedContainerCb);
-  },
-
-  _createMenu(target, excludedContainerCb) {
-    while (target.hasChildNodes()) {
-      target.removeChild(target.firstChild);
-    }
-
-    return new Promise((resolve, reject) => {
-      ContainerService.queryIdentities().then(identities => {
-        const fragment = this._window.document.createDocumentFragment();
-
-        const excludedUserContextId = excludedContainerCb ? excludedContainerCb() : 0;
-        if (excludedUserContextId) {
-          const bundle = this._window.document.getElementById("bundle_browser");
-
-          const menuitem = this._window.document.createElementNS(XUL_NS, "menuitem");
-          menuitem.setAttribute("data-usercontextid", "0");
-          menuitem.setAttribute("label", bundle.getString("userContextNone.label"));
-          menuitem.setAttribute("accesskey", bundle.getString("userContextNone.accesskey"));
-
-          fragment.appendChild(menuitem);
-
-          const menuseparator = this._window.document.createElementNS(XUL_NS, "menuseparator");
-          fragment.appendChild(menuseparator);
-        }
-
-        identities.forEach(identity => {
-          if (identity.userContextId === excludedUserContextId) {
-            return;
-          }
-
-          const menuitem = this._window.document.createElementNS(XUL_NS, "menuitem");
-          menuitem.setAttribute("label", identity.name);
-          menuitem.classList.add("menuitem-iconic");
-          menuitem.setAttribute("data-usercontextid", identity.userContextId);
-          menuitem.setAttribute("data-identity-color", identity.color);
-          menuitem.setAttribute("data-identity-icon", identity.icon);
-          fragment.appendChild(menuitem);
-        });
-
-        target.appendChild(fragment);
-        resolve();
-      }).catch(() => {reject();});
-    });
-  },
-
-  // This timer is used to hide the panel auto-magically if it's not used in
-  // the following X seconds. This is need to avoid the leaking of the panel
-  // when the mouse goes out of of the 'plus' button.
-  _createTimeout(key, callback, timeoutTime) {
-    this._cleanTimeout(key);
-    this._timeoutStore.set(key, this._window.setTimeout(() => {
-      callback();
-      this._timeoutStore.delete(key);
-    }, timeoutTime));
-  },
-
-  _cleanAllTimeouts() {
-    for (let key of this._timeoutStore.keys()) { // eslint-disable-line prefer-const
-      this._cleanTimeout(key);
-    }
-  },
-
-  _cleanTimeout(key) {
-    if (this._timeoutStore.has(key)) {
-      this._window.clearTimeout(this._timeoutStore.get(key));
-      this._timeoutStore.delete(key);
-    }
-  },
-
-  shutdown() {
-    // CSS must be removed.
-    detachFrom(this._style, this._window);
-
-    this._shutdownFileMenu();
-    this._shutdownAllTabsMenu();
-    this._shutdownContextMenu();
-  },
-
-  _shutDownPlusButtonMenuElement(buttonElement) {
-    if (buttonElement) {
-      this._shutdownElement(buttonElement);
-      buttonElement.setAttribute("tooltip", this._tooltipCache.get(buttonElement));
-
-      buttonElement.removeEventListener("mouseover", this);
-      buttonElement.removeEventListener("click", this);
-      buttonElement.removeEventListener("mouseout", this);
-    }
-  },
-
-  _shutdownFileMenu() {
-    this._shutdownMenu("menu_newUserContext");
-  },
-
-  _shutdownAllTabsMenu() {
-    this._shutdownMenu("alltabs_containersTab");
-  },
-
-  _shutdownContextMenu() {
-    this._shutdownMenu("context-openlinkinusercontext-menu");
-  },
-
-  _shutdownMenu(menuId) {
-    const menu = this._window.document.getElementById(menuId);
-    this._shutdownElement(menu);
-  },
-
-  _shutdownElement(element) {
-    // Let's remove our elements.
-    while (element.firstChild) {
-      element.firstChild.remove();
-    }
-
-    const elementCache = this._elementCache.get(element);
-    if (elementCache) {
-      for (let e of elementCache) { // eslint-disable-line prefer-const
-        element.appendChild(e);
-      }
-    }
-  },
-
-  _disableElement(element) {
-    // Nothing to disable.
-    if (!element || this._elementCache.has(element)) {
-      return false;
-    }
-    const cacheArray = [];
-
-    // Let's store the previous elements so that we can repopulate it in case
-    // the addon is uninstalled.
-    while (element.firstChild) {
-      cacheArray.push(element.removeChild(element.firstChild));
-    }
-
-    this._elementCache.set(element, cacheArray);
-
-    return true;
-  },
-
-  _resetContainerToCentralIcons() {
-    ContextualIdentityProxy.getIdentities().forEach(identity => {
-      if (IDENTITY_ICONS_STANDARD.indexOf(identity.icon) !== -1 &&
-          IDENTITY_COLORS_STANDARD.indexOf(identity.color) !== -1) {
-        return;
-      }
-
-      if (IDENTITY_ICONS_STANDARD.indexOf(identity.icon) === -1) {
-        if (identity.userContextId <= IDENTITY_ICONS_STANDARD.length) {
-          identity.icon = IDENTITY_ICONS_STANDARD[identity.userContextId - 1];
-        } else {
-          identity.icon = IDENTITY_ICONS_STANDARD[0];
-        }
-      }
-
-      if (IDENTITY_COLORS_STANDARD.indexOf(identity.color) === -1) {
-        if (identity.userContextId <= IDENTITY_COLORS_STANDARD.length) {
-          identity.color = IDENTITY_COLORS_STANDARD[identity.userContextId - 1];
-        } else {
-          identity.color = IDENTITY_COLORS_STANDARD[0];
-        }
-      }
-
-      ContextualIdentityService.update(identity.userContextId,
-                                       identity.name,
-                                       identity.icon,
-                                       identity.color);
-    });
-  }
-};
-
-// uninstall/install events ---------------------------------------------------
-
-exports.main = function (options) {
-  const installation = options.loadReason === "install" ||
-                       options.loadReason === "downgrade" ||
-                       options.loadReason === "enable" ||
-                       options.loadReason === "upgrade";
-
-  // Let's start :)
-  ContainerService.init(installation, options.loadReason);
-};
-
-exports.onUnload = function (reason) {
-  if (reason === "disable" ||
-      reason === "downgrade" ||
-      reason === "uninstall" ||
-      reason === "upgrade") {
-    ContainerService.uninstall(reason);
-  }
-};
@@ -1,55 +0,0 @@
-/**
- * Drop-in replacement for {@link external:sdk/event/target.EventTarget} for use
- * with es6 classes.
- * @module event-target
- * @author Martin Giger
- * @license MPL-2.0
- */
- /**
- * An SDK class that add event reqistration methods
- * @external sdk/event/target
- * @requires sdk/event/target
- */
-/**
- * @class EventTarget
- * @memberof external:sdk/event/target
- * @see {@link https://developer.mozilla.org/en-US/Add-ons/SDK/Low-Level_APIs/event_target#EventTarget}
- */
-
-// slightly modified from:  https://raw.githubusercontent.com/freaktechnik/justintv-stream-notifications/master/lib/event-target.js
-
-"use strict";
-
-const { on, once, off, setListeners } = require("sdk/event/core");
-
-/* istanbul ignore next */
-/**
- * @class
- */
-class EventTarget {
-    constructor(options) {
-        setListeners(this, options);
-    }
-
-    on(...args) {
-        on(this, ...args);
-        return this;
-    }
-
-    once(...args) {
-        once(this, ...args);
-        return this;
-    }
-
-    off(...args) {
-        off(this, ...args);
-        return this;
-    }
-
-    removeListener(...args) {
-        off(this, ...args);
-        return this;
-    }
-}
-
-exports.EventTarget = EventTarget;
@@ -1,428 +0,0 @@
-"use strict";
-
-// Chrome privileged
-const {Cu} = require("chrome");
-const { Services } = Cu.import("resource://gre/modules/Services.jsm");
-const { TelemetryController } = Cu.import("resource://gre/modules/TelemetryController.jsm");
-const CID = Cu.import("resource://gre/modules/ClientID.jsm");
-
-// sdk
-const { merge } = require("sdk/util/object");
-const querystring = require("sdk/querystring");
-const { prefs } = require("sdk/simple-prefs");
-const prefSvc = require("sdk/preferences/service");
-const { setInterval } = require("sdk/timers");
-const tabs = require("sdk/tabs");
-const { URL } = require("sdk/url");
-
-const { EventTarget } = require("./event-target");
-const { emit } = require("sdk/event/core");
-const self = require("sdk/self");
-
-const DAY = 86400*1000;
-
-// ongoing within-addon fuses / timers
-let lastDailyPing = Date.now();
-
-/* Functional, self-contained utils */
-
-// equal probability choices from a list "choices"
-function chooseVariation(choices,rng=Math.random()) {
-  let l = choices.length;
-  return choices[Math.floor(l*Math.random())];
-}
-
-function dateToUTC(date) {
-    return Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds());
-}
-
-function generateTelemetryIdIfNeeded() {
-  let id = TelemetryController.clientID;
-  /* istanbul ignore next */
-  if (id == undefined) {
-    return CID.ClientIDImpl._doLoadClientID()
-  } else {
-    return Promise.resolve(id)
-  }
-}
-
-function userId () {
-  return prefSvc.get("toolkit.telemetry.cachedClientID","unknown");
-}
-
-var Reporter = new EventTarget().on("report",
-  (d) => prefSvc.get('shield.debug') && console.log("report",d)
-);
-
-function report(data, src="addon", bucket="shield-study") {
-  data = merge({}, data , {
-    study_version: self.version,
-    about: {
-      _src: src,
-      _v: 2
-    }
-  });
-  if (prefSvc.get('shield.testing')) data.testing = true
-
-  emit(Reporter, "report", data);
-  let telOptions = {addClientId: true, addEnvironment: true}
-  return TelemetryController.submitExternalPing(bucket, data, telOptions);
-}
-
-function survey (url, queryArgs={}) {
-  if (! url) return
-
-  let U = new URL(url);
-  let q = U.search;
-  if (q) {
-    url = U.href.split(q)[0];
-    q = querystring.parse(querystring.unescape(q.slice(1)));
-  } else {
-    q = {};
-  }
-  // get user info.
-  let newArgs = merge({},
-    q,
-    queryArgs
-  );
-  let searchstring = querystring.stringify(newArgs);
-  url = url + "?" + searchstring;
-  return url;
-}
-
-
-function setOrGetFirstrun () {
-  let firstrun = prefs["shield.firstrun"];
-  if (firstrun === undefined) {
-    firstrun = prefs["shield.firstrun"] = String(dateToUTC(new Date())) // in utc, user set
-  }
-  return Number(firstrun)
-}
-
-function reuseVariation (choices) {
-  return prefs["shield.variation"];
-}
-
-function setVariation (choice) {
-  prefs["shield.variation"] = choice
-  return choice
-}
-
-function die (addonId=self.id) {
-  /* istanbul ignore else */
-  if (prefSvc.get("shield.fakedie")) return;
-  /* istanbul ignore next */
-  require("sdk/addon/installer").uninstall(addonId);
-}
-
-// TODO: GRL vulnerable to clock time issues #1
-function expired (xconfig, now = Date.now() ) {
-  return ((now - Number(xconfig.firstrun))/ DAY) > xconfig.days;
-}
-
-function resetShieldPrefs () {
-  delete prefs['shield.firstrun'];
-  delete prefs['shield.variation'];
-}
-
-function cleanup () {
-  prefSvc.keys(`extensions.${self.preferencesBranch}`).forEach (
-  (p) => {
-    delete prefs[p];
-  })
-}
-
-function telemetrySubset (xconfig) {
-  return {
-    study_name: xconfig.name,
-    branch: xconfig.variation,
-  }
-}
-
-class Study extends EventTarget {
-  constructor (config) {
-    super();
-    this.config = merge({
-      name: self.addonId,
-      variations: {'observe-only': () => {}},
-      surveyUrls: {},
-      days: 7
-    },config);
-
-    this.config.firstrun = setOrGetFirstrun();
-
-    let variation = reuseVariation();
-    if (variation === undefined) {
-      variation = this.decideVariation();
-      if (!(variation in this.config.variations)) {
-        // chaijs doesn't think this is an instanceof Error
-        // freaktechnik and gregglind debugged for a while.
-        // sdk errors might not be 'Errors' or chai is wack, who knows.
-        // https://dxr.mozilla.org/mozilla-central/search?q=regexp%3AError%5Cs%3F(%3A%7C%3D)+path%3Aaddon-sdk%2Fsource%2F&redirect=false would list
-        throw new Error("Study Error: chosen variation must be in config.variations")
-      }
-      setVariation(variation);
-    }
-    this.config.variation = variation;
-
-    this.flags = {
-      ineligibleDie: undefined
-    };
-    this.states = [];
-    // all these work, but could be cleaner.  I hate the `bind` stuff.
-    this.on(
-      "change", (function (newstate) {
-        prefSvc.get('shield.debug') && console.log(newstate, this.states);
-        this.states.push(newstate);
-        emit(this, newstate);  // could have checks here.
-      }).bind(this)
-    )
-    this.on(
-      "starting", (function () {
-        this.changeState("modifying");
-      }).bind(this)
-    )
-    this.on(
-      "maybe-installing", (function () {
-        if (!this.isEligible()) {
-          this.changeState("ineligible-die");
-        } else {
-          this.changeState("installed")
-        }
-      }).bind(this)
-    )
-    this.on(
-      "ineligible-die", (function () {
-        try {this.whenIneligible()} catch (err) {/*ok*/} finally { /*ok*/ }
-        this.flags.ineligibleDie = true;
-        this.report(merge({}, telemetrySubset(this.config), {study_state: "ineligible"}), "shield");
-        this.final();
-        die();
-      }).bind(this)
-    )
-    this.on(
-      "installed", (function () {
-        try {this.whenInstalled()} catch (err) {/*ok*/} finally { /*ok*/ }
-        this.report(merge({}, telemetrySubset(this.config), {study_state: "install"}), "shield");
-        this.changeState("modifying");
-      }).bind(this)
-    )
-    this.on(
-      "modifying", (function () {
-        var mybranchname = this.variation;
-        this.config.variations[mybranchname]();  // do the effect
-        this.changeState("running");
-      }).bind(this)
-    )
-    this.on(  // the one 'many'
-      "running", (function () {
-        // report success
-        this.report(merge({}, telemetrySubset(this.config), {study_state: "running"}), "shield");
-        this.final();
-      }).bind(this)
-    )
-    this.on(
-      "normal-shutdown", (function () {
-        this.flags.dying = true;
-        this.report(merge({}, telemetrySubset(this.config), {study_state: "shutdown"}), "shield");
-        this.final();
-      }).bind(this)
-    )
-    this.on(
-      "end-of-study", (function () {
-        if (this.flags.expired) {  // safe to call multiple times
-          this.final();
-          return;
-        } else {
-          // first time seen.
-          this.flags.expired = true;
-          try {this.whenComplete()} catch (err) { /*ok*/ } finally { /*ok*/ }
-          this.report(merge({}, telemetrySubset(this.config) ,{study_state: "end-of-study"}), "shield");
-          // survey for end of study
-          let that = this;
-          generateTelemetryIdIfNeeded().then(()=>that.showSurvey("end-of-study"));
-          try {this.cleanup()} catch (err) {/*ok*/} finally { /*ok*/ }
-          this.final();
-          die();
-        }
-      }).bind(this)
-    )
-    this.on(
-      "user-uninstall-disable", (function () {
-        if (this.flags.dying) {
-          this.final();
-          return;
-        }
-        this.flags.dying = true;
-        this.report(merge({}, telemetrySubset(this.config), {study_state: "user-ended-study"}), "shield");
-        let that = this;
-        generateTelemetryIdIfNeeded().then(()=>that.showSurvey("user-ended-study"));
-        try {this.cleanup()} catch (err) {/*ok*/} finally { /*ok*/ }
-        this.final();
-        die();
-      }).bind(this)
-    )
-  }
-
-  get state () {
-    let n = this.states.length;
-    return n ? this.states[n-1]  : undefined
-  }
-
-  get variation () {
-    return this.config.variation;
-  }
-
-  get firstrun () {
-    return this.config.firstrun;
-  }
-
-  dieIfExpired () {
-    let xconfig = this.config;
-    if (expired(xconfig)) {
-      emit(this, "change", "end-of-study");
-      return true
-    } else {
-      return false
-    }
-  }
-
-  alivenessPulse (last=lastDailyPing) {
-    // check for new day, phone home if true.
-    let t = Date.now();
-    if ((t - last) >= DAY) {
-      lastDailyPing = t;
-      // phone home
-      emit(this,"change","running");
-    }
-    // check expiration, and die with report if needed
-    return this.dieIfExpired();
-  }
-
-  changeState (newstate) {
-    emit(this,'change', newstate);
-  }
-
-  final () {
-    emit(this,'final', {});
-  }
-
-  startup (reason) {
-    // https://developer.mozilla.org/en-US/Add-ons/SDK/Tutorials/Listening_for_load_and_unload
-
-    // check expiry first, before anything, quit and die if so
-
-    // check once, right away, short circuit both install and startup
-    // to prevent modifications from happening.
-    if (this.dieIfExpired()) return this
-
-    switch (reason) {
-      case "install":
-        emit(this, "change", "maybe-installing");
-        break;
-
-      case "enable":
-      case "startup":
-      case "upgrade":
-      case "downgrade":
-        emit(this, "change", "starting");
-    }
-
-    if (! this._pulseTimer) this._pulseTimer = setInterval(this.alivenessPulse.bind(this), 5*60*1000 /*5 minutes */)
-    return this;
-  }
-
-  shutdown (reason) {
-    // https://developer.mozilla.org/en-US/Add-ons/SDK/Tutorials/Listening_for_load_and_unload
-    if (this.flags.ineligibleDie ||
-      this.flags.expired ||
-      this.flags.dying
-    ) { return this }        // special cases.
-
-    switch (reason) {
-      case "uninstall":
-      case "disable":
-        emit(this, "change", "user-uninstall-disable");
-        break;
-
-      // 5. usual end of session.
-      case "shutdown":
-      case "upgrade":
-      case "downgrade":
-        emit(this, "change", "normal-shutdown")
-        break;
-    }
-    return this;
-  }
-
-  cleanup () {
-    // do the simple prefs and simplestorage cleanup
-    // extend by extension
-    resetShieldPrefs();
-    cleanup();
-  }
-
-  isEligible () {
-    return true;
-  }
-
-  whenIneligible () {
-    // empty function unless overrided
-  }
-
-  whenInstalled () {
-    // empty unless overrided
-  }
-
-  whenComplete () {
-    // when the study expires
-  }
-
-  /**
-    * equal choice from varations, by default.  override to get unequal
-    */
-  decideVariation (rng=Math.random()) {
-    return chooseVariation(Object.keys(this.config.variations), rng);
-  }
-
-  get surveyQueryArgs () {
-    return {
-      variation: this.variation,
-      xname: this.config.name,
-      who: userId(),
-      updateChannel: Services.appinfo.defaultUpdateChannel,
-      fxVersion: Services.appinfo.version,
-    }
-  }
-
-  showSurvey(reason) {
-    let partial = this.config.surveyUrls[reason];
-
-    let queryArgs = this.surveyQueryArgs;
-    queryArgs.reason = reason;
-    if (partial) {
-      let url = survey(partial, queryArgs);
-      tabs.open(url);
-      return url
-    } else {
-      return
-    }
-  }
-
-  report () {  // convenience only
-    return report.apply(null, arguments);
-  }
-}
-
-module.exports = {
-  chooseVariation: chooseVariation,
-  die: die,
-  expired: expired,
-  generateTelemetryIdIfNeeded: generateTelemetryIdIfNeeded,
-  report: report,
-  Reporter: Reporter,
-  resetShieldPrefs: resetShieldPrefs,
-  Study:  Study,
-  cleanup: cleanup,
-  survey: survey
-}
@@ -1,95 +0,0 @@
-const { AddonManager } = require('resource://gre/modules/AddonManager.jsm');
-const { ClientID } = require('resource://gre/modules/ClientID.jsm');
-const Events = require('sdk/system/events');
-const { Services } = require('resource://gre/modules/Services.jsm');
-const { storage } = require('sdk/simple-storage');
-const {
-  TelemetryController
-} = require('resource://gre/modules/TelemetryController.jsm');
-const { Request } = require('sdk/request');
-
-
-const EVENT_SEND_METRIC = 'testpilot::send-metric';
-const startTime = (Services.startup.getStartupInfo().process);
-
-function makeTimestamp(timestamp) {
-  return Math.round((timestamp - startTime) / 1000);
-}
-
-function experimentPing(event) {
-  const timestamp = new Date();
-  const { subject, data } = event;
-  let parsed;
-  try {
-    parsed = JSON.parse(data);
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    return console.error(`Dropping bad metrics packet: ${err}`);
-  }
-
-  AddonManager.getAddonByID(subject, addon => {
-    const payload = {
-      test: subject,
-      version: addon.version,
-      timestamp: makeTimestamp(timestamp),
-      variants: storage.experimentVariants &&
-        subject in storage.experimentVariants
-        ? storage.experimentVariants[subject]
-        : null,
-      payload: parsed
-    };
-    TelemetryController.submitExternalPing('testpilottest', payload, {
-      addClientId: true,
-      addEnvironment: true
-    });
-
-    // TODO: DRY up this ping centre code here and in lib/Telemetry.
-    const pcPing = TelemetryController.getCurrentPingData();
-    pcPing.type = 'testpilot';
-    pcPing.payload = payload;
-    const pcPayload = {
-      // 'method' is used by testpilot-metrics library.
-      // 'event' was used before that library existed.
-      event_type: parsed.event || parsed.method,
-      client_time: makeTimestamp(parsed.timestamp || timestamp),
-      addon_id: subject,
-      addon_version: addon.version,
-      firefox_version: pcPing.environment.build.version,
-      os_name: pcPing.environment.system.os.name,
-      os_version: pcPing.environment.system.os.version,
-      locale: pcPing.environment.settings.locale,
-      // Note: these two keys are normally inserted by the ping-centre client.
-      client_id: ClientID.getCachedClientID(),
-      topic: 'testpilot'
-    };
-    // Add any other extra top-level keys = require(the payload, possibly including
-    // 'object' or 'category', among others.
-    Object.keys(parsed).forEach(f => {
-      // Ignore the keys we've already added to `pcPayload`.
-      const ignored = ['event', 'method', 'timestamp'];
-      if (!ignored.includes(f)) {
-        pcPayload[f] = parsed[f];
-      }
-    });
-
-    const req = new Request({
-      url: 'https://tiles.services.mozilla.com/v3/links/ping-centre',
-      contentType: 'application/json',
-      content: JSON.stringify(pcPayload)
-    });
-    req.post();
-  });
-}
-
-function Experiment() {
-  // If the user has @testpilot-addon, it already bound
-  // experimentPing to testpilot::send-metric,
-  // so we don't need to bind this one
-  AddonManager.getAddonByID('@testpilot-addon', addon => {
-    if (!addon) {
-      Events.on(EVENT_SEND_METRIC, experimentPing);
-    }
-  });
-}
-
-module.exports = Experiment;
@@ -1,58 +1,47 @@
 {
  "name": "testpilot-containers",
-  "title": "Containers Experiment",
-  "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.",
-  "version": "3.0.0",
+  "title": "Multi-Account Containers",
+  "description": "Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
+  "version": "6.0.1",
  "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
  "bugs": {
-    "url": "https://github.com/mozilla/testpilot-containers/issues"
+    "url": "https://github.com/mozilla/multi-account-containers/issues"
  },
  "dependencies": {},
  "devDependencies": {
-    "addons-linter": "^0.15.14",
-    "deploy-txp": "^1.0.7",
+    "addons-linter": "^1.3.2",
+    "chai": "^4.1.2",
    "eslint": "^3.17.1",
    "eslint-plugin-no-unsanitized": "^2.0.0",
    "eslint-plugin-promise": "^3.4.0",
-    "htmllint-cli": "^0.0.5",
-    "jpm": "^1.2.2",
+    "htmllint-cli": "0.0.7",
+    "jsdom": "^11.6.2",
    "json": "^9.0.6",
+    "mocha": "^5.0.0",
    "npm-run-all": "^4.0.0",
-    "shield-studies-addon-utils": "^2.0.0",
+    "sinon": "^4.4.0",
+    "sinon-chai": "^2.14.0",
    "stylelint": "^7.9.0",
    "stylelint-config-standard": "^16.0.0",
    "stylelint-order": "^0.3.0",
-    "testpilot-metrics": "^2.1.0"
+    "web-ext": "^2.2.2"
  },
-  "engines": {
-    "firefox": ">=51.0"
-  },
-  "permissions": {
-    "multiprocess": true
-  },
-  "hasEmbeddedWebExtension": true,
-  "homepage": "https://github.com/mozilla/testpilot-containers#readme",
-  "keywords": [
-    "jetpack"
-  ],
+  "homepage": "https://github.com/mozilla/multi-account-containers#readme",
  "license": "MPL-2.0",
  "main": "index.js",
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/mozilla/testpilot-containers.git"
+    "url": "git+https://github.com/mozilla/multi-account-containers.git"
  },
  "scripts": {
-    "build": "npm test && jpm xpi",
-    "build-shield": "npm test && npm run package-shield",
-    "deploy": "deploy-txp",
+    "build": "npm test && cd src && web-ext build --overwrite-dest",
    "lint": "npm-run-all lint:*",
-    "lint:addon": "addons-linter webextension --self-hosted",
-    "lint:css": "stylelint webextension/css/*.css",
-    "lint:html": "htmllint webextension/*.html",
+    "lint:addon": "addons-linter src --self-hosted",
+    "lint:css": "stylelint src/css/*.css",
+    "lint:html": "htmllint *.html",
    "lint:js": "eslint .",
-    "package": "npm run build && mv testpilot-containers.xpi addon.xpi",
-    "package-shield": "./node_modules/.bin/json -I -f package.json -e 'this.name=\"shield-study-containers\"' && jpm xpi && ./node_modules/.bin/json -I -f package.json -e 'this.name=\"testpilot-containers\"'",
-    "test": "npm run lint"
-  },
-  "updateURL": "https://testpilot.firefox.com/files/@testpilot-containers/updates.json"
+    "package": "rm -rf src/web-ext-artifacts && npm run build && mv src/web-ext-artifacts/firefox_multi-account_containers-*.zip addon.xpi",
+    "test": "npm run lint && mocha ./test/setup.js test/**/*.test.js",
+    "test-watch": "mocha ./test/setup.js test/**/*.test.js --watch"
+  }
 }
@@ -1,7 +1,7 @@
 <html>
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Containers confirm navigation</title>
+  <title>Multi-Account Containers Confirm Navigation</title>
  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="chrome://browser/skin/aboutNetError.css" type="text/css" media="all" />
  <link rel="stylesheet" href="/css/confirm-page.css" />
 </head>
@@ -45,6 +45,7 @@ body {
  --small-text-size: 0.833rem; /* 10px */
  --small-radius: 3px;
  --icon-button-size: calc(calc(var(--block-line-separation-size) * 2) + 1.66rem); /* 20px */
+  --inactive-opacity: 0.3;
 }

@media (min-resolution: 1dppx) {
@@ -242,7 +243,8 @@ table {
  min-block-size: 400px;
 }

-.panel.onboarding {
+.panel.onboarding,
+.achievement-panel {
  align-items: center;
  block-size: 360px;
  margin-block-end: 16px;
@@ -536,7 +538,7 @@ span ~ .panel-header-text {
 }

 #current-tab > label > input:checked {
-  background-image: url("chrome://global/skin/in-content/check.svg#check-native");
+  background-image: url("/img/check.svg");
  background-position: -1px -1px;
  background-size: var(--icon-size);
 }
@@ -577,6 +579,11 @@ span ~ .panel-header-text {
  max-inline-size: 204px;
 }

+.disable-edit-containers {
+  opacity: var(--inactive-opacity);
+  pointer-events: none;
+}
+
 .userContext-wrapper {
  align-items: center;
  display: flex;
@@ -887,3 +894,53 @@ span ~ .panel-header-text {
  font-size: 14px !important;
  padding-block-end: 6px;
 }
+
+/* Achievement panel elements */
+.share-ctas {
+  padding-block-end: 0.5em;
+  padding-block-start: 0.5em;
+  padding-inline-end: 0.5em;
+  padding-inline-start: 0.5em;
+  text-align: center;
+}
+
+.cta-link {
+  text-decoration: none;
+}
+
+.cta {
+  color: #fff;
+  font-size: 0.7em;
+  font-weight: bold;
+  margin-block-end: 0.4em;
+  margin-block-start: 0.4em;
+  margin-inline-end: 0.4em;
+  margin-inline-start: 0.4em;
+  padding-block-end: 0.5em;
+  padding-block-start: 0.5em;
+  padding-inline-end: 0.5em;
+  padding-inline-start: 0.5em;
+  text-transform: uppercase;
+}
+
+.cta-icon {
+  height: 18px;
+  padding-right: 0.5em;
+  vertical-align: middle;
+}
+
+.fb-share-cta {
+  background: #375496;
+}
+
+.fb-share-cta .cta-icon {
+  margin-block-start: -5px;
+}
+
+.tweet-cta {
+  background: #37bae7;
+}
+
+.amo-rate-cta {
+  background: #0f1126;
+}
@@ -0,0 +1 @@
+<svg width="32px" height="33px" viewBox="0 0 32 33" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch --> <desc>Created with Sketch.</desc> <defs> <linearGradient x1="74.0423237%" y1="18.5882821%" x2="0%" y2="100%" id="linearGradient-1"> <stop stop-color="#00FEFF" offset="0%"/> <stop stop-color="#3D85FF" offset="100%"/> </linearGradient> </defs> <g id="Specs" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="Header-Copy" transform="translate(-182.000000, -152.000000)" fill="url(#linearGradient-1)"> <path d="M205.58574,176.859518 L205.58574,169.287998 C205.58574,169.287998 205.800116,167.315137 207.086372,167.315137 C208.372629,167.315137 208.265441,169.394639 210.677171,169.394639 C211.909834,169.394639 214,168.754792 214,165.022352 C214,161.289912 211.909834,160.810027 210.677171,160.810027 C208.265441,160.810027 208.372629,162.782888 207.086372,162.782888 C205.800116,162.782888 205.58574,160.756707 205.58574,160.756707 L205.58574,157.664114 C205.58574,156.491061 204.621048,155.531291 203.44198,155.531291 L197.814608,155.531291 C197.814608,155.531291 195.992412,155.211368 195.992412,153.931674 C195.992412,152.65198 198.028985,152.545339 198.028985,150.145914 C198.028985,148.91954 197.332262,147 193.580682,147 C189.829101,147 189.293161,148.91954 189.293161,150.145914 C189.293161,152.545339 191.115357,152.65198 191.115357,153.931674 C191.115357,155.211368 189.293161,155.531291 189.293161,155.531291 L184.148135,155.531291 C182.969067,155.531291 182.004375,156.491061 182.004375,157.664114 L182.004375,161.823118 C182.004375,161.823118 181.789999,165.022352 184.362512,165.022352 C186.023926,165.022352 186.07752,162.836209 188.274874,162.836209 C189.346755,162.836209 190.418635,163.8493 190.418635,166.035443 C190.418635,168.274907 189.346755,169.394639 188.274874,169.394639 C186.131114,169.394639 186.023926,167.208496 184.362512,167.208496 C181.789999,167.208496 182.004375,170.301089 182.004375,170.301089 L182.004375,176.859518 C182.004375,178.032571 182.969067,178.992341 184.148135,178.992341 L191.115357,178.992341 C191.115357,178.992341 194.49178,179.205623 194.49178,176.646236 C194.49178,174.993299 192.348019,174.726696 192.348019,172.540552 C192.348019,171.474141 193.527088,170.141127 195.778036,170.141127 C198.028985,170.141127 199.315241,171.474141 199.315241,172.540552 C199.315241,174.673375 197.225074,174.993299 197.225074,176.646236 C197.225074,179.258944 200.601497,178.992341 200.601497,178.992341 L203.44198,178.992341 C204.621048,178.992341 205.58574,178.032571 205.58574,176.859518 Z" id="Shape-Copy-23" transform="translate(198.000000, 163.000000) rotate(-42.000000) translate(-198.000000, -163.000000) "/> </g> </g> </svg>
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#3c3c3c" d="M6 14a1 1 0 0 1-.707-.293l-3-3a1 1 0 0 1 1.414-1.414l2.157 2.157 6.316-9.023a1 1 0 0 1 1.639 1.146l-7 10a1 1 0 0 1-.732.427A.863.863 0 0 1 6 14z"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill #4c4c4c" fill-opacity="context-fill-opacity" d="M12.9137931,3.0862069 L12.9137931,1.27586207 C12.9137931,0.84736528 12.5664278,0.5 12.137931,0.5 C11.7094342,0.5 11.362069,0.84736528 11.362069,1.27586207 L11.362069,1.27586207 L11.362069,3.0862069 L9.55172414,3.0862069 C9.12322735,3.0862069 8.77586207,3.43357218 8.77586207,3.86206897 C8.77586207,4.29056575 9.12322735,4.63793103 9.55172414,4.63793103 L11.362069,4.63793103 L11.362069,6.44827586 C11.362069,6.87677265 11.7094342,7.22413793 12.137931,7.22413793 L12.137931,7.22413793 C12.5664278,7.22413793 12.9137931,6.87677265 12.9137931,6.44827586 L12.9137931,6.44827586 L12.9137931,4.63793103 L14.7241379,4.63793103 C15.1526347,4.63793103 15.5,4.29056575 15.5,3.86206897 L15.5,3.86206897 C15.5,3.43357218 15.1526347,3.0862069 14.7241379,3.0862069 L14.7241379,3.0862069 L12.9137931,3.0862069 Z M0.5,9.76803178 C0.5,9.22007158 0.94118947,8.77586207 1.49216971,8.77586207 L6.23196822,8.77586207 C6.77992842,8.77586207 7.22413793,9.21705154 7.22413793,9.76803178 L7.22413793,14.5078303 C7.22413793,15.0557905 6.78294846,15.5 6.23196822,15.5 L1.49216971,15.5 C0.94420951,15.5 0.5,15.0588105 0.5,14.5078303 L0.5,9.76803178 Z M8.77586207,9.76803178 C8.77586207,9.22007158 9.21705154,8.77586207 9.76803178,8.77586207 L14.5078303,8.77586207 C15.0557905,8.77586207 15.5,9.21705154 15.5,9.76803178 L15.5,14.5078303 C15.5,15.0557905 15.0588105,15.5 14.5078303,15.5 L9.76803178,15.5 C9.22007158,15.5 8.77586207,15.0588105 8.77586207,14.5078303 L8.77586207,9.76803178 Z M0.5,1.49216971 C0.5,0.94420951 0.94118947,0.5 1.49216971,0.5 L6.23196822,0.5 C6.77992842,0.5 7.22413793,0.94118947 7.22413793,1.49216971 L7.22413793,6.23196822 C7.22413793,6.77992842 6.78294846,7.22413793 6.23196822,7.22413793 L1.49216971,7.22413793 C0.94420951,7.22413793 0.5,6.78294846 0.5,6.23196822 L0.5,1.49216971 Z"></path>
+</svg>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-14 -14 48 48" enable-background="new -14 -14 48 48" xml:space="preserve">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="90.0527" y1="-99.7603" x2="90.0527" y2="-106.3809" gradientTransform="matrix(7.2338 0 0 -7.2338 -641.4998 -735.5619)">
+	<stop  offset="0" style="stop-color:#4B71B8"/>
+	<stop  offset="1" style="stop-color:#293F7E"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M33.931,27.993c0,3.304-2.689,5.983-6.002,5.983H-8.082c-3.315,0-6.001-2.683-6.001-5.983V-7.928
+	c0-3.308,2.687-5.988,6.001-5.988h36.011c3.312,0,6.002,2.681,6.002,5.988V27.993z"/>
+<path fill="#FFFFFF" d="M25.613-4.557c0,0-3.707,0-6.166,0c-3.662,0-7.732,1.535-7.732,6.835c0.019,1.845,0,3.613,0,5.603H7.481
+	v6.728h4.366v19.37h8.021V14.48h5.295l0.479-6.618h-5.913c0,0,0.016-2.946,0-3.8c0-2.093,2.184-1.974,2.312-1.974
+	c1.042,0,3.059,0.003,3.578,0v-6.646H25.613z"/>
+</svg>
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9995" y1="0" x2="23.9995" y2="48.0005">
+	<stop  offset="0" style="stop-color:#4BD0EF"/>
+	<stop  offset="1" style="stop-color:#29AAE1"/>
+</linearGradient>
+<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M48,42c0,3.313-2.687,6-6,6H6c-3.313,0-6-2.687-6-6V6
+	c0-3.313,2.687-6,6-6h36c3.313,0,6,2.687,6,6V42z"/>
+<path fill="#29AAE1" d="M40.231,13.413c-1.12,0.497-2.323,0.833-3.588,0.984c1.291-0.774,2.28-1.998,2.747-3.457
+	c-1.206,0.716-2.543,1.236-3.968,1.516c-1.139-1.214-2.763-1.972-4.56-1.972c-3.449,0-6.246,2.796-6.246,6.247
+	c0,0.49,0.055,0.966,0.161,1.424c-5.192-0.261-9.795-2.749-12.876-6.528c-0.538,0.923-0.846,1.996-0.846,3.141
+	c0,2.167,1.103,4.08,2.779,5.199c-1.024-0.032-1.987-0.313-2.83-0.781c0,0.026,0,0.053,0,0.079c0,3.026,2.153,5.551,5.011,6.125
+	c-0.525,0.143-1.076,0.219-1.646,0.219c-0.403,0-0.794-0.038-1.176-0.11c0.795,2.48,3.102,4.287,5.835,4.338
+	c-2.138,1.675-4.832,2.675-7.758,2.675c-0.504,0-1.002-0.03-1.491-0.089c2.765,1.773,6.048,2.808,9.576,2.808
+	c11.49,0,17.774-9.519,17.774-17.774c0-0.271-0.006-0.54-0.019-0.809C38.334,15.766,39.394,14.666,40.231,13.413z"/>
+<path fill="#FFFFFF" d="M40.231,14.739c-1.12,0.497-2.323,0.833-3.588,0.984c1.291-0.773,2.28-1.998,2.747-3.456
+	c-1.206,0.716-2.543,1.236-3.968,1.516c-1.139-1.214-2.763-1.972-4.56-1.972c-3.449,0-6.246,2.796-6.246,6.247
+	c0,0.489,0.055,0.966,0.161,1.424c-5.192-0.261-9.795-2.748-12.876-6.527c-0.538,0.923-0.846,1.996-0.846,3.141
+	c0,2.167,1.103,4.079,2.779,5.199c-1.024-0.032-1.987-0.313-2.83-0.781c0,0.026,0,0.052,0,0.079c0,3.027,2.153,5.551,5.011,6.125
+	c-0.525,0.144-1.076,0.219-1.646,0.219c-0.403,0-0.794-0.038-1.176-0.11c0.795,2.481,3.102,4.287,5.835,4.338
+	c-2.138,1.676-4.832,2.675-7.758,2.675c-0.504,0-1.002-0.03-1.491-0.089c2.765,1.773,6.048,2.808,9.576,2.808
+	c11.49,0,17.774-9.519,17.774-17.774c0-0.271-0.006-0.54-0.019-0.808C38.334,17.092,39.394,15.992,40.231,14.739z"/>
+</svg>
@@ -7,8 +7,6 @@ module.exports = {
    "badge": true,
    "backgroundLogic": true,
    "identityState": true,
-    "messageHandler": true,
-    "tabPageCounter": true,
-    "themeManager": true
+    "messageHandler": true
  }
 };
@@ -1,6 +1,10 @@
 const assignManager = {
  MENU_ASSIGN_ID: "open-in-this-container",
  MENU_REMOVE_ID: "remove-open-in-this-container",
+  MENU_SEPARATOR_ID: "separator",
+  MENU_HIDE_ID: "hide-container",
+  MENU_MOVE_ID: "move-to-new-window-container",
+
  storageArea: {
    area: browser.storage.local,
    exemptedTabs: {},
@@ -109,21 +113,29 @@ const assignManager = {
    return true;
  },

-  init() {
-    browser.contextMenus.onClicked.addListener((info, tab) => {
-      this._onClickedHandler(info, tab);
-    });
-
  // Before a request is handled by the browser we decide if we should route through a different container
-    browser.webRequest.onBeforeRequest.addListener((options) => {
+  async onBeforeRequest(options) {
    if (options.frameId !== 0 || options.tabId === -1) {
      return {};
    }
    this.removeContextMenu();
-      return Promise.all([
+    const [tab, siteSettings] = await Promise.all([
      browser.tabs.get(options.tabId),
      this.storageArea.get(options.url)
-      ]).then(([tab, siteSettings]) => {
+    ]);
+    let container;
+    try {
+      container = await browser.contextualIdentities.get(backgroundLogic.cookieStoreId(siteSettings.userContextId));
+    } catch (e) {
+      container = false;
+    }
+
+    // The container we have in the assignment map isn't present any more so lets remove it
+    //   then continue the existing load
+    if (siteSettings && !container) {
+      this.deleteContainer(siteSettings.userContextId);
+      return {};
+    }
    const userContextId = this.getUserContextIdFromCookieStore(tab);
    if (!siteSettings
        || userContextId === siteSettings.userContextId
@@ -131,8 +143,57 @@ const assignManager = {
        || this.storageArea.isExempted(options.url, tab.id)) {
      return {};
    }
+    const removeTab = backgroundLogic.NEW_TAB_PAGES.has(tab.url)
+      || (messageHandler.lastCreatedTab
+        && messageHandler.lastCreatedTab.id === tab.id);
+    const openTabId = removeTab ? tab.openerTabId : tab.id;

-        this.reloadPageInContainer(options.url, userContextId, siteSettings.userContextId, tab.index + 1, siteSettings.neverAsk);
+    if (!this.canceledRequests[tab.id]) {
+      // we decided to cancel the request at this point, register canceled request
+      this.canceledRequests[tab.id] = {
+        requestIds: {
+          [options.requestId]: true
+        },
+        urls: {
+          [options.url]: true
+        }
+      };
+
+      // since webRequest onCompleted and onErrorOccurred are not 100% reliable (see #1120)
+      // we register a timer here to cleanup canceled requests, just to make sure we don't
+      // end up in a situation where certain urls in a tab.id stay canceled
+      setTimeout(() => {
+        if (this.canceledRequests[tab.id]) {
+          delete this.canceledRequests[tab.id];
+        }
+      }, 2000);
+    } else {
+      let cancelEarly = false;
+      if (this.canceledRequests[tab.id].requestIds[options.requestId] ||
+          this.canceledRequests[tab.id].urls[options.url]) {
+        // same requestId or url from the same tab
+        // this is a redirect that we have to cancel early to prevent opening two tabs
+        cancelEarly = true;
+      }
+      // we decided to cancel the request at this point, register canceled request
+      this.canceledRequests[tab.id].requestIds[options.requestId] = true;
+      this.canceledRequests[tab.id].urls[options.url] = true;
+      if (cancelEarly) {
+        return {
+          cancel: true
+        };
+      }
+    }
+
+    this.reloadPageInContainer(
+      options.url,
+      userContextId,
+      siteSettings.userContextId,
+      tab.index + 1,
+      tab.active,
+      siteSettings.neverAsk,
+      openTabId
+    );
    this.calculateContextMenu(tab);

    /* Removal of existing tabs:
@@ -146,32 +207,67 @@ const assignManager = {
            however they don't run on about:blank so this would likely be just as hacky.
        We capture the time the tab was created and close if it was within the timeout to try to capture pages which haven't had user interaction or history.
    */
-        if (backgroundLogic.NEW_TAB_PAGES.has(tab.url)
-            || (messageHandler.lastCreatedTab
-            && messageHandler.lastCreatedTab.id === tab.id)) {
+    if (removeTab) {
      browser.tabs.remove(tab.id);
    }
    return {
      cancel: true,
    };
-      }).catch((e) => {
-        throw e;
+  },
+
+  init() {
+    browser.contextMenus.onClicked.addListener((info, tab) => {
+      this._onClickedHandler(info, tab);
    });
+
+    // Before a request is handled by the browser we decide if we should route through a different container
+    this.canceledRequests = {};
+    browser.webRequest.onBeforeRequest.addListener((options) => {
+      return this.onBeforeRequest(options);
    },{urls: ["<all_urls>"], types: ["main_frame"]}, ["blocking"]);
+
+    // Clean up canceled requests
+    browser.webRequest.onCompleted.addListener((options) => {
+      if (this.canceledRequests[options.tabId]) {
+        delete this.canceledRequests[options.tabId];
+      }
+    },{urls: ["<all_urls>"], types: ["main_frame"]});
+    browser.webRequest.onErrorOccurred.addListener((options) => {
+      if (this.canceledRequests[options.tabId]) {
+        delete this.canceledRequests[options.tabId];
+      }
+    },{urls: ["<all_urls>"], types: ["main_frame"]});
+
  },

  async _onClickedHandler(info, tab) {
    const userContextId = this.getUserContextIdFromCookieStore(tab);
    // Mapping ${URL(info.pageUrl).hostname} to ${userContextId}
-    if (userContextId) {
-     // let actionName;
    let remove;
+    if (userContextId) {
+      switch (info.menuItemId) {
+      case this.MENU_ASSIGN_ID:
+      case this.MENU_REMOVE_ID:
        if (info.menuItemId === this.MENU_ASSIGN_ID) {
          remove = false;
        } else {
          remove = true;
        }
        await this._setOrRemoveAssignment(tab.id, info.pageUrl, userContextId, remove);
+        break;
+      case this.MENU_MOVE_ID:
+        backgroundLogic.moveTabsToWindow({
+          cookieStoreId: tab.cookieStoreId,
+          windowId: tab.windowId,
+        });
+        break;
+      case this.MENU_HIDE_ID:
+        backgroundLogic.hideTabs({
+          cookieStoreId: tab.cookieStoreId,
+          windowId: tab.windowId,
+        });
+        break;
+      }
    }
  },

@@ -234,10 +330,6 @@ const assignManager = {
    browser.tabs.sendMessage(tabId, {
      text: `Successfully ${actionName} site to always open in this container`
    });
-    backgroundLogic.sendTelemetryPayload({
-      event: `${actionName}-container-assignment`,
-      userContextId: userContextId,
-    });
    const tab = await browser.tabs.get(tabId);
    this.calculateContextMenu(tab);
  },
@@ -264,6 +356,9 @@ const assignManager = {
    // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1352102
    browser.contextMenus.remove(this.MENU_ASSIGN_ID);
    browser.contextMenus.remove(this.MENU_REMOVE_ID);
+    browser.contextMenus.remove(this.MENU_SEPARATOR_ID);
+    browser.contextMenus.remove(this.MENU_HIDE_ID);
+    browser.contextMenus.remove(this.MENU_MOVE_ID);
  },

  async calculateContextMenu(tab) {
@@ -274,40 +369,57 @@ const assignManager = {
    if (siteSettings === false) {
      return false;
    }
-    // ✓ This is to mitigate https://bugzilla.mozilla.org/show_bug.cgi?id=1351418
-    let prefix = "   "; // Alignment of non breaking space, unknown why this requires so many spaces to align with the tick
+    let checked = false;
    let menuId = this.MENU_ASSIGN_ID;
    const tabUserContextId = this.getUserContextIdFromCookieStore(tab);
    if (siteSettings &&
        Number(siteSettings.userContextId) === Number(tabUserContextId)) {
-      prefix = "✓";
+      checked = true;
      menuId = this.MENU_REMOVE_ID;
    }
    browser.contextMenus.create({
      id: menuId,
-      title: `${prefix} Always Open in This Container`,
-      checked: true,
+      title: "Always Open in This Container",
+      checked,
+      type: "checkbox",
+      contexts: ["all"],
+    });
+
+    browser.contextMenus.create({
+      id: this.MENU_SEPARATOR_ID,
+      type: "separator",
+      contexts: ["all"],
+    });
+
+    browser.contextMenus.create({
+      id: this.MENU_HIDE_ID,
+      title: "Hide This Container",
+      contexts: ["all"],
+    });
+
+    browser.contextMenus.create({
+      id: this.MENU_MOVE_ID,
+      title: "Move Tabs to a New Window",
      contexts: ["all"],
    });
  },

-  reloadPageInContainer(url, currentUserContextId, userContextId, index, neverAsk = false) {
+  encodeURLProperty(url) {
+    return encodeURIComponent(url).replace(/[!'()*]/g, (c) => {
+      const charCode = c.charCodeAt(0).toString(16);
+      return `%${charCode}`;
+    });
+  },
+
+  reloadPageInContainer(url, currentUserContextId, userContextId, index, active, neverAsk = false, openerTabId = null) {
    const cookieStoreId = backgroundLogic.cookieStoreId(userContextId);
    const loadPage = browser.extension.getURL("confirm-page.html");
    // False represents assignment is not permitted
    // If the user has explicitly checked "Never Ask Again" on the warning page we will send them straight there
    if (neverAsk) {
-      browser.tabs.create({url, cookieStoreId, index});
-      backgroundLogic.sendTelemetryPayload({
-        event: "auto-reload-page-in-container",
-        userContextId: userContextId,
-      });
+      browser.tabs.create({url, cookieStoreId, index, active, openerTabId});
    } else {
-      backgroundLogic.sendTelemetryPayload({
-        event: "prompt-to-reload-page-in-container",
-        userContextId: userContextId,
-      });
-      let confirmUrl = `${loadPage}?url=${encodeURIComponent(url)}&cookieStoreId=${cookieStoreId}`;
+      let confirmUrl = `${loadPage}?url=${this.encodeURLProperty(url)}&cookieStoreId=${cookieStoreId}`;
      let currentCookieStoreId;
      if (currentUserContextId) {
        currentCookieStoreId = backgroundLogic.cookieStoreId(currentUserContextId);
@@ -316,7 +428,9 @@ const assignManager = {
      browser.tabs.create({
        url: confirmUrl,
        cookieStoreId: currentCookieStoreId,
-        index
+        openerTabId,
+        index,
+        active
      }).then(() => {
        // We don't want to sync this URL ever nor clutter the users history
        browser.history.deleteUrl({url: confirmUrl});
@@ -0,0 +1,310 @@
+const DEFAULT_TAB = "about:newtab";
+const backgroundLogic = {
+  NEW_TAB_PAGES: new Set([
+    "about:startpage",
+    "about:newtab",
+    "about:home",
+    "about:blank"
+  ]),
+
+  async getExtensionInfo() {
+    const manifestPath = browser.extension.getURL("manifest.json");
+    const response = await fetch(manifestPath);
+    const extensionInfo = await response.json();
+    return extensionInfo;
+  },
+
+  getUserContextIdFromCookieStoreId(cookieStoreId) {
+    if (!cookieStoreId) {
+      return false;
+    }
+    const container = cookieStoreId.replace("firefox-container-", "");
+    if (container !== cookieStoreId) {
+      return container;
+    }
+    return false;
+  },
+
+  async deleteContainer(userContextId, removed = false) {
+    await this._closeTabs(userContextId);
+    if (!removed) {
+      await browser.contextualIdentities.remove(this.cookieStoreId(userContextId));
+    }
+    assignManager.deleteContainer(userContextId);
+    return {done: true, userContextId};
+  },
+
+  async createOrUpdateContainer(options) {
+    let donePromise;
+    if (options.userContextId !== "new") {
+      donePromise = browser.contextualIdentities.update(
+        this.cookieStoreId(options.userContextId),
+        options.params
+      );
+    } else {
+      donePromise = browser.contextualIdentities.create(options.params);
+    }
+    await donePromise;
+    browser.runtime.sendMessage({
+      method: "refreshNeeded"
+    });
+  },
+
+  async openNewTab(options) {
+    let url = options.url || undefined;
+    const userContextId = ("userContextId" in options) ? options.userContextId : 0;
+    const active = ("nofocus" in options) ? options.nofocus : true;
+
+    const cookieStoreId = backgroundLogic.cookieStoreId(userContextId);
+    // Autofocus url bar will happen in 54: https://bugzilla.mozilla.org/show_bug.cgi?id=1295072
+
+    // We can't open new tab pages, so open a blank tab. Used in tab un-hide
+    if (this.NEW_TAB_PAGES.has(url)) {
+      url = undefined;
+    }
+
+    if (!this.isPermissibleURL(url)) {
+      return;
+    }
+
+    return browser.tabs.create({
+      url,
+      active,
+      pinned: options.pinned || false,
+      cookieStoreId
+    });
+  },
+
+  isPermissibleURL(url) {
+    const protocol = new URL(url).protocol;
+    // We can't open these we just have to throw them away
+    if (protocol === "about:"
+        || protocol === "chrome:"
+        || protocol === "moz-extension:") {
+      return false;
+    }
+    return true;
+  },
+
+  checkArgs(requiredArguments, options, methodName) {
+    requiredArguments.forEach((argument) => {
+      if (!(argument in options)) {
+        return new Error(`${methodName} must be called with ${argument} argument.`);
+      }
+    });
+  },
+
+  async getTabs(options) {
+    const requiredArguments = ["cookieStoreId", "windowId"];
+    this.checkArgs(requiredArguments, options, "getTabs");
+    const { cookieStoreId, windowId } = options;
+
+    const list = [];
+    const tabs = await browser.tabs.query({
+      cookieStoreId,
+      windowId
+    });
+    tabs.forEach((tab) => {
+      list.push(identityState._createTabObject(tab));
+    });
+
+    const containerState = await identityState.storageArea.get(cookieStoreId);
+    return list.concat(containerState.hiddenTabs);
+  },
+
+  async moveTabsToWindow(options) {
+    const requiredArguments = ["cookieStoreId", "windowId"];
+    this.checkArgs(requiredArguments, options, "moveTabsToWindow");
+    const { cookieStoreId, windowId } = options;
+
+    const list = await browser.tabs.query({
+      cookieStoreId,
+      windowId
+    });
+
+    const containerState = await identityState.storageArea.get(cookieStoreId);
+    // Nothing to do
+    if (list.length === 0 &&
+        containerState.hiddenTabs.length === 0) {
+      return;
+    }
+    let newWindowObj;
+    let hiddenDefaultTabToClose;
+    if (list.length) {
+      newWindowObj = await browser.windows.create();
+
+      // Pin the default tab in the new window so existing pinned tabs can be moved after it.
+      // From the docs (https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/tabs/move):
+      //   Note that you can't move pinned tabs to a position after any unpinned tabs in a window, or move any unpinned tabs to a position before any pinned tabs.
+      await browser.tabs.update(newWindowObj.tabs[0].id, { pinned: true });
+
+      browser.tabs.move(list.map((tab) => tab.id), {
+        windowId: newWindowObj.id,
+        index: -1
+      });
+    } else {
+      //As we get a blank tab here we will need to await the tabs creation
+      newWindowObj = await browser.windows.create({
+      });
+      hiddenDefaultTabToClose = true;
+    }
+
+    const showHiddenPromises = [];
+
+    // Let's show the hidden tabs.
+    for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const
+      showHiddenPromises.push(browser.tabs.create({
+        url: object.url || DEFAULT_TAB,
+        windowId: newWindowObj.id,
+        cookieStoreId
+      }));
+    }
+
+    if (hiddenDefaultTabToClose) {
+      // Lets wait for hidden tabs to show before closing the others
+      await showHiddenPromises;
+    }
+
+    containerState.hiddenTabs = [];
+
+    // Let's close all the normal tab in the new window. In theory it
+    // should be only the first tab, but maybe there are addons doing
+    // crazy stuff.
+    const tabs = await browser.tabs.query({windowId: newWindowObj.id});
+    for (let tab of tabs) { // eslint-disable-line prefer-const
+      if (tab.cookieStoreId !== cookieStoreId) {
+        browser.tabs.remove(tab.id);
+      }
+    }
+    return await identityState.storageArea.set(cookieStoreId, containerState);
+  },
+
+  async _closeTabs(userContextId, windowId = false) {
+    const cookieStoreId = this.cookieStoreId(userContextId);
+    let tabs;
+    /* if we have no windowId we are going to close all this container (used for deleting) */
+    if (windowId !== false) {
+      tabs = await browser.tabs.query({
+        cookieStoreId,
+        windowId
+      });
+    } else {
+      tabs = await browser.tabs.query({
+        cookieStoreId
+      });
+    }
+    const tabIds = tabs.map((tab) => tab.id);
+    return browser.tabs.remove(tabIds);
+  },
+
+  async queryIdentitiesState(windowId) {
+    const identities = await browser.contextualIdentities.query({});
+    const identitiesOutput = {};
+    const identitiesPromise = identities.map(async function (identity) {
+      const { cookieStoreId } = identity;
+      const containerState = await identityState.storageArea.get(cookieStoreId);
+      const openTabs = await browser.tabs.query({
+        cookieStoreId,
+        windowId
+      });
+      identitiesOutput[cookieStoreId] = {
+        hasHiddenTabs: !!containerState.hiddenTabs.length,
+        hasOpenTabs: !!openTabs.length
+      };
+      return;
+    });
+    await Promise.all(identitiesPromise);
+    return identitiesOutput;
+  },
+
+  async sortTabs() {
+    const windows = await browser.windows.getAll();
+    for (let windowObj of windows) { // eslint-disable-line prefer-const
+      // First the pinned tabs, then the normal ones.
+      await this._sortTabsInternal(windowObj, true);
+      await this._sortTabsInternal(windowObj, false);
+    }
+  },
+
+  async _sortTabsInternal(windowObj, pinnedTabs) {
+    const tabs = await browser.tabs.query({windowId: windowObj.id});
+    let pos = 0;
+
+    // Let's collect UCIs/tabs for this window.
+    const map = new Map;
+    for (const tab of tabs) {
+      if (pinnedTabs && !tab.pinned) {
+        // We don't have, or we already handled all the pinned tabs.
+        break;
+      }
+
+      if (!pinnedTabs && tab.pinned) {
+        // pinned tabs must be consider as taken positions.
+        ++pos;
+        continue;
+      }
+
+      const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(tab.cookieStoreId);
+      if (!map.has(userContextId)) {
+        map.set(userContextId, []);
+      }
+      map.get(userContextId).push(tab);
+    }
+
+    // Let's sort the map.
+    const sortMap = new Map([...map.entries()].sort((a, b) => a[0] > b[0]));
+
+    // Let's move tabs.
+    sortMap.forEach(tabs => {
+      for (const tab of tabs) {
+        ++pos;
+        browser.tabs.move(tab.id, {
+          windowId: windowObj.id,
+          index: pos
+        });
+      }
+    });
+  },
+
+  async hideTabs(options) {
+    const requiredArguments = ["cookieStoreId", "windowId"];
+    this.checkArgs(requiredArguments, options, "hideTabs");
+    const { cookieStoreId, windowId } = options;
+
+    const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(cookieStoreId);
+
+    const containerState = await identityState.storeHidden(cookieStoreId, windowId);
+    await this._closeTabs(userContextId, windowId);
+    return containerState;
+  },
+
+  async showTabs(options) {
+    if (!("cookieStoreId" in options)) {
+      return Promise.reject("showTabs must be called with cookieStoreId argument.");
+    }
+
+    const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(options.cookieStoreId);
+    const promises = [];
+
+    const containerState = await identityState.storageArea.get(options.cookieStoreId);
+
+    for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const
+      promises.push(this.openNewTab({
+        userContextId: userContextId,
+        url: object.url,
+        nofocus: options.nofocus || false,
+        pinned: object.pinned,
+      }));
+    }
+
+    containerState.hiddenTabs = [];
+
+    await Promise.all(promises);
+    return await identityState.storageArea.set(options.cookieStoreId, containerState);
+  },
+
+  cookieStoreId(userContextId) {
+    return `firefox-container-${userContextId}`;
+  }
+};
+
@@ -1,8 +1,15 @@
 const MAJOR_VERSIONS = ["2.3.0", "2.4.0"];
 const badge = {
-  init() {
-    this.displayBrowserActionBadge();
+  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" });
+  },
+
  async displayBrowserActionBadge() {
    const extensionInfo = await backgroundLogic.getExtensionInfo();
    const storage = await browser.storage.local.get({browserActionBadgesClicked: []});
@@ -0,0 +1,62 @@
+const identityState = {
+  storageArea: {
+    area: browser.storage.local,
+
+    getContainerStoreKey(cookieStoreId) {
+      const storagePrefix = "identitiesState@@_";
+      return `${storagePrefix}${cookieStoreId}`;
+    },
+
+    async get(cookieStoreId) {
+      const storeKey = this.getContainerStoreKey(cookieStoreId);
+      const storageResponse = await this.area.get([storeKey]);
+      if (storageResponse && storeKey in storageResponse) {
+        return storageResponse[storeKey];
+      }
+      const defaultContainerState = identityState._createIdentityState();
+      await this.set(cookieStoreId, defaultContainerState);
+
+      return defaultContainerState;
+    },
+
+    set(cookieStoreId, data) {
+      const storeKey = this.getContainerStoreKey(cookieStoreId);
+      return this.area.set({
+        [storeKey]: data
+      });
+    },
+
+    remove(cookieStoreId) {
+      const storeKey = this.getContainerStoreKey(cookieStoreId);
+      return this.area.remove([storeKey]);
+    }
+  },
+
+  _createTabObject(tab) {
+    return Object.assign({}, tab);
+  },
+
+  async storeHidden(cookieStoreId, windowId) {
+    const containerState = await this.storageArea.get(cookieStoreId);
+    const tabsByContainer = await browser.tabs.query({cookieStoreId, windowId});
+    tabsByContainer.forEach((tab) => {
+      const tabObject = this._createTabObject(tab);
+      if (!backgroundLogic.isPermissibleURL(tab.url)) {
+        return;
+      }
+      // This tab is going to be closed. Let's mark this tabObject as
+      // non-active.
+      tabObject.active = false;
+      tabObject.hiddenState = true;
+      containerState.hiddenTabs.push(tabObject);
+    });
+
+    return this.storageArea.set(cookieStoreId, containerState);
+  },
+
+  _createIdentityState() {
+    return {
+      hiddenTabs: []
+    };
+  },
+};
@@ -11,9 +11,6 @@
      "js/background/badge.js",
      "js/background/identityState.js",
      "js/background/messageHandler.js",
-      "js/background/tabPageCounter.js",
-      "js/background/themeManager.js",
-      "js/backdround/init.js"
    ]
 -->
    <script type="text/javascript" src="backgroundLogic.js"></script>
@@ -21,8 +18,5 @@
    <script type="text/javascript" src="badge.js"></script>
    <script type="text/javascript" src="identityState.js"></script>
    <script type="text/javascript" src="messageHandler.js"></script>
-    <script type="text/javascript" src="tabPageCounter.js"></script>
-    <script type="text/javascript" src="themeManager.js"></script>
-    <script type="text/javascript" src="init.js"></script>
  </body>
 </html>
@@ -0,0 +1,214 @@
+const messageHandler = {
+  // After the timer completes we assume it's a tab the user meant to keep open
+  // We use this to catch redirected tabs that have just opened
+  // If this were in platform we would change how the tab opens based on "new tab" link navigations such as ctrl+click
+  LAST_CREATED_TAB_TIMER: 2000,
+  unhideQueue: [],
+
+  init() {
+    // Handles messages from webextension code
+    browser.runtime.onMessage.addListener((m) => {
+      let response;
+
+      switch (m.method) {
+      case "deleteContainer":
+        response = backgroundLogic.deleteContainer(m.message.userContextId);
+        break;
+      case "createOrUpdateContainer":
+        response = backgroundLogic.createOrUpdateContainer(m.message);
+        break;
+      case "neverAsk":
+        assignManager._neverAsk(m);
+        break;
+      case "getAssignment":
+        response = browser.tabs.get(m.tabId).then((tab) => {
+          return assignManager._getAssignment(tab);
+        });
+        break;
+      case "getAssignmentObjectByContainer":
+        response = assignManager._getByContainer(m.message.userContextId);
+        break;
+      case "setOrRemoveAssignment":
+        // m.tabId is used for where to place the in content message
+        // m.url is the assignment to be removed/added
+        response = browser.tabs.get(m.tabId).then((tab) => {
+          return assignManager._setOrRemoveAssignment(tab.id, m.url, m.userContextId, m.value);
+        });
+        break;
+      case "sortTabs":
+        backgroundLogic.sortTabs();
+        break;
+      case "showTabs":
+        this.unhideContainer(m.cookieStoreId);
+        break;
+      case "hideTabs":
+        backgroundLogic.hideTabs({
+          cookieStoreId: m.cookieStoreId,
+          windowId: m.windowId
+        });
+        break;
+      case "checkIncompatibleAddons":
+        // TODO
+        break;
+      case "moveTabsToWindow":
+        response = backgroundLogic.moveTabsToWindow({
+          cookieStoreId: m.cookieStoreId,
+          windowId: m.windowId
+        });
+        break;
+      case "getTabs":
+        response = backgroundLogic.getTabs({
+          cookieStoreId: m.cookieStoreId,
+          windowId: m.windowId
+        });
+        break;
+      case "queryIdentitiesState":
+        response = backgroundLogic.queryIdentitiesState(m.message.windowId);
+        break;
+      case "exemptContainerAssignment":
+        response = assignManager._exemptTab(m);
+        break;
+      }
+      return response;
+    });
+
+    // Handles external messages from webextensions
+    const externalExtensionAllowed = {};
+    browser.runtime.onMessageExternal.addListener(async (message, sender) => {
+      if (!externalExtensionAllowed[sender.id]) {
+        const extensionInfo = await browser.management.get(sender.id);
+        if (!extensionInfo.permissions.includes("contextualIdentities")) {
+          throw new Error("Missing contextualIdentities permission");
+        }
+        externalExtensionAllowed[sender.id] = true;
+      }
+      let response;
+      switch (message.method) {
+      case "getAssignment":
+        if (typeof message.url === "undefined") {
+          throw new Error("Missing message.url");
+        }
+        response = assignManager.storageArea.get(message.url);
+        break;
+      default:
+        throw new Error("Unknown message.method");
+      }
+      return response;
+    });
+    // Delete externalExtensionAllowed if add-on installs/updates; permissions might change
+    browser.management.onInstalled.addListener(extensionInfo => {
+      if (externalExtensionAllowed[extensionInfo.id]) {
+        delete externalExtensionAllowed[extensionInfo.id];
+      }
+    });
+    // Delete externalExtensionAllowed if add-on uninstalls; not needed anymore
+    browser.management.onUninstalled.addListener(extensionInfo => {
+      if (externalExtensionAllowed[extensionInfo.id]) {
+        delete externalExtensionAllowed[extensionInfo.id];
+      }
+    });
+
+    if (browser.contextualIdentities.onRemoved) {
+      browser.contextualIdentities.onRemoved.addListener(({contextualIdentity}) => {
+        const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(contextualIdentity.cookieStoreId);
+        backgroundLogic.deleteContainer(userContextId, true);
+      });
+    }
+
+    browser.tabs.onActivated.addListener((info) => {
+      assignManager.removeContextMenu();
+      browser.tabs.get(info.tabId).then((tab) => {
+        assignManager.calculateContextMenu(tab);
+      }).catch((e) => {
+        throw e;
+      });
+    });
+
+    browser.windows.onFocusChanged.addListener((windowId) => {
+      this.onFocusChangedCallback(windowId);
+    });
+
+    browser.webRequest.onCompleted.addListener((details) => {
+      if (details.frameId !== 0 || details.tabId === -1) {
+        return {};
+      }
+      assignManager.removeContextMenu();
+
+      browser.tabs.get(details.tabId).then((tab) => {
+        assignManager.calculateContextMenu(tab);
+      }).catch((e) => {
+        throw e;
+      });
+    }, {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) {
+        // Don't count firefox-default, firefox-private, nor our own confirm page loads
+        if (tab.cookieStoreId !== "firefox-default" &&
+            tab.cookieStoreId !== "firefox-private" &&
+            !tab.url.startsWith("moz-extension")) {
+          // increment the counter of container tabs opened
+          this.incrementCountOfContainerTabsOpened();
+        }
+
+        this.unhideContainer(tab.cookieStoreId);
+      }
+      setTimeout(() => {
+        this.lastCreatedTab = null;
+      }, this.LAST_CREATED_TAB_TIMER);
+    });
+  },
+
+  async incrementCountOfContainerTabsOpened() {
+    const key = "containerTabsOpened";
+    const count = await browser.storage.local.get({[key]: 0});
+    const countOfContainerTabsOpened = ++count[key];
+    browser.storage.local.set({[key]: countOfContainerTabsOpened});
+
+    // When the user opens their _ tab, give them the achievement
+    if (countOfContainerTabsOpened === 100) {
+      const storage = await browser.storage.local.get({achievements: []});
+      storage.achievements.push({"name": "manyContainersOpened", "done": false});
+      // use set and spread to create a unique array
+      const achievements = [...new Set(storage.achievements)];
+      browser.storage.local.set({achievements});
+      browser.browserAction.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"});
+      browser.browserAction.setBadgeText({text: "NEW"});
+    }
+  },
+
+  async unhideContainer(cookieStoreId) {
+    if (!this.unhideQueue.includes(cookieStoreId)) {
+      this.unhideQueue.push(cookieStoreId);
+      // Unhide all hidden tabs
+      await backgroundLogic.showTabs({
+        cookieStoreId
+      });
+      this.unhideQueue.splice(this.unhideQueue.indexOf(cookieStoreId), 1);
+    }
+  },
+
+  async onFocusChangedCallback(windowId) {
+    assignManager.removeContextMenu();
+    // browserAction loses background color in new windows ...
+    // https://bugzil.la/1314674
+    // https://github.com/mozilla/testpilot-containers/issues/608
+    // ... so re-call displayBrowserActionBadge on window changes
+    badge.displayBrowserActionBadge();
+    browser.tabs.query({active: true, windowId}).then((tabs) => {
+      if (tabs && tabs[0]) {
+        assignManager.calculateContextMenu(tabs[0]);
+      }
+    }).catch((e) => {
+      throw e;
+    });
+  }
+};
+
+// Lets do this last as theme manager did a check before connecting before
+messageHandler.init();
@@ -49,10 +49,6 @@ function confirmSubmit(redirectUrl, cookieStoreId) {
      pageUrl: redirectUrl
    });
  }
-  browser.runtime.sendMessage({
-    method: "sendTelemetryPayload",
-    event: "click-to-reload-page-in-container",
-  });
  openInContainer(redirectUrl, cookieStoreId);
 }

@@ -70,10 +66,6 @@ async function denySubmit(redirectUrl) {
    tabId: tab[0].id,
    pageUrl: redirectUrl
  });
-  browser.runtime.sendMessage({
-    method: "sendTelemetryPayload",
-    event: "click-to-reload-page-in-same-container",
-  });
  document.location.replace(redirectUrl);
 }

@@ -20,11 +20,15 @@ async function doAnimation(element, property, value) {
 async function addMessage(message) {
  const divElement = document.createElement("div");
  divElement.classList.add("container-notification");
-  // For the eager eyed, this is an experiment. It is however likely that a website will know it is "contained" anyway
+  // Ideally we would use https://bugzilla.mozilla.org/show_bug.cgi?id=1340930 when this is available
  divElement.innerText = message.text;

  const imageElement = document.createElement("img");
-  imageElement.src = browser.extension.getURL("/img/container-site-d-24.png");
+  const imagePath = browser.extension.getURL("/img/container-site-d-24.png");
+  const response = await fetch(imagePath);
+  const blob = await response.blob();
+  const objectUrl = URL.createObjectURL(blob);
+  imageElement.src = objectUrl;
  divElement.prepend(imageElement);

  document.body.appendChild(divElement);
@@ -22,6 +22,7 @@ const P_CONTAINERS_EDIT  = "containersEdit";
 const P_CONTAINER_INFO   = "containerInfo";
 const P_CONTAINER_EDIT   = "containerEdit";
 const P_CONTAINER_DELETE = "containerDelete";
+const P_CONTAINERS_ACHIEVEMENT = "containersAchievement";

 /**
 * Escapes any occurances of &, ", <, > or / with XML entities.
@@ -81,38 +82,25 @@ const Logic = {

    // Retrieve the list of identities.
    const identitiesPromise = this.refreshIdentities();
-    // Get the onboarding variation
-    const variationPromise = this.getShieldStudyVariation();

    try {
-      await Promise.all([identitiesPromise, variationPromise]);
+      await identitiesPromise;
    } catch(e) {
      throw new Error("Failed to retrieve the identities or variation. We cannot continue. ", e.message);
    }

    // Routing to the correct panel.
    // If localStorage is disabled, we don't show the onboarding.
-    const data = await browser.storage.local.get([ONBOARDING_STORAGE_KEY]);
-    let onboarded = data[ONBOARDING_STORAGE_KEY];
+    const onboardingData = await browser.storage.local.get([ONBOARDING_STORAGE_KEY]);
+    let onboarded = onboardingData[ONBOARDING_STORAGE_KEY];
    if (!onboarded) {
-      // Legacy local storage used before panel 5
-      if (localStorage.getItem("onboarded4")) {
-        onboarded = 4;
-      } else if (localStorage.getItem("onboarded3")) {
-        onboarded = 3;
-      } else if (localStorage.getItem("onboarded2")) {
-        onboarded = 2;
-      } else if (localStorage.getItem("onboarded1")) {
-        onboarded = 1;
-      } else {
      onboarded = 0;
-      }
      this.setOnboardingStage(onboarded);
    }

    switch (onboarded) {
    case 5:
-      this.showPanel(P_CONTAINERS_LIST);
+      this.showAchievementOrContainersListPanel();
      break;
    case 4:
      this.showPanel(P_ONBOARDING_5);
@@ -134,6 +122,37 @@ const Logic = {

  },

+  async showAchievementOrContainersListPanel() {
+    // Do we need to show an achievement panel?
+    let showAchievements = false;
+    const achievementsStorage = await browser.storage.local.get({achievements: []});
+    for (const achievement of achievementsStorage.achievements) {
+      if (!achievement.done) {
+        showAchievements = true;
+      }
+    }
+    if (showAchievements) {
+      this.showPanel(P_CONTAINERS_ACHIEVEMENT);
+    } else {
+      this.showPanel(P_CONTAINERS_LIST);
+    }
+  },
+
+  // In case the user wants to click multiple actions,
+  // they have to click the "Done" button to stop the panel
+  // from showing
+  async setAchievementDone(achievementName) {
+    const achievementsStorage = await browser.storage.local.get({achievements: []});
+    const achievements = achievementsStorage.achievements;
+    achievements.forEach((achievement, index, achievementsArray) => {
+      if (achievement.name === achievementName) {
+        achievement.done = true;
+        achievementsArray[index] = achievement;
+      }
+    });
+    browser.storage.local.set({achievements});
+  },
+
  setOnboardingStage(stage) {
    return browser.storage.local.set({
      [ONBOARDING_STORAGE_KEY]: stage
@@ -143,20 +162,29 @@ const Logic = {
  async clearBrowserActionBadge() {
    const extensionInfo = await getExtensionInfo();
    const storage = await browser.storage.local.get({browserActionBadgesClicked: []});
-    browser.browserAction.setBadgeBackgroundColor({color: ""});
+    browser.browserAction.setBadgeBackgroundColor({color: null});
    browser.browserAction.setBadgeText({text: ""});
    storage.browserActionBadgesClicked.push(extensionInfo.version);
-    browser.storage.local.set({browserActionBadgesClicked: storage.browserActionBadgesClicked});
+    // use set and spread to create a unique array
+    const browserActionBadgesClicked = [...new Set(storage.browserActionBadgesClicked)];
+    browser.storage.local.set({
+      browserActionBadgesClicked
+    });
  },

  async identity(cookieStoreId) {
-    const identity = await browser.contextualIdentities.get(cookieStoreId);
-    return identity || {
+    const defaultContainer = {
      name: "Default",
      cookieStoreId,
      icon: "default-tab",
      color: "default-tab"
    };
+    // Handle old style rejection with null and also Promise.reject new style
+    try {
+      return await browser.contextualIdentities.get(cookieStoreId) || defaultContainer;
+    } catch(e) {
+      return defaultContainer;
+    }
  },

  addEnterHandler(element, handler) {
@@ -165,6 +193,7 @@ const Logic = {
    });
    element.addEventListener("keydown", (e) => {
      if (e.keyCode === 13) {
+        e.preventDefault();
        handler(e);
      }
    });
@@ -183,11 +212,35 @@ const Logic = {
    return false;
  },

+  async numTabs() {
+    const activeTabs = await browser.tabs.query({windowId: browser.windows.WINDOW_ID_CURRENT});
+    return activeTabs.length;
+  },
+
+  _disableMoveTabs(message) {
+    const moveTabsEl = document.querySelector("#container-info-movetabs");
+    const fragment = document.createDocumentFragment();
+    const incompatEl = document.createElement("div");
+
+    moveTabsEl.classList.remove("clickable");
+    moveTabsEl.setAttribute("title", message);
+
+    fragment.appendChild(incompatEl);
+    incompatEl.setAttribute("id", "container-info-movetabs-incompat");
+    incompatEl.textContent = message;
+    incompatEl.classList.add("container-info-tab-row");
+
+    moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling);
+  },
+
  async refreshIdentities() {
    const [identities, state] = await Promise.all([
      browser.contextualIdentities.query({}),
      browser.runtime.sendMessage({
-        method: "queryIdentitiesState"
+        method: "queryIdentitiesState",
+        message: {
+          windowId: browser.windows.WINDOW_ID_CURRENT
+        }
      })
    ]);
    this._identities = identities.map((identity) => {
@@ -269,14 +322,6 @@ const Logic = {
    return identity.cookieStoreId;
  },

-  sendTelemetryPayload(message = {}) {
-    if (!message.event) {
-      throw new Error("Missing event name for telemetry");
-    }
-    message.method = "sendTelemetryPayload";
-    browser.runtime.sendMessage(message);
-  },
-
  removeIdentity(userContextId) {
    if (!userContextId) {
      return Promise.reject("removeIdentity must be called with userContextId argument.");
@@ -312,13 +357,6 @@ const Logic = {
    });
  },

-  async getShieldStudyVariation() {
-    const variation = await browser.runtime.sendMessage({
-      method: "getShieldStudyVariation"
-    });
-    this._onboardingVariation = variation;
-  },
-
  generateIdentityName() {
    const defaultName = "Container #";
    const ids = [];
@@ -463,16 +501,15 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
  panelSelector: "#container-panel",

  // This method is called when the object is registered.
-  initialize() {
+  async initialize() {
    Logic.addEnterHandler(document.querySelector("#container-add-link"), () => {
      Logic.showPanel(P_CONTAINER_EDIT, { name: Logic.generateIdentityName() });
    });

-    Logic.addEnterHandler(document.querySelector("#edit-containers-link"), () => {
-      Logic.sendTelemetryPayload({
-        event: "edit-containers"
-      });
+    Logic.addEnterHandler(document.querySelector("#edit-containers-link"), (e) => {
+      if (!e.target.classList.contains("disable-edit-containers")){
        Logic.showPanel(P_CONTAINERS_EDIT);
+      }
    });

    Logic.addEnterHandler(document.querySelector("#sort-containers-link"), async function () {
@@ -509,6 +546,15 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
      case 38:
        previous();
        break;
+      default:
+        if ((e.keyCode >= 49 && e.keyCode <= 57) &&
+            Logic._currentPanel === "containersList") {
+          const element = selectables[e.keyCode - 48];
+          if (element) {
+            element.click();
+          }
+        }
+        break;
      }
    });

@@ -614,12 +660,8 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
            || e.target.parentNode.matches(".open-newtab")
            || e.type === "keydown") {
          try {
-            await browser.runtime.sendMessage({
-              method: "openTab",
-              message: {
-                userContextId: Logic.userContextId(identity.cookieStoreId),
-                source: "pop-up"
-              }
+            browser.tabs.create({
+              cookieStoreId: identity.cookieStoreId
            });
            window.close();
          } catch (e) {
@@ -647,6 +689,13 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
    document.addEventListener("mousedown", () => {
      document.removeEventListener("focus", focusHandler);
    });
+    /*  If no container is present disable the Edit Containers button */
+    const editContainer = document.querySelector("#edit-containers-link");
+    if (Logic.identities().length === 0) {
+      editContainer.classList.add("disable-edit-containers");
+    } else {
+      editContainer.classList.remove("disable-edit-containers");
+    }

    return Promise.resolve();
  },
@@ -669,6 +718,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
      try {
        browser.runtime.sendMessage({
          method: identity.hasHiddenTabs ? "showTabs" : "hideTabs",
+          windowId: browser.windows.WINDOW_ID_CURRENT,
          cookieStoreId: Logic.currentCookieStoreId()
        });
        window.close();
@@ -678,36 +728,31 @@ Logic.registerPanel(P_CONTAINER_INFO, {
    });

    // Check if the user has incompatible add-ons installed
+    let incompatible = false;
    try {
-      const incompatible = await browser.runtime.sendMessage({
+      incompatible = await browser.runtime.sendMessage({
        method: "checkIncompatibleAddons"
      });
+    } catch (e) {
+      throw new Error("Could not check for incompatible add-ons.");
+    }
    const moveTabsEl = document.querySelector("#container-info-movetabs");
+    const numTabs = await Logic.numTabs();
    if (incompatible) {
-        const fragment = document.createDocumentFragment();
-        const incompatEl = document.createElement("div");
-
-        moveTabsEl.classList.remove("clickable");
-        moveTabsEl.setAttribute("title", "Moving container tabs is incompatible with Pulse, PageShot, and SnoozeTabs.");
-
-        fragment.appendChild(incompatEl);
-        incompatEl.setAttribute("id", "container-info-movetabs-incompat");
-        incompatEl.textContent = "Incompatible with other Experiments.";
-        incompatEl.classList.add("container-info-tab-row");
-
-        moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling);
-      } else {
+      Logic._disableMoveTabs("Moving container tabs is incompatible with Pulse, PageShot, and SnoozeTabs.");
+      return;
+    } else if (numTabs === 1) {
+      Logic._disableMoveTabs("Cannot move a tab from a single-tab window.");
+      return; 
+    }
    Logic.addEnterHandler(moveTabsEl, async function () {
      await browser.runtime.sendMessage({
        method: "moveTabsToWindow",
+        windowId: browser.windows.WINDOW_ID_CURRENT,
        cookieStoreId: Logic.currentIdentity().cookieStoreId,
      });
      window.close();
    });
-      }
-    } catch (e) {
-      throw new Error("Could not check for incompatible add-ons.");
-    }
  },

  // This method is called when the panel is shown.
@@ -741,6 +786,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
    // Let's retrieve the list of tabs.
    const tabs = await browser.runtime.sendMessage({
      method: "getTabs",
+      windowId: browser.windows.WINDOW_ID_CURRENT,
      cookieStoreId: Logic.currentIdentity().cookieStoreId
    });
    return this.buildInfoTable(tabs);
@@ -815,7 +861,7 @@ Logic.registerPanel(P_CONTAINERS_EDIT, {
        </td>`;
      tr.querySelector(".container-name").textContent = identity.name;
      tr.querySelector(".edit-container").setAttribute("title", `Edit ${identity.name} container`);
-      tr.querySelector(".remove-container").setAttribute("title", `Delete ${identity.name} container`);
+      tr.querySelector(".remove-container").setAttribute("title", `Remove ${identity.name} container`);


      Logic.addEnterHandler(tr, e => {
@@ -979,6 +1025,11 @@ Logic.registerPanel(P_CONTAINER_EDIT, {

    document.querySelector("#edit-container-panel-name-input").value = identity.name || "";
    document.querySelector("#edit-container-panel-usercontext-input").value = userContextId || NEW_CONTAINER_ID;
+    const containerName = document.querySelector("#edit-container-panel-name-input");
+    window.requestAnimationFrame(() => {
+      containerName.select();
+      containerName.focus();
+    });
    [...document.querySelectorAll("[name='container-color']")].forEach(colorInput => {
      colorInput.checked = colorInput.value === identity.color;
    });
@@ -1034,4 +1085,25 @@ Logic.registerPanel(P_CONTAINER_DELETE, {
  },
 });

+// P_CONTAINERS_ACHIEVEMENT: Page for achievement.
+// ----------------------------------------------------------------------------
+
+Logic.registerPanel(P_CONTAINERS_ACHIEVEMENT, {
+  panelSelector: ".achievement-panel",
+
+  // This method is called when the object is registered.
+  initialize() {
+    // Set done and move to the containers list panel.
+    Logic.addEnterHandler(document.querySelector("#achievement-done-button"), async function () {
+      await Logic.setAchievementDone("manyContainersOpened");
+      Logic.showPanel(P_CONTAINERS_LIST);
+    });
+  },
+
+  // This method is called when the panel is shown.
+  prepare() {
+    return Promise.resolve(null);
+  },
+});
+
 Logic.init();
@@ -1,4 +1,4 @@
-const DEFAULT_FAVICON = "moz-icon://goat?size=16";
+const DEFAULT_FAVICON = "/img/blank-favicon.svg";

 // TODO use export here instead of globals
 window.Utils = {
@@ -0,0 +1,69 @@
+{
+  "manifest_version": 2,
+  "name": "Firefox Multi-Account Containers",
+  "version": "6.0.1",
+
+  "description": "Multi-Account Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
+  "icons": {
+    "48": "img/container-site-d-48.png",
+    "96": "img/container-site-d-96.png"
+  },
+
+  "applications": {
+    "gecko": {
+      "id": "@testpilot-containers",
+      "strict_min_version": "57.0"
+    }
+  },
+
+  "homepage_url": "https://github.com/mozilla/multi-account-containers#readme",
+
+  "permissions": [
+    "<all_urls>",
+    "activeTab",
+    "cookies",
+    "contextMenus",
+    "contextualIdentities",
+    "history",
+    "idle",
+    "management",
+    "storage",
+    "tabs",
+    "webRequestBlocking",
+    "webRequest"
+  ],
+
+  "commands": {
+    "_execute_browser_action": {
+      "suggested_key": {
+        "default": "Ctrl+Period",
+        "mac": "MacCtrl+Period"
+      },
+      "description": "Open containers panel"
+    }
+  },
+
+  "browser_action": {
+    "browser_style": true,
+    "default_icon": "img/container-site.svg",
+    "default_title": "Multi-Account Containers",
+    "default_popup": "popup.html"
+  },
+
+  "background": {
+    "page": "js/background/index.html"
+  },
+
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": ["js/content-script.js"],
+      "css": ["css/content.css"],
+      "run_at": "document_start"
+    }
+  ],
+
+  "web_accessible_resources": [
+    "/img/container-site-d-24.png"
+  ]
+}
@@ -1,8 +1,8 @@
 <html>
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Containers browserAction Popup</title>
-  <link rel="stylesheet" href="/css/popup.css">
+  <title>Multi-Account Containers</title>
+  <link rel="stylesheet" href="css/popup.css">

 </head>
 <body>
@@ -67,6 +67,34 @@
    <a href="#" id="onboarding-longpress-button" class="onboarding-button">Done</a>
  </div>

+  <div class="panel achievement-panel hide" id="achievement-panel">
+    <img class="onboarding-img" alt="You achieved a Containers milestone!" src="/img/onboarding-3.png" />
+    <h3 class="onboarding-title">100 tabs!</h3>
+    <p>You've opened 100 Container tabs.</p>
+    <p>If you enjoy Containers, help us spread the word!</p>
+    <p class="share-ctas">
+      <a class="cta-link" href="https://mzl.la/2gJtIZ4" id="achievement-rate-button" target="_blank">
+        <span class="cta amo-rate-cta">
+          <img src="/img/amo-icon.svg" class="cta-icon" alt="addons.mozilla.org Icon">
+          Rate
+        </span>
+      </a>
+      <a class="cta-link" href="https://bit.ly/fb-share-mac-addon" target="_blank">
+        <span class="cta fb-share-cta">
+          <img src="/img/webicon-facebook.svg" class="cta-icon" alt="Facebook Icon">
+          Share
+        </span>
+      </a>
+      <a class="cta-link" href="http://bit.ly/tweet-100-tabs-mac-addon" target="_blank">
+        <span class="cta tweet-cta">
+          <img src="/img/webicon-twitter.svg" class="cta-icon" alt="Twitter Icon">
+          Tweet
+        </span>
+      </a>
+    </p>
+    <a href="#" id="achievement-done-button" class="onboarding-button">Done</a>
+  </div>
+
  <div class="panel container-panel hide" id="container-panel">
    <div id="current-tab">
      <h3>Current Tab</h3>
@@ -1,40 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const self = require("sdk/self");
-const { when: unload } = require("sdk/system/unload");
-
-const shield = require("./lib/shield/index");
-
-const surveyUrl = "https://www.surveygizmo.com/s3/3621810/shield-txp-containers";
-
-const studyConfig = {
-  name: self.addonId,
-  days: 28,
-  surveyUrls: {
-    "end-of-study": surveyUrl,
-    "user-ended-study": surveyUrl,
-    ineligible: null,
-  },
-  variations: {
-    "control": () => {},
-    "securityOnboarding": () => {}
-  }
-};
-
-class ContainersStudy extends shield.Study {
-  isEligible () {
-    // If the user already has testpilot-containers extension, they are in the
-    // Test Pilot experiment, so exclude them.
-    return super.isEligible();
-  }
-}
-
-const thisStudy = new ContainersStudy(studyConfig);
-
-if (self.id === "@shield-study-containers") {
-  unload((reason) => thisStudy.shutdown(reason));
-}
-
-exports.study = thisStudy;
@@ -0,0 +1,16 @@
+module.exports = {
+    env: {
+      "node": true,
+      "mocha": true
+    },
+    globals: {
+      "sinon": false,
+      "expect": false,
+      "nextTick": false,
+      "buildBackgroundDom": false,
+      "background": false,
+      "buildPopupDom": false,
+      "popup": false,
+      "helper": false
+    }
+}
@@ -0,0 +1,137 @@
+module.exports = () => {
+  const _storage = {};
+
+  // could maybe be replaced by https://github.com/acvetkov/sinon-chrome
+  const browserMock = {
+    _storage,
+    runtime: {
+      onMessage: {
+        addListener: sinon.stub(),
+      },
+      onMessageExternal: {
+        addListener: sinon.stub(),
+      },
+      sendMessage: sinon.stub().resolves(),
+    },
+    webRequest: {
+      onBeforeRequest: {
+        addListener: sinon.stub()
+      },
+      onCompleted: {
+        addListener: sinon.stub()
+      },
+      onErrorOccurred: {
+        addListener: sinon.stub()
+      }
+    },
+    windows: {
+      getCurrent: sinon.stub().resolves({}),
+      onFocusChanged: {
+        addListener: sinon.stub(),
+      }
+    },
+    tabs: {
+      onActivated: {
+        addListener: sinon.stub()
+      },
+      onCreated: {
+        addListener: sinon.stub()
+      },
+      onUpdated: {
+        addListener: sinon.stub()
+      },
+      sendMessage: sinon.stub(),
+      query: sinon.stub().resolves([{}]),
+      get: sinon.stub(),
+      create: sinon.stub().resolves({}),
+      remove: sinon.stub().resolves()
+    },
+    history: {
+      deleteUrl: sinon.stub()
+    },
+    storage: {
+      local: {
+        get: sinon.stub(),
+        set: sinon.stub()
+      }
+    },
+    contextualIdentities: {
+      create: sinon.stub(),
+      get: sinon.stub(),
+      query: sinon.stub().resolves([])
+    },
+    contextMenus: {
+      create: sinon.stub(),
+      remove: sinon.stub(),
+      onClicked: {
+        addListener: sinon.stub()
+      }
+    },
+    browserAction: {
+      setBadgeBackgroundColor: sinon.stub(),
+      setBadgeText: sinon.stub()
+    },
+    management: {
+      get: sinon.stub(),
+      onInstalled: {
+        addListener: sinon.stub()
+      },
+      onUninstalled: {
+        addListener: sinon.stub()
+      }
+    },
+    extension: {
+      getURL: sinon.stub().returns("moz-extension://multi-account-containers/confirm-page.html")
+    }
+  };
+
+  // inmemory local storage
+  browserMock.storage.local = {
+    get: sinon.spy(async key => {
+      if (!key) {
+        return _storage;
+      }
+      let result = {};
+      if (Array.isArray(key)) {
+        key.map(akey => {
+          if (typeof _storage[akey] !== "undefined") {
+            result[akey] = _storage[akey];
+          }
+        });
+      } else if (typeof key === "object") {
+        // TODO support nested objects
+        Object.keys(key).map(oKey => {
+          if (typeof _storage[oKey] !== "undefined") {
+            result[oKey] = _storage[oKey];
+          } else {
+            result[oKey] = key[oKey];
+          }
+        });
+      } else {
+        result = _storage[key];
+      }
+      return result;
+    }),
+    set: sinon.spy(async (key, value) => {
+      if (typeof key === "object") {
+        // TODO support nested objects
+        Object.keys(key).map(oKey => {
+          _storage[oKey] = key[oKey];
+        });
+      } else {
+        _storage[key] = value;
+      }
+    }),
+    remove: sinon.spy(async (key) => {
+      if (Array.isArray(key)) {
+        key.map(aKey => {
+          delete _storage[aKey];
+        });
+      } else {
+        delete _storage[key];
+      }
+    }),
+  };
+
+  return browserMock;
+};
@@ -0,0 +1,75 @@
+describe("Assignment Feature", () => {
+  const activeTab = {
+    id: 1,
+    cookieStoreId: "firefox-container-1",
+    url: "http://example.com",
+    index: 0
+  };
+  beforeEach(async () => {
+    await helper.browser.initializeWithTab(activeTab);
+  });
+
+  describe("click the 'Always open in' checkbox in the popup", () => {
+    beforeEach(async () => {
+      // popup click to set assignment for activeTab.url
+      await helper.popup.clickElementById("container-page-assigned");
+    });
+
+    describe("open new Tab with the assigned URL in the default container", () => {
+      const newTab = {
+        id: 2,
+        cookieStoreId: "firefox-default",
+        url: activeTab.url,
+        index: 1,
+        active: true
+      };
+      beforeEach(async () => {
+        // new Tab opening activeTab.url in default container
+        await helper.browser.openNewTab(newTab);
+      });
+
+      it("should open the confirm page", async () => {
+        // should have created a new tab with the confirm page
+        background.browser.tabs.create.should.have.been.calledWith({
+          url: "moz-extension://multi-account-containers/confirm-page.html?" +
+               `url=${encodeURIComponent(activeTab.url)}` +
+               `&cookieStoreId=${activeTab.cookieStoreId}`,
+          cookieStoreId: undefined,
+          openerTabId: null,
+          index: 2,
+          active: true
+        });
+      });
+
+      it("should remove the new Tab that got opened in the default container", () => {
+        background.browser.tabs.remove.should.have.been.calledWith(newTab.id);
+      });
+    });
+
+    describe("click the 'Always open in' checkbox in the popup again", () => {
+      beforeEach(async () => {
+        // popup click to remove assignment for activeTab.url
+        await helper.popup.clickElementById("container-page-assigned");
+      });
+
+      describe("open new Tab with the no longer assigned URL in the default container", () => {
+        const newTab = {
+          id: 3,
+          cookieStoreId: "firefox-default",
+          url: activeTab.url,
+          index: 3,
+          active: true
+        };
+        beforeEach(async () => {
+          // new Tab opening activeTab.url in default container
+          await helper.browser.openNewTab(newTab);
+        });
+
+        it("should not open the confirm page", async () => {
+          // should not have created a new tab
+          background.browser.tabs.create.should.not.have.been.called;
+        });
+      });
+    });
+  });
+});
@@ -0,0 +1,67 @@
+describe("External Webextensions", () => {
+  const activeTab = {
+    id: 1,
+    cookieStoreId: "firefox-container-1",
+    url: "http://example.com",
+    index: 0
+  };
+  beforeEach(async () => {
+    await helper.browser.initializeWithTab(activeTab);
+    await helper.popup.clickElementById("container-page-assigned");
+  });
+
+  describe("with contextualIdentities permissions", () => {
+    it("should be able to get assignments", async () => {
+      background.browser.management.get.resolves({
+        permissions: ["contextualIdentities"]
+      });
+
+      const message = {
+        method: "getAssignment",
+        url: "http://example.com"
+      };
+      const sender = {
+        id: "external-webextension"
+      };
+
+      // currently not possible to get the return value of yielding with sinon
+      // so we expect that if no error is thrown and the storage was called, everything is ok
+      // maybe i get around to provide a PR https://github.com/sinonjs/sinon/issues/903
+      //
+      // the alternative would be to expose the actual messageHandler and call it directly
+      // but personally i think that goes against the black-box-ish nature of these feature tests
+      const rejectionStub = sinon.stub();
+      process.on("unhandledRejection", rejectionStub);
+      background.browser.runtime.onMessageExternal.addListener.yield(message, sender);
+      await nextTick();
+      process.removeListener("unhandledRejection", rejectionStub);
+      rejectionStub.should.not.have.been.called;
+      background.browser.storage.local.get.should.have.been.called;
+    });
+  });
+
+  describe("without contextualIdentities permissions", () => {
+    it("should throw an error", async () => {
+      background.browser.management.get.resolves({
+        permissions: []
+      });
+
+      const message = {
+        method: "getAssignment",
+        url: "http://example.com"
+      };
+      const sender = {
+        id: "external-webextension"
+      };
+
+      const rejectionStub = sinon.spy();
+      process.on("unhandledRejection", rejectionStub);
+      background.browser.runtime.onMessageExternal.addListener.yield(message, sender);
+      await nextTick();
+      process.removeListener("unhandledRejection", rejectionStub);
+      rejectionStub.should.have.been.calledWith(sinon.match({
+        message: "Missing contextualIdentities permission"
+      }));
+    });
+  });
+});
@@ -0,0 +1,47 @@
+module.exports = {
+  browser: {
+    async initializeWithTab(tab) {
+      await buildBackgroundDom({
+        beforeParse(window) {
+          window.browser.tabs.get.resolves(tab);
+          window.browser.tabs.query.resolves([tab]);
+          window.browser.contextualIdentities.get.resolves({
+            cookieStoreId: tab.cookieStoreId
+          });
+        }
+      });
+      await buildPopupDom({
+        beforeParse(window) {
+          window.browser.tabs.get.resolves(tab);
+          window.browser.tabs.query.resolves([tab]);
+        }
+      });
+    },
+
+    async openNewTab(tab, options = {}) {
+      if (options.resetHistory) {
+        background.browser.tabs.create.resetHistory();
+        background.browser.tabs.remove.resetHistory();
+      }
+      background.browser.tabs.get.resolves(tab);
+      background.browser.tabs.onCreated.addListener.yield(tab);
+      const [promise] = background.browser.webRequest.onBeforeRequest.addListener.yield({
+        frameId: 0,
+        tabId: tab.id,
+        url: tab.url,
+        requestId: options.requestId
+      });
+
+      return promise;
+    }
+  },
+
+  popup: {
+    async clickElementById(id) {
+      const clickEvent = popup.document.createEvent("HTMLEvents");
+      clickEvent.initEvent("click");
+      popup.document.getElementById(id).dispatchEvent(clickEvent);
+      await nextTick();
+    }
+  },
+};
@@ -0,0 +1,180 @@
+describe("#940", () => {
+  describe("when other onBeforeRequestHandlers are faster and redirect with the same requestId", () => {
+    it("should not open two confirm pages", async () => {
+      // init
+      const activeTab = {
+        id: 1,
+        cookieStoreId: "firefox-container-1",
+        url: "http://example.com",
+        index: 0
+      };
+      await helper.browser.initializeWithTab(activeTab);
+      // assign the activeTab.url
+      await helper.popup.clickElementById("container-page-assigned");
+
+      // start request and don't await the requests at all
+      // so the second request below is actually comparable to an actual redirect that also fires immediately
+      const newTab = {
+        id: 2,
+        cookieStoreId: "firefox-default",
+        url: activeTab.url,
+        index: 1,
+        active: true
+      };
+      helper.browser.openNewTab(newTab, {
+        requestId: 1
+      });
+
+      // other addon sees the same request
+      // and redirects to the https version of activeTab.url
+      // since it's a redirect the request has the same requestId
+      background.browser.webRequest.onBeforeRequest.addListener.yield({
+        frameId: 0,
+        tabId: newTab.id,
+        url: "https://example.com",
+        requestId: 1
+      });
+      await nextTick();
+
+      background.browser.tabs.create.should.have.been.calledOnce;
+    });
+  });
+
+  describe("when redirects change requestId midflight", () => {
+    let promiseResults;
+    beforeEach(async () => {
+      // init
+      const activeTab = {
+        id: 1,
+        cookieStoreId: "firefox-container-1",
+        url: "https://www.youtube.com",
+        index: 0
+      };
+      await helper.browser.initializeWithTab(activeTab);
+      // assign the activeTab.url
+      await helper.popup.clickElementById("container-page-assigned");
+
+      // http://youtube.com
+      const newTab = {
+        id: 2,
+        cookieStoreId: "firefox-default",
+        url: "http://youtube.com",
+        index: 1,
+        active: true
+      };
+      const promise1 = helper.browser.openNewTab(newTab, {
+        requestId: 1
+      });
+
+      // https://youtube.com
+      const [promise2] = background.browser.webRequest.onBeforeRequest.addListener.yield({
+        frameId: 0,
+        tabId: newTab.id,
+        url: "https://youtube.com",
+        requestId: 1
+      });
+
+      // https://www.youtube.com
+      const [promise3] = background.browser.webRequest.onBeforeRequest.addListener.yield({
+        frameId: 0,
+        tabId: newTab.id,
+        url: "https://www.youtube.com",
+        requestId: 1
+      });
+
+      // https://www.youtube.com
+      const [promise4] = background.browser.webRequest.onBeforeRequest.addListener.yield({
+        frameId: 0,
+        tabId: newTab.id,
+        url: "https://www.youtube.com",
+        requestId: 2
+      });
+
+      promiseResults = await Promise.all([promise1, promise2, promise3, promise4]);
+    });
+
+    it("should not open two confirm pages", async () => {
+      // http://youtube.com is not assigned, no cancel, no reopening
+      expect(promiseResults[0]).to.deep.equal({});
+
+      // https://youtube.com is not assigned, no cancel, no reopening
+      expect(promiseResults[1]).to.deep.equal({});
+
+      // https://www.youtube.com is assigned, this triggers reopening, cancel
+      expect(promiseResults[2]).to.deep.equal({
+        cancel: true
+      });
+
+      // https://www.youtube.com is assigned, this was a redirect, cancel early, no reopening
+      expect(promiseResults[3]).to.deep.equal({
+        cancel: true
+      });
+
+      background.browser.tabs.create.should.have.been.calledOnce;
+    });
+
+    it("should uncancel after webRequest.onCompleted", async () => {
+      const [promise1] = background.browser.webRequest.onCompleted.addListener.yield({
+        tabId: 2
+      });
+      await promise1;
+
+      const [promise2] = background.browser.webRequest.onBeforeRequest.addListener.yield({
+        frameId: 0,
+        tabId: 2,
+        url: "https://www.youtube.com",
+        requestId: 123
+      });
+      await promise2;
+
+      background.browser.tabs.create.should.have.been.calledTwice;
+    });
+
+    it("should uncancel after webRequest.onErrorOccurred", async () => {
+      const [promise1] = background.browser.webRequest.onErrorOccurred.addListener.yield({
+        tabId: 2
+      });
+      await promise1;
+
+      // request to assigned url in same tab
+      const [promise2] = background.browser.webRequest.onBeforeRequest.addListener.yield({
+        frameId: 0,
+        tabId: 2,
+        url: "https://www.youtube.com",
+        requestId: 123
+      });
+      await promise2;
+
+      background.browser.tabs.create.should.have.been.calledTwice;
+    });
+
+    it("should uncancel after 2 seconds", async () => {
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      // request to assigned url in same tab
+      const [promise2] = background.browser.webRequest.onBeforeRequest.addListener.yield({
+        frameId: 0,
+        tabId: 2,
+        url: "https://www.youtube.com",
+        requestId: 123
+      });
+      await promise2;
+
+      background.browser.tabs.create.should.have.been.calledTwice;
+    }).timeout(2002);
+
+    it("should not influence the canceled url in other tabs", async () => {
+      const newTab = {
+        id: 123,
+        cookieStoreId: "firefox-default",
+        url: "https://www.youtube.com",
+        index: 10,
+        active: true
+      };
+      await helper.browser.openNewTab(newTab, {
+        requestId: 321
+      });
+
+      background.browser.tabs.create.should.have.been.calledTwice;
+    });
+  });
+});
@@ -0,0 +1,101 @@
+if (!process.listenerCount("unhandledRejection")) {
+  // eslint-disable-next-line no-console
+  process.on("unhandledRejection", r => console.log(r));
+}
+const jsdom = require("jsdom");
+const path = require("path");
+const chai = require("chai");
+const sinonChai = require("sinon-chai");
+global.sinon = require("sinon");
+global.expect = chai.expect;
+chai.should();
+chai.use(sinonChai);
+global.nextTick = () => {
+  return new Promise(resolve => {
+    setTimeout(() => {
+      process.nextTick(resolve);
+    });
+  });
+};
+
+global.helper = require("./helper");
+const browserMock = require("./browser.mock");
+const srcBasePath = path.resolve(path.join(__dirname, "..", "src"));
+const srcJsBackgroundPath = path.join(srcBasePath, "js", "background");
+global.buildBackgroundDom = async (options = {}) => {
+  const dom = await jsdom.JSDOM.fromFile(path.join(srcJsBackgroundPath, "index.html"), {
+    runScripts: "dangerously",
+    resources: "usable",
+    virtualConsole: (new jsdom.VirtualConsole).sendTo(console),
+    beforeParse(window) {
+      window.browser = browserMock();
+      window.fetch = sinon.stub().resolves({
+        json: sinon.stub().resolves({})
+      });
+
+      if (options.beforeParse) {
+        options.beforeParse(window);
+      }
+    }
+  });
+  await new Promise(resolve => {
+    dom.window.document.addEventListener("DOMContentLoaded", resolve);
+  });
+  await nextTick();
+
+  global.background = {
+    dom,
+    browser: dom.window.browser
+  };
+};
+
+global.buildPopupDom = async (options = {}) => {
+  const dom = await jsdom.JSDOM.fromFile(path.join(srcBasePath, "popup.html"), {
+    runScripts: "dangerously",
+    resources: "usable",
+    virtualConsole: (new jsdom.VirtualConsole).sendTo(console),
+    beforeParse(window) {
+      window.browser = browserMock();
+      window.browser.storage.local.set("browserActionBadgesClicked", []);
+      window.browser.storage.local.set("onboarding-stage", 5);
+      window.browser.storage.local.set("achievements", []);
+      window.browser.storage.local.set.resetHistory();
+      window.fetch = sinon.stub().resolves({
+        json: sinon.stub().resolves({})
+      });
+
+      if (options.beforeParse) {
+        options.beforeParse(window);
+      }
+    }
+  });
+  await new Promise(resolve => {
+    dom.window.document.addEventListener("DOMContentLoaded", resolve);
+  });
+  await nextTick();
+  dom.window.browser.runtime.sendMessage.resetHistory();
+
+  if (global.background) {
+    dom.window.browser.runtime.sendMessage = sinon.spy(function() {
+      global.background.browser.runtime.onMessage.addListener.yield(...arguments);
+    });
+  }
+
+  global.popup = {
+    dom,
+    document: dom.window.document,
+    browser: dom.window.browser
+  };
+};
+
+global.afterEach(() => {
+  if (global.background) {
+    global.background.dom.window.close();
+    delete global.background;
+  }
+
+  if (global.popup) {
+    global.popup.dom.window.close();
+    delete global.popup;
+  }
+});
@@ -1,19 +0,0 @@
-const main = require("../");
-
-exports["test main"] = function(assert) {
-  assert.pass("Unit test running!");
-};
-
-exports["test main async"] = function(assert, done) {
-  assert.pass("async Unit test running!");
-  done();
-};
-
-exports["test dummy"] = function(assert, done) {
-  main.dummy("foo", function(text) {
-    assert.ok((text === "foo"), "Is the text actually 'foo'");
-    done();
-  });
-};
-
-require("sdk/test").run(exports);
@@ -1,336 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-const Experiment = require('./lib/testpilot/experiment');
-
-const experiment = new Experiment();
-
-/**
- * Class that represents a metrics event broker. Events are sent to Google
- * Analytics if the `tid` parameter is set. Events are sent to Mozilla's
- * data pipeline via the Test Pilot add-on. No metrics code changes are
- * needed when the experiment is added to or removed from Test Pilot.
- * @constructor
- * @param {string} $0.id - addon ID, e.g. '@testpilot-addon'. See https://mdn.io/add_on_id.
- * @param {string} $0.version - addon version, e.g. '1.0.2'.
- * @param {string} [$0.uid] - unique identifier for a specific instance of an addon.
- * Optional, but required to send events to Google Analytics. Sent to Google Analytics
- * but not Mozilla services.
- * @param {string} [$0.tid] - Google Analytics tracking ID. Optional, but required
- * to send events to Google Analytics.
- * @param {string} [$0.type=webextension] - addon type. one of: 'webextension',
- * 'sdk', 'bootstrapped'.
- * @param {boolean} [$0.debug=false] - if true, enables logging. Note that this
- * value can be changed on a running instance, by modifying its `debug` property.
- * @throws {SyntaxError} If the required properties are missing, or if the
- * 'type' property is unrecognized.
- * @throws {Error} if initializing the transports fails.
- */
-function Metrics({id, version, uid, tid = null, type = 'webextension', debug = false}) {
-  if (!id) {
-    throw new SyntaxError(`'id' property is required.`);
-  } else if (!version) {
-    throw new SyntaxError(`'version' property is required.`);
-  } else if (tid && !uid) {
-    throw new SyntaxError(`'uid' property is required to send events to Google Analytics.`);
-  }
-
-  if (!['webextension', 'sdk', 'bootstrapped'].includes(type)) {
-    throw new SyntaxError(`'type' property must be one of: 'webextension', 'sdk', or 'bootstrapped'`);
-  }
-  Object.assign(this, {id, uid, version, tid, type, debug});
-
-  // The test pilot add-on uses its own nsIObserverService topic for sending
-  // pings to Telemetry. Otherwise, the topic is based on add-on type.
-  if (id === '@testpilot-addon') {
-    this.topic = 'testpilot';
-  } else if (type === 'webextension') {
-    this.topic = 'testpilot-telemetry';
-  } else {
-    this.topic = 'testpilottest';
-  }
-
-  // NOTE: order is important here. _initTransports uses console.log, which may
-  // not be available before _initConsole has run.
-  this._initConsole();
-  this._initTransports();
-
-  this.sendEvent = this.sendEvent.bind(this);
-
-  this._log(`Initialized topic to ${this.topic}`);
-  if (!tid) {
-    this._log(`Google Analytics disabled: 'tid' value not passed to constructor.`);
-  } else {
-    this._log(`Google Analytics enabled for Tracking ID ${tid}.`);
-  }
-  this._log('Constructor finished successfully.');
-}
-Metrics.prototype = {
-  /**
-   * Sends an event to the Mozilla data pipeline (and Google Analytics, if
-   * a `tid` was passed to the constructor). Note: to avoid breaking callers,
-   * if sending the event fails, no Errors will be thrown. Instead, the message
-   * will be silently dropped, and, if debug mode is enabled, an error will be
-   * logged to the Browser Console.
-   *
-   * If you want to pass extra fields to GA, or use a GA hit type other than
-   * `Event`, you can transform the output data object yourself using the
-   * `transform` parameter. You will need to add Custom Dimensions to GA for any
-   * extra fields: https://support.google.com/analytics/answer/2709828. Note
-   * that, by convention, the `variant` argument is mapped to the first Custom
-   * Dimension (`cd1`) when constructing the GA Event hit.
-   *
-   * Note: the data object format is currently different for each experiment,
-   * and should be defined based on the result of conversations with the Mozilla
-   * data team.
-   *
-   * A suggested default format is:
-   * @param {string} [$0.method] - What is happening? e.g. `click`
-   * @param {string} [$0.object] - What is being affected? e.g. `home-button-1`
-   * @param {string} [$0.category=interactions] - If you want to add a category
-   * for easy reporting later. e.g. `mainmenu`
-   * @param {string} [$0.variant=null] - An identifying string if you're running
-   * different variants. e.g. `cohort-A`
-   * @param {function} [transform] - Transform function used to alter the
-   * parameters sent to GA. The `transform` function signature is
-   * `transform(input, output)`, where `input` is the object passed to
-   * `sendEvent` (excluding `transform`), and `output` is the default GA
-   * object generated by the `_gaTransform` method. The `transform` function
-   * should return an object whose keys are GA Measurement Protocol parameters.
-   * The returned object will be form encoded and sent to GA.
-   */
-  sendEvent: function(params = {}, transform) {
-    const args = this._clone(params);
-    args.object = params.object || null;
-    args.category = params.category || 'interactions';
-    args.variant = params.variant || null;
-
-    this._log(`sendEvent called with method = ${args.method}, object = ${args.object}, category = ${args.category}, variant = ${args.variant}.`);
-
-    const clientData = this._clone(args);
-    const gaData = this._clone(args);
-    if (!clientData) {
-      this._error(`Unable to process data object. Dropping packet.`);
-      return;
-    }
-    this._sendToClient(clientData);
-
-    if (this.tid && this.uid) {
-      const defaultEvent = this._gaTransform(gaData);
-
-      let userEvent;
-      if (transform) {
-        userEvent = transform.call(null, gaData, defaultEvent);
-      }
-
-      this._gaSend(userEvent || defaultEvent);
-    }
-  },
-
-  /**
-   * Clone a data object by serializing / deserializing it.
-   * @private
-   * @param {object} o - Object to be cloned.
-   * @returns A clone of the object, or `null` if cloning failed.
-   */
-  _clone: function(o) {
-    let cloned;
-    try {
-      cloned = JSON.parse(JSON.stringify(o));
-    } catch (ex) {
-      this._error(`Unable to clone object: ${ex}.`);
-      return null;
-    }
-    return cloned;
-  },
-
-  /**
-   * Sends an event to the Mozilla data pipeline via the Test Pilot add-on.
-   * Uses BroadcastChannel for WebExtensions, and nsIObserverService for other
-   * add-on types.
-   * @private
-   * @param {object} params - Entire object sent to `sendEvent`.
-   */
-  _sendToClient: function(params) {
-    if (this.type === 'webextension') {
-      this._channel.postMessage(params);
-      this._log(`Sent client message via postMessage: ${params}`);
-    } else {
-      let stringified;
-
-      try {
-        stringified = JSON.stringify(params);
-      } catch(ex) {
-        this._error(`Unable to serialize metrics event: ${ex}`);
-        return;
-      }
-
-      const subject = {
-        wrappedJSObject: {
-          observersModuleSubjectWrapper: true,
-          object: this.id
-        }
-      };
-
-      try {
-        Services.obs.notifyObservers(subject, 'testpilot::send-metric', stringified);
-        this._log(`Sent client message via nsIObserverService: ${stringified}`);
-      } catch (ex) {
-        this._error(`Failed to send nsIObserver client ping: ${ex}`);
-        return;
-      }
-    }
-  },
-
-   /**
-   * Transforms `sendEvent()` arguments into a Google Analytics `Event` hit.
-   * @private
-   * @param {string} method - see `sendEvent` docs
-   * @param {string} [object] - see `sendEvent` docs
-   * @param {string} category - see `sendEvent` docs. Note that `category` is
-   * required here, assuming the default value was filled in by `sendEvent()`.
-   * @param {string} variant - see `sendEvent` docs. Note that `variant` is
-   * required here, assuming the default value was filled in by `sendEvent()`.
-   */
-  _gaTransform: function({method, object, category, variant}) {
-    const data = {
-      v: 1,
-      an: this.id,
-      av: this.version,
-      tid: this.tid,
-      uid: this.uid,
-      t: 'event',
-      ec: category,
-      ea: method
-    };
-    if (object) {
-      data.el = object;
-    }
-    if (variant) {
-      data.cd1 = variant;
-    }
-    return data;
-  },
-
-  /**
-   * Encodes and sends an event message to Google Analytics.
-   * @private
-   * @param {object} msg - An object whose keys correspond to parameters in the
-   * Google Analytics Measurement Protocol.
-   */
-  _gaSend: function(msg) {
-    const encoded = this._formEncode(msg);
-    const GA_URL = 'https://ssl.google-analytics.com/collect';
-    if (this.type === 'webextension') {
-      navigator.sendBeacon(GA_URL, encoded);
-    } else {
-      // SDK and bootstrapped types might not have a window reference, so get
-      // the sendBeacon DOM API from the hidden window.
-      Services.appShell.hiddenDOMWindow.navigator.sendBeacon(GA_URL, encoded);
-    }
-    this._log(`Sent GA message: ${encoded}`);
-  },
-
-  /**
-   * URL encodes an object. Encodes spaces as '%20', not '+', following the
-   * GA docs.
-   *
-   * @example
-   * // returns 'a=b&foo=b%20ar'
-   * metrics._formEncode({a: 'b', foo: 'b ar'});
-   * @private
-   * @param {Object} obj - Any JS object
-   * @returns {string}
-   */
-  _formEncode: function(obj) {
-    const params = [];
-    if (!obj) { return ''; }
-    Object.keys(obj).forEach(item => {
-      const encoded = encodeURIComponent(item) + '=' + encodeURIComponent(obj[item]);
-      params.push(encoded);
-    });
-    return params.join('&');
-  },
-
-  /**
-   * Initializes transports used for sending messages. For WebExtensions,
-   * creates a `BroadcastChannel` (transport for client pings). WebExtensions
-   * use navigator.sendBeacon for GA transport, and they always have access
-   * to DOM APIs, so there's no setup work required. For other types, loads
-   * `Services.jsm`, which exposes the nsIObserverService (transport for client
-   * pings), and exposes the navigator.sendBeacon API (GA transport) via the
-   * appShell service's hidden window.
-   * @private
-   * @throws {Error} if transport setup unexpectedly fails
-   */
-  _initTransports: function() {
-    if (this.type === 'webextension') {
-      try {
-        this._channel = new BroadcastChannel(this.topic);
-      } catch(ex) {
-        throw new Error(`Unable to create BroadcastChannel: ${ex}`);
-      }
-    } else if (this.type === 'sdk') {
-      try {
-        const { Cu } = require('chrome');
-        Cu.import('resource://gre/modules/Services.jsm');
-      } catch(ex) {
-        throw new Error(`Unable to load Services.jsm: ${ex}`);
-      }
-    } else { /* this.type === 'bootstrapped' */
-      try {
-        Components.utils.import('resource://gre/modules/Services.jsm');
-      } catch(ex) {
-        throw new Error(`Unable to load Services.jsm: ${ex}`);
-      }
-    }
-    this._log('Successfully initialized transports.');
-  },
-
-  /**
-   * Initializes a console for 'bootstrapped' add-ons.
-   * @private
-   */
-  _initConsole: function() {
-    if (this.type === 'bootstrapped') {
-      try {
-        Components.utils.import('resource://gre/modules/Console.jsm');
-        this._log('Successfully initialized console.');
-      } catch(ex) {
-        throw new Error(`Unable to initialize console: ${ex}`);
-      }
-    }
-  },
-
-  /**
-   * Logs messages to the console. Only enabled if `this.debug` is truthy.
-   * @private
-   * @param {string} msg - A message
-   */
-  _log: function(msg) {
-    if (this.debug) {
-      console.log(msg); // eslint-disable-line no-console
-    }
-  },
-
-  /**
-   * Logs errors to the console. Only enabled if `this.debug` is truthy.
-   * @private
-   * @param {string} msg - An error message
-   */
-  _error: function(msg) {
-    if (this.debug) {
-      console.error(msg); // eslint-disable-line no-console
-    }
-  }
-};
-
-// WebExtensions don't support CommonJS module style, so 'module' might not be
-// defined.
-if (typeof module !== 'undefined') {
-  module.exports = Metrics;
-}
-
-// Export the Metrics constructor in Gecko JSM style, for legacy addons
-// that use the JSM loader. See also: https://mdn.io/jsm/using
-const EXPORTED_SYMBOLS = ['Metrics']; // eslint-disable-line no-unused-vars
@@ -1,345 +0,0 @@
-const DEFAULT_TAB = "about:newtab";
-const backgroundLogic = {
-  NEW_TAB_PAGES: new Set([
-    "about:startpage",
-    "about:newtab",
-    "about:home",
-    "about:blank"
-  ]),
-
-  async getExtensionInfo() {
-    const manifestPath = browser.extension.getURL("manifest.json");
-    const response = await fetch(manifestPath);
-    const extensionInfo = await response.json();
-    return extensionInfo;
-  },
-
-  getUserContextIdFromCookieStoreId(cookieStoreId) {
-    if (!cookieStoreId) {
-      return false;
-    }
-    const container = cookieStoreId.replace("firefox-container-", "");
-    if (container !== cookieStoreId) {
-      return container;
-    }
-    return false;
-  },
-
-  async deleteContainer(userContextId) {
-    this.sendTelemetryPayload({
-      event: "delete-container",
-      userContextId
-    });
-
-    await this._closeTabs(userContextId);
-    await browser.contextualIdentities.remove(this.cookieStoreId(userContextId));
-    assignManager.deleteContainer(userContextId);
-    await browser.runtime.sendMessage({
-      method: "forgetIdentityAndRefresh"
-    });
-    return {done: true, userContextId};
-  },
-
-  async createOrUpdateContainer(options) {
-    let donePromise;
-    if (options.userContextId !== "new") {
-      donePromise = browser.contextualIdentities.update(
-        this.cookieStoreId(options.userContextId),
-        options.params
-      );
-      this.sendTelemetryPayload({
-        event: "edit-container",
-        userContextId: options.userContextId
-      });
-    } else {
-      donePromise = browser.contextualIdentities.create(options.params);
-      this.sendTelemetryPayload({
-        event: "add-container"
-      });
-    }
-    await donePromise;
-    browser.runtime.sendMessage({
-      method: "refreshNeeded"
-    });
-  },
-
-  async openTab(options) {
-    let url = options.url || undefined;
-    const userContextId = ("userContextId" in options) ? options.userContextId : 0;
-    const active = ("nofocus" in options) ? options.nofocus : true;
-    const source = ("source" in options) ? options.source : null;
-
-    const cookieStoreId = backgroundLogic.cookieStoreId(userContextId);
-    // Only send telemetry for tabs opened by UI - i.e., not via showTabs
-    if (source && userContextId) {
-      this.sendTelemetryPayload({
-        "event": "open-tab",
-        "eventSource": source,
-        "userContextId": userContextId,
-        "clickedContainerTabCount": await identityState.containerTabCount(cookieStoreId)
-      });
-    }
-    // Autofocus url bar will happen in 54: https://bugzilla.mozilla.org/show_bug.cgi?id=1295072
-
-    // We can't open new tab pages, so open a blank tab. Used in tab un-hide
-    if (this.NEW_TAB_PAGES.has(url)) {
-      url = undefined;
-    }
-
-    // Unhide all hidden tabs
-    this.showTabs({
-      cookieStoreId
-    });
-    return browser.tabs.create({
-      url,
-      active,
-      pinned: options.pinned || false,
-      cookieStoreId
-    });
-  },
-
-  async getTabs(options) {
-    if (!("cookieStoreId" in options)) {
-      return new Error("getTabs must be called with cookieStoreId argument.");
-    }
-
-    const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(options.cookieStoreId);
-    await identityState.remapTabsIfMissing(options.cookieStoreId);
-    const isKnownContainer = await identityState._isKnownContainer(userContextId);
-    if (!isKnownContainer) {
-      return [];
-    }
-
-    const list = [];
-    const tabs = await this._containerTabs(options.cookieStoreId);
-    tabs.forEach((tab) => {
-      list.push(identityState._createTabObject(tab));
-    });
-
-    const containerState = await identityState.storageArea.get(options.cookieStoreId);
-    return list.concat(containerState.hiddenTabs);
-  },
-
-  async moveTabsToWindow(options) {
-    if (!("cookieStoreId" in options)) {
-      return new Error("moveTabsToWindow must be called with cookieStoreId argument.");
-    }
-
-    const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(options.cookieStoreId);
-    await identityState.remapTabsIfMissing(options.cookieStoreId);
-    if (!identityState._isKnownContainer(userContextId)) {
-      return null;
-    }
-
-    this.sendTelemetryPayload({
-      "event": "move-tabs-to-window",
-      "userContextId": userContextId,
-      "clickedContainerTabCount": identityState.containerTabCount(userContextId),
-    });
-
-    const list = await identityState._matchTabsByContainer(options.cookieStoreId);
-
-    const containerState = await identityState.storageArea.get(options.cookieStoreId);
-    // Nothing to do
-    if (list.length === 0 &&
-        containerState.hiddenTabs.length === 0) {
-      return;
-    }
-    const window = await browser.windows.create({
-      tabId: list.shift().id
-    });
-    browser.tabs.move(list, {
-      windowId: window.id,
-      index: -1
-    });
-
-    // Let's show the hidden tabs.
-    for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const
-      browser.tabs.create(object.url || DEFAULT_TAB, {
-        windowId: window.id,
-        cookieStoreId: options.cookieStoreId
-      });
-    }
-
-    containerState.hiddenTabs = [];
-
-    // Let's close all the normal tab in the new window. In theory it
-    // should be only the first tab, but maybe there are addons doing
-    // crazy stuff.
-    const tabs = browser.tabs.query({windowId: window.id});
-    for (let tab of tabs) { // eslint-disable-line prefer-const
-      if (tabs.cookieStoreId !== options.cookieStoreId) {
-        browser.tabs.remove(tab.id);
-      }
-    }
-    return await identityState.storageArea.set(options.cookieStoreId, containerState);
-  },
-
-  async _closeTabs(userContextId) {
-    const cookieStoreId = this.cookieStoreId(userContextId);
-    const tabs = await this._containerTabs(cookieStoreId);
-    const tabIds = tabs.map((tab) => tab.id);
-    return browser.tabs.remove(tabIds);
-  },
-
-  async queryIdentitiesState() {
-    const identities = await browser.contextualIdentities.query({});
-    const identitiesOutput = {};
-    const identitiesPromise = identities.map(async function (identity) {
-      await identityState.remapTabsIfMissing(identity.cookieStoreId);
-      const containerState = await identityState.storageArea.get(identity.cookieStoreId);
-      identitiesOutput[identity.cookieStoreId] = {
-        hasHiddenTabs: !!containerState.hiddenTabs.length,
-        hasOpenTabs: !!containerState.openTabs
-      };
-      return;
-    });
-    await Promise.all(identitiesPromise);
-    return identitiesOutput;
-  },
-
-  async sortTabs() {
-    const containersCounts = identityState.containersCounts();
-    this.sendTelemetryPayload({
-      "event": "sort-tabs",
-      "shownContainersCount": containersCounts.shown,
-      "totalContainerTabsCount": await identityState.totalContainerTabsCount(),
-      "totalNonContainerTabsCount": await identityState.totalNonContainerTabsCount()
-    });
-    const windows = await browser.windows.getAll();
-    for (let window of windows) { // eslint-disable-line prefer-const
-      // First the pinned tabs, then the normal ones.
-      await this._sortTabsInternal(window, true);
-      await this._sortTabsInternal(window, false);
-    }
-  },
-
-  async _sortTabsInternal(window, pinnedTabs) {
-    const tabs = await browser.tabs.query({windowId: window.id});
-    let pos = 0;
-
-    // Let's collect UCIs/tabs for this window.
-    const map = new Map;
-    for (const tab of tabs) {
-      if (pinnedTabs && !tab.pinned) {
-        // We don't have, or we already handled all the pinned tabs.
-        break;
-      }
-
-      if (!pinnedTabs && tab.pinned) {
-        // pinned tabs must be consider as taken positions.
-        ++pos;
-        continue;
-      }
-
-      const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(tab.cookieStoreId);
-      if (!map.has(userContextId)) {
-        map.set(userContextId, []);
-      }
-      map.get(userContextId).push(tab);
-    }
-
-    // Let's sort the map.
-    const sortMap = new Map([...map.entries()].sort((a, b) => a[0] > b[0]));
-
-    // Let's move tabs.
-    sortMap.forEach(tabs => {
-      for (const tab of tabs) {
-        ++pos;
-        browser.tabs.move(tab.id, {
-          windowId: window.id,
-          index: pos
-        });
-        //xulWindow.gBrowser.moveTabTo(tab, pos++);
-      }
-    });
-  },
-
-  async hideTabs(options) {
-    if (!("cookieStoreId" in options)) {
-      return new Error("hideTabs must be called with cookieStoreId option.");
-    }
-
-    const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(options.cookieStoreId);
-    await identityState.remapTabsIfMissing(options.cookieStoreId);
-    const isKnownContainer = await identityState._isKnownContainer(userContextId);
-    if (!isKnownContainer) {
-      return null;
-    }
-
-    const containersCounts = identityState.containersCounts();
-    this.sendTelemetryPayload({
-      "event": "hide-tabs",
-      "userContextId": userContextId,
-      "clickedContainerTabCount": identityState.containerTabCount(userContextId),
-      "shownContainersCount": containersCounts.shown,
-      "hiddenContainersCount": containersCounts.hidden,
-      "totalContainersCount": containersCounts.total
-    });
-
-    const containerState = await identityState.storeHidden(options.cookieStoreId);
-    await this._closeTabs(userContextId); 
-    return containerState;
-  },
-
-  async showTabs(options) {
-    if (!("cookieStoreId" in options)) {
-      return Promise.reject("showTabs must be called with cookieStoreId argument.");
-    }
-
-    const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(options.cookieStoreId);
-    await identityState.remapTabsIfMissing(options.cookieStoreId);
-    if (!identityState._isKnownContainer(userContextId)) {
-      return null;
-    }
-
-    const containersCounts = identityState.containersCounts();
-    this.sendTelemetryPayload({
-      "event": "show-tabs",
-      "userContextId": userContextId,
-      "clickedContainerTabCount": await identityState.containerTabCount(options.cookieStoreId),
-      "shownContainersCount": containersCounts.shown,
-      "hiddenContainersCount": containersCounts.hidden,
-      "totalContainersCount": containersCounts.total
-    });
-
-    const promises = [];
-
-    const containerState = await identityState.storageArea.get(options.cookieStoreId);
-
-    for (let object of containerState.hiddenTabs) { // eslint-disable-line prefer-const
-      promises.push(this.openTab({
-        userContextId: userContextId,
-        url: object.url,
-        nofocus: options.nofocus || false,
-        pinned: object.pinned,
-      }));
-    }
-
-    containerState.hiddenTabs = [];
-
-    await Promise.all(promises);
-    return await identityState.storageArea.set(options.cookieStoreId, containerState);
-  },
-
-
-  sendTelemetryPayload(message = {}) {
-    if (!message.event) {
-      throw new Error("Missing event name for telemetry");
-    }
-    message.method = "sendTelemetryPayload";
-  //TODO decide where this goes
-  //  browser.runtime.sendMessage(message);
-  },
-
-  cookieStoreId(userContextId) {
-    return `firefox-container-${userContextId}`;
-  },
-
-  _containerTabs(cookieStoreId) {
-    return browser.tabs.query({
-      cookieStoreId
-    }).catch((e) => {throw e;});
-  },
-};
-
@@ -1,142 +0,0 @@
-const identityState = {
-  storageArea: {
-    area: browser.storage.local,
-
-    getContainerStoreKey(cookieStoreId) {
-      const storagePrefix = "identitiesState@@_";
-      return `${storagePrefix}${cookieStoreId}`;
-    },
-
-    async get(cookieStoreId) {
-      const storeKey = this.getContainerStoreKey(cookieStoreId);
-      const storageResponse = await this.area.get([storeKey]);
-      if (storageResponse && storeKey in storageResponse) {
-        return storageResponse[storeKey];
-      }
-      return null;
-    },
-
-    set(cookieStoreId, data) {
-      const storeKey = this.getContainerStoreKey(cookieStoreId);
-      return this.area.set({
-        [storeKey]: data
-      });
-    },
-
-    remove(cookieStoreId) {
-      const storeKey = this.getContainerStoreKey(cookieStoreId);
-      return this.area.remove([storeKey]);
-    }
-  },
-
-  async _isKnownContainer(userContextId) {
-    const cookieStoreId = backgroundLogic.cookieStoreId(userContextId);
-    const state = await this.storageArea.get(cookieStoreId);
-    return !!state;
-  },
-
-  _createTabObject(tab) {
-    return Object.assign({}, tab);
-  },
-
-  async storeHidden(cookieStoreId) {
-    const containerState = await this.storageArea.get(cookieStoreId);
-    const tabsByContainer = await this._matchTabsByContainer(cookieStoreId);
-    tabsByContainer.forEach((tab) => {
-      const tabObject = this._createTabObject(tab);
-      // This tab is going to be closed. Let's mark this tabObject as
-      // non-active.
-      tabObject.active = false;
-      tabObject.hiddenState = true;
-      containerState.hiddenTabs.push(tabObject);
-    });
-
-    return this.storageArea.set(cookieStoreId, containerState);
-  },
-
-  async containersCounts() {
-    let containersCounts = { // eslint-disable-line prefer-const
-      "shown": 0,
-      "hidden": 0,
-      "total": 0
-    };
-    const containers = await browser.contextualIdentities.query({});
-    for (const id in containers) {
-      const container = containers[id];
-      await this.remapTabsIfMissing(container.cookieStoreId);
-      const containerState = await this.storageArea.get(container.cookieStoreId);
-      if (containerState.openTabs > 0) {
-        ++containersCounts.shown;
-        ++containersCounts.total;
-        continue;
-      } else if (containerState.hiddenTabs.length > 0) {
-        ++containersCounts.hidden;
-        ++containersCounts.total;
-        continue;
-      }
-    }
-    return containersCounts;
-  },
-
-  async containerTabCount(cookieStoreId) {
-    // Returns the total of open and hidden tabs with this userContextId
-    let containerTabsCount = 0;
-    await identityState.remapTabsIfMissing(cookieStoreId);
-    const containerState = await this.storageArea.get(cookieStoreId);
-    containerTabsCount += containerState.openTabs;
-    containerTabsCount += containerState.hiddenTabs.length;
-    return containerTabsCount;
-  },
-
-  async totalContainerTabsCount() {
-    // Returns the number of total open tabs across ALL containers
-    let totalContainerTabsCount = 0;
-    const containers = await browser.contextualIdentities.query({});
-    for (const id in containers) {
-      const container = containers[id];
-      const cookieStoreId = container.cookieStoreId;
-      await identityState.remapTabsIfMissing(cookieStoreId);
-      totalContainerTabsCount += await this.storageArea.get(cookieStoreId).openTabs;
-    }
-    return totalContainerTabsCount;
-  },
-
-  async totalNonContainerTabsCount() {
-    // Returns the number of open tabs NOT IN a container
-    let totalNonContainerTabsCount = 0;
-    const tabs = await browser.tabs.query({});
-    for (const tab of tabs) {
-      const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(tab.cookieStoreId);
-      if (userContextId === 0) {
-        ++totalNonContainerTabsCount;
-      }
-    }
-    return totalNonContainerTabsCount;
-  },
-
-  async remapTabsIfMissing(cookieStoreId) {
-    // We already know this cookieStoreId.
-    const containerState = await this.storageArea.get(cookieStoreId) || this._createIdentityState();
-
-    await this.storageArea.set(cookieStoreId, containerState);
-    await this.remapTabsFromUserContextId(cookieStoreId);
-  },
-
-  _matchTabsByContainer(cookieStoreId) {
-    return browser.tabs.query({cookieStoreId});
-  },
-
-  async remapTabsFromUserContextId(cookieStoreId) {
-    const tabsByContainer = await this._matchTabsByContainer(cookieStoreId);
-    const containerState = await this.storageArea.get(cookieStoreId);
-    containerState.openTabs = tabsByContainer.length;
-    await this.storageArea.set(cookieStoreId, containerState);
-  },
-
-  _createIdentityState() {
-    return {
-      hiddenTabs: [],
-      openTabs: 0
-    };
-  },
-};
@@ -1,27 +0,0 @@
-browser.runtime.sendMessage({
-  method: "getPreference",
-  pref: "browser.privatebrowsing.autostart"
-}).then(pbAutoStart => {
-
-  // We don't want to disable the addon if we are in auto private-browsing.
-  if (!pbAutoStart) {
-    browser.tabs.onCreated.addListener(tab => {
-      if (tab.incognito) {
-        disableAddon(tab.id);
-      }
-    });
-
-    browser.tabs.query({}).then(tabs => {
-      for (let tab of tabs) { // eslint-disable-line prefer-const
-        if (tab.incognito) {
-          disableAddon(tab.id);
-        }
-      }
-    }).catch(() => {});
-  }
-}).catch(() => {});
-
-function disableAddon(tabId) {
-  browser.browserAction.disable(tabId);
-  browser.browserAction.setTitle({ tabId, title: "Containers disabled in Private Browsing Mode" });
-}
@@ -1,177 +0,0 @@
-const messageHandler = {
-  // After the timer completes we assume it's a tab the user meant to keep open
-  // We use this to catch redirected tabs that have just opened
-  // If this were in platform we would change how the tab opens based on "new tab" link navigations such as ctrl+click
-  LAST_CREATED_TAB_TIMER: 2000,
-
-  init() {
-    // Handles messages from webextension code
-    browser.runtime.onMessage.addListener((m) => {
-      let response;
-
-      switch (m.method) {
-      case "deleteContainer":
-        response = backgroundLogic.deleteContainer(m.message.userContextId);
-        break;
-      case "createOrUpdateContainer":
-        response = backgroundLogic.createOrUpdateContainer(m.message);
-        break;
-      case "openTab":
-        // Same as open-tab for index.js
-        response = backgroundLogic.openTab(m.message);
-        break;
-      case "neverAsk":
-        assignManager._neverAsk(m);
-        break;
-      case "getAssignment":
-        response = browser.tabs.get(m.tabId).then((tab) => {
-          return assignManager._getAssignment(tab);
-        });
-        break;
-      case "getAssignmentObjectByContainer":
-        response = assignManager._getByContainer(m.message.userContextId);
-        break;
-      case "setOrRemoveAssignment":
-        // m.tabId is used for where to place the in content message
-        // m.url is the assignment to be removed/added
-        response = browser.tabs.get(m.tabId).then((tab) => {
-          return assignManager._setOrRemoveAssignment(tab.id, m.url, m.userContextId, m.value);
-        });
-        break;
-      case "sendTelemetryPayload":
-        // TODO
-        break;
-      case "sortTabs":
-        backgroundLogic.sortTabs();
-        break;
-      case "showTabs":
-        backgroundLogic.showTabs({cookieStoreId: m.cookieStoreId});
-        break;
-      case "hideTabs":
-        backgroundLogic.hideTabs({cookieStoreId: m.cookieStoreId});
-        break;
-      case "checkIncompatibleAddons":
-        // TODO
-        break;
-      case "getShieldStudyVariation":
-        // TODO
-        break;
-      case "moveTabsToWindow":
-        response = backgroundLogic.moveTabsToWindow({
-          cookieStoreId: m.cookieStoreId
-        });
-        break;
-      case "getTabs":
-        response = backgroundLogic.getTabs({
-          cookieStoreId: m.cookieStoreId
-        });
-        break;
-      case "queryIdentitiesState":
-        response = backgroundLogic.queryIdentitiesState();
-        break;
-      case "exemptContainerAssignment":
-        response = assignManager._exemptTab(m);
-        break;
-      }
-      return response;
-    });
-
-    // Handles messages from sdk code
-    const port = browser.runtime.connect();
-    port.onMessage.addListener(m => {
-      switch (m.type) {
-      case "lightweight-theme-changed":
-        themeManager.update(m.message);
-        break;
-      case "open-tab":
-        backgroundLogic.openTab(m.message);
-        break;
-      default:
-        throw new Error(`Unhandled message type: ${m.message}`);
-      }
-    });
-
-    browser.tabs.onCreated.addListener((tab) => {
-      // This works at capturing the tabs as they are created
-      // However we need onFocusChanged and onActivated to capture the initial tab
-      if (tab.id === -1) {
-        return {};
-      }
-      tabPageCounter.initTabCounter(tab);
-    });
-
-    browser.tabs.onRemoved.addListener((tabId) => {
-      if (tabId === -1) {
-        return {};
-      }
-      tabPageCounter.sendTabCountAndDelete(tabId);
-    });
-
-    browser.tabs.onActivated.addListener((info) => {
-      assignManager.removeContextMenu();
-      browser.tabs.get(info.tabId).then((tab) => {
-        tabPageCounter.initTabCounter(tab);
-        assignManager.calculateContextMenu(tab);
-      }).catch((e) => {
-        throw e;
-      });
-    });
-
-    browser.windows.onFocusChanged.addListener((windowId) => {
-      assignManager.removeContextMenu();
-      // browserAction loses background color in new windows ...
-      // https://bugzil.la/1314674
-      // https://github.com/mozilla/testpilot-containers/issues/608
-      // ... so re-call displayBrowserActionBadge on window changes
-      badge.displayBrowserActionBadge();
-      browser.tabs.query({active: true, windowId}).then((tabs) => {
-        if (tabs && tabs[0]) {
-          tabPageCounter.initTabCounter(tabs[0]);
-          assignManager.calculateContextMenu(tabs[0]);
-        }
-      }).catch((e) => {
-        throw e;
-      });
-    });
-
-    browser.idle.onStateChanged.addListener((newState) => {
-      browser.tabs.query({}).then(tabs => {
-        for (let tab of tabs) { // eslint-disable-line prefer-const
-          if (newState === "idle") {
-            tabPageCounter.sendTabCountAndDelete(tab.id, "user-went-idle");
-          } else if (newState === "active" && tab.active) {
-            tabPageCounter.initTabCounter(tab);
-          }
-        }
-      }).catch(e => {
-        throw e;
-      });
-    });
-
-    browser.webRequest.onCompleted.addListener((details) => {
-      if (details.frameId !== 0 || details.tabId === -1) {
-        return {};
-      }
-      assignManager.removeContextMenu();
-
-      browser.tabs.get(details.tabId).then((tab) => {
-        tabPageCounter.incrementTabCount(tab);
-        assignManager.calculateContextMenu(tab);
-      }).catch((e) => {
-        throw e;
-      });
-    }, {urls: ["<all_urls>"], types: ["main_frame"]});
-
-    // lets remember the last tab created so we can close it if it looks like a redirect
-    browser.tabs.onCreated.addListener((details) => {
-      this.lastCreatedTab = details;
-      setTimeout(() => {
-        this.lastCreatedTab = null;
-      }, this.LAST_CREATED_TAB_TIMER);
-    });
-
-  }
-};
-
-// Lets do this last as theme manager did a check before connecting before
-messageHandler.init();
@@ -1,65 +0,0 @@
-// eslint-disable-next-line no-unused-vars
-const tabPageCounter = {
-  counters: {},
-
-  initTabCounter(tab) {
-    if (tab.id in this.counters) {
-      if (!("activity" in this.counters[tab.id])) {
-        this.counters[tab.id].activity = {
-          "cookieStoreId": tab.cookieStoreId,
-          "pageRequests": 0
-        };
-      }
-      if (!("tab" in this.counters[tab.id])) {
-        this.counters[tab.id].tab = {
-          "cookieStoreId": tab.cookieStoreId,
-          "pageRequests": 0
-        };
-      }
-    } else {
-      this.counters[tab.id] = {};
-      this.counters[tab.id].tab = {
-        "cookieStoreId": tab.cookieStoreId,
-        "pageRequests": 0
-      };
-      this.counters[tab.id].activity = {
-        "cookieStoreId": tab.cookieStoreId,
-        "pageRequests": 0
-      };
-    }
-  },
-
-  sendTabCountAndDelete(tabId, why = "user-closed-tab") {
-    if (!(this.counters[tabId])) {
-      return;
-    }
-    if (why === "user-closed-tab" && this.counters[tabId].tab) {
-      backgroundLogic.sendTelemetryPayload({
-        event: "page-requests-completed-per-tab",
-        userContextId: this.counters[tabId].tab.cookieStoreId,
-        pageRequestCount: this.counters[tabId].tab.pageRequests
-      });
-      // When we send the ping because the user closed the tab,
-      // delete both the 'tab' and 'activity' counters
-      delete this.counters[tabId];
-    } else if (why === "user-went-idle" && this.counters[tabId].activity) {
-      backgroundLogic.sendTelemetryPayload({
-        event: "page-requests-completed-per-activity",
-        userContextId: this.counters[tabId].activity.cookieStoreId,
-        pageRequestCount: this.counters[tabId].activity.pageRequests
-      });
-      // When we send the ping because the user went idle,
-      // only reset the 'activity' counter
-      this.counters[tabId].activity = {
-        "cookieStoreId": this.counters[tabId].tab.cookieStoreId,
-        "pageRequests": 0
-      };
-    }
-  },
-
-  incrementTabCount(tab) {
-    this.initTabCounter(tab);
-    this.counters[tab.id].tab.pageRequests++;
-    this.counters[tab.id].activity.pageRequests++;
-  }
-};
@@ -1,51 +0,0 @@
-const THEME_BUILD_DATE = 20170630;
-const themeManager = {
-  existingTheme: null,
-  disabled: false,
-  async init() {
-    const browserInfo = await browser.runtime.getBrowserInfo();
-    if (Number(browserInfo.buildID.substring(0, 8)) >= THEME_BUILD_DATE) {
-      this.disabled = true;
-    } else {
-      this.check();
-    }
-  },
-  setPopupIcon(theme) {
-    if (this.disabled) {
-      return;
-    }
-    let icons = {
-      16: "img/container-site-d-24.png",
-      32: "img/container-site-d-48.png"
-    };
-    if (theme === "firefox-compact-dark@mozilla.org") {
-      icons = {
-        16: "img/container-site-w-24.png",
-        32: "img/container-site-w-48.png"
-      };
-    }
-    browser.browserAction.setIcon({
-      path: icons
-    });
-  },
-  check() {
-    if (this.disabled) {
-      return;
-    }
-    browser.runtime.sendMessage({
-      method: "getTheme"
-    }).then((theme) => {
-      this.update(theme);
-    }).catch(() => {
-      throw new Error("Unable to get theme");
-    });
-  },
-  update(theme) {
-    if (this.existingTheme !== theme) {
-      this.setPopupIcon(theme);
-      this.existingTheme = theme;
-    }
-  }
-};
-
-themeManager.init();
@@ -1,103 +0,0 @@
-{
-  "manifest_version": 2,
-  "name": "Containers Experiment",
-  "version": "3.0.0",
-
-  "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.",
-  "icons": {
-    "48": "img/container-site-d-48.png",
-    "96": "img/container-site-d-96.png"
-  },
-
-  "applications": {
-    "gecko": {
-      "strict_min_version": "51.0",
-      "update_url": "https://testpilot.firefox.com/files/@testpilot-containers/updates.json"
-    }
-  },
-
-  "homepage_url": "https://testpilot.firefox.com/",
-
-  "permissions": [
-    "<all_urls>",
-    "activeTab",
-    "cookies",
-    "contextMenus",
-    "contextualIdentities",
-    "history",
-    "idle",
-    "storage",
-    "tabs",
-    "webRequestBlocking",
-    "webRequest"
-  ],
-
-  "commands": {
-    "_execute_browser_action": {
-      "suggested_key": {
-        "default": "Ctrl+Period",
-        "mac": "MacCtrl+Period"
-      },
-      "description": "Open containers panel"
-    }
-  },
-
-  "browser_action": {
-    "browser_style": true,
-    "default_icon": {
-      "16": "img/container-site-d-24.png",
-      "32": "img/container-site-d-48.png"
-    },
-    "theme_icons": [
-      {
-        "size": 16,
-        "dark": "img/container-site-d-24.png",
-        "light": "img/container-site-w-24.png"
-      },
-      {
-        "size": 24,
-        "dark": "img/container-site-d-24.png",
-        "light": "img/container-site-w-24.png"
-      },
-      {
-        "size": 32,
-        "dark": "img/container-site-d-48.png",
-        "light": "img/container-site-w-48.png"
-      },
-      {
-        "size": 48,
-        "dark": "img/container-site-d-48.png",
-        "light": "img/container-site-w-48.png"
-      },
-      {
-        "size": 96,
-        "dark": "img/container-site-d-96.png",
-        "light": "img/container-site-w-96.png"
-      },
-      {
-        "size": 192,
-        "dark": "img/container-site-d-192.png",
-        "light": "img/container-site-w-192.png"
-      }
-    ],
-    "default_title": "Containers",
-    "default_popup": "popup.html"
-  },
-
-  "background": {
-    "page": "js/background/index.html"
-  },
-
-  "content_scripts": [
-    {
-      "matches": ["<all_urls>"],
-      "js": ["js/content-script.js"],
-      "css": ["css/content.css"],
-      "run_at": "document_start"
-    }
-  ],
-
-  "web_accessible_resources": [
-    "/img/container-site-d-24.png"
-  ]
-}
Author	SHA1	Message	Date
luke crouch	a2995b6c66	Merge pull request #1292 from jonathanKingston/fix-missing-favicon Add in missing favicon. Fixes #1285	2018-12-05 12:41:43 -06:00
luke crouch	ed383c8dfc	Merge pull request #1294 from jonathanKingston/badge-background-error Remove badge background error. Fixes #1293	2018-12-05 09:09:34 -06:00
luke crouch	df9b900db6	Merge pull request #1297 from jonathanKingston/6.0.1 Bump release to 6.0.1	2018-12-05 08:48:50 -06:00
luke crouch	8e611de605	Merge pull request #1295 from jonathanKingston/fix-missing-check-image Fix missing assignment check mark. Fixes #1271	2018-12-05 08:47:02 -06:00
Jonathan Kingston	0a437ff303	Bump release to 6.0.1. Fixes #1296	2018-10-21 22:33:08 +01:00
Jonathan Kingston	f7f4c320a6	Fix missing assignment check mark. Fixes #1271	2018-10-21 22:22:48 +01:00
Jonathan Kingston	5813621fb9	Remove badge background error. Fixes #1293	2018-10-21 21:25:55 +01:00
Jonathan Kingston	56fc7407da	Add in missing favicon. Fixes #1285	2018-10-21 21:13:57 +01:00
Jonathan Kingston	220b902144	Merge pull request #1275 from ShivangiKakkar/fixes-256 #256 disables edit-container button when no container is present	2018-10-21 19:45:44 +01:00
shivangikakkar	dcc3b76cda	simplifying the solution	2018-10-21 17:12:56 +05:30
shivangikakkar	752d18ffca	prevent event handler when edit containers disabled	2018-10-18 21:33:48 +05:30
luke crouch	97559dd08a	Merge pull request #1281 from hritvi/npm_fixes Fixes vulnerabilities in npm	2018-10-03 07:00:14 -05:00
hritvi	0e7363a87f	npm fixes	2018-10-03 16:16:44 +05:30
hritvi	6c62c2f599	fixes vulnerabilities in npm	2018-10-03 16:14:36 +05:30
Jonathan Kingston	884e419a7c	Merge pull request #1265 from ShivangiKakkar/fixes-1028 #1028 resolves focus name field on opening new container sub-panel	2018-10-02 18:18:05 +01:00
shivangikakkar	d7586dd4c2	resolves #256 disables edit-container button when no container is present resolve lint errors review changes	2018-10-01 00:01:50 +05:30
shivangikakkar	aada0419eb	removing event loop and using requestAnimationFrame	2018-09-30 18:17:01 +05:30
luke crouch	3d1dcd33d1	Merge pull request #1262 from ShivangiKakkar/fixes-885 #885 disables move tab to a new window when only one tab is opened	2018-09-24 14:05:27 -05:00
shivangikakkar	fe0810b048	restructuring the code acc to the review	2018-09-23 00:42:43 +05:30
shivangikakkar	e1c1ac4bd9	adds back the unnecessarily removed new line	2018-09-21 14:31:54 +05:30
shivangikakkar	7f7f221a79	fix-#1028 resolves focus name field on opening new container sub-panel	2018-09-21 14:04:43 +05:30
shivangikakkar	e57c556427	review changes	2018-09-20 23:40:22 +05:30
shivangikakkar	dd57158ab5	#885 disables move tab to a new window when only one tab is opened	2018-09-20 21:34:19 +05:30
stoically	99db192792	Merge pull request #1170 from real-or-random/master Update GitHub URLs	2018-03-31 00:04:37 +02:00
stoically	fcbee854d0	Merge pull request #1172 from stoically/add-issue-template Add ISSUE_TEMPLATE	2018-03-30 16:46:22 +02:00
stoically	fae1336467	Add ISSUE_TEMPLATE	2018-03-30 16:43:24 +02:00
Tim Ruffing	655d8f3791	Update GitHub URLs	2018-03-29 13:45:05 +02:00
luke crouch	dcc852bf17	Merge pull request #1120 from stoically/cancel-redirects-tabid-url Cancel redirects for the same requestIds and urls if originating from the same tabId	2018-03-01 14:23:29 -06:00
stoically	dab3005c6f	Cancel redirects for the same requestIds and urls if originating from the same tabId Fixes #940	2018-02-23 15:33:32 +01:00
luke crouch	ee6a54ffa2	Merge pull request #1116 from mozilla/testing-6.0.0 Version 6.0.0	2018-02-22 14:44:12 -06:00
Jonathan Kingston	601056406a	Merge pull request #1118 from stoically/tests-6.0.0 Add and fix tests for 6.0.0	2018-02-22 16:57:08 +00:00
stoically	fd72ce12b4	Fix assignment test to check for the new openerTabId property	2018-02-10 00:51:13 +01:00
stoically	6e45532f58	Add tests for external webextensions feature	2018-02-10 00:50:29 +01:00
Jonathan Kingston	61da6b5e99	Merge pull request #1117 from mozilla/jonathanKingston-patch-1 Adding an s://	2018-02-09 18:37:45 +00:00
Jonathan Kingston	e0156388e8	Adding an s://	2018-02-09 18:37:29 +00:00
Jonathan Kingston	16f1d47bf2	Merge pull request #1115 from jonathanKingston/6.0.0 Bumping version to 6.0.0 to account for latest fixes	2018-02-09 18:34:54 +00:00
Jonathan Kingston	ee647344a1	Bumping version to 6.0.0 to account for latest fixes	2018-02-09 18:33:54 +00:00
Jonathan Kingston	40426ca936	Merge pull request #1107 from stoically/tests Adding assignment feature tests	2018-02-09 18:07:20 +00:00
Jonathan Kingston	d1e9c2d1e3	Merge pull request #1066 from LoveIsGrief/1065_-_Feature_Request]_Pass_openerTabId_when_creating_tabs_in_order_to_know_the_parent Pass opener tab id when creating tabs in order to know the parent	2018-02-09 18:06:56 +00:00
Jonathan Kingston	3bd33cda99	Merge branch 'testing-6.0.0' into 1065_-_Feature_Request]_Pass_openerTabId_when_creating_tabs_in_order_to_know_the_parent	2018-02-09 18:04:58 +00:00
stoically	609f62ac7a	Allow webextensions with contextualIdentities permission to get assignment Closes #1095	2018-02-09 18:00:26 +00:00
stoically	ce84665e3a	Add management permission to manifest.json Part of #1095	2018-02-09 18:00:26 +00:00
stoically	7dceaf6679	Cancel requests with the same requestId Prevents potential redirects from opening two tabs Closes #1114	2018-02-09 17:59:23 +00:00
stoically	b6bcd99dc8	Add test for issue #940	2018-02-09 12:02:41 +01:00
stoically	9bc9509316	Added assignment feature test Part of #1107	2018-02-02 19:05:40 +01:00
luke crouch	22ec01d565	Merge pull request #1106 from timendum/master Fix for siteSettings is null	2018-01-30 14:03:06 -06:00
Timendum	a16cae0342	Fix for siteSettings is null siteSettings can be null, with this change we can avoid an exception.	2018-01-30 10:51:38 +01:00
luke crouch	f17ff7168f	Merge pull request #1055 from ericlathrop/fix-moving-pinned-tabs-to-new-window Fix #1053.	2018-01-29 11:02:14 -06:00
luke crouch	d3b22faf65	Merge pull request #1097 from crenwick/fix-unwanted-shortcut-bug Fixes #1084.	2018-01-29 10:27:16 -06:00
Charles Renwick	30e5a27eb4	Fixes #1084 . Before opening a container with the `1-9` shortcut, it ensures that the current pannel is the "containersList"	2018-01-26 13:44:46 -05:00
luke crouch	0f720ec11d	Merge pull request #1073 from tiagonbotelho/tb-fix-readme-code-wrapping Fixes code markdown wrapping under Development in the README section	2018-01-18 14:19:57 -06:00
groovecoder	0ddee7f9d0	id:@testpilot-containers to manifest.json; 5.0.1	2018-01-08 22:59:52 +00:00
Tiago Botelho	1e16e203dc	Fixes code markdown wrapping under Development in the README section	2018-01-08 20:37:35 +00:00
LoveIsGrief	af986e8880	Set the openerTabId to a tab that won't be removed/closed The tab might be removed before we can create the tab making the parent invalid. #1065 - [Feature Request] Pass openerTabId when creating tabs in order to know the parent	2018-01-05 13:51:47 +01:00
LoveIsGrief	7e04c46070	Pass the openerTabId when automatically opening tabs in containers the `openerTabId` can also be seen as the tab's parent. This is useful for extensions like https://github.com/piroor/treestyletab #1065 - [Feature Request] Pass openerTabId when creating tabs in order to know the parent	2018-01-05 13:05:32 +01:00
LoveIsGrief	166420dd86	Ignore JetBrains IDE files #1065 - [Feature Request] Pass openerTabId when creating tabs in order to know the parent	2018-01-05 13:01:43 +01:00
Eric Lathrop	d7a2b43b07	Fix #1053 . Create the new window with the default tab rather than an existing tab, then pin the default tab. This allows any pinned tabs to be moved to the new window because they're not allowed to be moved after a un-pinned tab. The default tab is automatically closed later in `moveTabsToWindow` because it's not a part of the container.	2017-12-22 11:51:11 -05:00
groovecoder	bea201a389	update README & package.json to match web-ext flow	2017-12-05 19:06:13 +00:00
Jonathan Kingston	d944116e3e	Move to a Web Extension only. Fixes #1005	2017-12-05 19:06:13 +00:00
luke crouch	4a1597c87f	Merge pull request #1021 from gaborluk/maintain-tab-active-state Maintain the active state of the redirected tab	2017-12-04 09:20:02 -06:00
Gabor Luk	f87bf2a861	Maintain the active state of the redirected tab	2017-12-02 15:25:32 +01:00
luke crouch	ef45cde290	Merge pull request #992 from crenwick/open-containers-shortcut Adds shortcut to open containers.	2017-11-28 15:59:19 -06:00
Charles Renwick	752b1c3b27	Removes shortcut for the tenth container.	2017-11-28 16:17:48 -05:00
Charles Renwick	cf26d8547a	Consolidates switch pattern for shortcut keys. Applies @groovecoder suggestions to consolidate a long switch statement.	2017-11-28 11:40:10 -05:00
Charles Renwick	1d78febafc	fixes keyCodes	2017-11-21 10:51:29 -05:00
Charles Renwick	f483119a40	Adds shortcut to open containers. Makes it more effective to open the first ten containers in the containers list. Keys 1-0 will open containers 1-10, if that container exists. Note: the plugin's popup panel does not autofocus when opened. This requires the user to focus on the panel by either clicking or pressing TAB before using shortcut keys. This behavior is consistent with the previous shortcuts for this addon.	2017-11-21 10:26:30 -05:00
groovecoder	abd2b73fca	ignore all .sw files for jpm and git	2017-11-17 09:59:29 -06:00
luke crouch	31ac365e6d	Merge pull request #974 from mozilla/bump-version-to-4.1.0 bump version to 4.1.0	2017-11-16 09:50:59 -06:00
groovecoder	df8471a4dd	bump version to 4.1.0	2017-11-16 09:47:18 -06:00
groovecoder	18539f2540	ignore webextension/web-ext-artifacts	2017-11-16 15:38:34 +00:00
Jonathan Kingston	7c1105a2b7	Change (un)install changes to only work for >57. Fixes #858 and Fixes #900	2017-11-16 15:38:34 +00:00
groovecoder	31298146f3	when user reaches container tab count, show achievement panel	2017-11-16 15:30:02 +00:00
groovecoder	4e6eee220c	start containerTabsOpened counter	2017-11-16 15:30:02 +00:00
baku	a7be3c9935	TextEncoder/TextDecoder from Cu.importGlobalProperties - #949	2017-11-14 19:36:34 +00:00
luke crouch	f512473986	Merge pull request #882 from mozilla/update-README-distribute-steps add steps for signing, AMO, and GitHub to README	2017-09-29 14:21:22 -05:00
groovecoder	8166a37722	add steps for signing, AMO, and GitHub to README	2017-09-29 13:15:16 -05:00
groovecoder	adadb98482	bump version to 4.0.3	2017-09-29 18:04:53 +01:00
luke crouch	25e760cd64	Merge pull request #879 from jonathanKingston/fix-disable-notice Clean up disabled Private Mode notice. Fixes #878	2017-09-29 11:24:24 -05:00
luke crouch	0ff8e17005	Merge pull request #870 from jonathanKingston/delete-non-existent-container Fix assignment of stale containers. Fixes #803	2017-09-29 11:06:03 -05:00
Jonathan Kingston	c433c6b39e	Clean up disabled Private Mode notice. Fixes #878	2017-09-29 16:59:51 +01:00
Jonathan Kingston	1c09c29104	Fix assignment of stale containers. Fixes #803 Fixes #827	2017-09-27 13:51:40 +01:00
luke crouch	c1e9cc3c56	Merge pull request #859 from jonathanKingston/prevent-enter-handler-calling-click Preventing default on enter handler as it seems to call click handler…	2017-09-26 10:46:53 -05:00
luke crouch	27296d24c5	Merge pull request #857 from jonathanKingston/change-wording Change delete title to remove. Fixes #700	2017-09-26 10:38:57 -05:00
luke crouch	030e635417	Merge pull request #853 from jonathanKingston/bump-version-and-min-ff-version Add strict min version and extension id and bump version to 4.0.2. Fixes	2017-09-26 10:37:21 -05:00
Jonathan Kingston	07711aaecc	Preventing default on enter handler as it seems to call click handlers now. Fixes #856	2017-09-26 11:16:58 +01:00
Jonathan Kingston	16ed8992e2	Change delete title to remove. Fixes #700	2017-09-26 02:50:10 +01:00
Jonathan Kingston	88e6dc7a05	Add strict min version and extension id and bump version to 4.0.2. Fixes #692 . Fixes #852	2017-09-23 23:36:24 +01:00
luke crouch	28e8d46743	Merge pull request #834 from jonathanKingston/storage-clean Store only one of the current version opened. Fixes #833	2017-09-20 15:47:06 -05:00
Jonathan Kingston	77ba1b723f	Store only one of the current version opened. Fixes #833	2017-09-20 02:26:50 +01:00
Jonathan Kingston	b0cc6e7c2f	Merge pull request #818 from jonathanKingston/update-readme-launch-notice Minor README edit	2017-09-15 00:17:42 +01:00
Jonathan Kingston	e84e482130	Minor README edit	2017-09-15 00:17:05 +01:00
Jonathan Kingston	b5ae20b874	Merge pull request #817 from jonathanKingston/update-readme-launch-notice Add launch notice in README	2017-09-14 23:16:55 +01:00
Jonathan Kingston	3ec81e3d1f	Add launch notice in README	2017-09-14 23:15:01 +01:00
luke crouch	fb5436c287	Merge pull request #815 from jonathanKingston/blob-image Fix dumping UUID image into the page. Fixes #812	2017-09-13 20:04:05 -05:00
Jonathan Kingston	01a628822b	Fix dumping UUID image into the page. Fixes #812	2017-09-14 01:48:32 +01:00
Jonathan Kingston	66e2c8e297	Merge pull request #811 from mozilla/bump-version-4.0.2 bump version to 4.0.2	2017-09-13 22:32:54 +01:00
groovecoder	80661d68f2	fix #809 : use "Containers" for name for context menu	2017-09-13 16:16:43 -05:00
groovecoder	ef8aa3be75	bump version to 4.0.2	2017-09-13 10:07:56 -05:00
luke crouch	6bc056e019	Merge pull request #794 from jonathanKingston/hide-button-in-queue Add show button to use showing queue to prevent dupes. Fixes #793	2017-09-07 14:28:47 -05:00
Jonathan Kingston	75deab139b	Fix a moving hidden tabs to a new window. Fixes #797	2017-09-07 12:03:28 -07:00
Jonathan Kingston	ae79f0a303	Ignore non permissible urls when hiding as we can't open them which causes issues. Fixes #793	2017-09-07 10:12:25 -07:00
Jonathan Kingston	9b83068234	Add show button to use showing queue to prevent dupes. Fixes #791	2017-09-07 09:25:13 -07:00
luke crouch	fec2be9429	Merge pull request #789 from jonathanKingston/encode-url-fix Encode non conforming chars that break moz-extension urls. Fixes #787	2017-09-07 09:05:16 -05:00
luke crouch	9f1b06ddd3	Merge pull request #790 from jonathanKingston/jpm-ignore-more Ignore more files with .jpmignore	2017-09-06 14:46:45 -05:00
Jonathan Kingston	ad2198e8b5	Encode non conforming chars that break moz-extension urls. Fixes #787	2017-09-05 17:10:07 -07:00
Jonathan Kingston	1791fdf0ef	Ignore more files with .jpmignore	2017-09-05 17:09:36 -07:00
luke crouch	4ab705081e	Merge pull request #788 from mozilla/bump-version-to-4.0.0 bump version to 4 for AMO	2017-09-05 14:25:57 -05:00
groovecoder	15b9dce1a9	AMO needs another version bump	2017-09-05 14:23:33 -05:00
groovecoder	da3fc2ede2	bump version to 4.0.0	2017-09-05 13:33:34 -05:00
luke crouch	385c585888	Merge pull request #784 from jonathanKingston/fix-new-tab Simplify new tab creation in the popup fixing issues. Fixes #781	2017-09-05 13:30:34 -05:00
luke crouch	734b97beb0	Merge pull request #786 from jonathanKingston/name-change Name change. Fixes #763	2017-09-05 10:15:53 -05:00
Jonathan Kingston	3aa311a3c1	Name change. Fixes #763	2017-09-01 15:16:56 -07:00
Jonathan Kingston	df7d7f9c38	Simplify new tab creation in the popup fixing issues. Fixes #781	2017-09-01 12:27:40 -07:00
luke crouch	65be77665a	Merge pull request #783 from jonathanKingston/reset-prefs-on-uninstall Reset prefs on uninstall	2017-09-01 11:08:06 -05:00
luke crouch	44548659db	Merge pull request #780 from jonathanKingston/apply-styles-to-legacy Add styles for 55+56 versions of Firefox so everyone gets a consisten…	2017-09-01 11:01:02 -05:00
Jonathan Kingston	10c4395efd	Reset prefs for new users on uninstall. Fixes #782	2017-08-31 15:00:40 -07:00
Jonathan Kingston	27b2a4b5f2	Add styles for 55+56 versions of Firefox so everyone gets a consistent underline. Fixes #779	2017-08-31 11:58:03 -07:00
luke crouch	6f54e7ff7f	Merge pull request #776 from jonathanKingston/context-menu-neaten Add move and hide to context menu and neaten using checkboxes. Fixes …	2017-08-30 15:48:38 -05:00
Jonathan Kingston	cb6726b667	Add move and hide to context menu and neaten using checkboxes. Fixes #711	2017-08-30 13:20:57 -07:00
luke crouch	0964311fa1	Merge pull request #778 from jonathanKingston/web-ext-advice Add web extension specific advice on building. Fixes #751	2017-08-30 15:13:44 -05:00
luke crouch	2831d019f5	Merge pull request #777 from jonathanKingston/container-removal-fixes Handle removing containers to refresh menus and remove assignments. F…	2017-08-30 15:13:03 -05:00
luke crouch	1cc58cad9b	Merge pull request #775 from jonathanKingston/remove-unusable-paths-on-show Remove about: paths from showTabs as it prevents the tabs being creat…	2017-08-30 15:00:26 -05:00
luke crouch	bc9660f76e	Merge pull request #774 from jonathanKingston/hidden-tab-open Add a tab observer to show hidden tabs as there are many tab creation…	2017-08-30 14:55:06 -05:00
Jonathan Kingston	f526caca50	Add web extension specific advice on building. Fixes #751	2017-08-30 11:12:55 -07:00
Jonathan Kingston	b6a98fb83e	Handle removing containers to refresh menus and remove assignments. Fixes: #761 , Fixes: #752	2017-08-28 21:55:29 -07:00
Jonathan Kingston	af2b4b79a9	Remove about: paths from showTabs as it prevents the tabs being created. Fixes #773	2017-08-28 17:46:55 -07:00
Jonathan Kingston	a762b5eca2	Add a tab observer to show hidden tabs as there are many tab creation routes. Uses a queue to prevent multiple triggers. Fixes #765	2017-08-28 17:07:46 -07:00
luke crouch	3cc40344af	Merge pull request #760 from jonathanKingston/removalOfTabPageCounter Removal of tab page counter code. Fixes #759	2017-08-25 11:44:51 -05:00
luke crouch	278cdb7f69	Merge pull request #762 from jonathanKingston/change-to-window-only Remove tab counting code as also not needed, change tab counting to b…	2017-08-25 11:27:45 -05:00
Jonathan Kingston	0be03ebeb7	Remove tab counting code as also not needed, change tab counting to be per window. Prevent reopening of hidden tabs doesn't call itself. Fixes #750 , Fixes #753 , Fixes #756	2017-08-24 16:05:14 +01:00
Jonathan Kingston	c69f37a2de	Removal of tab page counter code. Fixes #759	2017-08-24 15:04:47 +01:00
Jonathan Kingston	b20ac8169a	Merge pull request #758 from mozilla/move-to-AMO-665 for #665: update title, desc, version for AMO	2017-08-24 15:02:43 +01:00
groovecoder	9e98d35b45	for #665 : update title, desc, version for AMO	2017-08-23 12:53:23 -05:00
luke crouch	17f2781e07	Merge pull request #757 from jonathanKingston/remove-pb-mode Extension shouldn't be enabled in pb mode as it's currently not worki…	2017-08-23 12:48:38 -05:00
luke crouch	0acf9cc0e6	Merge pull request #754 from jonathanKingston/move-containers-fix Fix moving of more than one tab to a new window. Fixes #746	2017-08-23 12:40:11 -05:00
Jonathan Kingston	70573d0559	Extension shouldn't be enabled in pb mode as it's currently not working in many places. Fixes #756	2017-08-23 15:23:49 +01:00
Jonathan Kingston	da239237f7	Fix moving of more than one tab to a new window. Fixes #746	2017-08-22 18:54:32 +01:00
luke crouch	29f078d2c9	Merge pull request #726 from jonathanKingston/bootstrapify Bootstrapify	2017-08-15 16:31:13 -05:00
Jonathan Kingston	5704a21c97	Merge remote-tracking branch 'upstream/master' into bootstrapify	2017-08-15 22:24:32 +01:00
Jonathan Kingston	57a31f7f97	Remove legacy telemetry code as non functional now	2017-08-15 19:30:57 +01:00
Jonathan Kingston	d685a58d74	Bootstrapify extension to work for Firefox Nightly 57 SDK removal. Fixes #725	2017-08-15 16:53:43 +01:00
Jonathan Kingston	a44bf21582	Merge pull request #713 from jonathanKingston/svg-icon-context-change Svg icon context change	2017-08-15 10:50:44 +01:00
luke crouch	8f8fc322eb	Merge pull request #715 from jonathanKingston/remove-legacy-css Removal of legacy CSS for builds after 2015-08-06. Fixes #714	2017-08-07 14:05:51 -05:00
Jonathan Kingston	f03404ad9e	Removal of legacy CSS for builds after 2015-08-06. Fixes #714	2017-08-07 19:50:37 +01:00
Jonathan Kingston	78b5de3b44	Adding in SVG icon for context-fill colours. Fixes #710	2017-08-05 10:28:27 +01:00
Jonathan Kingston	e78f49bec5	Making icons sharper since hand crafting your own svg was cool.	2017-08-05 09:59:45 +01:00
				`@@ -0,0 +1 @@`
				<svg width="32px" height="33px" viewBox="0 0 32 33" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch --> <desc>Created with Sketch.</desc> <defs> <linearGradient x1="74.0423237%" y1="18.5882821%" x2="0%" y2="100%" id="linearGradient-1"> <stop stop-color="#00FEFF" offset="0%"/> <stop stop-color="#3D85FF" offset="100%"/> </linearGradient> </defs> <g id="Specs" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="Header-Copy" transform="translate(-182.000000, -152.000000)" fill="url(#linearGradient-1)"> <path d="M205.58574,176.859518 L205.58574,169.287998 C205.58574,169.287998 205.800116,167.315137 207.086372,167.315137 C208.372629,167.315137 208.265441,169.394639 210.677171,169.394639 C211.909834,169.394639 214,168.754792 214,165.022352 C214,161.289912 211.909834,160.810027 210.677171,160.810027 C208.265441,160.810027 208.372629,162.782888 207.086372,162.782888 C205.800116,162.782888 205.58574,160.756707 205.58574,160.756707 L205.58574,157.664114 C205.58574,156.491061 204.621048,155.531291 203.44198,155.531291 L197.814608,155.531291 C197.814608,155.531291 195.992412,155.211368 195.992412,153.931674 C195.992412,152.65198 198.028985,152.545339 198.028985,150.145914 C198.028985,148.91954 197.332262,147 193.580682,147 C189.829101,147 189.293161,148.91954 189.293161,150.145914 C189.293161,152.545339 191.115357,152.65198 191.115357,153.931674 C191.115357,155.211368 189.293161,155.531291 189.293161,155.531291 L184.148135,155.531291 C182.969067,155.531291 182.004375,156.491061 182.004375,157.664114 L182.004375,161.823118 C182.004375,161.823118 181.789999,165.022352 184.362512,165.022352 C186.023926,165.022352 186.07752,162.836209 188.274874,162.836209 C189.346755,162.836209 190.418635,163.8493 190.418635,166.035443 C190.418635,168.274907 189.346755,169.394639 188.274874,169.394639 C186.131114,169.394639 186.023926,167.208496 184.362512,167.208496 C181.789999,167.208496 182.004375,170.301089 182.004375,170.301089 L182.004375,176.859518 C182.004375,178.032571 182.969067,178.992341 184.148135,178.992341 L191.115357,178.992341 C191.115357,178.992341 194.49178,179.205623 194.49178,176.646236 C194.49178,174.993299 192.348019,174.726696 192.348019,172.540552 C192.348019,171.474141 193.527088,170.141127 195.778036,170.141127 C198.028985,170.141127 199.315241,171.474141 199.315241,172.540552 C199.315241,174.673375 197.225074,174.993299 197.225074,176.646236 C197.225074,179.258944 200.601497,178.992341 200.601497,178.992341 L203.44198,178.992341 C204.621048,178.992341 205.58574,178.032571 205.58574,176.859518 Z" id="Shape-Copy-23" transform="translate(198.000000, 163.000000) rotate(-42.000000) translate(-198.000000, -163.000000) "/> </g> </g> </svg>