Merge pull request #5350 from darkdh/5292

Set extension icon in context menu
brave · Nov 9, 2016 · f610233 · f610233
2 parents bc97dd2 + 661f0f4
commit f610233
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/app/browser/extensions/contextMenus.js b/app/browser/extensions/contextMenus.js
@@ -7,9 +7,9 @@ const contextMenus = {
         extensionActions.contextMenuAllRemoved(extensionId)
       })
     })
-    process.on('chrome-context-menus-create', (extensionId, menuItemId, properties) => {
+    process.on('chrome-context-menus-create', (extensionId, menuItemId, properties, icon) => {
       setImmediate(() => {
-        extensionActions.contextMenuCreated(extensionId, menuItemId, properties)
+        extensionActions.contextMenuCreated(extensionId, menuItemId, properties, icon)
       })
     })
   }

diff --git a/app/common/actions/extensionActions.js b/app/common/actions/extensionActions.js
@@ -85,13 +85,15 @@ const extensionActions = {
    * @param {string} extensionId - the extension id
    * @param {string} menuItemId - the id of the menu item that was clicked
    * @param {object} properties - createProperties of chrome.contextMenus.create
+   * @param {string} icon - 16x16 extension icon
    */
-  contextMenuCreated: function (extensionId, menuItemId, properties) {
+  contextMenuCreated: function (extensionId, menuItemId, properties, icon) {
     AppDispatcher.dispatch({
       actionType: ExtensionConstants.CONTEXT_MENU_CREATED,
       extensionId,
       menuItemId,
-      properties
+      properties,
+      icon
     })
   },
 

diff --git a/app/common/state/extensionState.js b/app/common/state/extensionState.js
@@ -157,11 +157,15 @@ const extensionState = {
         state = state.setIn(['extensions', action.get('extensionId'), 'contextMenus'], new Immutable.List())
       }
       let contextMenus = state.getIn(['extensions', action.get('extensionId'), 'contextMenus'])
+      let basePath = state.getIn(['extensions', action.get('extensionId'), 'base_path'])
+      basePath = decodeURI(basePath)
+      basePath = basePath.replace('file://', '')
       return state.setIn(['extensions', action.get('extensionId'), 'contextMenus'],
         contextMenus.push({
           extensionId: action.get('extensionId'),
           menuItemId: action.get('menuItemId'),
-          properties: action.get('properties').toJS()
+          properties: action.get('properties').toJS(),
+          icon: basePath + '/' + action.get('icon')
         }))
     } else {
       return state

diff --git a/js/contextMenus.js b/js/contextMenus.js
@@ -1176,7 +1176,8 @@ function mainTemplateInit (nodeProps, frame) {
                   extensionActions.contextMenuClicked(
                     extensionContextMenu.extensionId, frame.get('tabId'), info)
                 }
-              }
+              },
+              icon: extensionContextMenu.icon
             })
           templateMap[extensionContextMenu.menuItemId] = template[template.length - 1]
         }