| Index: chrome/browser/sync/glue/syncable_service_adapter.h
|
| ===================================================================
|
| --- chrome/browser/sync/glue/syncable_service_adapter.h (revision 94142)
|
| +++ chrome/browser/sync/glue/syncable_service_adapter.h (working copy)
|
| @@ -29,8 +29,8 @@
|
| virtual ~SyncableServiceAdapter();
|
|
|
| // AssociatorInterface implementation.
|
| - virtual bool AssociateModels(SyncError* error) OVERRIDE;
|
| - virtual bool DisassociateModels(SyncError* error) OVERRIDE;
|
| + virtual bool AssociateModels() OVERRIDE;
|
| + virtual bool DisassociateModels() OVERRIDE;
|
| virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes) OVERRIDE;
|
| virtual void AbortAssociation() OVERRIDE;
|
| virtual bool CryptoReadyIfNecessary() OVERRIDE;
|
|
|