Merge pull request #8204 from cezaraugusto/menu/8203

Add Extensions / rm Manager string from windowMenu
brave · Apr 10, 2017 · 0ec9dbd · 0ec9dbd
2 parents 6306259 + 160d01f
commit 0ec9dbd
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -421,6 +421,7 @@ const createWindowSubmenu = () => {
     CommonMenu.separatorMenuItem,
     CommonMenu.bookmarksManagerMenuItem(),
     CommonMenu.downloadsMenuItem(),
+    CommonMenu.extensionsMenuItem(),
     CommonMenu.passwordsMenuItem()
   ]
 

diff --git a/app/common/commonMenu.js b/app/common/commonMenu.js
@@ -250,6 +250,24 @@ module.exports.downloadsMenuItem = () => {
   }
 }
 
+module.exports.extensionsMenuItem = () => {
+  return {
+    label: locale.translation('extensionsManager'),
+    click: (item, focusedWindow) => {
+      if (BrowserWindow.getAllWindows().length === 0) {
+        appActions.newWindow(Immutable.fromJS({
+          location: 'about:preferences#extensions'
+        }))
+      } else {
+        appActions.maybeCreateTabRequested({
+          url: 'about:preferences#extensions',
+          windowId: getCurrentWindowId()
+        })
+      }
+    }
+  }
+}
+
 module.exports.passwordsMenuItem = () => {
   return {
     label: locale.translation('passwordsManager'),

diff --git a/app/extensions/brave/locales/en-US/menu.properties b/app/extensions/brave/locales/en-US/menu.properties
@@ -85,7 +85,7 @@ find=Find…
 checkForUpdates=Check for Updates…
 preferences=Preferences…
 settings=Settings…
-bookmarksManager=Bookmarks Manager…
+bookmarksManager=Bookmarks…
 importBrowserData=Import Browser Data…
 exportBookmarks=Export Bookmarks…
 submitFeedback=Submit Feedback…
@@ -141,8 +141,9 @@ aboutApp=About Brave
 quit=Quit
 quitApp=Quit Brave
 inspectElement=Inspect Element
-downloadsManager=Downloads Manager…
-passwordsManager=Passwords Manager…
+downloadsManager=Downloads…
+passwordsManager=Passwords…
+extensionsManager=Extensions…
 zoom=Zoom
 new=New
 learnSpelling=Learn Spelling

diff --git a/app/locale.js b/app/locale.js
@@ -220,6 +220,7 @@ var rendererIdentifiers = function () {
     'noThanks',
     'neverForThisSite',
     'passwordsManager',
+    'extensionsManager',
     'downloadItemPause',
     'downloadItemResume',
     'downloadItemCancel',

diff --git a/test/unit/app/common/commonMenuTest.js b/test/unit/app/common/commonMenuTest.js
@@ -144,6 +144,12 @@ describe('Common menu module unit tests', function () {
     })
   })
 
+  describe('extensionsMenuItem', function () {
+    it('has the expected defaults set', function () {
+      checkExpectedDefaults(commonMenu.extensionsMenuItem, false)
+    })
+  })
+
   describe('importBrowserDataMenuItem', function () {
     it('has the expected defaults set', function () {
       checkExpectedDefaults(commonMenu.importBrowserDataMenuItem, false)