components/content_settings/core/common/content_settings.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/common/content_settings.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/host_content_settings_map.cc ('K') | « components/content_settings/core/browser/host_content_settings_map.cc ('k') | components/content_settings/core/common/pref_names.h » ('j') | components/content_settings/core/common/pref_names.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ae9fb93fdd38d0bc41281fbdf0bf4979df4fdedb..7f49a8c11d9fc217abb0211939f4b915d1923947 100644

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

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

@@ -60,15 +60,16 @@ struct RendererContentSettingRules {

namespace content_settings {

// Enum containing the various source for content settings. Settings can be

-// set by policy, extension or the user. Certain (internal) schemes are

-// whilelisted. For whilelisted schemes the source is

-// |SETTING_SOURCE_WHITELIST|.

+// set by policy, extension, the user or by the custodian of a supervised user.

+// Certain (internal) schemes are whilelisted. For whilelisted schemes the

+// source is |SETTING_SOURCE_WHITELIST|.

enum SettingSource {

SETTING_SOURCE_NONE,

SETTING_SOURCE_POLICY,

SETTING_SOURCE_EXTENSION,

SETTING_SOURCE_USER,

SETTING_SOURCE_WHITELIST,

+ SETTING_SOURCE_SUPERVISED,

};

// |SettingInfo| provides meta data for content setting values. |source|