| Index: chrome/browser/sync/glue/syncable_service_adapter.h
|
| diff --git a/chrome/browser/sync/glue/syncable_service_adapter.h b/chrome/browser/sync/glue/syncable_service_adapter.h
|
| index b19a867156104508d9132ec1b11907aad51e06d6..7390f1c0513e7459be17a72188ed07f8a29c2843 100644
|
| --- a/chrome/browser/sync/glue/syncable_service_adapter.h
|
| +++ b/chrome/browser/sync/glue/syncable_service_adapter.h
|
| @@ -29,8 +29,8 @@ class SyncableServiceAdapter : public AssociatorInterface {
|
| virtual ~SyncableServiceAdapter();
|
|
|
| // AssociatorInterface implementation.
|
| - virtual bool AssociateModels() OVERRIDE;
|
| - virtual bool DisassociateModels() OVERRIDE;
|
| + virtual bool AssociateModels(SyncError* error) OVERRIDE;
|
| + virtual bool DisassociateModels(SyncError* error) OVERRIDE;
|
| virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes) OVERRIDE;
|
| virtual void AbortAssociation() OVERRIDE;
|
| virtual bool CryptoReadyIfNecessary() OVERRIDE;
|
|
|