diff options
| author | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 18:52:53 +0000 |
|---|---|---|
| committer | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 18:52:53 +0000 |
| commit | f3d6b05780a984808f6bd833ad4302146667f684 (patch) | |
| tree | 2e7085f2105b651f1ff4b933d1487577db3d6249 /chrome/browser/sync/engine | |
| parent | 8079b36066fdbd24978e01fcce4c9c44a5470748 (diff) | |
| download | chromium_src-f3d6b05780a984808f6bd833ad4302146667f684.zip chromium_src-f3d6b05780a984808f6bd833ad4302146667f684.tar.gz chromium_src-f3d6b05780a984808f6bd833ad4302146667f684.tar.bz2 | |
Revert "Protocol extension for syncing passwords."
This reverts commit 4ab711db8ace2106fea6a95e12d2da6fbe4f78f7.
TBR=tommi
Review URL: http://codereview.chromium.org/2014004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 27 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.h | 12 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncproto.h | 1 |
3 files changed, 0 insertions, 40 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index bace7c4..20bfc12 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -48,7 +48,6 @@ #include "chrome/browser/sync/engine/syncer_thread.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/service_constants.h" #include "chrome/browser/sync/protocol/theme_specifics.pb.h" @@ -484,15 +483,6 @@ const sync_pb::BookmarkSpecifics& BaseNode::GetBookmarkSpecifics() const { return GetEntry()->Get(SPECIFICS).GetExtension(sync_pb::bookmark); } -bool BaseNode::GetPasswordSpecifics(sync_pb::PasswordSpecificsData* data) - const { - DCHECK(GetModelType() == syncable::PASSWORD); - DCHECK(data); - const sync_pb::PasswordSpecifics& specifics = - GetEntry()->Get(SPECIFICS).GetExtension(sync_pb::password); - return data->ParseFromString(specifics.blob()); -} - const sync_pb::PreferenceSpecifics& BaseNode::GetPreferenceSpecifics() const { DCHECK(GetModelType() == syncable::PREFERENCES); return GetEntry()->Get(SPECIFICS).GetExtension(sync_pb::preference); @@ -567,16 +557,6 @@ void WriteNode::PutBookmarkSpecificsAndMarkForSyncing( PutSpecificsAndMarkForSyncing(entity_specifics); } -void WriteNode::SetPasswordSpecifics( - const sync_pb::PasswordSpecificsData& data) { - DCHECK(GetModelType() == syncable::PASSWORD); - std::string serialized_data; - data.SerializeToString(&serialized_data); - sync_pb::PasswordSpecifics new_value; - new_value.set_blob(serialized_data); - PutPasswordSpecificsAndMarkForSyncing(new_value); -} - void WriteNode::SetPreferenceSpecifics( const sync_pb::PreferenceSpecifics& new_value) { DCHECK(GetModelType() == syncable::PREFERENCES); @@ -589,13 +569,6 @@ void WriteNode::SetThemeSpecifics( PutThemeSpecificsAndMarkForSyncing(new_value); } -void WriteNode::PutPasswordSpecificsAndMarkForSyncing( - const sync_pb::PasswordSpecifics& new_value) { - sync_pb::EntitySpecifics entity_specifics; - entity_specifics.MutableExtension(sync_pb::password)->CopyFrom(new_value); - PutSpecificsAndMarkForSyncing(entity_specifics); -} - void WriteNode::PutPreferenceSpecificsAndMarkForSyncing( const sync_pb::PreferenceSpecifics& new_value) { sync_pb::EntitySpecifics entity_specifics; diff --git a/chrome/browser/sync/engine/syncapi.h b/chrome/browser/sync/engine/syncapi.h index edfd70f..6420be6 100644 --- a/chrome/browser/sync/engine/syncapi.h +++ b/chrome/browser/sync/engine/syncapi.h @@ -76,8 +76,6 @@ class AutofillSpecifics; class BookmarkSpecifics; class EntitySpecifics; class PreferenceSpecifics; -class PasswordSpecifics; -class PasswordSpecificsData; class ThemeSpecifics; class TypedUrlSpecifics; } @@ -174,10 +172,6 @@ class BaseNode { // data. Can only be called if GetModelType() == AUTOFILL. const sync_pb::AutofillSpecifics& GetAutofillSpecifics() const; - // Getter specific to the PASSWORD datatype. Returns protobuf - // data. Can only be called if GetModelType() == PASSWORD. - bool GetPasswordSpecifics(sync_pb::PasswordSpecificsData*) const; - // Getter specific to the PREFERENCE datatype. Returns protobuf // data. Can only be called if GetModelType() == PREFERENCE. const sync_pb::PreferenceSpecifics& GetPreferenceSpecifics() const; @@ -293,10 +287,6 @@ class WriteNode : public BaseNode { // Should only be called if GetModelType() == AUTOFILL. void SetAutofillSpecifics(const sync_pb::AutofillSpecifics& specifics); - // Set the password specifics. - // Should only be called if GetModelType() == PASSWORD. - void SetPasswordSpecifics(const sync_pb::PasswordSpecificsData& specifics); - // Set the preference specifics (name and value). // Should only be called if GetModelType() == PREFERENCE. void SetPreferenceSpecifics(const sync_pb::PreferenceSpecifics& specifics); @@ -332,8 +322,6 @@ class WriteNode : public BaseNode { const sync_pb::AutofillSpecifics& new_value); void PutBookmarkSpecificsAndMarkForSyncing( const sync_pb::BookmarkSpecifics& new_value); - void PutPasswordSpecificsAndMarkForSyncing( - const sync_pb::PasswordSpecifics& new_value); void PutPreferenceSpecificsAndMarkForSyncing( const sync_pb::PreferenceSpecifics& new_value); void PutThemeSpecificsAndMarkForSyncing( diff --git a/chrome/browser/sync/engine/syncproto.h b/chrome/browser/sync/engine/syncproto.h index 3b9acb0..b412bea 100644 --- a/chrome/browser/sync/engine/syncproto.h +++ b/chrome/browser/sync/engine/syncproto.h @@ -8,7 +8,6 @@ #define CHROME_BROWSER_SYNC_ENGINE_SYNCPROTO_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/syncable/model_type.h" |