| Index: sync/sessions/ordered_commit_set.h
|
| diff --git a/sync/sessions/ordered_commit_set.h b/sync/sessions/ordered_commit_set.h
|
| index 4226d2830043bb9a0e976e3fb46873b993195d57..cc6940a6172686e918d13fd6667904369391bc12 100644
|
| --- a/sync/sessions/ordered_commit_set.h
|
| +++ b/sync/sessions/ordered_commit_set.h
|
| @@ -29,7 +29,7 @@ class OrderedCommitSet {
|
| typedef std::vector<size_t> Projection;
|
|
|
| // TODO(chron): Reserve space according to batch size?
|
| - explicit OrderedCommitSet(const syncer::ModelSafeRoutingInfo& routes);
|
| + explicit OrderedCommitSet(const ModelSafeRoutingInfo& routes);
|
| ~OrderedCommitSet();
|
|
|
| bool HaveCommitItem(const int64 metahandle) const {
|
| @@ -37,7 +37,7 @@ class OrderedCommitSet {
|
| }
|
|
|
| void AddCommitItem(const int64 metahandle, const syncable::Id& commit_id,
|
| - syncer::ModelType type);
|
| + ModelType type);
|
|
|
| const std::vector<syncable::Id>& GetAllCommitIds() const {
|
| return commit_ids_;
|
| @@ -55,7 +55,7 @@ class OrderedCommitSet {
|
| }
|
|
|
| // Same as above, but for ModelType of the item.
|
| - syncer::ModelType GetModelTypeAt(const size_t position) const {
|
| + ModelType GetModelTypeAt(const size_t position) const {
|
| return types_[position];
|
| }
|
|
|
| @@ -64,7 +64,7 @@ class OrderedCommitSet {
|
| // response one ModelSafeGroup at a time. See GetCommitIdAt for how the
|
| // indices contained in the returned Projection can be used.
|
| const Projection& GetCommitIdProjection(
|
| - syncer::ModelSafeGroup group) const;
|
| + ModelSafeGroup group) const;
|
|
|
| size_t Size() const {
|
| return commit_ids_.size();
|
| @@ -88,13 +88,13 @@ class OrderedCommitSet {
|
| void operator=(const OrderedCommitSet& other);
|
| private:
|
| // A set of CommitIdProjections associated with particular ModelSafeGroups.
|
| - typedef std::map<syncer::ModelSafeGroup, Projection> Projections;
|
| + typedef std::map<ModelSafeGroup, Projection> Projections;
|
|
|
| // Helper container for return value of GetCommitItemAt.
|
| struct CommitItem {
|
| int64 meta;
|
| syncable::Id id;
|
| - syncer::ModelType group;
|
| + ModelType group;
|
| };
|
|
|
| CommitItem GetCommitItemAt(const size_t position) const;
|
| @@ -112,9 +112,9 @@ class OrderedCommitSet {
|
| // projection. We could store it in commit_ids_, but sometimes we want
|
| // to just return the vector of Ids, so this is more straightforward
|
| // and shouldn't take up too much extra space since commit lists are small.
|
| - std::vector<syncer::ModelType> types_;
|
| + std::vector<ModelType> types_;
|
|
|
| - syncer::ModelSafeRoutingInfo routes_;
|
| + ModelSafeRoutingInfo routes_;
|
| };
|
|
|
| } // namespace sessions
|
|
|