components/content_settings/core/browser/content_settings_override_provider.h - Issue 902833003: Add a HostContentSettingsMap layer for Supervised Users.

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_override_provider.h

Issue 902833003: Add a HostContentSettingsMap layer for Supervised Users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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

« components/content_settings/core/browser/content_settings_binary_value_map.h ('K') | « components/content_settings/core/browser/content_settings_binary_value_map.cc ('k') | components/content_settings/core/browser/content_settings_override_provider.cc » ('j') | components/content_settings/core/browser/content_settings_supervised_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_override_provider.h

diff --git a/components/content_settings/core/browser/content_settings_override_provider.h b/components/content_settings/core/browser/content_settings_override_provider.h

index 08f3052a49e048b3f94266f1df61025a551bd62e..ca61f609120694879e25091c66232484c59320f4 100644

--- a/components/content_settings/core/browser/content_settings_override_provider.h

+++ b/components/content_settings/core/browser/content_settings_override_provider.h

@@ -8,6 +8,7 @@

#include "base/macros.h"

#include "base/synchronization/lock.h"

#include "base/threading/thread_checker.h"

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

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

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

@@ -59,7 +60,7 @@ class OverrideProvider : public ProviderInterface {

void ReadOverrideSettings();

// Copies of the pref data, so that we can read it on the IO thread.

- bool allowed_settings_[CONTENT_SETTINGS_NUM_TYPES];

+ BinaryValueMap allowed_settings_;

PrefService* prefs_;