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

Unified Diff: sync/api/sync_data.cc

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments 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
« no previous file with comments | « sync/api/sync_data.h ('k') | sync/api/sync_error.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/api/sync_data.cc
diff --git a/sync/api/sync_data.cc b/sync/api/sync_data.cc
index 43e44ebba8950ea4eea173555aebe1d15929acd3..078d6e6e06905ad94e8280f3d1570a4a20e4f60e 100644
--- a/sync/api/sync_data.cc
+++ b/sync/api/sync_data.cc
@@ -15,7 +15,7 @@
#include "sync/protocol/proto_value_conversions.h"
#include "sync/protocol/sync.pb.h"
-namespace csync {
+namespace syncer {
void SyncData::ImmutableSyncEntityTraits::InitializeWrapper(
Wrapper* wrapper) {
@@ -44,7 +44,7 @@ void SyncData::ImmutableSyncEntityTraits::Swap(sync_pb::SyncEntity* t1,
SyncData::SyncData()
: is_valid_(false),
- id_(csync::kInvalidId) {}
+ id_(syncer::kInvalidId) {}
SyncData::SyncData(int64 id, sync_pb::SyncEntity* entity)
: is_valid_(true),
@@ -71,13 +71,13 @@ SyncData SyncData::CreateLocalData(
entity.set_client_defined_unique_tag(sync_tag);
entity.set_non_unique_name(non_unique_title);
entity.mutable_specifics()->CopyFrom(specifics);
- return SyncData(csync::kInvalidId, &entity);
+ return SyncData(syncer::kInvalidId, &entity);
}
// Static.
SyncData SyncData::CreateRemoteData(
int64 id, const sync_pb::EntitySpecifics& specifics) {
- DCHECK_NE(id, csync::kInvalidId);
+ DCHECK_NE(id, syncer::kInvalidId);
sync_pb::SyncEntity entity;
entity.mutable_specifics()->CopyFrom(specifics);
return SyncData(id, &entity);
@@ -112,7 +112,7 @@ int64 SyncData::GetRemoteId() const {
}
bool SyncData::IsLocal() const {
- return id_ == csync::kInvalidId;
+ return id_ == syncer::kInvalidId;
}
std::string SyncData::ToString() const {
@@ -122,7 +122,7 @@ std::string SyncData::ToString() const {
std::string type = syncable::ModelTypeToString(GetDataType());
std::string specifics;
scoped_ptr<DictionaryValue> value(
- csync::EntitySpecificsToValue(GetSpecifics()));
+ syncer::EntitySpecificsToValue(GetSpecifics()));
base::JSONWriter::WriteWithOptions(value.get(),
base::JSONWriter::OPTIONS_PRETTY_PRINT,
&specifics);
@@ -141,4 +141,4 @@ void PrintTo(const SyncData& sync_data, std::ostream* os) {
*os << sync_data.ToString();
}
-} // namespace csync
+} // namespace syncer
« no previous file with comments | « sync/api/sync_data.h ('k') | sync/api/sync_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698