Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Unified Diff: sync/notifier/invalidation_notifier.cc

Issue 10911084: Implement Invalidator::Acknowledge (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restart test + more cleanup Created 8 years, 2 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: sync/notifier/invalidation_notifier.cc
diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index 873c578743b018b425d933d1da9219c340ae0a0d..ca6d3b9bd060391db82292b98e30cc9192ac0d32 100644
--- a/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -19,12 +19,12 @@ namespace syncer {
InvalidationNotifier::InvalidationNotifier(
scoped_ptr<notifier::PushClient> push_client,
- const InvalidationVersionMap& initial_max_invalidation_versions,
+ const InvalidationStateMap& initial_invalidation_state_map,
const std::string& invalidation_bootstrap_data,
const WeakHandle<InvalidationStateTracker>& invalidation_state_tracker,
const std::string& client_info)
: state_(STOPPED),
- initial_max_invalidation_versions_(initial_max_invalidation_versions),
+ initial_invalidation_state_map_(initial_invalidation_state_map),
invalidation_state_tracker_(invalidation_state_tracker),
client_info_(client_info),
invalidation_bootstrap_data_(invalidation_bootstrap_data),
@@ -52,6 +52,12 @@ void InvalidationNotifier::UnregisterHandler(InvalidationHandler* handler) {
registrar_.UnregisterHandler(handler);
}
+void InvalidationNotifier::Acknowledge(const invalidation::ObjectId& id,
+ const AckHandle& ack_handle) {
+ DCHECK(CalledOnValidThread());
+ invalidation_listener_.Acknowledge(id, ack_handle);
+}
+
InvalidatorState InvalidationNotifier::GetInvalidatorState() const {
DCHECK(CalledOnValidThread());
return registrar_.GetInvalidatorState();
@@ -90,7 +96,7 @@ void InvalidationNotifier::UpdateCredentials(
invalidation_listener_.Start(
base::Bind(&invalidation::CreateInvalidationClient),
client_id_, client_info_, invalidation_bootstrap_data_,
- initial_max_invalidation_versions_,
+ initial_invalidation_state_map_,
invalidation_state_tracker_,
this);
invalidation_bootstrap_data_.clear();

Powered by Google App Engine
This is Rietveld 408576698