| Index: chrome/browser/sync/glue/theme_model_associator.h
|
| diff --git a/chrome/browser/sync/glue/theme_model_associator.h b/chrome/browser/sync/glue/theme_model_associator.h
|
| index 0ef4b987d18159b36ab5be24696f80e63f4947c2..b2200a7b014370b96b7203cc1928935308d98fa1 100644
|
| --- a/chrome/browser/sync/glue/theme_model_associator.h
|
| +++ b/chrome/browser/sync/glue/theme_model_associator.h
|
| @@ -28,8 +28,8 @@ class ThemeModelAssociator : public AssociatorInterface {
|
| static syncable::ModelType model_type() { return syncable::THEMES; }
|
|
|
| // AssociatorInterface implementation.
|
| - virtual SyncError AssociateModels() OVERRIDE;
|
| - virtual SyncError DisassociateModels() OVERRIDE;
|
| + virtual csync::SyncError AssociateModels() OVERRIDE;
|
| + virtual csync::SyncError DisassociateModels() OVERRIDE;
|
| virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes) OVERRIDE;
|
| virtual void AbortAssociation() OVERRIDE {
|
| // No implementation needed, this associator runs on the main
|
|
|