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

Unified Diff: components/sync/api/entity_data.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/entity_change.cc ('k') | components/sync/api/entity_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/api/entity_data.h
diff --git a/components/sync/api/entity_data.h b/components/sync/api/entity_data.h
index 0494755d8c648c5171186f58a92cd9525ad95307..913f2bf032c46d577ca2713032377db31fbc580e 100644
--- a/components/sync/api/entity_data.h
+++ b/components/sync/api/entity_data.h
@@ -15,7 +15,7 @@
#include "components/sync/base/proto_value_ptr.h"
#include "components/sync/protocol/sync.pb.h"
-namespace syncer {
+namespace syncer_v2 {
struct EntityData;
@@ -25,7 +25,7 @@ struct EntityDataTraits {
static const EntityData& DefaultValue();
};
-typedef ProtoValuePtr<EntityData, EntityDataTraits> EntityDataPtr;
+typedef syncer::ProtoValuePtr<EntityData, EntityDataTraits> EntityDataPtr;
typedef std::vector<EntityDataPtr> EntityDataList;
typedef std::map<std::string, EntityDataPtr> EntityDataMap;
@@ -86,6 +86,6 @@ struct EntityData {
DISALLOW_COPY_AND_ASSIGN(EntityData);
};
-} // namespace syncer
+} // namespace syncer_v2
#endif // COMPONENTS_SYNC_API_ENTITY_DATA_H_
« no previous file with comments | « components/sync/api/entity_change.cc ('k') | components/sync/api/entity_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698