chrome/browser/prefs/browser_prefs.cc - Issue 6253012: Add ContentSettingsProvider Interface.

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/prefs/browser_prefs.cc

Issue 6253012: Add ContentSettingsProvider Interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix nits and rename ContentSettingsProviderInterface to ProviderInterface Created 9 years, 11 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:

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index f47187e08928caa980b539a99ee4ae54b2e10342..c43a5b89f16fed2801da38e6ef76b7b6b940a4dc 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -133,8 +133,10 @@ void RegisterUserPrefs(PrefService* user_prefs) {

PluginsUI::RegisterUserPrefs(user_prefs);

ProfileImpl::RegisterUserPrefs(user_prefs);

HostContentSettingsMap::RegisterUserPrefs(user_prefs);

- PolicyContentSettingsProvider::RegisterUserPrefs(user_prefs);

- PrefContentSettingsProvider::RegisterUserPrefs(user_prefs);

+ content_settings::PolicyDefaultContentSettingsProvider::RegisterUserPrefs(

+ user_prefs);

+ content_settings::PrefDefaultContentSettingsProvider::RegisterUserPrefs(

+ user_prefs);

HostZoomMap::RegisterUserPrefs(user_prefs);

DevToolsManager::RegisterUserPrefs(user_prefs);

PinnedTabCodec::RegisterUserPrefs(user_prefs);