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

Unified Diff: sync/sessions/ordered_commit_set.cc

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/sessions/ordered_commit_set.h ('k') | sync/sessions/ordered_commit_set_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/ordered_commit_set.cc
diff --git a/sync/sessions/ordered_commit_set.cc b/sync/sessions/ordered_commit_set.cc
index 1d13c09ba50f3974ac6d4594a8633330606aa9c1..06a59888ac5e8a39d302d2251ac150096e761503 100644
--- a/sync/sessions/ordered_commit_set.cc
+++ b/sync/sessions/ordered_commit_set.cc
@@ -20,7 +20,7 @@ OrderedCommitSet::~OrderedCommitSet() {}
void OrderedCommitSet::AddCommitItem(const int64 metahandle,
const syncable::Id& commit_id,
- syncable::ModelType type) {
+ syncer::ModelType type) {
if (!HaveCommitItem(metahandle)) {
inserted_metahandles_.insert(metahandle);
metahandle_order_.push_back(metahandle);
@@ -100,7 +100,7 @@ OrderedCommitSet::CommitItem OrderedCommitSet::GetCommitItemAt(
bool OrderedCommitSet::HasBookmarkCommitId() const {
ModelSafeRoutingInfo::const_iterator group
- = routes_.find(syncable::BOOKMARKS);
+ = routes_.find(syncer::BOOKMARKS);
if (group == routes_.end())
return false;
Projections::const_iterator proj = projections_.find(group->second);
@@ -108,7 +108,7 @@ bool OrderedCommitSet::HasBookmarkCommitId() const {
return false;
DCHECK_LE(proj->second.size(), types_.size());
for (size_t i = 0; i < proj->second.size(); i++) {
- if (types_[proj->second[i]] == syncable::BOOKMARKS)
+ if (types_[proj->second[i]] == syncer::BOOKMARKS)
return true;
}
return false;
« no previous file with comments | « sync/sessions/ordered_commit_set.h ('k') | sync/sessions/ordered_commit_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698