diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 23:41:32 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 23:41:32 +0000 |
commit | a4a1476522880f416690e9357eedaa40b5ac8a99 (patch) | |
tree | bc2a8cc0a4942e16094f9a07859508583b03e169 /sync/sessions/ordered_commit_set.cc | |
parent | dade34b60910f213ae8f8fdd13709ec17581ef9e (diff) | |
download | chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.zip chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.gz chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.bz2 |
[Sync] Move ModelType and related classes to 'syncer' namespace
Previously they were in 'syncer::syncable'.
Also remove aliases to those classes from 'syncable'.
BUG=128060
TEST=
TBR=pkasting@chromium.org,jhawkins@chromium.org,
Review URL: https://chromiumcodereview.appspot.com/10696087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sessions/ordered_commit_set.cc')
-rw-r--r-- | sync/sessions/ordered_commit_set.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/sessions/ordered_commit_set.cc b/sync/sessions/ordered_commit_set.cc index 1d13c09..06a5988 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; |