chrome/chrome_browser.gypi - Issue 179843002: Make invalidations work for Chrome OS Kiosk Apps.

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 179843002: Make invalidations work for Chrome OS Kiosk Apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge error leading to uninitialized memory access. Created 6 years, 9 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:

Index: chrome/chrome_browser.gypi

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

index 281b759d8658008f750491ed5255235bb304b540..6ed95e10391f2abe548c1fb415de6bb092a1f1cd 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -982,12 +982,16 @@

'browser/internal_auth.h',

'browser/intranet_redirect_detector.cc',

'browser/intranet_redirect_detector.h',

- 'browser/invalidation/invalidation_logger.cc',

- 'browser/invalidation/invalidation_logger.h',

+ 'browser/invalidation/device_invalidation_auth_provider_chromeos.cc',

+ 'browser/invalidation/device_invalidation_auth_provider_chromeos.h',

'browser/invalidation/gcm_invalidation_bridge.cc',

'browser/invalidation/gcm_invalidation_bridge.h',

+ 'browser/invalidation/invalidation_auth_provider.cc',

+ 'browser/invalidation/invalidation_auth_provider.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',

@@ -997,6 +1001,8 @@

'browser/invalidation/invalidation_service_util.h',

'browser/invalidation/invalidator_storage.cc',

'browser/invalidation/invalidator_storage.h',

+ 'browser/invalidation/profile_invalidation_auth_provider.cc',

+ 'browser/invalidation/profile_invalidation_auth_provider.h',

'browser/invalidation/ticl_invalidation_service.cc',

'browser/invalidation/ticl_invalidation_service.h',

'browser/io_thread.cc',

« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.cc ('k') | no next file » | no next file with comments »