Remove user-related data from local_state and add to user_preferences, i...

chrome/common/pref_names.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pref_names.h"
 
 namespace prefs {
 
 // *************** PROFILE PREFS ***************
 // These are attached to the user profile
@@ skipping 257 matching lines @@
 
 // Time when instant was last enabled.
 const char kInstantEnabledTime[] = "instant.enabled_time";
 
 // Used to maintain instant promo keys. See PromoCounter for details of subkeys
 // that are used.
 const char kInstantPromo[] = "instant.promo";
 
 // Used to migrate preferences from local state to user preferences to
 // enable multiple profiles.
-// Holds possible values:
-// 0: no preferences migrated yet.
-// 1: dns prefetching preferences stored in user preferences.
+// 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
 const char kMultipleProfilePrefMigration[] =
-    "profile.multiple_profile_prefs_version";
+    "local_state.multiple_profile_prefs_version";
 
 #if defined(USE_NSS) || defined(USE_OPENSSL)
 // Prefs for SSLConfigServicePref.  Currently, these are only present on
 // and used by NSS/OpenSSL using OSes.
 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled";
 const char kSSL3Enabled[] = "ssl.ssl3.enabled";
 const char kTLS1Enabled[] = "ssl.tls1.enabled";
 #endif
 
 #if defined(OS_CHROMEOS)
@@ skipping 938 matching lines @@
 const char kManagedDefaultPluginsSetting[] =
     "profile.managed_default_content_settings.plugins";
 const char kManagedDefaultPopupsSetting[] =
     "profile.managed_default_content_settings.popups";
 
 // Dictionary for storing the set of known background pages (keys are extension
 // IDs of background page owners, value is a boolean that is true if the user
 // needs to acknowledge this page.
 const char kKnownBackgroundPages[] = "background_pages.known";
 }  // namespace prefs