sync/internal_api/public/engine/sync_status.cc - Issue 11185064: FYI: Move conflict resolve + clean up afterwards

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/public/engine/sync_status.cc

Issue 11185064: FYI: Move conflict resolve + clean up afterwards (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/public/engine/sync_status.cc

diff --git a/sync/internal_api/public/engine/sync_status.cc b/sync/internal_api/public/engine/sync_status.cc

index 655571d218fd44a48a999ec32d11cf82a65bc234..63b1e8bef8438145e7ee48f6c7cda26be7fb032f 100644

--- a/sync/internal_api/public/engine/sync_status.cc

+++ b/sync/internal_api/public/engine/sync_status.cc

@@ -11,7 +11,6 @@ SyncStatus::SyncStatus()

notifications_received(0),

encryption_conflicts(0),

hierarchy_conflicts(0),

- simple_conflicts(0),

server_conflicts(0),

committed_count(0),

syncing(false),

@@ -31,7 +30,6 @@ SyncStatus::SyncStatus()

useful_sync_cycles(0),

nudge_source_notification(0),

nudge_source_local(0),

- nudge_source_continuation(0),

nudge_source_local_refresh(0),

cryptographer_ready(false),

crypto_has_pending_keys(false),