chrome/browser/prefs/browser_prefs.cc - Issue 5528010: Implement preference and policy based content settings providers.

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 5528010: Implement preference and policy based content settings providers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/content_settings

Patch Set: Created 10 years 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/pref_content_settings_provider.h ('K') | « chrome/browser/cookies_tree_model_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

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

index 7497dd6a32b466a9c546bbaa995055395c236b9a..9c5722137aa01477366ad53f13eaa9f7c107d48f 100644

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

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

@@ -12,6 +12,8 @@

#include "chrome/browser/bookmarks/bookmark_utils.h"

#include "chrome/browser/browser_shutdown.h"

#include "chrome/browser/content_settings/host_content_settings_map.h"

+#include "chrome/browser/content_settings/policy_content_settings_provider.h"

+#include "chrome/browser/content_settings/pref_content_settings_provider.h"

#include "chrome/browser/debugger/devtools_manager.h"

#include "chrome/browser/dom_ui/flags_ui.h"

#include "chrome/browser/dom_ui/new_tab_ui.h"

@@ -128,6 +130,8 @@ 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);

HostZoomMap::RegisterUserPrefs(user_prefs);

DevToolsManager::RegisterUserPrefs(user_prefs);

PinnedTabCodec::RegisterUserPrefs(user_prefs);