chrome/chrome_browser.gypi - Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService""

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: chrome/chrome_browser.gypi

Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService"" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/

Patch Set: Created 7 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: chrome/chrome_browser.gypi

===================================================================

--- chrome/chrome_browser.gypi (revision 208727)

+++ chrome/chrome_browser.gypi (working copy)

@@ -898,9 +898,7 @@

'browser/internal_auth.h',

'browser/intranet_redirect_detector.cc',

'browser/intranet_redirect_detector.h',

- 'browser/invalidation/fake_invalidation_service.cc',

- 'browser/invalidation/fake_invalidation_service.h',

- 'browser/invalidation/invalidation_service.h',

+ 'browser/invalidation/invalidation_frontend.h',

'browser/invalidation/invalidation_service_android.cc',

'browser/invalidation/invalidation_service_android.h',

'browser/invalidation/invalidation_service_factory.cc',

@@ -1993,6 +1991,10 @@

'browser/sync/backend_migrator.h',

'browser/sync/backend_unrecoverable_error_handler.cc',

'browser/sync/backend_unrecoverable_error_handler.h',

+ 'browser/sync/glue/android_invalidator_bridge.cc',

+ 'browser/sync/glue/android_invalidator_bridge.h',

+ 'browser/sync/glue/android_invalidator_bridge_proxy.cc',

+ 'browser/sync/glue/android_invalidator_bridge_proxy.h',

'browser/sync/glue/autofill_data_type_controller.cc',

'browser/sync/glue/autofill_data_type_controller.h',

'browser/sync/glue/autofill_profile_data_type_controller.cc',

@@ -2027,6 +2029,8 @@

'browser/sync/glue/data_type_manager_observer.h',

'browser/sync/glue/device_info.cc',

'browser/sync/glue/device_info.h',

+ 'browser/sync/glue/dummy_invalidator.cc',

+ 'browser/sync/glue/dummy_invalidator.h',

'browser/sync/glue/extension_data_type_controller.cc',

'browser/sync/glue/extension_data_type_controller.h',

'browser/sync/glue/extension_setting_data_type_controller.cc',

@@ -2116,7 +2120,6 @@

'browser/sync/profile_sync_service_harness.cc',

'browser/sync/profile_sync_service_harness.h',

'browser/sync/profile_sync_service_model_type_selection_android.h',

- 'browser/sync/profile_sync_service_observer.cc',

'browser/sync/profile_sync_service_observer.h',

'browser/sync/retry_verifier.cc',

'browser/sync/retry_verifier.h',

« no previous file with comments | « chrome/browser/sync/test_profile_sync_service.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »