chrome/browser/sync_file_system/sync_file_system_service.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.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

« no previous file with comments | « chrome/browser/sync_file_system/sync_file_system_service.h ('k') | chrome/browser/sync_file_system/sync_file_system_service_factory.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.cc

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

index a3ef87d84f91232aeb7fbcc276e8df1a8626b2a1..4abb7a3929197f7290aa62d77687da940333ef64 100644

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

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

@@ -381,14 +381,15 @@ void SyncFileSystemService::RemoveSyncEventObserver(

observers_.RemoveObserver(observer);

}

-ConflictResolutionPolicy

-SyncFileSystemService::GetConflictResolutionPolicy() const {

- return remote_service_->GetConflictResolutionPolicy();

+ConflictResolutionPolicy SyncFileSystemService::GetConflictResolutionPolicy(

+ const GURL& origin) const {

+ return remote_service_->GetConflictResolutionPolicy(origin);

}

SyncStatusCode SyncFileSystemService::SetConflictResolutionPolicy(

+ const GURL& origin,

ConflictResolutionPolicy policy) {

- return remote_service_->SetConflictResolutionPolicy(policy);

+ return remote_service_->SetConflictResolutionPolicy(origin, policy);

}

LocalChangeProcessor* SyncFileSystemService::GetLocalChangeProcessor(