components/content_settings/core/browser/host_content_settings_map.cc - 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/host_content_settings_map.cc

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

Patch Set: Addressed comments. 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

« chrome/browser/supervised_user/supervised_user_settings_service.cc ('K') | « components/content_settings/core/browser/host_content_settings_map.h ('k') | components/content_settings/core/common/content_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 386de0c5872b9a8524b3899a19e271ffed60b654..48a271e3f14bc79a711ce28801fa0d3095ed90fc 100644

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

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

@@ -37,6 +37,7 @@ typedef std::pair<std::string, std::string> StringPair;

// TODO(bauerb): Expose constants.

const char* kProviderNames[] = {

"platform_app",

+ "supervised_user",

"policy",

"extension",

"override",

@@ -57,6 +58,7 @@ const char kExtensionScheme[] = "chrome-extension";

content_settings::SettingSource kProviderSourceMap[] = {

content_settings::SETTING_SOURCE_EXTENSION,

content_settings::SETTING_SOURCE_POLICY,

+ content_settings::SETTING_SOURCE_SUPERVISED,

content_settings::SETTING_SOURCE_EXTENSION,

content_settings::SETTING_SOURCE_USER,