Move pref names and default value into WebsiteSettingsInfo

components/content_settings/core/common/pref_names.h

Index: components/content_settings/core/common/pref_names.h
diff --git a/components/content_settings/core/common/pref_names.h b/components/content_settings/core/common/pref_names.h
index ba3862cdd013375e79d29202904640c4ee36a344..61229657325e0da3e29be76e27c6d04ad9264a92 100644
--- a/components/content_settings/core/common/pref_names.h
+++ b/components/content_settings/core/common/pref_names.h
@@ -13,67 +13,8 @@ extern const char kBlockThirdPartyCookies[];
 extern const char kContentSettingsVersion[];
 extern const char kContentSettingsWindowLastTabIndex[];
 
-extern const char kDefaultCookiesSetting[];

[msramek, 2015/07/29 09:20:07]

Nit: Please leave a comment that this file now doesn't contain all content
settings-related prefs, and that defaults and exceptions are now located in
WebsiteSettingsRegistry.

[raymes, 2015/07/30 05:25:03]

Done.

-extern const char kDefaultImagesSetting[];
-extern const char kDefaultJavaScriptSetting[];
-extern const char kDefaultPluginsSetting[];
-extern const char kDefaultPopupsSetting[];
-extern const char kDefaultGeolocationSetting[];
-extern const char kDefaultNotificationsSetting[];
-extern const char kDefaultAutoSelectCertificateSetting[];
-extern const char kDefaultFullScreenSetting[];
-extern const char kDefaultMouseLockSetting[];
-extern const char kDefaultMixedScriptSetting[];
-extern const char kDefaultMediaStreamSetting[];
-extern const char kDefaultMediaStreamMicSetting[];
-extern const char kDefaultMediaStreamCameraSetting[];
-extern const char kDefaultProtocolHandlersSetting[];
-extern const char kDefaultPpapiBrokerSetting[];
-extern const char kDefaultAutomaticDownloadsSetting[];
-extern const char kDefaultMidiSysexSetting[];
-extern const char kDefaultPushMessagingSetting[];
-extern const char kDefaultSSLCertDecisionsSetting[];
-#if defined(OS_WIN)
-extern const char kDefaultMetroSwitchToDesktopSetting[];
-#elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
-extern const char kDefaultProtectedMediaIdentifierSetting[];
-#endif
-extern const char kDefaultAppBannerSetting[];
-extern const char kDefaultSiteEngagementSetting[];
-extern const char kDefaultDurableStorageSetting[];
-
 extern const char kMigratedDefaultMediaStreamSetting[];
 
-// Preferences storing the default values for individual content settings.
-extern const char kContentSettingsCookiesPatternPairs[];
-extern const char kContentSettingsImagesPatternPairs[];
-extern const char kContentSettingsJavaScriptPatternPairs[];
-extern const char kContentSettingsPluginsPatternPairs[];
-extern const char kContentSettingsPopupsPatternPairs[];
-extern const char kContentSettingsGeolocationPatternPairs[];
-extern const char kContentSettingsNotificationsPatternPairs[];
-extern const char kContentSettingsAutoSelectCertificatePatternPairs[];
-extern const char kContentSettingsFullScreenPatternPairs[];
-extern const char kContentSettingsMouseLockPatternPairs[];
-extern const char kContentSettingsMixedScriptPatternPairs[];
-extern const char kContentSettingsMediaStreamPatternPairs[];
-extern const char kContentSettingsMediaStreamMicPatternPairs[];
-extern const char kContentSettingsMediaStreamCameraPatternPairs[];
-extern const char kContentSettingsProtocolHandlersPatternPairs[];
-extern const char kContentSettingsPpapiBrokerPatternPairs[];
-extern const char kContentSettingsAutomaticDownloadsPatternPairs[];
-extern const char kContentSettingsMidiSysexPatternPairs[];
-extern const char kContentSettingsPushMessagingPatternPairs[];
-extern const char kContentSettingsSSLCertDecisionsPatternPairs[];
-#if defined(OS_WIN)
-extern const char kContentSettingsMetroSwitchToDesktopPatternPairs[];
-#elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
-extern const char kContentSettingsProtectedMediaIdentifierPatternPairs[];
-#endif
-extern const char kContentSettingsAppBannerPatternPairs[];
-extern const char kContentSettingsSiteEngagementPatternPairs[];
-extern const char kContentSettingsDurableStoragePatternPairs[];
-
 extern const char kManagedDefaultCookiesSetting[];
 extern const char kManagedDefaultImagesSetting[];
 extern const char kManagedDefaultJavaScriptSetting[];