diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 19:19:16 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 19:19:16 +0000 |
| commit | 08a6f99997bad56869412e1da065acda3dc41538 (patch) | |
| tree | cf28f8848aed5fa3f641e8f76380469500efa852 /sync/sync.gyp | |
| parent | c12229d169345b5ea6fc69cfc4f23d57ac3a9fcc (diff) | |
| download | chromium_src-08a6f99997bad56869412e1da065acda3dc41538.zip chromium_src-08a6f99997bad56869412e1da065acda3dc41538.tar.gz chromium_src-08a6f99997bad56869412e1da065acda3dc41538.tar.bz2 | |
[Invalidations] Add GetInvalidatorState() to Invalidator{,Frontend}
Combine OnNotifications{Enabled,Disabled}() into OnInvalidatorStateChange(). Replace NotificationsDisabledReason with InvalidatorState.
Rename OnIncomingNotification to OnIncomingInvalidation. Also change
some references of "notification" to "invalidation".
Set the initial invalidator state in ChromeToMobileService. Also remove OnNotificationsEnabled() call from OnIncomingInvalidation().
Instantiate InvalidatorTest template for ProfileSyncService.
Move comments for invalidation-related functions from ProfileSyncService to InvalidatorFrontend.
Put DISALLOW_COPY_AND_ASSIGN on some classes.
Fix comment in invalidator.h.
BUG=142475
TBR=brettw@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10916131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sync.gyp')
| -rw-r--r-- | sync/sync.gyp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sync/sync.gyp b/sync/sync.gyp index ab54597..decc13c 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -269,8 +269,8 @@ 'notifier/invalidator.h', 'notifier/invalidator_registrar.cc', 'notifier/invalidator_registrar.h', - 'notifier/notifications_disabled_reason.cc', - 'notifier/notifications_disabled_reason.h', + 'notifier/invalidator_state.cc', + 'notifier/invalidator_state.h', 'notifier/object_id_state_map.cc', 'notifier/object_id_state_map.h', ], @@ -474,16 +474,17 @@ { 'target_name': 'test_support_sync_notifier', 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, 'include_dirs': [ '..', ], 'dependencies': [ '../testing/gmock.gyp:gmock', + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', 'sync_notifier', ], 'export_dependent_settings': [ '../testing/gmock.gyp:gmock', + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', 'sync_notifier', ], 'sources': [ @@ -493,6 +494,7 @@ 'notifier/fake_invalidator.h', 'notifier/fake_invalidation_handler.cc', 'notifier/fake_invalidation_handler.h', + 'notifier/invalidator_test_template.cc', 'notifier/invalidator_test_template.h', 'notifier/object_id_state_map_test_util.cc', 'notifier/object_id_state_map_test_util.h', |