components/content_settings.gypi - 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.gypi

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

« chrome/browser/supervised_user/supervised_user_constants.h ('K') | « chrome/browser/supervised_user/supervised_user_pref_store.cc ('k') | components/content_settings/core/browser/BUILD.gn » ('j') | components/content_settings/core/browser/content_settings_binary_value_map.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings.gypi

diff --git a/components/content_settings.gypi b/components/content_settings.gypi

index 3ba3b12cbab447f78f80863eb94af14ea55dcbc0..8ffec8fe217ea1e2f34dc16decdfb5e69d9b1a14 100644

--- a/components/content_settings.gypi

+++ b/components/content_settings.gypi

@@ -27,6 +27,8 @@

'content_settings/core/browser/content_settings_default_provider.h',

'content_settings/core/browser/content_settings_details.cc',

'content_settings/core/browser/content_settings_details.h',

+ 'content_settings/core/browser/content_settings_binary_value_map.cc',

Bernhard Bauer 2015/02/05 12:07:51 Keep this alphabetically ordered; "binary" comes b

knn 2015/02/26 12:07:29 Done.

+ 'content_settings/core/browser/content_settings_binary_value_map.h',

'content_settings/core/browser/content_settings_observable_provider.cc',

'content_settings/core/browser/content_settings_observable_provider.h',

'content_settings/core/browser/content_settings_observer.h',

@@ -41,6 +43,8 @@

'content_settings/core/browser/content_settings_provider.h',

'content_settings/core/browser/content_settings_rule.cc',

'content_settings/core/browser/content_settings_rule.h',

+ 'content_settings/core/browser/content_settings_supervised_provider.cc',

+ 'content_settings/core/browser/content_settings_supervised_provider.h',

'content_settings/core/browser/content_settings_usages_state.cc',

'content_settings/core/browser/content_settings_usages_state.h',

'content_settings/core/browser/content_settings_utils.cc',