chrome/browser/content_settings/content_settings_policy_provider.cc - Issue 7713034: HostContentSettingsMap refactoring.

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

Issue 7713034: HostContentSettingsMap refactoring. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Code review comments. Threading fixes. Mac + win fixes. Created 9 years, 4 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 | « chrome/browser/content_settings/content_settings_browsertest.cc ('k') | chrome/browser/content_settings/content_settings_pref_provider.cc » ('j') | chrome/browser/content_settings/cookie_settings.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_policy_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc

index 4b135b8c867d52d407f219ebd75f312021a7541e..178ac54338cb80e5a337c5f3ffd9099e487ac2fe 100644

--- a/chrome/browser/content_settings/content_settings_policy_provider.cc

+++ b/chrome/browser/content_settings/content_settings_policy_provider.cc

@@ -53,8 +53,16 @@ const PrefsForManagedContentSettingsMapEntry

CONTENT_SETTINGS_TYPE_COOKIES,

CONTENT_SETTING_ALLOW

}, {

+ prefs::kManagedCookiesAllowedForUrls,

+ CONTENT_SETTINGS_TYPE_COOKIES_SESSION_ONLY,

+ CONTENT_SETTING_ALLOW

+ }, {

prefs::kManagedCookiesSessionOnlyForUrls,

CONTENT_SETTINGS_TYPE_COOKIES,

+ CONTENT_SETTING_ALLOW

+ }, {

+ prefs::kManagedCookiesSessionOnlyForUrls,

+ CONTENT_SETTINGS_TYPE_COOKIES_SESSION_ONLY,

CONTENT_SETTING_SESSION_ONLY

}, {

prefs::kManagedCookiesBlockedForUrls,