sync/sync.gyp - Issue 10933075: FYI: Remove PerModelSafeGroupState + move ConflictResolution

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: sync/sync.gyp

Issue 10933075: FYI: Remove PerModelSafeGroupState + move ConflictResolution (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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

Index: sync/sync.gyp

diff --git a/sync/sync.gyp b/sync/sync.gyp

index 1e21ad4499301c06bcfa04a372acacb0f8548345..1fa6533ea5e29db358e739030db27d57655d05b0 100644

--- a/sync/sync.gyp

+++ b/sync/sync.gyp

@@ -107,8 +107,6 @@

'engine/process_commit_response_command.h',

'engine/process_updates_command.cc',

'engine/process_updates_command.h',

- 'engine/resolve_conflicts_command.cc',

- 'engine/resolve_conflicts_command.h',

'engine/store_timestamps_command.cc',

'engine/store_timestamps_command.h',

'engine/sync_engine_event.cc',

@@ -134,8 +132,6 @@

'engine/traffic_recorder.h',

'engine/update_applicator.cc',

'engine/update_applicator.h',

- 'engine/verify_updates_command.cc',

- 'engine/verify_updates_command.h',

'js/js_arg_list.cc',

'js/js_arg_list.h',

'js/js_backend.h',

@@ -155,8 +151,6 @@

'sessions/debug_info_getter.h',

'sessions/ordered_commit_set.cc',

'sessions/ordered_commit_set.h',

- 'sessions/session_state.cc',

- 'sessions/session_state.h',

'sessions/status_controller.cc',

'sessions/status_controller.h',

'sessions/sync_session.cc',

@@ -603,14 +597,12 @@

'engine/model_changing_syncer_command_unittest.cc',

'engine/process_commit_response_command_unittest.cc',

'engine/process_updates_command_unittest.cc',

- 'engine/resolve_conflicts_command_unittest.cc',

'engine/sync_scheduler_unittest.cc',

'engine/sync_scheduler_whitebox_unittest.cc',

'engine/syncer_proto_util_unittest.cc',

'engine/syncer_unittest.cc',

'engine/throttled_data_type_tracker_unittest.cc',

'engine/traffic_recorder_unittest.cc',

- 'engine/verify_updates_command_unittest.cc',

'js/js_arg_list_unittest.cc',

'js/js_event_details_unittest.cc',

'js/sync_js_controller_unittest.cc',

« no previous file with comments | « sync/sessions/test_util.cc ('k') | no next file » | no next file with comments »