Disable the Vimium browser action until we can polish it some more and get a new icon.

Sorry dmac! Next release.

2 files changed, 5 insertions, 6 deletions

diff --git a/background_page.html b/background_page.html
index c3b170f8..c6d4206b 100644
--- a/background_page.html
+++ b/background_page.html
@@ -392,11 +392,14 @@
    * 3. Active tab is enabled but should be disabled -> disable icon and disable vimium
    */
   function updateActiveState(tabId) {
+    // TODO(philc): Re-enable once we've restyled the browser action icon.
+    return;
     var enabledIcon = "icons/icon48.png";
     var disabledIcon = "icons/icon48disabled.png";
     chrome.tabs.get(tabId, function(tab) {
       // Default to disabled state in case we can't connect to Vimium, primarily for the "New Tab" page.
-      chrome.browserAction.setIcon({ path: disabledIcon });
+      // TODO(philc): Re-enable once we've restyled the browser action icon.
+      // chrome.browserAction.setIcon({ path: disabledIcon });
       var returnPort = chrome.tabs.connect(tabId, { name: "getActiveState" });
       returnPort.onMessage.addListener(function(response) {
         var isCurrentlyEnabled = response.enabled;
diff --git a/manifest.json b/manifest.json
index 5cfca600..c53a02bd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -29,9 +29,5 @@
       "run_at": "document_start",
       "all_frames": true
     }
-  ],
-  "browser_action": {
-    "default_icon": "icons/icon48disabled.png",
-    "popup": "popup.html"
-  }
+  ]
 }