chrome/browser/sync/protocol/client_debug_info.proto - Issue 9305001: sync: Remove the remaining conflict sets code

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: chrome/browser/sync/protocol/client_debug_info.proto

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove failing assertion. Created 8 years, 10 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: chrome/browser/sync/protocol/client_debug_info.proto

diff --git a/chrome/browser/sync/protocol/client_debug_info.proto b/chrome/browser/sync/protocol/client_debug_info.proto

index 6d67b72140965bf9b54c6bfd1cab13d9535544a4..d58f61cc7ca9e14152591d599e88b343a5ef542e 100644

--- a/chrome/browser/sync/protocol/client_debug_info.proto

+++ b/chrome/browser/sync/protocol/client_debug_info.proto

@@ -15,6 +15,8 @@ package sync_pb;

// SYNC_CYCLE_COMPLETED is sent.

message SyncCycleCompletedEventInfo {

// optional bool syncer_stuck = 1; // Was always false, now obsolete.

+ // TODO(rlarocque): rename these counters.

optional int32 num_blocking_conflicts = 2;

optional int32 num_non_blocking_conflicts = 3;

}