summaryrefslogtreecommitdiffstats
path: root/chrome/common/common_param_traits.cc
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-21 19:20:04 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-21 19:20:04 +0000
commit8a53de29a127aade966d8473d3bdbe48a7416f04 (patch)
tree9202ea75a55d588a3eef72984894368ffc34791b /chrome/common/common_param_traits.cc
parent177a06ad12d6be3250e3d6041e4d86314c4b9726 (diff)
downloadchromium_src-8a53de29a127aade966d8473d3bdbe48a7416f04.zip
chromium_src-8a53de29a127aade966d8473d3bdbe48a7416f04.tar.gz
chromium_src-8a53de29a127aade966d8473d3bdbe48a7416f04.tar.bz2
Move the mixed scripting infobar to a page action icon / content setting.
BUG=133189 Review URL: https://chromiumcodereview.appspot.com/10577028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/common_param_traits.cc')
-rw-r--r--chrome/common/common_param_traits.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
index e741e4f..6bbefcc 100644
--- a/chrome/common/common_param_traits.cc
+++ b/chrome/common/common_param_traits.cc
@@ -92,6 +92,9 @@ void ParamTraits<ContentSettingsType>::Log(const param_type& p,
case CONTENT_SETTINGS_TYPE_INTENTS:
setting_type = "CONTENT_SETTINGS_TYPE_INTENTS";
break;
+ case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
+ setting_type = "CONTENT_SETTINGS_TYPE_MIXEDSCRIPT";
+ break;
default:
setting_type = "UNKNOWN";
break;