chrome/browser/sync_file_system/sync_file_system_service_factory.cc - Issue 286203007: [SyncFS] Drop manual conflict resolution policy support.

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 286203007: [SyncFS] Drop manual conflict resolution policy support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: drop more unused Created 6 years, 7 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

« no previous file with comments | « chrome/browser/sync_file_system/sync_file_system_service.cc ('k') | chrome/browser/sync_file_system/sync_file_system_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3a22e1c29d115aa62a630d848d70c013adfdf6df..020ddd9ec141ec9befe86ff1f566833a42db9228 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

@@ -15,10 +15,6 @@

namespace sync_file_system {

-namespace {

-const char kDisableLastWriteWin[] = "disable-syncfs-last-write-win";

// static

SyncFileSystemService* SyncFileSystemServiceFactory::GetForProfile(

Profile* profile) {

@@ -75,11 +71,6 @@ KeyedService* SyncFileSystemServiceFactory::BuildServiceInstanceFor(

RemoteFileSyncService::V1, context);

}

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

- remote_file_service->SetDefaultConflictResolutionPolicy(

- CONFLICT_RESOLUTION_POLICY_MANUAL);

- }

service->Initialize(local_file_service.Pass(),

remote_file_service.Pass());

return service;