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

11
browser/native_window.cc
View file

@ -48,16 +48,19 @@ NativeWindow::NativeWindow(content::WebContents* web_contents,
: content::WebContentsObserver(web_contents),
has_frame_(true),
is_closed_(false),
iframe_security_("full"),
weak_factory_(this),
inspectable_web_contents_(
brightray::InspectableWebContents::Create(web_contents)) {
options->GetBoolean(switches::kFrame, &has_frame_);
// Read icon before window is created.
std::string icon;
if (options->GetString(switches::kIcon, &icon)) {
if (!SetIcon(icon))
LOG(ERROR) << "Failed to set icon to " << icon;
}
if (options->GetString(switches::kIcon, &icon) && !SetIcon(icon))
LOG(ERROR) << "Failed to set icon to " << icon;
// Read iframe security before any navigation.
options->GetString(switches::kIframeSecurity, &iframe_security_);
web_contents->SetDelegate(this);