chrome/chrome_browser.gypi - Issue 255273002: First step towards invalidations componentization

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 255273002: First step towards invalidations componentization (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to fix merge conflict Created 6 years, 7 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

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index d04f617bd74dbcf5c38e95bc5bb119d20396d264..92b6fc53a5c0a6fbcde8310e00bfc0d42453755c 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -37,6 +37,7 @@

'../components/components.gyp:favicon_core',

'../components/components.gyp:feedback_component',

'../components/components.gyp:infobars_core',

+ '../components/components.gyp:invalidation',

'../components/components.gyp:metrics',

'../components/components.gyp:navigation_metrics',

'../components/components.gyp:os_crypt',

@@ -905,9 +906,6 @@

'browser/invalidation/gcm_invalidation_bridge.h',

'browser/invalidation/invalidation_controller_android.cc',

'browser/invalidation/invalidation_controller_android.h',

- 'browser/invalidation/invalidation_logger.cc',

- 'browser/invalidation/invalidation_logger.h',

- 'browser/invalidation/invalidation_service.h',

'browser/invalidation/invalidation_service_android.cc',

'browser/invalidation/invalidation_service_android.h',

'browser/invalidation/invalidation_service_factory.cc',

@@ -920,8 +918,6 @@

'browser/invalidation/ticl_invalidation_service.h',

'browser/invalidation/ticl_profile_settings_provider.cc',

'browser/invalidation/ticl_profile_settings_provider.h',

- 'browser/invalidation/ticl_settings_provider.cc',

- 'browser/invalidation/ticl_settings_provider.h',

'browser/io_thread.cc',

'browser/io_thread.h',

'browser/jankometer.h',

@@ -3253,8 +3249,8 @@

'browser/invalidation/ticl_invalidation_service.h',

'browser/invalidation/ticl_profile_settings_provider.cc',

'browser/invalidation/ticl_profile_settings_provider.h',

- 'browser/invalidation/ticl_settings_provider.cc',

- 'browser/invalidation/ticl_settings_provider.h',

+ 'invalidation/ticl_settings_provider.cc',

+ 'invalidation/ticl_settings_provider.h',

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

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