chrome/browser/content_settings/content_settings_default_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_default_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:

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 d54a32fa1e5ee83b28dcd9ea7549a10fb9730da8..28a2fe11d3eff0028ff02cbd59cc6950dbc414cc 100644

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

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

@@ -15,8 +15,8 @@

#include "base/synchronization/lock.h"

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

+class PrefRegistrySyncable;

class PrefService;

-class PrefServiceSyncable;

namespace content_settings {

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

// default values.

class DefaultProvider : public ObservableProvider {

public:

- static void RegisterUserPrefs(PrefServiceSyncable* prefs);

+ static void RegisterUserPrefs(PrefRegistrySyncable* registry);

DefaultProvider(PrefService* prefs,

bool incognito);