components/content_settings/core/browser/content_settings_pref_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_pref_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_pref_provider.h ('k') | components/content_settings/core/browser/content_settings_registry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9a7e358875c0ac72ebd5cfde08c9869299459864..a29dfbdee59b0a9eca0e96f0ca60e0a574c010ce 100644

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

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

@@ -14,6 +14,9 @@

#include "base/bind.h"

#include "base/memory/scoped_ptr.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 "base/strings/string_split.h"

#include "base/time/clock.h"

#include "base/time/default_clock.h"

@@ -27,9 +30,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"

namespace {