| Index: components/content_settings/core/common/content_settings.h
|
| diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
|
| index c441e280eaa5f42cf6c21b1bdbf04315ed740357..e28e51eed34e8527a072345871cc4672b7b04cdf 100644
|
| --- a/components/content_settings/core/common/content_settings.h
|
| +++ b/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;
|
| };
|
|
|