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

Unified Diff: sync/notifier/invalidation_notifier.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/notifier/invalidation_notifier.h ('k') | sync/notifier/invalidation_notifier_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/notifier/invalidation_notifier.cc
diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index f373d187202832cb9520601a25a9b50e46bc73f9..58ef89a0b7f14a123902675e16e1e26005eb4bc8 100644
--- a/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -87,11 +87,11 @@ void InvalidationNotifier::UpdateCredentials(
}
void InvalidationNotifier::UpdateEnabledTypes(
- syncable::ModelTypeSet enabled_types) {
+ syncer::ModelTypeSet enabled_types) {
DCHECK(CalledOnValidThread());
CHECK(!invalidation_client_id_.empty());
ObjectIdSet ids;
- for (syncable::ModelTypeSet::Iterator it = enabled_types.First(); it.Good();
+ for (syncer::ModelTypeSet::Iterator it = enabled_types.First(); it.Good();
it.Inc()) {
invalidation::ObjectId id;
if (!RealModelTypeToObjectId(it.Get(), &id)) {
@@ -104,7 +104,7 @@ void InvalidationNotifier::UpdateEnabledTypes(
}
void InvalidationNotifier::SendNotification(
- syncable::ModelTypeSet changed_types) {
+ syncer::ModelTypeSet changed_types) {
DCHECK(CalledOnValidThread());
// Do nothing.
}
@@ -112,10 +112,10 @@ void InvalidationNotifier::SendNotification(
void InvalidationNotifier::OnInvalidate(const ObjectIdPayloadMap& id_payloads) {
DCHECK(CalledOnValidThread());
// TODO(dcheng): This should probably be a utility function somewhere...
- syncable::ModelTypePayloadMap type_payloads;
+ syncer::ModelTypePayloadMap type_payloads;
for (ObjectIdPayloadMap::const_iterator it = id_payloads.begin();
it != id_payloads.end(); ++it) {
- syncable::ModelType model_type;
+ syncer::ModelType model_type;
if (!ObjectIdToRealModelType(it->first, &model_type)) {
DLOG(WARNING) << "Invalid object ID: " << ObjectIdToString(it->first);
continue;
« no previous file with comments | « sync/notifier/invalidation_notifier.h ('k') | sync/notifier/invalidation_notifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698