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

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, 10 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/remote_file_sync_service.h ('k') | chrome/browser/sync_file_system/sync_file_system_service.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.h

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

index 0582ddcc065403181379f6a52222fdd221ef2e34..a5132e7edc925a451f6be19e149081d2a9269bb5 100644

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

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

@@ -71,8 +71,10 @@ class SyncFileSystemService

void AddSyncEventObserver(SyncEventObserver* observer);

void RemoveSyncEventObserver(SyncEventObserver* observer);

- ConflictResolutionPolicy GetConflictResolutionPolicy() const;

- SyncStatusCode SetConflictResolutionPolicy(ConflictResolutionPolicy policy);

+ ConflictResolutionPolicy GetConflictResolutionPolicy(

+ const GURL& origin) const;

+ SyncStatusCode SetConflictResolutionPolicy(const GURL& origin,

+ ConflictResolutionPolicy policy);

LocalChangeProcessor* GetLocalChangeProcessor(const GURL& origin);