chrome/browser/chromeos/preferences.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/chromeos/preferences.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/chromeos/preferences.h

diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h

index ffcad342ec6d185646139f19bd0a32216b64e33c..fa120b050f00ec6786510db0ed06318129600e61 100644

--- a/chrome/browser/chromeos/preferences.h

+++ b/chrome/browser/chromeos/preferences.h

@@ -13,6 +13,7 @@

#include "chrome/browser/chromeos/language_preferences.h"

#include "chrome/browser/prefs/pref_service_syncable_observer.h"

+class PrefRegistrySyncable;

class PrefService;

class PrefServiceSyncable;

@@ -33,7 +34,8 @@ class Preferences : public PrefServiceSyncableObserver {

virtual ~Preferences();

// This method will register the prefs associated with Chrome OS settings.

- static void RegisterUserPrefs(PrefServiceSyncable* prefs);

+ static void RegisterUserPrefs(PrefService* prefs,

+ PrefRegistrySyncable* registry);

// This method will initialize Chrome OS settings to values in user prefs.

void Init(PrefServiceSyncable* prefs);