chrome/browser/sync_file_system/drive_backend/sync_worker.cc - Issue 611323003: [SyncFS] Fix backgrounding race of ConflictResolver

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_file_system/drive_backend/sync_worker.cc

Issue 611323003: [SyncFS] Fix backgrounding race of ConflictResolver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@demotion

Patch Set: Created 6 years, 3 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

Index: chrome/browser/sync_file_system/drive_backend/sync_worker.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc

index 739d28b2ba69d1fb2b757aff739e96fb2623f234..dd86b9a5e43b81dccd1ffe0188b8851f72734de6 100644

--- a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc

+++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc

@@ -620,7 +620,7 @@ bool SyncWorker::MaybeStartFetchChanges() {

void SyncWorker::DidResolveConflict(SyncStatusCode status) {

DCHECK(sequence_checker_.CalledOnValidSequencedThread());

- if (status == SYNC_STATUS_OK)

+ if (status == SYNC_STATUS_OK || status == SYNC_STATUS_RETRY)

should_check_conflict_ = true;

}

« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc ('k') | no next file » | no next file with comments »