sync/sync.gyp - Issue 10690071: [Sync] Move model_type* from syncable/ to base/

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 10690071: [Sync] Move model_type* from syncable/ to base/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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 14cb5c3e1e86168a17623511c702dfe96788a8e3..807c99ccb9421ab2dc7f6ee9aff8607d5f8f35e2 100644

--- a/sync/sync.gyp

+++ b/sync/sync.gyp

@@ -33,6 +33,10 @@

'protocol/sync_proto.gyp:sync_proto',

'sources': [

+ 'internal_api/public/base/enum_set.h',

+ '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/model_safe_worker.cc',

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

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

@@ -47,10 +51,6 @@

'internal_api/public/sessions/sync_session_snapshot.h',

'internal_api/public/sessions/sync_source_info.cc',

'internal_api/public/sessions/sync_source_info.h',

- 'internal_api/public/syncable/model_type.h',

- 'internal_api/public/syncable/model_type_payload_map.cc',

- 'internal_api/public/syncable/model_type_payload_map.h',

- 'internal_api/public/util/enum_set.h',

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

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

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

@@ -382,8 +382,8 @@

'sync',

'sources': [

- 'internal_api/public/syncable/model_type_test_util.cc',

- 'internal_api/public/syncable/model_type_test_util.h',

+ 'internal_api/public/base/model_type_test_util.cc',

+ 'internal_api/public/base/model_type_test_util.h',

'js/js_test_util.cc',

'js/js_test_util.h',

'sessions/test_util.cc',

@@ -524,9 +524,9 @@

'..',

'sources': [

+ 'internal_api/public/base/enum_set_unittest.cc',

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

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

- 'internal_api/public/syncable/model_type_payload_map_unittest.cc',

- 'internal_api/public/util/enum_set_unittest.cc',

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

'engine/apply_updates_command_unittest.cc',

'engine/build_commit_command_unittest.cc',

« no previous file with comments | « sync/sessions/sync_session_unittest.cc ('k') | sync/syncable/DEPS » ('j') | no next file with comments »