mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #3288 from deepak1556/flash_context_menu_pathc

Browse source 
browser: handle flash context menu request
This commit is contained in:
Cheng Zhao 2015-11-02 21:20:44 +08:00
commit 56e6b28370
10 changed files with 177 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
atom/browser/api/atom_api_web_contents.cc
View file

@ -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)