chrome/browser/prefs/browser_prefs.h - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/prefs/browser_prefs.h

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix double registration in Chrome Frame test. 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/policy/user_policy_signin_service_unittest.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_PREFS_BROWSER_PREFS_H_	5 #ifndef CHROME_BROWSER_PREFS_BROWSER_PREFS_H_

6 #define CHROME_BROWSER_PREFS_BROWSER_PREFS_H_	6 #define CHROME_BROWSER_PREFS_BROWSER_PREFS_H_

7	7

	8 class PrefRegistrySimple;

8 class PrefService;	9 class PrefService;

9 class PrefServiceSimple;

10 class PrefServiceSyncable;	10 class PrefServiceSyncable;

11 class Profile;	11 class Profile;

12	12

13 namespace chrome {	13 namespace chrome {

14	14

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

16 void RegisterLocalState(PrefServiceSimple* local_state);	16 void RegisterLocalState(PrefRegistrySimple* registry, PrefService* local_state);

17 void RegisterUserPrefs(PrefServiceSyncable* user_prefs);	17 void RegisterUserPrefs(PrefServiceSyncable* user_prefs);

18	18

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

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

21	21

22 // Migrates prefs in \|profile\|'s pref store.	22 // Migrates prefs in \|profile\|'s pref store.

23 void MigrateUserPrefs(Profile* profile);	23 void MigrateUserPrefs(Profile* profile);

24	24

25 } // namespace chrome	25 } // namespace chrome

26	26

27 #endif // CHROME_BROWSER_PREFS_BROWSER_PREFS_H_	27 #endif // CHROME_BROWSER_PREFS_BROWSER_PREFS_H_

OLD	NEW