| Index: sync/notifier/invalidation_notifier.cc
|
| diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
|
| index aaab3685d2d51f338f0e90eb66e0243ee56f17af..fe44e98d21c3cfb48da7278bcaf16864373b9812 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& initial_invalidation_state,
|
| 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_state_(initial_invalidation_state),
|
| @@ -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_state_,
|
| - initial_max_invalidation_versions_,
|
| + initial_invalidation_state_map_,
|
| invalidation_state_tracker_,
|
| this);
|
| invalidation_state_.clear();
|
|
|