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

Translate menu template directly in C++

Browse source
This commit is contained in:
Cheng Zhao 2015-11-02 23:28:45 +08:00
parent 56e6b28370
commit 9236adfbf5
5 changed files with 100 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,7 @@
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/context_menu_params.h"
#include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h"
#include "net/http/http_response_headers.h"
@ -407,8 +408,11 @@ void WebContents::RendererResponsive(content::WebContents* source) {
}
bool WebContents::HandleContextMenu(const content::ContextMenuParams& params) {
context_menu_context_ = params.custom_context;
Emit("-context-menu", params);
if (!params.custom_context.is_pepper_menu)
return false;
Emit("pepper-context-menu", std::make_pair(params, web_contents()));
web_contents()->NotifyContextMenuClosed(params.custom_context);
return true;
}
@ -848,15 +852,6 @@ 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();
}
@ -1068,10 +1063,6 @@ 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)