From 17e16cab439b11f331b2ecde643e7d8f65478f53 Mon Sep 17 00:00:00 2001
From: Jonathan Kingston <jonathan@jooped.co.uk>
Date: Tue, 20 Dec 2016 21:03:28 +0000
Subject: [PATCH] Link up experiment addon code to extension

---
 index.js                                 |   6 ------
 webextension-experiment/.schema.json.swp | Bin 16384 -> 0 bytes
 webextension-experiment/api.js           |   5 +++++
 webextension/js/popup.js                 |  15 ++++-----------
 4 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 webextension-experiment/.schema.json.swp

diff --git a/index.js b/index.js
index 7d96902..5898741 100644
--- a/index.js
+++ b/index.js
@@ -2,12 +2,6 @@ const webExtension = require('sdk/webextension');
 const {ContextualIdentityService} = require('resource://gre/modules/ContextualIdentityService.jsm');
 
 function handleWebExtensionMessage(message, sender, sendReply) {
-  console.log(message);
-  if (message === 'get-identities') {
-    sendReply({
-      content: {identities: ContextualIdentityService.getIdentities()}
-    });
-  }
 }
 
 webExtension.startup().then(api=> {
diff --git a/webextension-experiment/.schema.json.swp b/webextension-experiment/.schema.json.swp
deleted file mode 100644
index 584e55918188c02df0dccd474daaefff83ecd58d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
zcmeI2O^6&t6vxZxYNAF>jDk6potx~=#zd1SQ4BjK3_;LMHn_y#)^ykG)~2UxQeCsV
z!?Nl{gdlqGpa($&LHq!3Dj4G-;5pv>I(g8OXGL`JUp3v+J#Fu->ts>fYWOkz`Rdib
zt6sh8srvpiwI}G|$^!)39fXWroPIibZ##MBBq8%MVtS56=F*_;yohFFEu*T4<OEYn
za8-KybE(1cmXh<_*YUXKv2KY_>M>tNnu&<3czlu9`I6>QEMzpsms(tjCXe)Z?9cHg
ztIWr8U6)GBcPE_!TULR#Zj2q-Ne&*kf4|XSpLZ|4bNAGimBUrsDc}@v3OEIv0!{&^
zfK$LJuoV^1t!?CaRD4@f`I+SRy29`E$?=ZlmldujhwjHI;1qBQI0c*nP64NYQ@|<U
z6mSYS1)Ks-f&ZWaEU<t3lMl^=AOHW)BtEX*PRMWID{u_#0VCj#+X(pvd;u<iY4H0_
zLf!(8fvdL?@+G(oJ^}B5H^GZQfV;rzErk3Cz6F=S>!1c60SCc-zymwL&o>kD5qJZ<
z05muQ4uh}pG2#+94vv6P;DLL<F7V5CLcRm9fJN{uI0YUAcY`Z85%MlL06x2skQ3k`
zFb4L4y<j)^b%c=b!K+{i%z)G25ZDE-+(5|3;C=8iXo9_96(3D5f<54Ed|-JEyaZN&
z1|gUPhrmzJ|0?(tn0N63C~P#_mPxwrwU}Z}uCZ>ydzhZh&a=1^`8cIjn~!Fv10MTI
zv^17h;G$RMA)bvXqh|dD*KHP35n!=}&>dRuP@!X7k>>@cr?ga@)~XdRXHIuo+}LTf
zBj4K0U5ntCxu$qiF7Vz{sqZV<t>=3FQM!`bFCJ0q3HS-4%U)V?tQD4@c%#&lwpJ{}
zWm{?L6)Jmrj#KkIl?|$~Z>zl2SLcdXZ~#U6GL&kVGOdAi3eCizcJmVT{&7Xk^BXGD
z!=fB4wb6o`mXyAw#G8VWRgSefA(~BHw)I+C(mKbRp}yiw^B~`BjM21$cuCe)uYDvX
zrteqQ%}SxZt9jpYt;kv}IBH&btvW!5v~^?slHwKWk#6yc6KNCfb^+T1YC)ebs7UH*
z+7fdnGEax>r&Fx}BKG=ef1{;~LeJT^Fe?^#L~$$2%iZ&EP%mxU5_)w@J<sWT&3kEs
zg)v9REqP~~*G&f$x{3XCK&e}zqYl~pCu|Ja%;w*XQrD>Y4->nOi_i?_YX{X1HRdZ`
z|3JBs=v|8%QZ<<wuc?-_VM|=2K#T@S99JA8EnnEANIql(nM|BR6A8nTf!z#h*%14;
z0^)@>SDoHN8;XZz5$*pl3S}ybTodXh0gT2N?ZY*)stsyC%d-)`t9&oR%+lO*snM(_
zWP3JmGkI$|XqV@VB|}e=?%IT4aPH9G2M6YfrR5;49FUp7dRjq~jSR|sORTRufc6_7
z5V1;(uRCPrjIR}#ihX2~w-k>t^N49#<0{S7GktnJ`Y-9CCjz9i-h`Rn*tDsZOm7NZ
z+givPmxoliDPpq(-JZnTO${XTBNI}RCRnV?RLpHSJ?hJVKU!CEG3Kh0Sx8)fg`?y4
z7JBT-nhC`==1>*|v?&A8=#)gV&L~1$EUAw`#{<gD{48BLpC)}aw~kxPxAU*Ea&6_8
z$ys9N|7KqQI56{nOq=cY1CBoj68K;mJOxgI6TsYG1#WW+I0c*nP64NYQ@|<U6mSYS
n1)Ks-0jI#0QNa8&(*5*g_RN-jh)U1&pEXCtuLl3he^q}116s2g

diff --git a/webextension-experiment/api.js b/webextension-experiment/api.js
index 4b391a8..0d17c69 100644
--- a/webextension-experiment/api.js
+++ b/webextension-experiment/api.js
@@ -3,6 +3,7 @@ const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 const {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+const CONTAINER_STORE = "firefox-container-";
 
 XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService",
                                   "resource://gre/modules/ContextualIdentityService.jsm");
@@ -18,6 +19,10 @@ function convert(identity) {
   return result;
 }
 
+function getCookieStoreIdForContainer(containerId) {
+  return CONTAINER_STORE + containerId;
+}
+
 class API extends ExtensionAPI {
   getAPI(context) {
     let self = {
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index 013dca1..f22da15 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -1,12 +1,5 @@
-const IDENTITY_L10NID_MATCH_INDEX = 1;
-
-browser.runtime.sendMessage('get-identities').then(reply=> {
-  if (reply) {
-    reply.content.identities.forEach(identity=> {
-      const identityName = identity.l10nID.match(/userContext(\w*)\.label/)[IDENTITY_L10NID_MATCH_INDEX];
-
-      document.querySelector('.identities-list').innerHTML += `<li><a href="#">${identityName}</a></li>`;
-    });
-    console.log('response from sdk addon: ', reply.content);
-  }
+browser.contextualIdentities.query({}).then((identites) => {
+  identites.forEach((identity) => {
+    document.querySelector('.identities-list').innerHTML += `<li><a href="#">${identity.icon} ${identity.name}</a></li>`;
+  });
 });