sync/engine/conflict_resolver.cc - Issue 10398051: [Sync] Replace TalkMediator*/MediatorThread* with PushClient

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/engine/conflict_resolver.cc

Issue 10398051: [Sync] Replace TalkMediator*/MediatorThread* with PushClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments, fix test Created 8 years, 7 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:

Index: sync/engine/conflict_resolver.cc

diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc

index 705567d88da25030916244aca1acd31d406b2a86..740919732c417045b2c3a4e45e26d2bd760dbbdb 100644

--- a/sync/engine/conflict_resolver.cc

+++ b/sync/engine/conflict_resolver.cc

@@ -14,7 +14,6 @@

#include "sync/engine/syncer.h"

#include "sync/engine/syncer_util.h"

#include "sync/protocol/nigori_specifics.pb.h"

-#include "sync/protocol/service_constants.h"

#include "sync/sessions/status_controller.h"

#include "sync/syncable/syncable.h"

#include "sync/util/cryptographer.h"

« no previous file with comments | « jingle/notifier/listener/talk_mediator_unittest.cc ('k') | sync/engine/syncer_proto_util.cc » ('j') | no next file with comments »