diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 11:09:57 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 11:09:57 +0000 |
| commit | 46f998248881f3271d6b679ebc4b0dd1d2a302f3 (patch) | |
| tree | 18cf22890cc797502f14058c285cb0fedccf5630 /chrome/browser/sync_file_system/sync_file_system_service.cc | |
| parent | e91aa9ea67f61df6a0ccd9ddac36330dcd8a2770 (diff) | |
| download | chromium_src-46f998248881f3271d6b679ebc4b0dd1d2a302f3.zip chromium_src-46f998248881f3271d6b679ebc4b0dd1d2a302f3.tar.gz chromium_src-46f998248881f3271d6b679ebc4b0dd1d2a302f3.tar.bz2 | |
SyncFS: Add {set,get}ConflictResolutionPolicy API
BUG=177159
TEST=browser_tests:SyncFileSystemApiTest.ConflictResolutionPolicyTest
TBR=benwells
Review URL: https://codereview.chromium.org/12422006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync_file_system/sync_file_system_service.cc')
| -rw-r--r-- | chrome/browser/sync_file_system/sync_file_system_service.cc | 10 |
1 files changed, 10 insertions, 0 deletions
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 38b1f40..4774edf 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service.cc +++ b/chrome/browser/sync_file_system/sync_file_system_service.cc @@ -146,6 +146,16 @@ void SyncFileSystemService::RemoveSyncEventObserver( observers_.RemoveObserver(observer); } +ConflictResolutionPolicy +SyncFileSystemService::GetConflictResolutionPolicy() const { + return remote_file_service_->GetConflictResolutionPolicy(); +} + +SyncStatusCode SyncFileSystemService::SetConflictResolutionPolicy( + ConflictResolutionPolicy policy) { + return remote_file_service_->SetConflictResolutionPolicy(policy); +} + SyncFileSystemService::SyncFileSystemService(Profile* profile) : profile_(profile), pending_local_changes_(0), |