diff options
Diffstat (limited to 'chromium/components/content_settings/core/common/content_settings.h')
-rw-r--r-- | chromium/components/content_settings/core/common/content_settings.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chromium/components/content_settings/core/common/content_settings.h b/chromium/components/content_settings/core/common/content_settings.h index c441e280eaa..e28e51eed34 100644 --- a/chromium/components/content_settings/core/common/content_settings.h +++ b/chromium/components/content_settings/core/common/content_settings.h @@ -7,9 +7,12 @@ #include <stddef.h> +#include <memory> #include <string> #include <vector> +#include "base/memory/ptr_util.h" +#include "base/values.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" @@ -43,14 +46,19 @@ int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, struct ContentSettingPatternSource { ContentSettingPatternSource(const ContentSettingsPattern& primary_pattern, const ContentSettingsPattern& secondary_patttern, - ContentSetting setting, + std::unique_ptr<base::Value> setting_value, const std::string& source, bool incognito); ContentSettingPatternSource(const ContentSettingPatternSource& other); ContentSettingPatternSource(); + ContentSettingPatternSource& operator=( + const ContentSettingPatternSource& other); + ~ContentSettingPatternSource(); + ContentSetting GetContentSetting() const; + ContentSettingsPattern primary_pattern; ContentSettingsPattern secondary_pattern; - ContentSetting setting; + std::unique_ptr<base::Value> setting_value; std::string source; bool incognito; }; |