Issue 286203007: [SyncFS] Drop manual conflict resolution policy support.

Issue 286203007: [SyncFS] Drop manual conflict resolution policy support. (Closed)

Created:
6 years, 7 months ago by tzik

Modified:
6 years, 7 months ago

Reviewers:
kinuko

CC:
chromium-reviews, chromium-apps-reviews_chromium.org, kinuko+watch, extensions-reviews_chromium.org, nhiroki, tzik

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

[SyncFS] Drop manual conflict resolution policy support. BUG=347424 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272018

Patch Set 3 : drop more unused #

Created: 6 years, 7 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+27 lines, -531 lines)			Patch
M	chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc	View		1 chunk	+3 lines, -17 lines	0 comments	Download
M	chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc	View		2 chunks	+0 lines, -8 lines	0 comments	Download
M	chrome/browser/sync_file_system/drive_backend/sync_engine.h	View	1 2	1 chunk	+0 lines, -17 lines	0 comments	Download
M	chrome/browser/sync_file_system/drive_backend/sync_engine.cc	View		2 chunks	+0 lines, -45 lines	0 comments	Download
M	chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h	View	1	2 chunks	+0 lines, -39 lines	0 comments	Download
M	chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc	View	1 2	4 chunks	+0 lines, -157 lines	0 comments	Download
M	chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc	View		2 chunks	+0 lines, -49 lines	0 comments	Download
M	chrome/browser/sync_file_system/mock_remote_file_sync_service.h	View		2 chunks	+0 lines, -24 lines	0 comments	Download
M	chrome/browser/sync_file_system/mock_remote_file_sync_service.cc	View		2 chunks	+0 lines, -37 lines	0 comments	Download
M	chrome/browser/sync_file_system/remote_file_sync_service.h	View		2 chunks	+0 lines, -31 lines	0 comments	Download
M	chrome/browser/sync_file_system/sync_file_system_service.cc	View		3 chunks	+0 lines, -24 lines	0 comments	Download
M	chrome/browser/sync_file_system/sync_file_system_service_factory.cc	View	1 2	2 chunks	+0 lines, -9 lines	0 comments	Download
M	chrome/browser/sync_file_system/sync_file_system_service_unittest.cc	View		3 chunks	+2 lines, -47 lines	0 comments	Download
M	chrome/test/data/extensions/api_test/sync_file_system/conflict_resolution_policy/test.js	View		1 chunk	+18 lines, -22 lines	0 comments	Download
M	chrome/test/data/extensions/api_test/sync_file_system/get_file_status/test.js	View		1 chunk	+2 lines, -2 lines	0 comments	Download
M	chrome/test/data/extensions/api_test/sync_file_system/get_file_statuses/test.js	View		2 chunks	+2 lines, -3 lines	0 comments	Download

Messages

Total messages: 8 (0 generated)

Expand Messages | Collapse Messages

kinuko

https://codereview.chromium.org/286203007/diff/1/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h File chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h (right): https://codereview.chromium.org/286203007/diff/1/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h#newcode201 chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h:201: void DoGetRemoteVersions( This (and below) can be probably also ...

6 years, 7 months ago (2014-05-19 14:18:42 UTC) #2

tzik

6 years, 7 months ago (2014-05-20 15:40:54 UTC) #3

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/tzik@chromium.org/286203007/30001

6 years, 7 months ago (2014-05-21 06:21:15 UTC) #7

Message was sent while issue was closed.

Change committed as 272018

Expand Messages | Collapse Messages