diff options
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.h | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index da61015..4a1cd31 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -159,11 +159,7 @@ enum MigratedPreferences { namespace chrome { -// TODO(joi): Do the work needed to remove the PrefService parameter, -// i.e. to do all registration up front before a PrefService is even -// created. -void RegisterLocalState(PrefService* local_state, - PrefRegistrySimple* registry) { +void RegisterLocalState(PrefRegistrySimple* registry) { // Prefs in Local State. registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); diff --git a/chrome/browser/prefs/browser_prefs.h b/chrome/browser/prefs/browser_prefs.h index 022f4a6..be8234d 100644 --- a/chrome/browser/prefs/browser_prefs.h +++ b/chrome/browser/prefs/browser_prefs.h @@ -12,8 +12,10 @@ class Profile; namespace chrome { -// Makes the PrefService objects aware of all the prefs. -void RegisterLocalState(PrefService* local_state, PrefRegistrySimple* registry); +// Register all prefs that will be used via the local state PrefService. +void RegisterLocalState(PrefRegistrySimple* registry); + +// Register all prefs that will be used via a PrefService attached to a Profile. void RegisterUserPrefs(PrefService* user_prefs, PrefRegistrySyncable* registry); // Migrates prefs from |local_state| to |profile|'s pref store. |