chrome/browser/prefs/browser_prefs.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/prefs/browser_prefs.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/prefs/browser_prefs.h

diff --git a/chrome/browser/prefs/browser_prefs.h b/chrome/browser/prefs/browser_prefs.h

index 5fb526224b73d9cf4ea21dcd1f4834f743c9ca90..022f4a6a5fa55a5e998195bc02631b4569fdd8df 100644

--- a/chrome/browser/prefs/browser_prefs.h

+++ b/chrome/browser/prefs/browser_prefs.h

@@ -6,15 +6,15 @@

#define CHROME_BROWSER_PREFS_BROWSER_PREFS_H_

class PrefRegistrySimple;

+class PrefRegistrySyncable;

class PrefService;

-class PrefServiceSyncable;

class Profile;

namespace chrome {

// Makes the PrefService objects aware of all the prefs.

-void RegisterLocalState(PrefRegistrySimple* registry, PrefService* local_state);

-void RegisterUserPrefs(PrefServiceSyncable* user_prefs);

+void RegisterLocalState(PrefService* local_state, PrefRegistrySimple* registry);

+void RegisterUserPrefs(PrefService* user_prefs, PrefRegistrySyncable* registry);

// Migrates prefs from |local_state| to |profile|'s pref store.

void MigrateBrowserPrefs(Profile* profile, PrefService* local_state);