chrome/browser/policy/configuration_policy_pref_store.cc - Issue 7828022: Add a method to the HostContentSettings map to return the |Value| of a content setting

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/policy/configuration_policy_pref_store.cc

Issue 7828022: Add a method to the HostContentSettings map to return the |Value| of a content setting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comments addressed & Removed default auto select cert setting. 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

« chrome/browser/content_settings/host_content_settings_map.cc ('K') | « chrome/browser/content_settings/host_content_settings_map_unittest.cc ('k') | chrome/browser/policy/configuration_policy_pref_store_unittest.cc » ('j') | chrome/common/pref_names.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/configuration_policy_pref_store.cc

diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc

index 13cc468bd55a14f375f9635d832b5c0be1d458da..f06de78d02bc0a11534599f44c974a4ef2077ad3 100644

--- a/chrome/browser/policy/configuration_policy_pref_store.cc

+++ b/chrome/browser/policy/configuration_policy_pref_store.cc

@@ -230,8 +230,6 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry

prefs::kManagedDefaultPluginsSetting },

{ Value::TYPE_INTEGER, kPolicyDefaultPopupsSetting,

prefs::kManagedDefaultPopupsSetting },

- { Value::TYPE_INTEGER, kPolicyDefaultAutoSelectCertificateSetting,

- prefs::kManagedDefaultAutoSelectCertificateSetting },

{ Value::TYPE_LIST, kPolicyAutoSelectCertificateForUrls,

prefs::kManagedAutoSelectCertificateForUrls},

{ Value::TYPE_LIST, kPolicyCookiesAllowedForUrls,

@@ -1114,8 +1112,6 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {

key::kDefaultNotificationsSetting },

{ kPolicyDefaultGeolocationSetting, Value::TYPE_INTEGER,

key::kDefaultGeolocationSetting },

- { kPolicyDefaultAutoSelectCertificateSetting, Value::TYPE_INTEGER,

- key::kDefaultAutoSelectCertificateSetting},

{ kPolicyAutoSelectCertificateForUrls, Value::TYPE_LIST,

key::kAutoSelectCertificateForUrls},

{ kPolicyCookiesAllowedForUrls, Value::TYPE_LIST,