| Index: sync/notifier/non_blocking_invalidation_notifier.cc
|
| diff --git a/sync/notifier/non_blocking_invalidation_notifier.cc b/sync/notifier/non_blocking_invalidation_notifier.cc
|
| index 531286f7fa55769f5eb2198dc33568143a9d8166..af67d1a8bbadc9cc11241365a3b9e1d60064dabb 100644
|
| --- a/sync/notifier/non_blocking_invalidation_notifier.cc
|
| +++ b/sync/notifier/non_blocking_invalidation_notifier.cc
|
| @@ -43,7 +43,8 @@ class NonBlockingInvalidationNotifier::Core
|
| virtual void OnIncomingNotification(
|
| const syncable::ModelTypePayloadMap& type_payloads,
|
| IncomingNotificationSource source);
|
| - virtual void OnNotificationStateChange(bool notifications_enabled);
|
| + virtual void OnSyncNotifierStateChange(
|
| + SyncNotifierState sync_notifier_state);
|
|
|
| private:
|
| friend class
|
| @@ -125,8 +126,8 @@ void NonBlockingInvalidationNotifier::Core::UpdateEnabledTypes(
|
| }
|
|
|
| void NonBlockingInvalidationNotifier::Core::OnIncomingNotification(
|
| - const syncable::ModelTypePayloadMap& type_payloads,
|
| - IncomingNotificationSource source) {
|
| + const syncable::ModelTypePayloadMap& type_payloads,
|
| + IncomingNotificationSource source) {
|
| DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
|
| delegate_observer_.Call(FROM_HERE,
|
| &SyncNotifierObserver::OnIncomingNotification,
|
| @@ -134,12 +135,12 @@ void NonBlockingInvalidationNotifier::Core::OnIncomingNotification(
|
| source);
|
| }
|
|
|
| -void NonBlockingInvalidationNotifier::Core::OnNotificationStateChange(
|
| - bool notifications_enabled) {
|
| +void NonBlockingInvalidationNotifier::Core::OnSyncNotifierStateChange(
|
| + SyncNotifierState sync_notifier_state) {
|
| DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
|
| delegate_observer_.Call(FROM_HERE,
|
| - &SyncNotifierObserver::OnNotificationStateChange,
|
| - notifications_enabled);
|
| + &SyncNotifierObserver::OnSyncNotifierStateChange,
|
| + sync_notifier_state);
|
| }
|
|
|
| NonBlockingInvalidationNotifier::NonBlockingInvalidationNotifier(
|
| @@ -253,11 +254,11 @@ void NonBlockingInvalidationNotifier::OnIncomingNotification(
|
| OnIncomingNotification(type_payloads, source));
|
| }
|
|
|
| -void NonBlockingInvalidationNotifier::OnNotificationStateChange(
|
| - bool notifications_enabled) {
|
| +void NonBlockingInvalidationNotifier::OnSyncNotifierStateChange(
|
| + SyncNotifierState sync_notifier_state) {
|
| DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
|
| FOR_EACH_OBSERVER(SyncNotifierObserver, observers_,
|
| - OnNotificationStateChange(notifications_enabled));
|
| + OnSyncNotifierStateChange(sync_notifier_state));
|
| }
|
|
|
| } // namespace sync_notifier
|
|
|