| Index: chrome/common/pref_names.cc
|
| ===================================================================
|
| --- chrome/common/pref_names.cc (revision 72174)
|
| +++ chrome/common/pref_names.cc (working copy)
|
| @@ -252,13 +252,11 @@
|
|
|
| // Used to migrate preferences from local state to user preferences to
|
| // enable multiple profiles.
|
| -// BITMASK with possible values (see browser_prefs.cc for enum):
|
| -// 0: No preferences migrated.
|
| -// 1: DNS preferences migrated: kDnsPrefetchingStartupList and HostReferralList
|
| -// 2: Browser window preferences migrated: kDevToolsSplitLocation and
|
| -// kBrowserWindowPlacement
|
| +// Holds possible values:
|
| +// 0: no preferences migrated yet.
|
| +// 1: dns prefetching preferences stored in user preferences.
|
| const char kMultipleProfilePrefMigration[] =
|
| - "local_state.multiple_profile_prefs_version";
|
| + "profile.multiple_profile_prefs_version";
|
|
|
| #if defined(USE_NSS) || defined(USE_OPENSSL)
|
| // Prefs for SSLConfigServicePref. Currently, these are only present on
|
|
|
| Property changes on: chrome/common/pref_names.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|