| Index: sync/sessions/model_type_registry.h
|
| diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h
|
| index 1317a6ac590ae6d116545c5c5e7b48ed1d4e5141..71d304f92a1630e57807fa5aec60ec1a673bfb43 100644
|
| --- a/sync/sessions/model_type_registry.h
|
| +++ b/sync/sessions/model_type_registry.h
|
| @@ -23,12 +23,15 @@ class Directory;
|
| class CommitContributor;
|
| class DirectoryCommitContributor;
|
| class DirectoryUpdateHandler;
|
| +class DirectoryTypeDebugInfoEmitter;
|
| class NonBlockingTypeProcessorCore;
|
| class NonBlockingTypeProcessor;
|
| class UpdateHandler;
|
|
|
| typedef std::map<ModelType, UpdateHandler*> UpdateHandlerMap;
|
| typedef std::map<ModelType, CommitContributor*> CommitContributorMap;
|
| +typedef std::map<ModelType, DirectoryTypeDebugInfoEmitter*>
|
| + DirectoryTypeDebugInfoEmitterMap;
|
|
|
| // Keeps track of the sets of active update handlers and commit contributors.
|
| class SYNC_EXPORT_PRIVATE ModelTypeRegistry {
|
| @@ -67,6 +70,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry {
|
| // Simple getters.
|
| UpdateHandlerMap* update_handler_map();
|
| CommitContributorMap* commit_contributor_map();
|
| + DirectoryTypeDebugInfoEmitterMap* directory_type_debug_info_emitter_map();
|
|
|
| private:
|
| ModelTypeSet GetEnabledNonBlockingTypes() const;
|
| @@ -75,6 +79,9 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry {
|
| // Sets of handlers and contributors.
|
| ScopedVector<DirectoryCommitContributor> directory_commit_contributors_;
|
| ScopedVector<DirectoryUpdateHandler> directory_update_handlers_;
|
| + ScopedVector<DirectoryTypeDebugInfoEmitter>
|
| + directory_type_debug_info_emitters_;
|
| +
|
| ScopedVector<NonBlockingTypeProcessorCore> non_blocking_type_processor_cores_;
|
|
|
| // Maps of UpdateHandlers and CommitContributors.
|
| @@ -82,6 +89,11 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry {
|
| UpdateHandlerMap update_handler_map_;
|
| CommitContributorMap commit_contributor_map_;
|
|
|
| + // Map of DebugInfoEmitters for directory types.
|
| + // Non-blocking types handle debug info differently.
|
| + // Does not own its contents.
|
| + DirectoryTypeDebugInfoEmitterMap directory_type_debug_info_emitter_map_;
|
| +
|
| // The known ModelSafeWorkers.
|
| std::map<ModelSafeGroup, scoped_refptr<ModelSafeWorker> > workers_map_;
|
|
|
|
|