Merge pull request #8829 from kspearrin/unhidebitwarden

Unhide bitwarden password manager. resolves #7921
brave · May 11, 2017 · 6ae3be2 · 6ae3be2
2 parents 4211ee5 + fc52e8c
commit 6ae3be2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/renderer/lib/extensionsUtil.js b/app/renderer/lib/extensionsUtil.js
@@ -27,8 +27,12 @@ const vimium = config.vimiumExtensionId
  * Properties such as name and description are referenced like keys for proper l10n
  */
 const dummyData = [
-  // { id: bitwarden, // TBD },
   {
+    id: bitwarden,
+    name: 'bitwarden',
+    description: 'bitwardenDesc',
+    icon: 'img/extensions/bitwarden-128.png'
+  }, {
     id: dashlane,
     name: 'dashlane',
     description: 'dashlaneDesc',

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -617,7 +617,7 @@ class SecurityTab extends ImmutableComponent {
             <option data-l10n-id='onePassword' value={passwordManagers.ONE_PASSWORD} />
             <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='bitwarden' value={passwordManagers.BITWARDEN} />
             { /* <option data-l10n-id='enpass' value={passwordManagers.ENPASS} /> */ }
             <option data-l10n-id='doNotManageMyPasswords' value={passwordManagers.UNMANAGED} />
           </SettingDropdown>