| 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 a1ff14c776a34c7e224d358a578ad0037efcfcf0..a75e2ff76d508f22a1c73d442ea95888935a4b66 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc
|
| @@ -404,16 +404,19 @@ bool HostContentSettingsMap::IsSettingAllowedForType(
|
| // static
|
| bool HostContentSettingsMap::ContentTypeHasCompoundValue(
|
| ContentSettingsType type) {
|
| - // Values for content type CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE and
|
| - // CONTENT_SETTINGS_TYPE_MEDIASTREAM are of type dictionary/map. Compound
|
| - // types like dictionaries can't be mapped to the type |ContentSetting|.
|
| + // Values for content type CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
|
| + // CONTENT_SETTINGS_TYPE_MEDIASTREAM, and
|
| + // CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS are of type dictionary/map.
|
| + // Compound types like dictionaries can't be mapped to the type
|
| + // |ContentSetting|.
|
| #if defined(OS_ANDROID)
|
| if (type == CONTENT_SETTINGS_TYPE_APP_BANNER)
|
| return true;
|
| #endif
|
|
|
| return (type == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE ||
|
| - type == CONTENT_SETTINGS_TYPE_MEDIASTREAM);
|
| + type == CONTENT_SETTINGS_TYPE_MEDIASTREAM ||
|
| + type == CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS);
|
| }
|
|
|
| void HostContentSettingsMap::OnContentSettingChanged(
|
|
|