chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc - Issue 98043004: [SyncFS] Run ConflictResolver only when it is needed.

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/conflict_resolver.cc

Issue 98043004: [SyncFS] Run ConflictResolver only when it is needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test expectation Created 7 years 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_file_system/drive_backend/conflict_resolver.cc

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

index a1b48fd6ff7b2e92ad7762ec7a803c1510e6329c..9dd1104265046317290ee0dfcddbc58ae9e66aab 100644

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

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

@@ -89,7 +89,7 @@ void ConflictResolver::Run(const SyncStatusCallback& callback) {

return;

}

- callback.Run(SYNC_STATUS_NO_CHANGE_TO_SYNC);

+ callback.Run(SYNC_STATUS_NO_CONFLICT);

}

void ConflictResolver::DetachFromNonPrimaryParents(

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