Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: sync/sync.gyp

Issue 10832286: sync: Introduce control data types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add ToFullModelTypeSet() function 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 397d057a089e6e1149851c0bbe06192e64b0fe46..6b7597900c75c9446b9ee1409eb9b9d478c83bd7 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -73,6 +73,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',
@@ -83,6 +85,8 @@
'engine/commit.h',
'engine/conflict_resolver.cc',
'engine/conflict_resolver.h',
+ 'engine/conflict_util.cc',
+ 'engine/conflict_util.h',
'engine/download_updates_command.cc',
'engine/download_updates_command.h',
'engine/get_commit_ids_command.cc',
@@ -582,6 +586,7 @@
'internal_api/public/base/model_type_state_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',
@@ -590,10 +595,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',

Powered by Google App Engine
This is Rietveld 408576698