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

Unified Diff: sync/internal_api/public/engine/model_safe_worker.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: sync/internal_api/public/engine/model_safe_worker.cc
diff --git a/sync/internal_api/public/engine/model_safe_worker.cc b/sync/internal_api/public/engine/model_safe_worker.cc
index f3722d40632d7bcbd9d2c8b42cf5b21738e54ef2..7623cd3f361412a0a0811235c373ee3ac476142f 100644
--- a/sync/internal_api/public/engine/model_safe_worker.cc
+++ b/sync/internal_api/public/engine/model_safe_worker.cc
@@ -15,7 +15,7 @@ base::DictionaryValue* ModelSafeRoutingInfoToValue(
base::DictionaryValue* dict = new base::DictionaryValue();
for (ModelSafeRoutingInfo::const_iterator it = routing_info.begin();
it != routing_info.end(); ++it) {
- dict->SetString(syncable::ModelTypeToString(it->first),
+ dict->SetString(syncer::ModelTypeToString(it->first),
ModelSafeGroupToString(it->second));
}
return dict;
@@ -29,10 +29,10 @@ std::string ModelSafeRoutingInfoToString(
return json;
}
-syncable::ModelTypePayloadMap ModelSafeRoutingInfoToPayloadMap(
+syncer::ModelTypePayloadMap ModelSafeRoutingInfoToPayloadMap(
const ModelSafeRoutingInfo& routes,
const std::string& payload) {
- syncable::ModelTypePayloadMap types_with_payloads;
+ syncer::ModelTypePayloadMap types_with_payloads;
for (ModelSafeRoutingInfo::const_iterator i = routes.begin();
i != routes.end(); ++i) {
types_with_payloads[i->first] = payload;
@@ -40,9 +40,9 @@ syncable::ModelTypePayloadMap ModelSafeRoutingInfoToPayloadMap(
return types_with_payloads;
}
-syncable::ModelTypeSet GetRoutingInfoTypes(
+syncer::ModelTypeSet GetRoutingInfoTypes(
const ModelSafeRoutingInfo& routing_info) {
- syncable::ModelTypeSet types;
+ syncer::ModelTypeSet types;
for (ModelSafeRoutingInfo::const_iterator it = routing_info.begin();
it != routing_info.end(); ++it) {
types.Put(it->first);
@@ -50,11 +50,11 @@ syncable::ModelTypeSet GetRoutingInfoTypes(
return types;
}
-ModelSafeGroup GetGroupForModelType(const syncable::ModelType type,
+ModelSafeGroup GetGroupForModelType(const syncer::ModelType type,
const ModelSafeRoutingInfo& routes) {
ModelSafeRoutingInfo::const_iterator it = routes.find(type);
if (it == routes.end()) {
- if (type != syncable::UNSPECIFIED && type != syncable::TOP_LEVEL_FOLDER)
+ if (type != syncer::UNSPECIFIED && type != syncer::TOP_LEVEL_FOLDER)
LOG(WARNING) << "Entry does not belong to active ModelSafeGroup!";
return GROUP_PASSIVE;
}
« no previous file with comments | « sync/internal_api/public/engine/model_safe_worker.h ('k') | sync/internal_api/public/engine/model_safe_worker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698