Adds support for Honey, and resolves a couple bugs

Author: jonathansampson

app/common/state/extensionState.js

@@ -76,7 +76,7 @@ const extensionState = {
 
   browserActionBackgroundImage: (browserAction, tabId) => {
     tabId = tabId ? tabId.toString() : '-1'
-    let path = browserAction.get('path')
+    let path = browserAction.getIn(['tabs', tabId, 'path']) || browserAction.get('path')
     let basePath = browserAction.get('base_path')
     if (path && basePath) {
       // Older extensions may provide a string path

app/extensions.js

@@ -516,6 +516,12 @@ module.exports.init = () => {
       disableExtension(config.vimiumExtensionId)
     }
 
+    if (getSetting(settings.HONEY_ENABLED)) {
+      registerComponent(config.honeyExtensionId)
+    } else {
+      disableExtension(config.honeyExtensionId)
+    }
+
     if (appStore.getState().getIn(['widevine', 'enabled'])) {
       registerComponent(config.widevineComponentId)
     }

app/renderer/components/navigation/navigator.js

@@ -102,13 +102,17 @@ class Navigator extends ImmutableComponent {
       .map((extension) => extensionState.getBrowserActionByTabId(this.props.appState, extension.get('id'), activeTabId))
       .filter((browserAction) => browserAction)
 
-    let buttons = extensionBrowserActions.map((browserAction, id) =>
-      <BrowserAction
-        browserAction={browserAction}
+    let buttons = extensionBrowserActions.map((browserAction, id) => {
+      let tabAction = browserAction.getIn(['tabs', activeTabId.toString()])
+      if (tabAction) {
+        tabAction = tabAction.set('base_path', browserAction.get('base_path'))
+      }
+      return <BrowserAction
+        browserAction={tabAction || browserAction}
         extensionId={id}
         tabId={activeTabId}
         popupWindowSrc={this.props.windowState.getIn(['popupWindowDetail', 'src'])} />
-    ).values()
+    }).values()
     buttons = Array.from(buttons)
     if (buttons.length > 0) {
       buttons.push(<span className='buttonSeparator' />)

docs/state.md

@@ -172,6 +172,7 @@ AppStore
     'bookmarks.toolbar.showOnlyFavicon': boolean, // true if only favicons should be shown on the bookmarks toolbar
     'extensions.pocket.enabled': boolean, // true if pocket is enabled
     'extensions.vimium.enabled': boolean, // true if vimium is enabled
+    'extensions.honey.enabled': boolean, // true if Honey is enabled
     'general.autohide-menu': boolean, // true if the Windows menu should be autohidden
     'general.bookmarks-toolbar-mode': boolean, // true to show bookmakrs toolbar
     'general.check-default-on-startup': boolean, // true to check whether brave is default browser on startup

js/constants/appConfig.js

@@ -198,6 +198,7 @@ module.exports = {
     'shutdown.clear-site-settings': false,
     'extensions.pocket.enabled': false,
     'extensions.vimium.enabled': false,
+    'extensions.honey.enabled': false,
     'general.bookmarks-toolbar-mode': null,
     'general.is-default-browser': null,
     'notification-add-funds-timestamp': null,

js/constants/config.js

@@ -50,6 +50,7 @@ module.exports = {
   PDFJSExtensionId: 'jdbefljfgobbmcidnmpjamcbhnbphjnb',
   PocketExtensionId: 'niloccemoadcdkdjlinkgdfekeahmflj',
   vimiumExtensionId: 'dbepggeogbaibhgnhhndojpepiihcmeb',
+  honeyExtensionId: 'bmnlcjabgnpnenekpadlanbbkooimhnj',
   widevineComponentId: 'oimompecagnajdejgnnjijobebaeigek',
   coinbaseOrigin: 'https://buy.coinbase.com',
   newtab: {

js/constants/settings.js

@@ -94,7 +94,8 @@ const settings = {
   SHOW_BOOKMARKS_TOOLBAR_FAVICON: 'bookmarks.toolbar.showFavicon',
   SHOW_BOOKMARKS_TOOLBAR_ONLY_FAVICON: 'bookmarks.toolbar.showOnlyFavicon',
   POCKET_ENABLED: 'extensions.pocket.enabled',
-  VIMIUM_ENABLED: 'extensions.vimium.enabled'
+  VIMIUM_ENABLED: 'extensions.vimium.enabled',
+  HONEY_ENABLED: 'extensions.honey.enabled'
 }
 
 module.exports = settings

test/about/extensionsTest.js

@@ -49,6 +49,19 @@ describe('about:extensions', function () {
         .url(pocketURL)
     })
   })
+  describe('Honey', function () {
+    Brave.beforeAll(this)
+    before(function * () {
+      yield setup(this.app.client)
+    })
+    it('installs when preference is enabled', function * () {
+      yield this.app.client
+        .windowByUrl(Brave.browserWindowUrl)
+        .changeSetting(settingsConst.HONEY_ENABLED, true)
+        .tabByIndex(0)
+        .waitForVisible('[data-extension-id="bmnlcjabgnpnenekpadlanbbkooimhnj"]', extensionDownloadWaitTime)
+    })
+  })
   describe('Vimium', function () {
     Brave.beforeAll(this)
     before(function * () {