| Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
|
| diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
|
| index 895c06f581e9febaf2db4b5049c572fc1d4c4bf5..256b3bbc3f71f6fdf6b6e74f457438ff1ec1bde9 100644
|
| --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
|
| +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
|
| @@ -114,6 +114,38 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
|
| settings_private::PrefType::PREF_TYPE_BOOLEAN;
|
| (*s_whitelist)["translate_blocked_languages"] =
|
| settings_private::PrefType::PREF_TYPE_LIST;
|
| + (*s_whitelist)["profile.default_content_setting_values.cookies"] =
|
| + settings_private::PrefType::PREF_TYPE_NUMBER;
|
| + (*s_whitelist)["profile.default_content_setting_values.fullscreen"] =
|
| + settings_private::PrefType::PREF_TYPE_NUMBER;
|
| + (*s_whitelist)["profile.default_content_setting_values.geolocation"] =
|
| + settings_private::PrefType::PREF_TYPE_NUMBER;
|
| + (*s_whitelist)["profile.default_content_setting_values.javascript"] =
|
| + settings_private::PrefType::PREF_TYPE_NUMBER;
|
| + (*s_whitelist)["profile.default_content_setting_values.media_stream_camera"] =
|
| + settings_private::PrefType::PREF_TYPE_NUMBER;
|
| + (*s_whitelist)["profile.default_content_setting_values.media_stream_mic"] =
|
| + settings_private::PrefType::PREF_TYPE_NUMBER;
|
| + (*s_whitelist)["profile.default_content_setting_values.notifications"] =
|
| + settings_private::PrefType::PREF_TYPE_NUMBER;
|
| + (*s_whitelist)["profile.default_content_setting_values.popups"] =
|
| + settings_private::PrefType::PREF_TYPE_NUMBER;
|
| + (*s_whitelist)["profile.content_settings.exceptions.cookies"] =
|
| + settings_private::PrefType::PREF_TYPE_DICTIONARY;
|
| + (*s_whitelist)["profile.content_settings.exceptions.fullscreen"] =
|
| + settings_private::PrefType::PREF_TYPE_DICTIONARY;
|
| + (*s_whitelist)["profile.content_settings.exceptions.geolocation"] =
|
| + settings_private::PrefType::PREF_TYPE_DICTIONARY;
|
| + (*s_whitelist)["profile.content_settings.exceptions.javascript"] =
|
| + settings_private::PrefType::PREF_TYPE_DICTIONARY;
|
| + (*s_whitelist)["profile.content_settings.exceptions.media_stream_camera"] =
|
| + settings_private::PrefType::PREF_TYPE_DICTIONARY;
|
| + (*s_whitelist)["profile.content_settings.exceptions.media_stream_mic"] =
|
| + settings_private::PrefType::PREF_TYPE_DICTIONARY;
|
| + (*s_whitelist)["profile.content_settings.exceptions.notifications"] =
|
| + settings_private::PrefType::PREF_TYPE_DICTIONARY;
|
| + (*s_whitelist)["profile.content_settings.exceptions.popups"] =
|
| + settings_private::PrefType::PREF_TYPE_DICTIONARY;
|
|
|
| #if defined(OS_CHROMEOS)
|
| (*s_whitelist)["cros.accounts.allowBWSI"] =
|
|
|