summaryrefslogtreecommitdiffstats
path: root/chrome/common/pref_names.h
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 20:26:59 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 20:26:59 +0000
commit48a98b382c7dd08e15aa794dad2eb28dcc75a8d8 (patch)
treedb33735092abbbea43d8f60776cd691cacbb2983 /chrome/common/pref_names.h
parentadace3f3a1306c0986936444574d84611a4bfa26 (diff)
downloadchromium_src-48a98b382c7dd08e15aa794dad2eb28dcc75a8d8.zip
chromium_src-48a98b382c7dd08e15aa794dad2eb28dcc75a8d8.tar.gz
chromium_src-48a98b382c7dd08e15aa794dad2eb28dcc75a8d8.tar.bz2
Take 2 - Get password sync to a usable state.
Plumb the gaia password up to the cryptographer to generate an encryption key. Add NIGORI to the list of active datatypes to request if enable-sync-passwords is specified. Also fixes behavior from bug 55501 (required adding ExtraChangeRecordData to syncapi), as well as an ADD-handling bug in ApplyChangesFromSyncModel. Add back the call to Cryptographer::Bootstrap which was mistakenly removed in auth refactor. This patch doesn't have necessary UI to handle secondary passphrases, password changes, or existing user upgrades. Only unsynced profiles can currently get password sync working. BUG=48702, 32410, 55501 TEST=ProfileSyncPasswordTest, upcoming password integration tests Review URL: http://codereview.chromium.org/3441009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pref_names.h')
-rw-r--r--chrome/common/pref_names.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 5f7b957..1bacef4 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -346,6 +346,7 @@ extern const char kSyncManaged[];
extern const char kSyncSuppressStart[];
extern const char kGoogleServicesUsername[];
extern const char kSyncCredentialsMigrated[];
+extern const char kSyncUsingSecondaryPassphrase[];
extern const char kEncryptionBootstrapToken[];
extern const char kWebAppCreateOnDesktop[];