components/content_settings/core/common/content_settings_struct_traits.h - Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/content_settings/core/common/content_settings_struct_traits.h

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)

Patch Set: rebased Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/content_settings/core/common/content_settings.mojom ('k') | components/content_settings/core/common/content_settings_struct_traits.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/common/content_settings_struct_traits.h

diff --git a/components/content_settings/core/common/content_settings_struct_traits.h b/components/content_settings/core/common/content_settings_struct_traits.h

index 10c78efeafd5152271019e57a6742e9adc1332be..ab3fee43862fc8889cdfb5b16a970cf94b2e5917 100644

--- a/components/content_settings/core/common/content_settings_struct_traits.h

+++ b/components/content_settings/core/common/content_settings_struct_traits.h

@@ -7,8 +7,11 @@

#include <string>

+#include "base/memory/ptr_util.h"

+#include "base/values.h"

#include "components/content_settings/core/common/content_settings.h"

#include "components/content_settings/core/common/content_settings.mojom.h"

+#include "mojo/common/values_struct_traits.h"

#include "mojo/public/cpp/bindings/enum_traits.h"

#include "mojo/public/cpp/bindings/struct_traits.h"

@@ -96,8 +99,9 @@ struct StructTraits<

return r.secondary_pattern;

}

- static ContentSetting setting(const ContentSettingPatternSource& r) {

- return r.setting;

+ static const std::unique_ptr<base::Value>& setting_value(

+ const ContentSettingPatternSource& r) {

+ return r.setting_value;

}

static const std::string& source(const ContentSettingPatternSource& r) {