components/content_settings/core/browser/content_settings_default_provider.cc - Issue 1662843002: Revert of Delete base/prefs and update callers to use components.

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: components/content_settings/core/browser/content_settings_default_provider.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/content_settings/core/browser/content_settings_default_provider.h ('k') | components/content_settings/core/browser/content_settings_policy_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_default_provider.cc

diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc

index 7d8d25b9c90e68e598777a8c4c45768ac4d3685c..9cd6eba3792e6eef889c0d338605e4c6ec316699 100644

--- a/components/content_settings/core/browser/content_settings_default_provider.cc

+++ b/components/content_settings/core/browser/content_settings_default_provider.cc

@@ -11,6 +11,9 @@

#include "base/bind.h"

#include "base/command_line.h"

#include "base/metrics/histogram_macros.h"

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

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

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

#include "components/content_settings/core/browser/content_settings_rule.h"

#include "components/content_settings/core/browser/content_settings_utils.h"

#include "components/content_settings/core/browser/website_settings_info.h"

@@ -19,9 +22,6 @@

#include "components/content_settings/core/common/content_settings_pattern.h"

#include "components/content_settings/core/common/pref_names.h"

#include "components/pref_registry/pref_registry_syncable.h"

-#include "components/prefs/pref_registry.h"

-#include "components/prefs/pref_service.h"

-#include "components/prefs/scoped_user_pref_update.h"

#include "url/gurl.h"

namespace content_settings {