Merge pull request brave#9546 from andrewalker/master

Re-enable Enpass password manager
evq · Jun 19, 2017 · 4688b1c · 4688b1c
2 parents 8ead2c8 + be5a9bd
commit 4688b1c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/extensions/brave/img/extensions/enpass-128.png b/app/extensions/brave/img/extensions/enpass-128.png
diff --git a/app/renderer/lib/extensionsUtil.js b/app/renderer/lib/extensionsUtil.js
@@ -39,7 +39,11 @@ const dummyData = [
     name: 'dashlane',
     description: 'dashlaneDesc',
     icon: 'img/extensions/dashlane-128.png'
-  // { id: enpass // TBD },
+  }, {
+    id: enpass,
+    name: 'enpass',
+    description: 'enpassDesc',
+    icon: 'img/extensions/enpass-128.png'
   }, {
     id: lastpass,
     name: 'lastpass',

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -637,7 +637,7 @@ class SecurityTab extends ImmutableComponent {
             <option data-l10n-id='dashlane' value={passwordManagers.DASHLANE} />
             <option data-l10n-id='lastPass' value={passwordManagers.LAST_PASS} />
             <option data-l10n-id='bitwarden' value={passwordManagers.BITWARDEN} />
-            { /* <option data-l10n-id='enpass' value={passwordManagers.ENPASS} /> */ }
+            <option data-l10n-id='enpass' value={passwordManagers.ENPASS} />
             <option data-l10n-id='doNotManageMyPasswords' value={passwordManagers.UNMANAGED} />
           </SettingDropdown>
         </SettingItem>