Remove onboarding icon. (mozilla-services#3542)

chenba · Nov 9, 2017 · 00f0409 · 00f0409
1 parent 00192a8
commit 00f0409
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 23 deletions.
diff --git a/addon/webextension/background/main.js b/addon/webextension/background/main.js
@@ -53,9 +53,6 @@ this.main = (function() {
 
   function setIconActive(active, tabId) {
     let path = active ? "icons/icon-highlight-32-v2.svg" : "icons/icon-32-v2.svg";
-    if ((!hasSeenOnboarding) && !active) {
-      path = "icons/icon-starred-32-v2.svg";
-    }
     startBackground.photonPageActionPort.postMessage({
       type: "setProperties",
       iconPath: path

diff --git a/addon/webextension/background/startBackground.js b/addon/webextension/background/startBackground.js
@@ -45,24 +45,6 @@ this.startBackground = (function() {
     });
   });
 
-  // Note this duplicates functionality in main.js, but we need to change
-  // the onboarding icon before main.js loads up
-  let iconPath = null;
-  browser.storage.local.get(["hasSeenOnboarding"]).then((result) => {
-    let hasSeenOnboarding = !!result.hasSeenOnboarding;
-    if (!hasSeenOnboarding) {
-      iconPath = "icons/icon-starred-32-v2.svg";
-      if (photonPageActionPort) {
-        photonPageActionPort.postMessage({
-          type: "setProperties",
-          iconPath
-        });
-      }
-    }
-  }).catch((error) => {
-    console.error("Error loading Screenshots onboarding flag:", error);
-  });
-
   browser.runtime.onMessage.addListener((req, sender, sendResponse) => {
     loadIfNecessary().then(() => {
       return communication.onMessage(req, sender, sendResponse);
@@ -150,7 +132,7 @@ this.startBackground = (function() {
     photonPageActionPort.postMessage({
       type: "setProperties",
       title: browser.i18n.getMessage("contextMenuLabel"),
-      iconPath
+      iconPath: "icons/icon-starred-32-v2.svg"
     });
 
     // Export these so that main.js can use them.

diff --git a/addon/webextension/icons/icon-starred-32-v2.svg b/addon/webextension/icons/icon-starred-32-v2.svg