diff options
| author | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 22:50:29 +0000 |
|---|---|---|
| committer | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 22:50:29 +0000 |
| commit | 58fe019372fa8cf8dee7c5ed5f7e4c69609ec5c0 (patch) | |
| tree | 2eba77b6b99335081ec273ef5b26068eef60f756 /chrome/browser/sync/syncable | |
| parent | 1056b6caefdc122e512becdc65c44b9f9574f3a7 (diff) | |
| download | chromium_src-58fe019372fa8cf8dee7c5ed5f7e4c69609ec5c0.zip chromium_src-58fe019372fa8cf8dee7c5ed5f7e4c69609ec5c0.tar.gz chromium_src-58fe019372fa8cf8dee7c5ed5f7e4c69609ec5c0.tar.bz2 | |
Re-land the protocol extension for syncing passwords patch.
BUG=34176
TEST=none
Review URL: http://codereview.chromium.org/2024006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/syncable')
| -rw-r--r-- | chrome/browser/sync/syncable/model_type.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/sync/syncable/model_type.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc index 27bfd92..dd3af20 100644 --- a/chrome/browser/sync/syncable/model_type.cc +++ b/chrome/browser/sync/syncable/model_type.cc @@ -7,6 +7,7 @@ #include "chrome/browser/sync/engine/syncproto.h" #include "chrome/browser/sync/protocol/autofill_specifics.pb.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" +#include "chrome/browser/sync/protocol/password_specifics.pb.h" #include "chrome/browser/sync/protocol/preference_specifics.pb.h" #include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/protocol/theme_specifics.pb.h" @@ -20,6 +21,9 @@ void AddDefaultExtensionValue(syncable::ModelType datatype, case BOOKMARKS: specifics->MutableExtension(sync_pb::bookmark); break; + case PASSWORD: + specifics->MutableExtension(sync_pb::password); + break; case PREFERENCES: specifics->MutableExtension(sync_pb::preference); break; @@ -72,6 +76,9 @@ ModelType GetModelTypeFromSpecifics(const sync_pb::EntitySpecifics& specifics) { if (specifics.HasExtension(sync_pb::bookmark)) return BOOKMARKS; + if (specifics.HasExtension(sync_pb::password)) + return PASSWORD; + if (specifics.HasExtension(sync_pb::preference)) return PREFERENCES; diff --git a/chrome/browser/sync/syncable/model_type.h b/chrome/browser/sync/syncable/model_type.h index dc7aceb..517484f 100644 --- a/chrome/browser/sync/syncable/model_type.h +++ b/chrome/browser/sync/syncable/model_type.h @@ -44,6 +44,8 @@ enum ModelType { // A preference folder or a preference object. PREFERENCES, + // A password folder or password object. + PASSWORD, // An autofill folder or an autofill object. AUTOFILL, // A themes folder or a themes object. |