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

Unified Diff: sync/engine/build_commit_command.h

Issue 10735041: Remove syncproto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Improve DCHECKing, fix tests Created 8 years, 5 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 | « no previous file | sync/engine/build_commit_command.cc » ('j') | sync/engine/build_commit_command.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/build_commit_command.h
diff --git a/sync/engine/build_commit_command.h b/sync/engine/build_commit_command.h
index b7dbee0b3004c02564e3467f512203082ed10e79..7fc9721ac73513000618fc44f67c6f13c68b2ef2 100644
--- a/sync/engine/build_commit_command.h
+++ b/sync/engine/build_commit_command.h
@@ -10,7 +10,6 @@
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "sync/engine/syncer_command.h"
-#include "sync/engine/syncproto.h"
#include "sync/syncable/entry_kernel.h"
namespace syncer {
@@ -38,7 +37,7 @@ class BuildCommitCommand : public SyncerCommand {
// The commit_message parameter is an output parameter which will contain the
// fully initialized commit message once ExecuteImpl() has been called.
BuildCommitCommand(const sessions::OrderedCommitSet& batch_commit_set,
- ClientToServerMessage* commit_message);
+ sync_pb::ClientToServerMessage* commit_message);
virtual ~BuildCommitCommand();
// SyncerCommand implementation.
@@ -53,7 +52,7 @@ class BuildCommitCommand : public SyncerCommand {
static int64 GetGap();
void AddExtensionsActivityToMessage(sessions::SyncSession* session,
- CommitMessage* message);
+ sync_pb::CommitMessage* message);
// Helper for computing position. Find the numeric position value
// of the closest already-synced entry. |direction| must be one of
// NEXT_ID or PREV_ID; this parameter controls the search direction.
@@ -71,7 +70,7 @@ class BuildCommitCommand : public SyncerCommand {
const sessions::OrderedCommitSet& batch_commit_set_;
// Output parameter; see constructor comment.
- ClientToServerMessage* commit_message_;
+ sync_pb::ClientToServerMessage* commit_message_;
};
} // namespace syncer
« no previous file with comments | « no previous file | sync/engine/build_commit_command.cc » ('j') | sync/engine/build_commit_command.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698