support no-displaying-insecure-content and allow-running-insecure-con…

…tent Fix #3123
nwjs · Apr 14, 2015 · a77b085 · a77b085
1 parent e62c9f3
commit a77b085
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -370,6 +370,7 @@ void ShellContentBrowserClient::OverrideWebkitPrefs(
       const GURL& url,
       content::WebPreferences* prefs) {
   nw::Package* package = shell_browser_main_parts()->package();
+  CommandLine* cmd_line = CommandLine::ForCurrentProcess();
 
   // Disable web security.
   prefs->dom_paste_enabled = true;
@@ -384,6 +385,11 @@ void ShellContentBrowserClient::OverrideWebkitPrefs(
   prefs->plugins_enabled = true;
   prefs->java_enabled = false;
 
+  prefs->allow_displaying_insecure_content =
+    !(cmd_line->HasSwitch(switches::kNoDisplayingInsecureContent));
+  prefs->allow_running_insecure_content =
+    cmd_line->HasSwitch(switches::kAllowRunningInsecureContent);
+
   base::DictionaryValue* webkit;
   if (package->root()->GetDictionary(switches::kmWebkit, &webkit)) {
     webkit->GetBoolean(switches::kmJava, &prefs->java_enabled);