chrome/browser/content_settings/content_settings_policy_provider.h - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. 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:

Index: chrome/browser/content_settings/content_settings_policy_provider.h

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

index eb8c3d0185750cdeaa0397124c3cbeb3d8e9eec0..6635996ee64614973c9686cf984f1afb6fe86e5d 100644

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

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

@@ -16,7 +16,7 @@

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

class PrefService;

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

namespace content_settings {

@@ -25,7 +25,7 @@ class PolicyProvider : public ObservableProvider {

public:

explicit PolicyProvider(PrefService* prefs);

virtual ~PolicyProvider();

- static void RegisterUserPrefs(PrefServiceSyncable* prefs);

+ static void RegisterUserPrefs(PrefRegistrySyncable* registry);

// ProviderInterface implementations.

virtual RuleIterator* GetRuleIterator(