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

Unified Diff: components/sync/syncable/model_type.cc

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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: components/sync/syncable/model_type.cc
diff --git a/components/sync/syncable/model_type.cc b/components/sync/syncable/model_type.cc
index 428359f129b41cea304b67911b7764f2110d4a20..6443ce18b9cec90eda091542f0dcf2f561009f01 100644
--- a/components/sync/syncable/model_type.cc
+++ b/components/sync/syncable/model_type.cc
@@ -557,7 +557,7 @@ bool IsControlType(ModelType model_type) {
}
ModelTypeSet CoreTypes() {
- ModelTypeSet result;
+ syncer::ModelTypeSet result;
result.PutAll(PriorityCoreTypes());
// The following are low priority core types.
@@ -570,7 +570,7 @@ ModelTypeSet CoreTypes() {
}
ModelTypeSet PriorityCoreTypes() {
- ModelTypeSet result;
+ syncer::ModelTypeSet result;
result.PutAll(ControlTypes());
// The following are non-control core types.
@@ -673,7 +673,7 @@ ModelTypeSet ModelTypeSetFromString(const std::string& model_types_string) {
} else {
type_str = working_copy.substr(0, end);
}
- ModelType type = ModelTypeFromString(type_str);
+ syncer::ModelType type = ModelTypeFromString(type_str);
if (IsRealDataType(type))
model_types.Put(type);
working_copy = working_copy.substr(end + 1);
« no previous file with comments | « components/sync/syncable/model_neutral_mutable_entry.h ('k') | components/sync/syncable/model_type_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698