github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

4
browser/native_window.h
View File

@@ -140,7 +140,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
}
bool has_frame() const { return has_frame_; }
std::string iframe_security() const { return iframe_security_; }
std::string node_integration() const { return node_integration_; }
protected:
explicit NativeWindow(content::WebContents* web_contents,
@@ -221,7 +221,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
bool is_closed_;
// The security token of iframe.
std::string iframe_security_;
std::string node_integration_;
// Closure that would be called when window is unresponsive when closing,
// it should be cancelled when we can prove that the window is responsive.