Chromium Code Reviews

Unified Diff: chrome/browser/extensions/api/settings_private/prefs_util.cc

Issue 1372053002: Flesh out the location-page class to make it more general. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/advanced_page/advanced_page.html » ('j') | chrome/browser/resources/settings/advanced_page/advanced_page.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b2c8a3c419a173f9431025601c663a8693f8fed7..8499e5fba677ea6222996e214019e8b4b82db5a2 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -116,6 +116,38 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)["browser.clear_data.time_period"] =
settings_private::PrefType::PREF_TYPE_NUMBER;
+ (*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;
// Web content settings.
(*s_whitelist)["webkit.webprefs.default_font_size"] =
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/advanced_page/advanced_page.html » ('j') | chrome/browser/resources/settings/advanced_page/advanced_page.html » ('J')

Powered by Google App Engine