Skip to content

Commit a77b085

Browse files
committed
support no-displaying-insecure-content and allow-running-insecure-content
Fix nwjs#3123
1 parent e62c9f3 commit a77b085

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/shell_content_browser_client.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ void ShellContentBrowserClient::OverrideWebkitPrefs(
370370
const GURL& url,
371371
content::WebPreferences* prefs) {
372372
nw::Package* package = shell_browser_main_parts()->package();
373+
CommandLine* cmd_line = CommandLine::ForCurrentProcess();
373374

374375
// Disable web security.
375376
prefs->dom_paste_enabled = true;
@@ -384,6 +385,11 @@ void ShellContentBrowserClient::OverrideWebkitPrefs(
384385
prefs->plugins_enabled = true;
385386
prefs->java_enabled = false;
386387

388+
prefs->allow_displaying_insecure_content =
389+
!(cmd_line->HasSwitch(switches::kNoDisplayingInsecureContent));
390+
prefs->allow_running_insecure_content =
391+
cmd_line->HasSwitch(switches::kAllowRunningInsecureContent);
392+
387393
base::DictionaryValue* webkit;
388394
if (package->root()->GetDictionary(switches::kmWebkit, &webkit)) {
389395
webkit->GetBoolean(switches::kmJava, &prefs->java_enabled);

0 commit comments

Comments
 (0)