Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(989)

Unified Diff: sync/sessions/ordered_commit_set.h

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/protocol/sync_protocol_error.h ('k') | sync/sessions/ordered_commit_set.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/ordered_commit_set.h
diff --git a/sync/sessions/ordered_commit_set.h b/sync/sessions/ordered_commit_set.h
index ed606bccfdde9e3d1a3c5a26fb240afb6459b56d..e2d24508a3db8b5ff1ba4be71f0c2ee2cd8b6305 100644
--- a/sync/sessions/ordered_commit_set.h
+++ b/sync/sessions/ordered_commit_set.h
@@ -38,7 +38,7 @@ class OrderedCommitSet {
}
void AddCommitItem(const int64 metahandle, const syncable::Id& commit_id,
- syncable::ModelType type);
+ syncer::ModelType type);
const std::vector<syncable::Id>& GetAllCommitIds() const {
return commit_ids_;
@@ -56,7 +56,7 @@ class OrderedCommitSet {
}
// Same as above, but for ModelType of the item.
- syncable::ModelType GetModelTypeAt(const size_t position) const {
+ syncer::ModelType GetModelTypeAt(const size_t position) const {
return types_[position];
}
@@ -95,7 +95,7 @@ class OrderedCommitSet {
struct CommitItem {
int64 meta;
syncable::Id id;
- syncable::ModelType group;
+ syncer::ModelType group;
};
CommitItem GetCommitItemAt(const size_t position) const;
@@ -113,7 +113,7 @@ 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<syncable::ModelType> types_;
+ std::vector<syncer::ModelType> types_;
syncer::ModelSafeRoutingInfo routes_;
};
« no previous file with comments | « sync/protocol/sync_protocol_error.h ('k') | sync/sessions/ordered_commit_set.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698