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

diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h

index f2a3d3ef23a83dd820370b33cd89afd87efceb33..71c42c518e32f886ee8ff7dd4f2e51f3482b5d82 100644

--- a/chrome/browser/ui/prefs/prefs_tab_helper.h

+++ b/chrome/browser/ui/prefs/prefs_tab_helper.h

@@ -12,7 +12,8 @@

#include "content/public/browser/web_contents_user_data.h"

class OverlayUserPrefStore;

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

+class PrefService;

class Profile;

namespace content {

@@ -26,7 +27,9 @@ class PrefsTabHelper : public content::NotificationObserver,

virtual ~PrefsTabHelper();

static void InitIncognitoUserPrefStore(OverlayUserPrefStore* pref_store);

- static void RegisterUserPrefs(PrefServiceSyncable* prefs);

+ static void RegisterUserPrefs(PrefRegistrySyncable* registry);

+ static void MigrateUserPrefs(PrefService* prefs,

+ PrefRegistrySyncable* registry);

protected:

// Update the RenderView's WebPreferences. Exposed as protected for testing.