| Index: chrome/browser/sync/glue/data_type_manager.h
|
| diff --git a/chrome/browser/sync/glue/data_type_manager.h b/chrome/browser/sync/glue/data_type_manager.h
|
| index db2ec3c38093d82e24bd43706ef184197a7be8f1..1c0fecbf3719801f06b32e39d8d613455398ca0c 100644
|
| --- a/chrome/browser/sync/glue/data_type_manager.h
|
| +++ b/chrome/browser/sync/glue/data_type_manager.h
|
| @@ -50,7 +50,7 @@ class DataTypeManager {
|
| UNRECOVERABLE_ERROR // We got an unrecoverable error during startup.
|
| };
|
|
|
| - typedef syncable::ModelTypeSet TypeSet;
|
| + typedef syncer::ModelTypeSet TypeSet;
|
|
|
| // Note: |errors| is only filled when status is not OK.
|
| struct ConfigureResult {
|
| @@ -60,7 +60,7 @@ class DataTypeManager {
|
| ConfigureResult(ConfigureStatus status,
|
| TypeSet requested_types,
|
| const std::list<syncer::SyncError>& failed_data_types,
|
| - syncable::ModelTypeSet waiting_to_start);
|
| + syncer::ModelTypeSet waiting_to_start);
|
| ~ConfigureResult();
|
| ConfigureStatus status;
|
| TypeSet requested_types;
|
| @@ -73,7 +73,7 @@ class DataTypeManager {
|
| // forward here and allow these types to continue loading in the
|
| // background. When these types are loaded DataTypeManager will
|
| // be informed and another configured cycle will be started.
|
| - syncable::ModelTypeSet waiting_to_start;
|
| + syncer::ModelTypeSet waiting_to_start;
|
| };
|
|
|
| virtual ~DataTypeManager() {}
|
|
|