Merge pull request #3288 from deepak1556/flash_context_menu_pathc

browser: handle flash context menu request

atom/browser/api/atom_api_app.cc

@@ -19,7 +19,7 @@
 #include "atom/browser/browser.h"
 #include "atom/browser/login_handler.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/content_converter.h"
+#include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"

atom/browser/api/atom_api_protocol.cc

@@ -12,7 +12,7 @@
 #include "atom/browser/net/url_request_fetch_job.h"
 #include "atom/browser/net/url_request_string_job.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/content_converter.h"
+#include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 

atom/browser/api/atom_api_web_contents.cc

@@ -18,6 +18,7 @@
 #include "atom/common/api/event_emitter_caller.h"
 #include "atom/common/native_mate_converters/blink_converter.h"
 #include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/content_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
@@ -405,6 +406,12 @@ void WebContents::RendererResponsive(content::WebContents* source) {
     owner_window()->RendererResponsive(source);
 }
 
+bool WebContents::HandleContextMenu(const content::ContextMenuParams& params) {
+  context_menu_context_ = params.custom_context;
+  Emit("-context-menu", params);
+  return true;
+}
+
 void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
   // Do nothing, we override this method just to avoid compilation error since
   // there are two virtual functions named BeforeUnloadFired.
@@ -841,6 +848,15 @@ void WebContents::RemoveWorkSpace(mate::Arguments* args,
   DevToolsRemoveFileSystem(path);
 }
 
+void WebContents::ExecuteContextMenuCommand(int action) {
+  web_contents()->ExecuteCustomContextMenuCommand(action,
+                                                  context_menu_context_);
+}
+
+void WebContents::NotifyContextMenuClosed() {
+  web_contents()->NotifyContextMenuClosed(context_menu_context_);
+}
+
 void WebContents::Undo() {
   web_contents()->Undo();
 }
@@ -1052,6 +1068,10 @@ mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder(
         .SetMethod("_printToPDF", &WebContents::PrintToPDF)
         .SetMethod("addWorkSpace", &WebContents::AddWorkSpace)
         .SetMethod("removeWorkSpace", &WebContents::RemoveWorkSpace)
+        .SetMethod("_executeContextMenuCommand",
+                   &WebContents::ExecuteContextMenuCommand)
+        .SetMethod("_notifyContextMenuClosed",
+                   &WebContents::NotifyContextMenuClosed)
         .SetProperty("session", &WebContents::Session, true)
         .SetProperty("devToolsWebContents",
                      &WebContents::DevToolsWebContents, true)

atom/browser/api/atom_api_web_contents.h

@@ -13,6 +13,7 @@
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/common_web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/context_menu_params.h"
 #include "content/public/common/favicon_url.h"
 #include "native_mate/handle.h"
 #include "ui/gfx/image/image.h"
@@ -92,6 +93,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void SetAudioMuted(bool muted);
   bool IsAudioMuted();
   void Print(mate::Arguments* args);
+  void ExecuteContextMenuCommand(int action);
+  void NotifyContextMenuClosed();
 
   // Print current page as PDF.
   void PrintToPDF(const base::DictionaryValue& setting,
@@ -189,6 +192,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void ExitFullscreenModeForTab(content::WebContents* source) override;
   void RendererUnresponsive(content::WebContents* source) override;
   void RendererResponsive(content::WebContents* source) override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
 
   // content::WebContentsObserver:
   void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
@@ -255,6 +259,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // embedders' zoom level change.
   void OnZoomLevelChanged(double level);
 
+  // Recent unhandled context menu context.
+  content::CustomContextMenuContext context_menu_context_;
+
   v8::Global<v8::Value> session_;
   v8::Global<v8::Value> devtools_web_contents_;
 

atom/browser/api/lib/web-contents.coffee

@@ -1,4 +1,5 @@
 EventEmitter = require('events').EventEmitter
+Menu = require './menu'
 NavigationController = require './navigation-controller'
 binding = process.atomBinding 'web_contents'
 ipc = require 'ipc'
@@ -34,6 +35,36 @@ PDFPageSize =
     width_microns: 279400
     custom_display_name: "Tabloid"
 
+clickHandler = (action) ->
+  @_executeContextMenuCommand action
+
+convertToMenuTemplate = (items, handler) ->
+  template = []
+  for item in items
+    do (item) ->
+      transformed =
+        if item.type is 'submenu'
+          type: 'submenu'
+          label: item.label
+          enabled: item.enabled
+          submenu: convertToMenuTemplate item.subItems, handler
+        else if item.type is 'separator'
+          type: 'separator'
+        else if item.type is 'checkbox'
+          type: 'checkbox'
+          label: item.label
+          enabled: item.enabled
+          checked: item.checked
+        else
+          type: 'normal'
+          label: item.label
+          enabled: item.enabled
+      if item.id?
+        transformed.click = ->
+          handler item.id
+      template.push transformed
+  template
+
 wrapWebContents = (webContents) ->
   # webContents is an EventEmitter.
   webContents.__proto__ = EventEmitter.prototype
@@ -65,6 +96,16 @@ wrapWebContents = (webContents) ->
     Object.defineProperty event, 'returnValue', set: (value) -> event.sendReply JSON.stringify(value)
     ipc.emit channel, event, args...
 
+  # Handle context menu action request from renderer widget.
+  webContents.on '-context-menu', (event, params) ->
+    if params.isPepperMenu
+      template = convertToMenuTemplate(params.menuItems, clickHandler.bind(webContents))
+      menu = Menu.buildFromTemplate template
+      # The menu is expected to show asynchronously.
+      setImmediate ->
+        menu.popup params.x, params.y
+        webContents._notifyContextMenuClosed()
+
   webContents.printToPDF = (options, callback) ->
     printingSetting =
       pageRage: []