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

diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h

index 029b83d7018eec354aa789509f83cc77d499ea78..ca028a095a0f7ef84399afe30c60928bbc0fb2ed 100644

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

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

class Extension;

}

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

namespace chrome {

@@ -34,7 +34,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

ChromeContentBrowserClient();

virtual ~ChromeContentBrowserClient();

- static void RegisterUserPrefs(PrefServiceSyncable* prefs);

+ static void RegisterUserPrefs(PrefRegistrySyncable* registry);

virtual content::BrowserMainParts* CreateBrowserMainParts(

const content::MainFunctionParams& parameters) OVERRIDE;