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

Unified Diff: sync/syncable/directory.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/sync_session_unittest.cc ('k') | sync/syncable/directory_backing_store.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/directory.cc
diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc
index 5dac15a2ee3d5c0eba14522c5242a9fb78252b66..37afc912d76f25e8d38a19d2d02abaf3d2f70adf 100644
--- a/sync/syncable/directory.cc
+++ b/sync/syncable/directory.cc
@@ -623,7 +623,7 @@ void Directory::PurgeEntriesWithTypeIn(ModelTypeSet types) {
}
// Ensure meta tracking for these data types reflects the deleted state.
- for (syncable::ModelTypeSet::Iterator it = types.First();
+ for (syncer::ModelTypeSet::Iterator it = types.First();
it.Good(); it.Inc()) {
set_initial_sync_ended_for_type_unsafe(it.Get(), false);
kernel_->persisted_info.reset_download_progress(it.Get());
@@ -798,7 +798,7 @@ int64 Directory::unsynced_entity_count() const {
FullModelTypeSet Directory::GetServerTypesWithUnappliedUpdates(
BaseTransaction* trans) const {
- syncable::FullModelTypeSet server_types;
+ syncer::FullModelTypeSet server_types;
ScopedKernelLock lock(this);
for (int i = UNSPECIFIED; i < MODEL_TYPE_COUNT; ++i) {
const ModelType type = ModelTypeFromInt(i);
« no previous file with comments | « sync/sessions/sync_session_unittest.cc ('k') | sync/syncable/directory_backing_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698