components/content_settings/core/common/content_settings_struct_traits.cc - 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.cc

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_struct_traits.h ('k') | components/content_settings/core/common/content_settings_utils.h » ('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.cc

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

index 11ad9c92ed692ac7f238c913be659ed3179d0763..b5bac4a40d9e2b1db249743639154c8a96e6eb34 100644

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

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

@@ -88,7 +88,8 @@ bool StructTraits<content_settings::mojom::ContentSettingPatternSourceDataView,

out->incognito = data.incognito();

return data.ReadPrimaryPattern(&out->primary_pattern) &&

data.ReadSecondaryPattern(&out->secondary_pattern) &&

- data.ReadSetting(&out->setting) && data.ReadSource(&out->source);

+ data.ReadSettingValue(&out->setting_value) &&

+ data.ReadSource(&out->source);

}

// static