sync/internal_api/debug_info_event_listener.cc - Issue 11192071: sync: Merge apply updates and resolve conflicts

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/internal_api/debug_info_event_listener.cc

Issue 11192071: sync: Merge apply updates and resolve conflicts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Retry (base files were missing) Created 8 years, 2 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/internal_api/debug_info_event_listener.cc

diff --git a/sync/internal_api/debug_info_event_listener.cc b/sync/internal_api/debug_info_event_listener.cc

index 273eeb511d24c755034436725e0dee765980e1db..a0250d8fa4bf2e21f605706f3a76d5de86ad9c85 100644

--- a/sync/internal_api/debug_info_event_listener.cc

+++ b/sync/internal_api/debug_info_event_listener.cc

@@ -29,8 +29,6 @@ void DebugInfoEventListener::OnSyncCycleCompleted(

snapshot.num_encryption_conflicts());

sync_completed_event_info->set_num_hierarchy_conflicts(

snapshot.num_hierarchy_conflicts());

- sync_completed_event_info->set_num_simple_conflicts(

- snapshot.num_simple_conflicts());

sync_completed_event_info->set_num_server_conflicts(

snapshot.num_server_conflicts());