chrome/browser/content_settings/policy_content_settings_provider.cc - Issue 6410022: Add content_settings::PrefProvider to HostContentSettingsMap.

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/policy_content_settings_provider.cc

Issue 6410022: Add content_settings::PrefProvider to HostContentSettingsMap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: " Created 9 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

« no previous file with comments | « chrome/browser/content_settings/mock_content_settings_provider.h ('k') | chrome/browser/content_settings/pref_content_settings_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/policy_content_settings_provider.cc

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

index fab9d543e2d53ed45e8973dee636d18a83693a3c..d39aceff67077c66f93741b05ee428b3c40ee171 100644

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

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

@@ -168,9 +168,9 @@ void PolicyDefaultProvider::UpdateManagedDefaultSetting(

// If a pref to manage a default-content-setting was not set (NOTICE:

// "HasPrefPath" returns false if no value was set for a registered pref) then

// the default value of the preference is used. The default value of a

- // preference to manage a default-content-settings is

- // CONTENT_SETTING_DEFAULT. This indicates that no managed value is set. If a

- // pref was set, than it MUST be managed.

+ // preference to manage a default-content-settings is CONTENT_SETTING_DEFAULT.

+ // This indicates that no managed value is set. If a pref was set, than it

+ // MUST be managed.

PrefService* prefs = profile_->GetPrefs();

DCHECK(!prefs->HasPrefPath(kPrefToManageType[type]) ||

prefs->IsManagedPreference(kPrefToManageType[type]));