From a43eb72e761ac2d4b89611d58223b37352455e0f Mon Sep 17 00:00:00 2001
From: Will Bamberg <wbamberg@mozilla.com>
Date: Fri, 28 Apr 2017 10:08:03 -0700
Subject: [PATCH] Fix for issue 197: make content script load using manifest
 key instead of executeScript

---
 cookie-bg-picker/background_scripts/background.js | 8 +-------
 cookie-bg-picker/manifest.json                    | 9 ++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cookie-bg-picker/background_scripts/background.js b/cookie-bg-picker/background_scripts/background.js
index fb0640a..fc8eca9 100644
--- a/cookie-bg-picker/background_scripts/background.js
+++ b/cookie-bg-picker/background_scripts/background.js
@@ -8,19 +8,13 @@ function getActiveTab() {
 
 function cookieUpdate(tabId, changeInfo, tab) {
   getActiveTab().then((tabs) => {
-    /* inject content script into current tab */
-
-    browser.tabs.executeScript(null, {
-      file: "/content_scripts/updatebg.js"
-    });
-
     // get any previously set cookie for the current tab 
     var gettingCookies = browser.cookies.get({
       url: tabs[0].url,
       name: "bgpicker"
     });
     gettingCookies.then((cookie) => {
-      if(cookie) {
+      if (cookie) {
         var cookieVal = JSON.parse(cookie.value);
         browser.tabs.sendMessage(tabs[0].id, {image: cookieVal.image});
         browser.tabs.sendMessage(tabs[0].id, {color: cookieVal.color});
diff --git a/cookie-bg-picker/manifest.json b/cookie-bg-picker/manifest.json
index 4e5c915..e626e70 100644
--- a/cookie-bg-picker/manifest.json
+++ b/cookie-bg-picker/manifest.json
@@ -36,5 +36,12 @@
 
   "background": {
     "scripts": ["background_scripts/background.js"]
-  }
+  },
+
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": ["content_scripts/updatebg.js"]
+    }
+  ]
 }