| Index: chrome/browser/sync/glue/autofill_change_processor.h
|
| diff --git a/chrome/browser/sync/glue/autofill_change_processor.h b/chrome/browser/sync/glue/autofill_change_processor.h
|
| index 70325a43d3f5b745ab9ec1c08bebac98d531cfe5..13196e3dea59631e2493c140599ecff11f5a8c90 100644
|
| --- a/chrome/browser/sync/glue/autofill_change_processor.h
|
| +++ b/chrome/browser/sync/glue/autofill_change_processor.h
|
| @@ -8,12 +8,12 @@
|
|
|
| #include <vector>
|
|
|
| +#include "base/compiler_specific.h"
|
| #include "chrome/browser/autofill/autofill_profile.h"
|
| #include "chrome/browser/autofill/credit_card.h"
|
| #include "chrome/browser/autofill/personal_data_manager.h"
|
| #include "chrome/browser/sync/glue/change_processor.h"
|
| #include "chrome/browser/sync/glue/sync_backend_host.h"
|
| -#include "chrome/browser/sync/internal_api/sync_manager.h"
|
| #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
|
| #include "chrome/browser/webdata/web_data_service.h"
|
| #include "content/common/notification_observer.h"
|
| @@ -52,17 +52,16 @@ class AutofillChangeProcessor : public ChangeProcessor,
|
| // WebDataService -> sync_api model change application.
|
| virtual void Observe(int type,
|
| const NotificationSource& source,
|
| - const NotificationDetails& details);
|
| + const NotificationDetails& details) OVERRIDE;
|
|
|
| // sync_api model -> WebDataService change application.
|
| virtual void ApplyChangesFromSyncModel(
|
| const sync_api::BaseTransaction* trans,
|
| - const sync_api::SyncManager::ChangeRecord* changes,
|
| - int change_count);
|
| + const sync_api::ImmutableChangeRecordList& changes) OVERRIDE;
|
|
|
| // Commit any changes from ApplyChangesFromSyncModel buffered in
|
| // autofill_changes_.
|
| - virtual void CommitChangesFromSyncModel();
|
| + virtual void CommitChangesFromSyncModel() OVERRIDE;
|
|
|
| // Copy the properties of the given Autofill entry into the sync
|
| // node.
|
| @@ -72,8 +71,8 @@ class AutofillChangeProcessor : public ChangeProcessor,
|
| // buffers).
|
|
|
| protected:
|
| - virtual void StartImpl(Profile* profile);
|
| - virtual void StopImpl();
|
| + virtual void StartImpl(Profile* profile) OVERRIDE;
|
| + virtual void StopImpl() OVERRIDE;
|
|
|
| private:
|
| void StartObserving();
|
| @@ -94,12 +93,12 @@ class AutofillChangeProcessor : public ChangeProcessor,
|
| // The following methods are the implementation of ApplyChangeFromSyncModel
|
| // for the respective autofill subtypes.
|
| void ApplySyncAutofillEntryChange(
|
| - sync_api::SyncManager::ChangeRecord::Action action,
|
| + sync_api::ChangeRecord::Action action,
|
| const sync_pb::AutofillSpecifics& autofill,
|
| std::vector<AutofillEntry>* new_entries,
|
| int64 sync_id);
|
| void ApplySyncAutofillProfileChange(
|
| - sync_api::SyncManager::ChangeRecord::Action action,
|
| + sync_api::ChangeRecord::Action action,
|
| const sync_pb::AutofillProfileSpecifics& profile,
|
| int64 sync_id);
|
|
|
|
|