components/sync_driver.gypi - Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed

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: components/sync_driver.gypi

Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pss_strings

Patch Set: Created 5 years, 1 month 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: components/sync_driver.gypi

diff --git a/components/sync_driver.gypi b/components/sync_driver.gypi

index e0787f3e509c46e7d25b4fd0bd8f24ddb0dbc797..2a326d2d655458b8b54c96a00d0e642119e95226 100644

--- a/components/sync_driver.gypi

+++ b/components/sync_driver.gypi

@@ -15,6 +15,7 @@

'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',

'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',

'../ui/gfx/gfx.gyp:gfx',

+ 'data_use_measurement_core',

'invalidation_public',

'os_crypt',

'signin_core_browser',

@@ -68,6 +69,12 @@

'sync_driver/glue/browser_thread_model_worker.h',

'sync_driver/glue/chrome_report_unrecoverable_error.cc',

'sync_driver/glue/chrome_report_unrecoverable_error.h',

+ 'sync_driver/glue/sync_backend_host.cc',

+ 'sync_driver/glue/sync_backend_host.h',

+ 'sync_driver/glue/sync_backend_host_core.cc',

+ 'sync_driver/glue/sync_backend_host_core.h',

+ 'sync_driver/glue/sync_backend_host_impl.cc',

+ 'sync_driver/glue/sync_backend_host_impl.h',

'sync_driver/glue/sync_backend_registrar.cc',

'sync_driver/glue/sync_backend_registrar.h',

'sync_driver/glue/synced_session.cc',

@@ -196,6 +203,8 @@

'sync_driver/fake_sync_service.h',

'sync_driver/frontend_data_type_controller_mock.cc',

'sync_driver/frontend_data_type_controller_mock.h',

+ 'sync_driver/glue/sync_backend_host_mock.cc',

+ 'sync_driver/glue/sync_backend_host_mock.h',

'sync_driver/local_device_info_provider_mock.cc',

'sync_driver/local_device_info_provider_mock.h',

'sync_driver/model_associator_mock.cc',

« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | components/sync_driver/BUILD.gn » ('j') | no next file with comments »