Add Vimium

Auditors: @bridiver

app/extensions.js

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

app/extensions/brave/locales/en-US/preferences.properties

@@ -1,4 +1,4 @@
-preferences=Preferences
+preferences=Preferences
 settings=Settings
 general=General
 search=Search
@@ -242,6 +242,7 @@ bookmarkToolbarShowOnlyFavicon=Show only favicon
 contentSettings=Content Settings
 extensions=Extensions
 enablePocket=Enable Pocket
+enableVimium=Enable Vimium
 moreExtensionsComingSoon=More extensions coming soon…
 viewInstalledExtensions=View Installed Extensions…
 useHardwareAcceleration=Use hardware acceleration when available *
@@ -344,4 +345,4 @@ checkDefaultOnStartup=Always check on startup
 useTorrentViewer=Enable Torrent Viewer *
 dashboardSettingsTitle=Dashboard
 dashboardShowImages=Show images
-requiresRestart=* Requires browser restart
+requiresRestart=* Requires browser restart

docs/state.md

@@ -167,6 +167,7 @@ AppStore
     'bookmarks.toolbar.showFavicon': boolean, // true if bookmark favicons should be shown on the bookmarks toolbar
     '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
     '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/about/preferences.js

@@ -868,6 +868,7 @@ class AdvancedTab extends ImmutableComponent {
         <SettingCheckbox dataL10nId='usePDFJS' prefKey={settings.PDFJS_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         <SettingCheckbox dataL10nId='useTorrentViewer' prefKey={settings.TORRENT_VIEWER_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         <SettingCheckbox dataL10nId='enablePocket' prefKey={settings.POCKET_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
+        <SettingCheckbox dataL10nId='enableVimium' prefKey={settings.VIMIUM_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         <Button l10nId='viewInstalledExtensions' className='primaryButton viewExtensionsInfo'
           onClick={aboutActions.newFrame.bind(null, {
             location: 'about:extensions'

js/constants/appConfig.js

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

js/constants/config.js

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

js/constants/settings.js

@@ -88,7 +88,8 @@ const settings = {
   // > phased out with 0.12.6
   SHOW_BOOKMARKS_TOOLBAR_FAVICON: 'bookmarks.toolbar.showFavicon',
   SHOW_BOOKMARKS_TOOLBAR_ONLY_FAVICON: 'bookmarks.toolbar.showOnlyFavicon',
-  POCKET_ENABLED: 'extensions.pocket.enabled'
+  POCKET_ENABLED: 'extensions.pocket.enabled',
+  VIMIUM_ENABLED: 'extensions.vimium.enabled'
 }
 
 module.exports = settings

test/about/extensionsTest.js

@@ -49,6 +49,19 @@ describe('about:extensions', function () {
         .url(pocketURL)
     })
   })
+  describe('Vimium', 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.VIMIUM_ENABLED, true)
+        .tabByIndex(0)
+        .waitForVisible('[data-extension-id="dbepggeogbaibhgnhhndojpepiihcmeb"]', extensionDownloadWaitTime)
+    })
+  })
   describe('1Password', function () {
     Brave.beforeAll(this)
     before(function * () {