chrome/browser/extensions/api/content_settings/content_settings_store.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: chrome/browser/extensions/api/content_settings/content_settings_store.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 | « chrome/browser/engagement/site_engagement_service.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_store.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.cc b/chrome/browser/extensions/api/content_settings/content_settings_store.cc

index aeab4cc6bb5249723cef94a387390bf1ff84487c..050dd7edd03b3703270aa2dc473d60bb6e8f1d52 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_store.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.cc

@@ -19,6 +19,7 @@

#include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.h"

#include "components/content_settings/core/browser/content_settings_rule.h"

#include "components/content_settings/core/browser/content_settings_utils.h"

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

#include "content/public/browser/browser_thread.h"

using content::BrowserThread;

@@ -27,7 +28,6 @@ using content_settings::Rule;

using content_settings::RuleIterator;

using content_settings::OriginIdentifierValueMap;

using content_settings::ResourceIdentifier;

-using content_settings::ValueToContentSetting;

namespace extensions {

@@ -276,7 +276,8 @@ std::unique_ptr<base::ListValue> ContentSettingsStore::GetSettingsForExtension(

helpers::ContentSettingsTypeToString(key.content_type));

setting_dict->SetString(keys::kResourceIdentifierKey,

key.resource_identifier);

- ContentSetting content_setting = ValueToContentSetting(rule.value.get());

+ ContentSetting content_setting =

+ content_settings::ValueToContentSetting(rule.value.get());

DCHECK_NE(CONTENT_SETTING_DEFAULT, content_setting);

std::string setting_string =