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

Add executeJavaScript method for webContents.

Browse source
This commit is contained in:
Cheng Zhao 2014-04-25 10:34:40 +08:00
parent 79babe858d
commit 00ed814962
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@
#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h" #include "atom/common/native_mate_converters/string16_converter.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
@ -53,6 +54,11 @@ bool WebContents::IsCrashed() const {
return web_contents_->IsCrashed(); return web_contents_->IsCrashed();
} }
void WebContents::ExecuteJavaScript(const string16& code) {
web_contents_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
string16(), code);
}
mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder( mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder(
v8::Isolate* isolate) { v8::Isolate* isolate) {
return mate::ObjectTemplateBuilder(isolate) return mate::ObjectTemplateBuilder(isolate)
@ -63,7 +69,8 @@ mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder(
.SetMethod("stop", &WebContents::Stop) .SetMethod("stop", &WebContents::Stop)
.SetMethod("getRoutingId", &WebContents::GetRoutingID) .SetMethod("getRoutingId", &WebContents::GetRoutingID)
.SetMethod("getProcessId", &WebContents::GetProcessID) .SetMethod("getProcessId", &WebContents::GetProcessID)
.SetMethod("isCrashed", &WebContents::IsCrashed); .SetMethod("isCrashed", &WebContents::IsCrashed)
.SetMethod("executeJavaScript", &WebContents::ExecuteJavaScript);
} }
// static // static

1
atom/browser/api/atom_api_web_contents.h
View file

@ -31,6 +31,7 @@ class WebContents : public mate::EventEmitter {
int GetRoutingID() const; int GetRoutingID() const;
int GetProcessID() const; int GetProcessID() const;
bool IsCrashed() const; bool IsCrashed() const;
void ExecuteJavaScript(const string16& code);
protected: protected:
explicit WebContents(content::WebContents* web_contents); explicit WebContents(content::WebContents* web_contents);