Index: sync/sessions/sync_session_context.h |
diff --git a/sync/sessions/sync_session_context.h b/sync/sessions/sync_session_context.h |
index 718cc6caad0ac90c54dfef6ea6d43ecb018bdd28..3133c32a2ef3e4b85e76aed0a3480aba4d09b28c 100644 |
--- a/sync/sessions/sync_session_context.h |
+++ b/sync/sessions/sync_session_context.h |
@@ -22,7 +22,9 @@ |
#include <string> |
#include <vector> |
+#include "base/stl_util.h" |
#include "sync/base/sync_export.h" |
+#include "sync/engine/sync_directory_commit_contributor.h" |
#include "sync/engine/sync_engine_event.h" |
#include "sync/engine/syncer_types.h" |
#include "sync/engine/traffic_recorder.h" |
@@ -71,8 +73,10 @@ class SYNC_EXPORT_PRIVATE SyncSessionContext { |
return routing_info_; |
} |
- void set_routing_info(const ModelSafeRoutingInfo& routing_info) { |
- routing_info_ = routing_info; |
+ void set_routing_info(const ModelSafeRoutingInfo& routing_info); |
+ |
+ CommitContributorMap* commit_contributor_map() { |
+ return &commit_contributor_map_; |
} |
const std::vector<scoped_refptr<ModelSafeWorker> >& workers() const { |
@@ -154,6 +158,14 @@ class SYNC_EXPORT_PRIVATE SyncSessionContext { |
// Must be updated manually when SBR's state is modified. |
ModelSafeRoutingInfo routing_info_; |
+ // A map of 'commit contributors', one for each enabled type. |
+ // This must be kept in sync with the routing info. Our temporary solution to |
+ // that problem is to initialize this map in set_routing_info(). |
+ CommitContributorMap commit_contributor_map_; |
+ |
+ // Deleter for the |commit_contributor_map_|. |
+ STLValueDeleter<CommitContributorMap> commit_contributor_deleter_; |
+ |
// The set of ModelSafeWorkers. Used to execute tasks of various threads. |
std::vector<scoped_refptr<ModelSafeWorker> > workers_; |