Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

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

Issue 12324009: Remove PrefService parameter from chrome::RegisterPrefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit. 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
OLDNEW
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 PrefRegistrySimple;
9 class PrefRegistrySyncable; 9 class PrefRegistrySyncable;
10 class PrefService; 10 class PrefService;
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 // Register all prefs that will be used via the local state PrefService.
16 void RegisterLocalState(PrefService* local_state, PrefRegistrySimple* registry); 16 void RegisterLocalState(PrefRegistrySimple* registry);
17
18 // Register all prefs that will be used via a PrefService attached to a Profile.
17 void RegisterUserPrefs(PrefService* user_prefs, PrefRegistrySyncable* registry); 19 void RegisterUserPrefs(PrefService* user_prefs, PrefRegistrySyncable* registry);
18 20
19 // Migrates prefs from |local_state| to |profile|'s pref store. 21 // Migrates prefs from |local_state| to |profile|'s pref store.
20 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state); 22 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state);
21 23
22 // Migrates prefs in |profile|'s pref store. 24 // Migrates prefs in |profile|'s pref store.
23 void MigrateUserPrefs(Profile* profile); 25 void MigrateUserPrefs(Profile* profile);
24 26
25 } // namespace chrome 27 } // namespace chrome
26 28
27 #endif // CHROME_BROWSER_PREFS_BROWSER_PREFS_H_ 29 #endif // CHROME_BROWSER_PREFS_BROWSER_PREFS_H_
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698