Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: components/content_settings/core/common/pref_names.cc

Issue 1252073002: Move pref names and default value into WebsiteSettingsInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@website-settings-registry-simple
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/content_settings/core/common/pref_names.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/content_settings/core/common/pref_names.cc
diff --git a/components/content_settings/core/common/pref_names.cc b/components/content_settings/core/common/pref_names.cc
index 0bf30130980e3d7028b0fccca26327697b21c2fa..50b8ab0a8532e3abe9c53f2a913842cd798c2976 100644
--- a/components/content_settings/core/common/pref_names.cc
+++ b/components/content_settings/core/common/pref_names.cc
@@ -18,121 +18,11 @@ const char kContentSettingsVersion[] = "profile.content_settings.pref_version";
const char kContentSettingsWindowLastTabIndex[] =
"content_settings_window.last_tab_index";
-// Preferences storing the default values for individual content settings.
-const char kDefaultCookiesSetting[] =
- "profile.default_content_setting_values.cookies";
-const char kDefaultImagesSetting[] =
- "profile.default_content_setting_values.images";
-const char kDefaultJavaScriptSetting[] =
- "profile.default_content_setting_values.javascript";
-const char kDefaultPluginsSetting[] =
- "profile.default_content_setting_values.plugins";
-const char kDefaultPopupsSetting[] =
- "profile.default_content_setting_values.popups";
-const char kDefaultGeolocationSetting[] =
- "profile.default_content_setting_values.geolocation";
-const char kDefaultNotificationsSetting[] =
- "profile.default_content_setting_values.notifications";
-const char kDefaultAutoSelectCertificateSetting[] =
- "profile.default_content_setting_values.auto_select_certificate";
-const char kDefaultFullScreenSetting[] =
- "profile.default_content_setting_values.fullscreen";
-const char kDefaultMouseLockSetting[] =
- "profile.default_content_setting_values.mouselock";
-const char kDefaultMixedScriptSetting[] =
- "profile.default_content_setting_values.mixed_script";
-const char kDefaultMediaStreamSetting[] =
- "profile.default_content_setting_values.media_stream";
-const char kDefaultMediaStreamMicSetting[] =
- "profile.default_content_setting_values.media_stream_mic";
-const char kDefaultMediaStreamCameraSetting[] =
- "profile.default_content_setting_values.media_stream_camera";
-const char kDefaultProtocolHandlersSetting[] =
- "profile.default_content_setting_values.protocol_handlers";
-const char kDefaultPpapiBrokerSetting[] =
- "profile.default_content_setting_values.ppapi_broker";
-const char kDefaultAutomaticDownloadsSetting[] =
- "profile.default_content_setting_values.automatic_downloads";
-const char kDefaultMidiSysexSetting[] =
- "profile.default_content_setting_values.midi_sysex";
-const char kDefaultPushMessagingSetting[] =
- "profile.default_content_setting_values.push_messaging";
-const char kDefaultSSLCertDecisionsSetting[] =
- "profile.default_content_setting_values.ssl_cert_decisions";
-#if defined(OS_WIN)
-const char kDefaultMetroSwitchToDesktopSetting[] =
- "profile.default_content_setting_values.metro_switch_to_desktop";
-#elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
-const char kDefaultProtectedMediaIdentifierSetting[] =
- "profile.default_content_setting_values.protected_media_identifier";
-#endif
-const char kDefaultAppBannerSetting[] =
- "profile.default_content_setting_values.app_banner";
-const char kDefaultSiteEngagementSetting[] =
- "profile.default_content_setting_values.site_engagement";
-const char kDefaultDurableStorageSetting[] =
- "profile.default_content_setting_values.durable_storage";
-
// Boolean indicating whether the media stream default setting had been
// migrated into two separate microphone and camera settings.
const char kMigratedDefaultMediaStreamSetting[] =
"profile.migrated_default_media_stream_content_settings";
-// Preferences storing the content settings exceptions.
-const char kContentSettingsCookiesPatternPairs[] =
- "profile.content_settings.exceptions.cookies";
-const char kContentSettingsImagesPatternPairs[] =
- "profile.content_settings.exceptions.images";
-const char kContentSettingsJavaScriptPatternPairs[] =
- "profile.content_settings.exceptions.javascript";
-const char kContentSettingsPluginsPatternPairs[] =
- "profile.content_settings.exceptions.plugins";
-const char kContentSettingsPopupsPatternPairs[] =
- "profile.content_settings.exceptions.popups";
-const char kContentSettingsGeolocationPatternPairs[] =
- "profile.content_settings.exceptions.geolocation";
-const char kContentSettingsNotificationsPatternPairs[] =
- "profile.content_settings.exceptions.notifications";
-const char kContentSettingsAutoSelectCertificatePatternPairs[] =
- "profile.content_settings.exceptions.auto_select_certificate";
-const char kContentSettingsFullScreenPatternPairs[] =
- "profile.content_settings.exceptions.fullscreen";
-const char kContentSettingsMouseLockPatternPairs[] =
- "profile.content_settings.exceptions.mouselock";
-const char kContentSettingsMixedScriptPatternPairs[] =
- "profile.content_settings.exceptions.mixed_script";
-const char kContentSettingsMediaStreamPatternPairs[] =
- "profile.content_settings.exceptions.media_stream";
-const char kContentSettingsMediaStreamMicPatternPairs[] =
- "profile.content_settings.exceptions.media_stream_mic";
-const char kContentSettingsMediaStreamCameraPatternPairs[] =
- "profile.content_settings.exceptions.media_stream_camera";
-const char kContentSettingsProtocolHandlersPatternPairs[] =
- "profile.content_settings.exceptions.protocol_handlers";
-const char kContentSettingsPpapiBrokerPatternPairs[] =
- "profile.content_settings.exceptions.ppapi_broker";
-const char kContentSettingsAutomaticDownloadsPatternPairs[] =
- "profile.content_settings.exceptions.automatic_downloads";
-const char kContentSettingsMidiSysexPatternPairs[] =
- "profile.content_settings.exceptions.midi_sysex";
-const char kContentSettingsPushMessagingPatternPairs[] =
- "profile.content_settings.exceptions.push_messaging";
-const char kContentSettingsSSLCertDecisionsPatternPairs[] =
- "profile.content_settings.exceptions.ssl_cert_decisions";
-#if defined(OS_WIN)
-const char kContentSettingsMetroSwitchToDesktopPatternPairs[] =
- "profile.content_settings.exceptions.metro_switch_to_desktop";
-#elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
-const char kContentSettingsProtectedMediaIdentifierPatternPairs[] =
- "profile.content_settings.exceptions.protected_media_identifier";
-#endif
-const char kContentSettingsAppBannerPatternPairs[] =
- "profile.content_settings.exceptions.app_banner";
-const char kContentSettingsSiteEngagementPatternPairs[] =
- "profile.content_settings.exceptions.site_engagement";
-const char kContentSettingsDurableStoragePatternPairs[] =
- "profile.content_settings.exceptions.durable_storage";
-
// Preferences that are exclusively used to store managed values for default
// content settings.
const char kManagedDefaultCookiesSetting[] =
« no previous file with comments | « components/content_settings/core/common/pref_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698