sync/sync.gyp - Issue 10832286: sync: Introduce control data types

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 10832286: sync: Introduce control data types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 4 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 720a28c69e47847197c039c4ad4e0e0bc292876b..043424e359ff3550e142d584064a4962d0130c29 100644

--- a/sync/sync.gyp

+++ b/sync/sync.gyp

@@ -44,6 +44,8 @@

'internal_api/public/base/model_type.h',

'internal_api/public/base/model_type_payload_map.cc',

'internal_api/public/base/model_type_payload_map.h',

+ 'internal_api/public/engine/control_model_worker.cc',

+ 'internal_api/public/engine/control_model_worker.h',

'internal_api/public/engine/model_safe_worker.cc',

'internal_api/public/engine/model_safe_worker.h',

'internal_api/public/engine/passive_model_worker.cc',

@@ -72,6 +74,8 @@

'internal_api/public/util/weak_handle.h',

'engine/all_status.cc',

'engine/all_status.h',

+ 'engine/apply_control_data_updates.cc',

+ 'engine/apply_control_data_updates.h',

'engine/apply_updates_command.cc',

'engine/apply_updates_command.h',

'engine/backoff_delay_provider.cc',

@@ -573,6 +577,7 @@

'internal_api/public/base/model_type_payload_map_unittest.cc',

'internal_api/public/engine/model_safe_worker_unittest.cc',

'internal_api/public/util/immutable_unittest.cc',

+ 'engine/apply_control_data_updates_unittest.cc',

'engine/apply_updates_command_unittest.cc',

'engine/backoff_delay_provider_unittest.cc',

'engine/build_commit_command_unittest.cc',

@@ -581,10 +586,10 @@

'engine/process_commit_response_command_unittest.cc',

'engine/process_updates_command_unittest.cc',

'engine/resolve_conflicts_command_unittest.cc',

- 'engine/syncer_proto_util_unittest.cc',

- 'engine/syncer_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',

« sync/internal_api/public/base/model_type.h ('K') | « sync/sessions/sync_session_unittest.cc ('k') | sync/syncable/model_type.cc » ('j') | no next file with comments »