| Index: chrome/browser/sync/glue/typed_url_model_associator.h
|
| diff --git a/chrome/browser/sync/glue/typed_url_model_associator.h b/chrome/browser/sync/glue/typed_url_model_associator.h
|
| index fb75550ff131db4dd58b3e8206f47c2d5f2c5484..ae4c5c180ae852625047727676f8e4f10132f2e1 100644
|
| --- a/chrome/browser/sync/glue/typed_url_model_associator.h
|
| +++ b/chrome/browser/sync/glue/typed_url_model_associator.h
|
| @@ -61,13 +61,13 @@ class TypedUrlModelAssociator
|
| // PerDataTypeAssociatorInterface implementation.
|
| //
|
| // Iterates through the sync model looking for matched pairs of items.
|
| - virtual bool AssociateModels();
|
| + virtual bool AssociateModels(SyncError* error);
|
|
|
| // Delete all typed url nodes.
|
| bool DeleteAllNodes(sync_api::WriteTransaction* trans);
|
|
|
| // Clears all associations.
|
| - virtual bool DisassociateModels();
|
| + virtual bool DisassociateModels(SyncError* error);
|
|
|
| // The has_nodes out param is true if the sync model has nodes other
|
| // than the permanent tagged nodes.
|
|
|