chrome/browser/content_settings/content_settings_policy_provider.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 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/content_settings_default_provider_unittest.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_policy_provider.cc

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

index 0687d6a2b2a4b1de1a34927a4eb2fd251e5a9389..53ead59a6c91424018e1c2182b4aa36d463c0e05 100644

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

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

@@ -8,11 +8,11 @@

#include <vector>

#include "base/json/json_reader.h"

+#include "base/prefs/pref_service.h"

#include "base/values.h"

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

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

#include "chrome/browser/prefs/pref_registry_syncable.h"

-#include "chrome/browser/prefs/pref_service.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/content_settings_pattern.h"

#include "chrome/common/pref_names.h"