| Index: chrome/browser/content_settings/host_content_settings_map.h
|
| diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
|
| index 3a9724b6e47f6af6bf2acb7875b0d80834bc11e8..ee6b45f9bacd40f0aca2b68a215bda9b499039ff 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map.h
|
| +++ b/chrome/browser/content_settings/host_content_settings_map.h
|
| @@ -124,6 +124,13 @@ class HostContentSettingsMap
|
| const std::string& resource_identifier,
|
| SettingsForOneType* settings) const;
|
|
|
| + // For a given content type, returns all patterns with a non-default setting,
|
| + // mapped to their actual setting, in the order in which they would be checked
|
| + // by GetContentSetting.
|
| + void GetConcatenatedSettingsForOneType(ContentSettingsType content_type,
|
| + const std::string& resource_identifier,
|
| + ContentSettingRules* rules) const;
|
| +
|
| // Sets the default setting for a particular content type. This method must
|
| // not be invoked on an incognito map.
|
| //
|
|
|