| Index: chrome/browser/sync/glue/bridged_invalidator.cc
|
| diff --git a/chrome/browser/sync/glue/bridged_invalidator.cc b/chrome/browser/sync/glue/bridged_invalidator.cc
|
| index c85c70b36d4ffc72a00bbd2b6646d01023fa1069..0146ad4a08c2ccedcca13e39f166ec1177179eb3 100644
|
| --- a/chrome/browser/sync/glue/bridged_invalidator.cc
|
| +++ b/chrome/browser/sync/glue/bridged_invalidator.cc
|
| @@ -10,8 +10,11 @@ namespace browser_sync {
|
|
|
| BridgedInvalidator::BridgedInvalidator(
|
| ChromeSyncNotificationBridge* bridge,
|
| - syncer::Invalidator* delegate)
|
| - : bridge_(bridge), delegate_(delegate) {
|
| + syncer::Invalidator* delegate,
|
| + syncer::InvalidatorState default_invalidator_state)
|
| + : bridge_(bridge),
|
| + delegate_(delegate),
|
| + default_invalidator_state_(default_invalidator_state) {
|
| DCHECK(bridge_);
|
| }
|
|
|
| @@ -33,6 +36,13 @@ void BridgedInvalidator::UpdateRegisteredIds(
|
| bridge_->UpdateRegisteredIds(handler, ids);
|
| }
|
|
|
| +syncer::InvalidatorState BridgedInvalidator::GetInvalidatorState() const {
|
| + return
|
| + delegate_.get() ?
|
| + delegate_->GetInvalidatorState() :
|
| + default_invalidator_state_;
|
| +}
|
| +
|
| void BridgedInvalidator::UnregisterHandler(
|
| syncer::InvalidationHandler* handler) {
|
| if (delegate_.get())
|
| @@ -56,10 +66,10 @@ void BridgedInvalidator::UpdateCredentials(
|
| delegate_->UpdateCredentials(email, token);
|
| }
|
|
|
| -void BridgedInvalidator::SendNotification(
|
| +void BridgedInvalidator::SendInvalidation(
|
| const syncer::ObjectIdStateMap& id_state_map) {
|
| if (delegate_.get())
|
| - delegate_->SendNotification(id_state_map);
|
| + delegate_->SendInvalidation(id_state_map);
|
| }
|
|
|
| } // namespace browser_sync
|
|
|