diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 18:53:19 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 18:53:19 +0000 |
| commit | f43fd974d2fa750fcfd706bc08b95bdbdcd155f3 (patch) | |
| tree | b75a74be089a9224e45453f2158244d102dae1da /chrome | |
| parent | b29974139602e00760b943340523b45b3296bb8f (diff) | |
| download | chromium_src-f43fd974d2fa750fcfd706bc08b95bdbdcd155f3.zip chromium_src-f43fd974d2fa750fcfd706bc08b95bdbdcd155f3.tar.gz chromium_src-f43fd974d2fa750fcfd706bc08b95bdbdcd155f3.tar.bz2 | |
Revert 85954 - Temporarily disabling mixed-content bocking by default. Will re-land with an infobar/bypass option and may alter the hueristic for blocking.
BUG=81637
TEST=None.
Review URL: http://codereview.chromium.org/7033026
TBR=jschuh@chromium.org
Review URL: http://codereview.chromium.org/7020036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/browser.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 3530eb8..a729bbd 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -2239,7 +2239,7 @@ void Browser::RegisterUserPrefs(PrefService* prefs) { true, PrefService::UNSYNCABLE_PREF); prefs->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent, - true, + false, PrefService::UNSYNCABLE_PREF); prefs->RegisterBooleanPref(prefs::kWebKitAllowDisplayingInsecureContent, true, |