| Index: chrome/browser/sync/glue/autofill_profile_model_associator.h
|
| diff --git a/chrome/browser/sync/glue/autofill_profile_model_associator.h b/chrome/browser/sync/glue/autofill_profile_model_associator.h
|
| index ec481fd682045bb479a89bb3a405d0e5ae2f7d38..b52ada481635547f7b045c2265d8b8bdcd448f5f 100755
|
| --- a/chrome/browser/sync/glue/autofill_profile_model_associator.h
|
| +++ b/chrome/browser/sync/glue/autofill_profile_model_associator.h
|
| @@ -31,6 +31,8 @@ class WriteTransaction;
|
|
|
| namespace browser_sync {
|
|
|
| +extern const char kAutofillProfileTag[];
|
| +
|
| class AutofillChangeProcessor;
|
| class UnrecoverableErrorHandler;
|
|
|
| @@ -69,13 +71,9 @@ class AutofillProfileModelAssociator
|
| // See ModelAssociator interface.
|
| virtual void AbortAssociation();
|
|
|
| - // [TODO]Not implemented. Does not seemt to be necessary.
|
| - virtual const std::string* GetChromeNodeFromSyncId(
|
| - int64 sync_id) {
|
| - return NULL;
|
| - }
|
| + virtual const std::string* GetChromeNodeFromSyncId(int64 sync_id);
|
|
|
| - // [TODO]Not implemented. Does not seem to be necessary.
|
| + // [TODO]Not implemented.
|
| virtual bool InitSyncNodeFromChromeId(std::string node_id,
|
| sync_api::BaseNode* sync_node) {
|
| return false;
|
| @@ -95,16 +93,17 @@ class AutofillProfileModelAssociator
|
| // given permanent tag was found and update
|
| // |sync_id| with that node's id. No current use. To Implement
|
| // only for completeness.
|
| - virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id) {
|
| - return false;
|
| - }
|
| + virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id);
|
|
|
| // Returns sync service instance.
|
| ProfileSyncService* sync_service() { return sync_service_; }
|
|
|
| + static bool OverwriteProfileWithServerData(
|
| + AutoFillProfile* merge_into,
|
| + const sync_pb::AutofillProfileSpecifics& specifics);
|
| +
|
| protected:
|
| AutofillProfileModelAssociator() {}
|
| - virtual sync_api::ReadNode* GetReadNode(sync_api::WriteTransaction *trans);
|
| bool TraverseAndAssociateChromeAutoFillProfiles(
|
| sync_api::WriteTransaction* write_trans,
|
| const sync_api::ReadNode& autofill_root,
|
| @@ -139,10 +138,6 @@ class AutofillProfileModelAssociator
|
| const sync_api::ReadNode& autofill_root,
|
| DataBundle* bundle);
|
|
|
| - static bool OverwriteProfileWithServerData(
|
| - AutoFillProfile* merge_into,
|
| - const sync_pb::AutofillProfileSpecifics& specifics);
|
| -
|
| private:
|
| typedef std::map<std::string, int64> AutofillToSyncIdMap;
|
| typedef std::map<int64, std::string> SyncIdToAutofillMap;
|
|
|