Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct the default of allowRunningInsecureContent as per docs #12556

Merged
merged 3 commits into from Apr 16, 2018
Merged

Correct the default of allowRunningInsecureContent as per docs #12556

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9e94b0
Correct the default of allowRunningInsecureContent as per docs
MarshallOfSound Apr 6, 2018
167ae82
fix linting
MarshallOfSound Apr 9, 2018
f3ac787
Update calls to match native_mate API change
ckerr Apr 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions atom/browser/web_contents_preferences.cc
View file
Open in desktop
Expand Up @@ -64,8 +64,14 @@ WebContentsPreferences::WebContentsPreferences(
SetDefaultBoolIfUndefined("images", true);
SetDefaultBoolIfUndefined("textAreasAreResizable", true);
SetDefaultBoolIfUndefined("webgl", true);
SetDefaultBoolIfUndefined("webSecurity", true);
SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
bool webSecurity = true;
SetDefaultBoolIfUndefined("webSecurity", webSecurity);
// If webSecurity was explicity set to false, let's inherit that into insureContent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo insure

if (web_preferences.GetBoolean("webSecurity", &webSecurity) && !webSecurity) {
SetDefaultBoolIfUndefined("allowRunningInsecureContent", true);
} else {
SetDefaultBoolIfUndefined("allowRunningInsecureContent", false);
}
#if defined(OS_MACOSX)
SetDefaultBoolIfUndefined(options::kScrollBounce, false);
#endif
Expand Down