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

Unified Diff: sync/engine/model_type_entity.cc

Issue 1285443002: move V2 classes in chrome/engine to syncer_v2 namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/engine/model_type_entity.h ('k') | sync/engine/model_type_entity_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/model_type_entity.cc
diff --git a/sync/engine/model_type_entity.cc b/sync/engine/model_type_entity.cc
index 2417d39a802c20a77234e98da1d5707438fd8101..0b635aae0f7676b11fe541e9ffa8c1714af01009 100644
--- a/sync/engine/model_type_entity.cc
+++ b/sync/engine/model_type_entity.cc
@@ -6,17 +6,17 @@
#include "sync/internal_api/public/non_blocking_sync_common.h"
#include "sync/syncable/syncable_util.h"
-namespace syncer {
+namespace syncer_v2 {
scoped_ptr<ModelTypeEntity> ModelTypeEntity::NewLocalItem(
const std::string& client_tag,
const sync_pb::EntitySpecifics& specifics,
base::Time now) {
return scoped_ptr<ModelTypeEntity>(new ModelTypeEntity(
- 1, 0, 0, syncer_v2::kUncommittedVersion, true,
+ 1, 0, 0, kUncommittedVersion, true,
std::string(), // Sync thread will assign the initial ID.
- syncable::GenerateSyncableHash(GetModelTypeFromSpecifics(specifics),
- client_tag),
+ syncer::syncable::GenerateSyncableHash(
+ syncer::GetModelTypeFromSpecifics(specifics), client_tag),
client_tag, // As non-unique name.
specifics, false, now, now, std::string()));
}
@@ -139,7 +139,7 @@ void ModelTypeEntity::Delete() {
}
void ModelTypeEntity::InitializeCommitRequestData(
- syncer_v2::CommitRequestData* request) const {
+ CommitRequestData* request) const {
request->id = id_;
request->client_tag_hash = client_tag_hash_;
request->sequence_number = sequence_number_;
@@ -173,7 +173,7 @@ void ModelTypeEntity::ClearTransientSyncState() {
}
void ModelTypeEntity::ClearSyncState() {
- base_version_ = syncer_v2::kUncommittedVersion;
+ base_version_ = kUncommittedVersion;
is_dirty_ = true;
sequence_number_ = 1;
commit_requested_sequence_number_ = 0;
« no previous file with comments | « sync/engine/model_type_entity.h ('k') | sync/engine/model_type_entity_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698