chrome/chrome_browser.gypi - Issue 114223002: Multi-strategy based tracking.

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 114223002: Multi-strategy based tracking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge up to r248367 Created 6 years, 11 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 c2b436f1aa787bdadeebf5b13b1bf1e486a28e19..e13af6c264f39f98f3e1ca2749596da9bf48bf7d 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1599,10 +1599,10 @@

'browser/prefs/pref_hash_store.h',

'browser/prefs/pref_hash_store_impl.cc',

'browser/prefs/pref_hash_store_impl.h',

- 'browser/prefs/pref_model_associator.cc',

- 'browser/prefs/pref_model_associator.h',

'browser/prefs/pref_metrics_service.cc',

'browser/prefs/pref_metrics_service.h',

+ 'browser/prefs/pref_model_associator.cc',

+ 'browser/prefs/pref_model_associator.h',

'browser/prefs/pref_service_syncable.cc',

'browser/prefs/pref_service_syncable.h',

'browser/prefs/pref_service_syncable_factory.cc',

@@ -1617,6 +1617,13 @@

'browser/prefs/synced_pref_change_registrar.cc',

'browser/prefs/synced_pref_change_registrar.h',

'browser/prefs/synced_pref_observer.h',

+ 'browser/prefs/tracked/tracked_atomic_preference.cc',

+ 'browser/prefs/tracked/tracked_atomic_preference.h',

+ 'browser/prefs/tracked/tracked_preference.h',

+ 'browser/prefs/tracked/tracked_preference_helper.cc',

+ 'browser/prefs/tracked/tracked_preference_helper.h',

+ 'browser/prefs/tracked/tracked_split_preference.cc',

+ 'browser/prefs/tracked/tracked_split_preference.h',

'browser/prerender/external_prerender_handler_android.cc',

'browser/prerender/external_prerender_handler_android.h',

'browser/prerender/prerender_condition.h',