chrome/browser/policy/configuration_policy_pref_store.cc - Issue 7328018: Migrate default geolocation content setting to host content settings map.

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 7328018: Migrate default geolocation content setting to host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix nits Created 9 years, 5 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/geolocation/geolocation_settings_state.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc » ('j') | no next file with comments »
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 72915448d7e31bf4a6939ef3be8be4a62d9d3cb2..9cfdb62e76739f73d67d85401ddfec6a8fabf8fe 100644

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

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

@@ -236,7 +236,7 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry

{ Value::TYPE_INTEGER, kPolicyDefaultNotificationSetting,

prefs::kDesktopNotificationDefaultContentSetting },

{ Value::TYPE_INTEGER, kPolicyDefaultGeolocationSetting,

- prefs::kGeolocationDefaultContentSetting },

+ prefs::kManagedDefaultGeolocationSetting },

{ Value::TYPE_STRING, kPolicyAuthSchemes,

prefs::kAuthSchemes },

{ Value::TYPE_BOOLEAN, kPolicyDisableAuthNegotiateCnameLookup,