chrome/browser/content_settings/content_settings_default_provider.h - Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace.

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_default_provider.h

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixes Created 7 years, 8 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/chromeos/proxy_config_service_impl.cc ('k') | chrome/browser/content_settings/content_settings_default_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_default_provider.h

diff --git a/chrome/browser/content_settings/content_settings_default_provider.h b/chrome/browser/content_settings/content_settings_default_provider.h

index 9bc124ba49e467afea445eb8f82725ce8ad443fe..92c2e3ef5075b07dc5c7566ced75714efa406b44 100644

--- a/chrome/browser/content_settings/content_settings_default_provider.h

+++ b/chrome/browser/content_settings/content_settings_default_provider.h

@@ -15,9 +15,12 @@

#include "base/synchronization/lock.h"

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

-class PrefRegistrySyncable;

class PrefService;

+namespace user_prefs {

+class PrefRegistrySyncable;

namespace content_settings {

// Provider that provides default content settings based on

@@ -25,7 +28,7 @@ namespace content_settings {

// default values.

class DefaultProvider : public ObservableProvider {

public:

- static void RegisterUserPrefs(PrefRegistrySyncable* registry);

+ static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);

DefaultProvider(PrefService* prefs,

bool incognito);