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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log

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

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"	5 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"	9 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"

10 #include "chrome/browser/sync_file_system/sync_file_system_service.h"	10 #include "chrome/browser/sync_file_system/sync_file_system_service.h"

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 remote_file_service = mock_remote_file_service_.Pass();	68 remote_file_service = mock_remote_file_service_.Pass();

69 } else if (IsV2Enabled()) {	69 } else if (IsV2Enabled()) {

70 remote_file_service = RemoteFileSyncService::CreateForBrowserContext(	70 remote_file_service = RemoteFileSyncService::CreateForBrowserContext(

71 RemoteFileSyncService::V2, context);	71 RemoteFileSyncService::V2, context);

72 } else {	72 } else {

73 remote_file_service = RemoteFileSyncService::CreateForBrowserContext(	73 remote_file_service = RemoteFileSyncService::CreateForBrowserContext(

74 RemoteFileSyncService::V1, context);	74 RemoteFileSyncService::V1, context);

75 }	75 }

76	76

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

78 remote_file_service->SetConflictResolutionPolicy(	78 remote_file_service->SetDefaultConflictResolutionPolicy(

79 CONFLICT_RESOLUTION_POLICY_MANUAL);	79 CONFLICT_RESOLUTION_POLICY_MANUAL);

80 }	80 }

81	81

82 service->Initialize(local_file_service.Pass(),	82 service->Initialize(local_file_service.Pass(),

83 remote_file_service.Pass());	83 remote_file_service.Pass());

84 return service;	84 return service;

85 }	85 }

86	86

87 } // namespace sync_file_system	87 } // namespace sync_file_system

OLD	NEW