summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/command_line_pref_store.cc
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 03:21:37 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 03:21:37 +0000
commit839fee770e1024d748460e59c229339ccaf82279 (patch)
treebba1deeb8513ccb8323932f88255072c895cf265 /chrome/browser/prefs/command_line_pref_store.cc
parent6d6a1e9045ed303fbeb7b6a7db08c9f25234ea87 (diff)
downloadchromium_src-839fee770e1024d748460e59c229339ccaf82279.zip
chromium_src-839fee770e1024d748460e59c229339ccaf82279.tar.gz
chromium_src-839fee770e1024d748460e59c229339ccaf82279.tar.bz2
Wire new WebCore settings for blocking mixed-content loads into Chrome.
Review URL: http://codereview.chromium.org/6883291 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/command_line_pref_store.cc')
-rw-r--r--chrome/browser/prefs/command_line_pref_store.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index 03b6ef6..d4f87e4 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -35,6 +35,10 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
true },
{ switches::kNoPings, prefs::kEnableHyperlinkAuditing, false },
{ switches::kNoReferrers, prefs::kEnableReferrers, false },
+ { switches::kAllowRunningInsecureContent,
+ prefs::kWebKitAllowRunningInsecureContent, true },
+ { switches::kNoDisplayingInsecureContent,
+ prefs::kWebKitAllowDisplayingInsecureContent, false },
};
CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line)