Chromium Code Reviews| Index: chrome/browser/content_settings/content_settings_extension_provider.cc |
| diff --git a/chrome/browser/content_settings/content_settings_extension_provider.cc b/chrome/browser/content_settings/content_settings_extension_provider.cc |
| index 10c94bd3fcc7a85a426c31de8e3ae4050a3a8574..64f149dc0aa60380d736736e7ba098a00eed6ede 100644 |
| --- a/chrome/browser/content_settings/content_settings_extension_provider.cc |
| +++ b/chrome/browser/content_settings/content_settings_extension_provider.cc |
| @@ -22,21 +22,40 @@ ExtensionProvider::~ExtensionProvider() { |
| } |
| ContentSetting ExtensionProvider::GetContentSetting( |
| - const GURL& embedded_url, |
| - const GURL& top_level_url, |
| + const GURL& primary_url, |
| + const GURL& secondary_url, |
| ContentSettingsType content_type, |
| const ResourceIdentifier& resource_identifier) const { |
| // TODO(markusheintz): Instead of getting the effective setting every time |
| // effective patterns could be cached in here. |
| DCHECK(extensions_settings_); |
| return extensions_settings_->GetEffectiveContentSetting( |
| - embedded_url, |
| - top_level_url, |
| + primary_url, |
| + secondary_url, |
| content_type, |
| resource_identifier, |
| incognito_); |
| } |
| +Value* ExtensionProvider::GetContentSettingValue( |
| + const GURL& primary_url, |
| + const GURL& secondary_url, |
| + ContentSettingsType content_type, |
| + const ResourceIdentifier& resource_identifier) const { |
| + // TODO(markusheintz): Change the ExtensionSettingsStore to use the |
| + // OriginIdentifierValueMap to allow arbitray |Value|s to be stored inseted of |
|
Pam (message me for reviews)
2011/09/02 10:50:16
typo "instead"
markusheintz_
2011/09/02 15:22:21
Done.
|
| + // |ContentSetting|s. |
| + ContentSetting setting = GetContentSetting( |
| + primary_url, |
| + secondary_url, |
| + content_type, |
| + resource_identifier); |
| + if (setting == CONTENT_SETTING_DEFAULT) |
| + return NULL; |
| + return Value::CreateIntegerValue(setting); |
| +} |
| + |
| + |
| void ExtensionProvider::GetAllContentSettingsRules( |
| ContentSettingsType content_type, |
| const ResourceIdentifier& resource_identifier, |