chrome/browser/sync_file_system/drive_backend/sync_engine.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/drive_backend/sync_engine.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, 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/extensions/api/sync_file_system/sync_file_system_api.cc ('k') | chrome/browser/sync_file_system/drive_backend/sync_engine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/sync_engine.h

diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.h b/chrome/browser/sync_file_system/drive_backend/sync_engine.h

index 5ef69bb278811af16650e9e9f4782b051d782c22..175fe8c068229c09a8cbeb467aba4fa85dbe9eca 100644

--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.h

+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.h

@@ -85,9 +85,15 @@ class SyncEngine : public RemoteFileSyncService,

virtual scoped_ptr<base::ListValue> DumpFiles(const GURL& origin) OVERRIDE;

virtual scoped_ptr<base::ListValue> DumpDatabase() OVERRIDE;

virtual void SetSyncEnabled(bool enabled) OVERRIDE;

+ virtual SyncStatusCode SetDefaultConflictResolutionPolicy(

+ ConflictResolutionPolicy policy) OVERRIDE;

virtual SyncStatusCode SetConflictResolutionPolicy(

+ const GURL& origin,

ConflictResolutionPolicy policy) OVERRIDE;

- virtual ConflictResolutionPolicy GetConflictResolutionPolicy() const OVERRIDE;

+ virtual ConflictResolutionPolicy GetDefaultConflictResolutionPolicy()

+ const OVERRIDE;

+ virtual ConflictResolutionPolicy GetConflictResolutionPolicy(

+ const GURL& origin) const OVERRIDE;

virtual void GetRemoteVersions(

const fileapi::FileSystemURL& url,

const RemoteVersionsCallback& callback) OVERRIDE;

@@ -197,7 +203,7 @@ class SyncEngine : public RemoteFileSyncService,

base::TimeTicks time_to_check_changes_;

bool sync_enabled_;

- ConflictResolutionPolicy conflict_resolution_policy_;

+ ConflictResolutionPolicy default_conflict_resolution_policy_;

bool network_available_;

scoped_ptr<SyncTaskManager> task_manager_;