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

Unified Diff: sync/engine/non_blocking_type_commit_contribution.h

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
Index: sync/engine/non_blocking_type_commit_contribution.h
diff --git a/sync/engine/non_blocking_type_commit_contribution.h b/sync/engine/non_blocking_type_commit_contribution.h
index 0ee54f03d60e9896b23855d68e3efcffc3f41ee9..3a258b93abb0e098f9e53b6f72d37c31b9ffed76 100644
--- a/sync/engine/non_blocking_type_commit_contribution.h
+++ b/sync/engine/non_blocking_type_commit_contribution.h
@@ -11,7 +11,7 @@
#include "sync/engine/commit_contribution.h"
#include "sync/protocol/sync.pb.h"
-namespace syncer {
+namespace syncer_v2 {
class ModelTypeSyncWorkerImpl;
@@ -19,7 +19,7 @@ class ModelTypeSyncWorkerImpl;
//
// Helps build a commit message and process its response. It collaborates
// closely with the ModelTypeSyncWorkerImpl.
-class NonBlockingTypeCommitContribution : public CommitContribution {
+class NonBlockingTypeCommitContribution : public syncer::CommitContribution {
public:
NonBlockingTypeCommitContribution(
const sync_pb::DataTypeContext& context,
@@ -30,9 +30,9 @@ class NonBlockingTypeCommitContribution : public CommitContribution {
// Implementation of CommitContribution
void AddToCommitMessage(sync_pb::ClientToServerMessage* msg) override;
- SyncerError ProcessCommitResponse(
+ syncer::SyncerError ProcessCommitResponse(
const sync_pb::ClientToServerResponse& response,
- sessions::StatusController* status) override;
+ syncer::sessions::StatusController* status) override;
void CleanUp() override;
size_t GetNumEntries() const override;
« no previous file with comments | « sync/engine/model_type_sync_worker_impl_unittest.cc ('k') | sync/engine/non_blocking_type_commit_contribution.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698