| Index: chrome/browser/content_settings/policy_content_settings_provider.h
|
| diff --git a/chrome/browser/content_settings/policy_content_settings_provider.h b/chrome/browser/content_settings/policy_content_settings_provider.h
|
| index 3aad0437cd97739eb427507fb4582f2031a2e49d..76c3c1467fccd1de27aa2504ec6b58ffe28086ca 100644
|
| --- a/chrome/browser/content_settings/policy_content_settings_provider.h
|
| +++ b/chrome/browser/content_settings/policy_content_settings_provider.h
|
| @@ -20,13 +20,16 @@ class DictionaryValue;
|
| class PrefService;
|
| class Profile;
|
|
|
| -class PolicyContentSettingsProvider : public DefaultContentSettingsProvider,
|
| - public NotificationObserver {
|
| +namespace content_settings {
|
| +
|
| +class PolicyDefaultContentSettingsProvider
|
| + : public DefaultContentSettingsProviderInterface,
|
| + public NotificationObserver {
|
| public:
|
| - explicit PolicyContentSettingsProvider(Profile* profile);
|
| - virtual ~PolicyContentSettingsProvider();
|
| + explicit PolicyDefaultContentSettingsProvider(Profile* profile);
|
| + virtual ~PolicyDefaultContentSettingsProvider();
|
|
|
| - // DefaultContentSettingsProvider implementation.
|
| + // DefaultContentSettingsProviderInterface implementation.
|
| virtual bool CanProvideDefaultSetting(ContentSettingsType content_type) const;
|
| virtual ContentSetting ProvideDefaultSetting(
|
| ContentSettingsType content_type) const;
|
| @@ -72,7 +75,9 @@ class PolicyContentSettingsProvider : public DefaultContentSettingsProvider,
|
| PrefChangeRegistrar pref_change_registrar_;
|
| NotificationRegistrar notification_registrar_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(PolicyContentSettingsProvider);
|
| + DISALLOW_COPY_AND_ASSIGN(PolicyDefaultContentSettingsProvider);
|
| };
|
|
|
| +} // namespace content_settings
|
| +
|
| #endif // CHROME_BROWSER_CONTENT_SETTINGS_POLICY_CONTENT_SETTINGS_PROVIDER_H_
|
|
|