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

Append --iframe-security to renderer process.

Browse source
This commit is contained in:
Cheng Zhao 2014-01-30 21:57:01 +08:00
parent 9a58706e1f
commit a0b15661ed
6 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
browser/native_window.h
View file

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