Chromium Code Reviews| Index: chrome/browser/content_settings/host_content_settings_map.cc |
| diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc |
| index 133e66fac475f09c0df8b34b0f0652825cafd630..c15ceb1fbff2cdb2ca90027da92aaca264b672c3 100644 |
| --- a/chrome/browser/content_settings/host_content_settings_map.cc |
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc |
| @@ -87,11 +87,13 @@ ContentSetting ClickToPlayFixup(ContentSettingsType content_type, |
| return setting; |
| } |
| -typedef std::vector<linked_ptr<ContentSettingsProviderInterface> >::iterator |
| - provider_iterator; |
| typedef |
| - std::vector<linked_ptr<ContentSettingsProviderInterface> >::const_iterator |
| - const_provider_iterator; |
| + std::vector<linked_ptr<DefaultContentSettingsProviderInterface> >::iterator |
| + provider_iterator; |
| +typedef |
| + std::vector |
| + <linked_ptr<DefaultContentSettingsProviderInterface> >::const_iterator |
| + const_provider_iterator; |
|
Bernhard Bauer
2011/01/25 13:11:19
I guess you could pull out some more typedefs (ptr
markusheintz_
2011/01/25 13:57:43
done.
|
| } // namespace |
| @@ -111,10 +113,10 @@ HostContentSettingsMap::HostContentSettingsMap(Profile* profile) |
| // as providers that are further down in the list (i.e. added later) override |
| // providers further up. |
| content_settings_providers_.push_back( |
| - linked_ptr<ContentSettingsProviderInterface>( |
| + linked_ptr<DefaultContentSettingsProviderInterface>( |
| new PrefContentSettingsProvider(profile))); |
| content_settings_providers_.push_back( |
| - linked_ptr<ContentSettingsProviderInterface>( |
| + linked_ptr<DefaultContentSettingsProviderInterface>( |
| new PolicyContentSettingsProvider(profile))); |
| PrefService* prefs = profile_->GetPrefs(); |