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

diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h

index 1063988cb3a3ea05519f4d38c2d3def640ffe88b..8a96910543d854ab31b1e9a67abcddc655e6844c 100644

--- a/chrome/browser/ui/browser_instant_controller.h

+++ b/chrome/browser/ui/browser_instant_controller.h

@@ -17,7 +17,8 @@

class Browser;

struct InstantSuggestion;

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

+class PrefService;

class Profile;

class ThemeService;

@@ -41,7 +42,8 @@ class BrowserInstantController : public content::NotificationObserver,

static bool IsInstantEnabled(Profile* profile);

// Registers Instant related preferences.

- static void RegisterUserPrefs(PrefServiceSyncable* prefs);

+ static void RegisterUserPrefs(PrefService* prefs,

+ PrefRegistrySyncable* registry);

// If |url| is the new tab page URL, set |target_contents| to the preloaded

// NTP contents from InstantController. If |source_contents| is not NULL, we