chrome/browser/sync_file_system/sync_file_system_service_factory.cc - Issue 185563011: [SyncFS] Change RemoteFileSyncService interface to accept per-app conflict resolution policy

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

Issue 185563011: [SyncFS] Change RemoteFileSyncService interface to accept per-app conflict resolution policy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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/sync_file_system_service_factory.cc

diff --git a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc

index 2effc8b1423fc12c0a86831d416f14c91f66d1d3..f950a04206265ff7aa056811931ca2124f5eb609 100644

--- a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc

+++ b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc

@@ -75,7 +75,7 @@ SyncFileSystemServiceFactory::BuildServiceInstanceFor(

}

if (CommandLine::ForCurrentProcess()->HasSwitch(kDisableLastWriteWin)) {

- remote_file_service->SetConflictResolutionPolicy(

+ remote_file_service->SetDefaultConflictResolutionPolicy(

CONFLICT_RESOLUTION_POLICY_MANUAL);

}

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