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

Unified Diff: components/sync/base/model_type.h

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
« no previous file with comments | « components/sync/api/sync_data_unittest.cc ('k') | components/sync/base/proto_value_ptr.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/base/model_type.h
diff --git a/components/sync/base/model_type.h b/components/sync/base/model_type.h
index e3edb49287cf1962da031cef06f49abc65268836..f1ea0f3f45ee4bd751d17948e6670e1e064f4320 100644
--- a/components/sync/base/model_type.h
+++ b/components/sync/base/model_type.h
@@ -170,7 +170,7 @@ enum ModelType {
typedef EnumSet<ModelType, FIRST_REAL_MODEL_TYPE, LAST_REAL_MODEL_TYPE>
ModelTypeSet;
typedef EnumSet<ModelType, UNSPECIFIED, LAST_REAL_MODEL_TYPE> FullModelTypeSet;
-typedef std::map<ModelType, const char*> ModelTypeNameMap;
+typedef std::map<syncer::ModelType, const char*> ModelTypeNameMap;
inline ModelType ModelTypeFromInt(int i) {
DCHECK_GE(i, 0);
« no previous file with comments | « components/sync/api/sync_data_unittest.cc ('k') | components/sync/base/proto_value_ptr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698