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

Unified Diff: chrome/browser/sync/invalidations/invalidator_storage.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
Index: chrome/browser/sync/invalidations/invalidator_storage.cc
diff --git a/chrome/browser/sync/invalidations/invalidator_storage.cc b/chrome/browser/sync/invalidations/invalidator_storage.cc
index 4f9ca5b88076b2282a39237bc050e89f5722dd04..3546d9cd7f1a9e9b4991cb7684a68705191bc91c 100644
--- a/chrome/browser/sync/invalidations/invalidator_storage.cc
+++ b/chrome/browser/sync/invalidations/invalidator_storage.cc
@@ -186,19 +186,19 @@ void InvalidatorStorage::DeserializeMap(
LOG(WARNING) << "Invalid model type key: " << *it;
continue;
}
- if ((model_type_int < syncable::FIRST_REAL_MODEL_TYPE) ||
- (model_type_int >= syncable::MODEL_TYPE_COUNT)) {
+ if ((model_type_int < syncer::FIRST_REAL_MODEL_TYPE) ||
+ (model_type_int >= syncer::MODEL_TYPE_COUNT)) {
LOG(WARNING) << "Out-of-range model type key: " << model_type_int;
continue;
}
- const syncable::ModelType model_type =
- syncable::ModelTypeFromInt(model_type_int);
+ const syncer::ModelType model_type =
+ syncer::ModelTypeFromInt(model_type_int);
std::string max_version_str;
CHECK(max_versions_dict->GetString(*it, &max_version_str));
int64 max_version = 0;
if (!base::StringToInt64(max_version_str, &max_version)) {
LOG(WARNING) << "Invalid max invalidation version for "
- << syncable::ModelTypeToString(model_type) << ": "
+ << syncer::ModelTypeToString(model_type) << ": "
<< max_version_str;
continue;
}

Powered by Google App Engine
This is Rietveld 408576698