| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef SYNC_SESSIONS_ORDERED_COMMIT_SET_H_ | 5 #ifndef SYNC_SESSIONS_ORDERED_COMMIT_SET_H_ |
| 6 #define SYNC_SESSIONS_ORDERED_COMMIT_SET_H_ | 6 #define SYNC_SESSIONS_ORDERED_COMMIT_SET_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "sync/internal_api/public/base/model_type.h" |
| 13 #include "sync/internal_api/public/engine/model_safe_worker.h" | 14 #include "sync/internal_api/public/engine/model_safe_worker.h" |
| 14 #include "sync/internal_api/public/syncable/model_type.h" | |
| 15 #include "sync/syncable/syncable_id.h" | 15 #include "sync/syncable/syncable_id.h" |
| 16 | 16 |
| 17 namespace syncer { | 17 namespace syncer { |
| 18 namespace sessions { | 18 namespace sessions { |
| 19 | 19 |
| 20 // TODO(ncarter): This code is more generic than just Commit and can | 20 // TODO(ncarter): This code is more generic than just Commit and can |
| 21 // be reused elsewhere (e.g. ChangeReorderBuffer do similar things). Merge | 21 // be reused elsewhere (e.g. ChangeReorderBuffer do similar things). Merge |
| 22 // all these implementations. | 22 // all these implementations. |
| 23 class OrderedCommitSet { | 23 class OrderedCommitSet { |
| 24 public: | 24 public: |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 std::vector<syncable::ModelType> types_; | 116 std::vector<syncable::ModelType> types_; |
| 117 | 117 |
| 118 syncer::ModelSafeRoutingInfo routes_; | 118 syncer::ModelSafeRoutingInfo routes_; |
| 119 }; | 119 }; |
| 120 | 120 |
| 121 } // namespace sessions | 121 } // namespace sessions |
| 122 } // namespace syncer | 122 } // namespace syncer |
| 123 | 123 |
| 124 #endif // SYNC_SESSIONS_ORDERED_COMMIT_SET_H_ | 124 #endif // SYNC_SESSIONS_ORDERED_COMMIT_SET_H_ |
| 125 | 125 |
| OLD | NEW |