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

Rename iframe-security to node-integration.

Browse source
This commit is contained in:
Cheng Zhao 2014-01-30 23:20:12 +08:00
parent d4929de33c
commit ec00da416f
8 changed files with 44 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
renderer/atom_renderer_client.h
View file

@ -28,10 +28,11 @@ class AtomRendererClient : public content::ContentRendererClient {
AtomRendererBindings* atom_bindings() const { return atom_bindings_.get(); }
private:
enum IframeSecurity {
FULL,
MANUAL,
NONE,
enum NodeIntegration {
ALL,
EXCEPT_IFRAME,
MANUAL_ENABLE_IFRAME,
DISABLE,
};
virtual void RenderThreadStarted() OVERRIDE;
@ -55,7 +56,11 @@ class AtomRendererClient : public content::ContentRendererClient {
scoped_ptr<NodeBindings> node_bindings_;
scoped_ptr<AtomRendererBindings> atom_bindings_;
IframeSecurity iframe_security_;
// The level of node integration we should support.
NodeIntegration node_integration_;
// The main frame.
WebKit::WebFrame* main_frame_;
DISALLOW_COPY_AND_ASSIGN(AtomRendererClient);
};