components/content_settings/core/browser/content_settings_policy_provider.cc - Issue 2853983002: Ensure settings returned from Content Settings providers are valid

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/browser/content_settings_policy_provider.cc

Issue 2853983002: Ensure settings returned from Content Settings providers are valid (Closed)

Patch Set: Ensure settings returned from Content Settings providers are valid Created 3 years, 8 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/browser/content_settings_info.cc ('k') | components/content_settings/core/browser/content_settings_pref.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_policy_provider.cc

diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc

index 3923d0f6ab32282782b9f410a6f8178b67fa77f9..bf13551ddb49ef89f5d941252352b82061971264 100644

--- a/components/content_settings/core/browser/content_settings_policy_provider.cc

+++ b/components/content_settings/core/browser/content_settings_policy_provider.cc

@@ -13,6 +13,8 @@

#include "base/json/json_reader.h"

#include "base/macros.h"

#include "base/values.h"

+#include "components/content_settings/core/browser/content_settings_info.h"

+#include "components/content_settings/core/browser/content_settings_registry.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_pattern.h"

@@ -355,7 +357,9 @@ void PolicyProvider::UpdateManagedDefaultSetting(

value_map_.DeleteValue(ContentSettingsPattern::Wildcard(),

ContentSettingsPattern::Wildcard(),

entry.content_type, std::string());

- } else {

+ } else if (ContentSettingsRegistry::GetInstance()

+ ->Get(entry.content_type)

+ ->IsSettingValid(IntToContentSetting(setting))) {

// Don't set a timestamp for policy settings.

value_map_.SetValue(ContentSettingsPattern::Wildcard(),

ContentSettingsPattern::Wildcard(), entry.content_type,