| Index: sync/notifier/p2p_notifier.h
|
| diff --git a/sync/notifier/p2p_notifier.h b/sync/notifier/p2p_notifier.h
|
| index 341bc8b65eeaad9671859122072c31a39c651f86..adb4df27664419019790e58aa50b9237c26235fa 100644
|
| --- a/sync/notifier/p2p_notifier.h
|
| +++ b/sync/notifier/p2p_notifier.h
|
| @@ -19,6 +19,7 @@
|
| #include "jingle/notifier/listener/push_client_observer.h"
|
| #include "sync/internal_api/public/syncable/model_type.h"
|
| #include "sync/notifier/sync_notifier.h"
|
| +#include "sync/notifier/sync_notifier_state.h"
|
|
|
| namespace notifier {
|
| class PushClient;
|
| @@ -107,7 +108,8 @@ class P2PNotifier
|
| syncable::ModelTypeSet changed_types) OVERRIDE;
|
|
|
| // PushClientObserver implementation.
|
| - virtual void OnNotificationStateChange(bool notifications_enabled) OVERRIDE;
|
| + virtual void OnPushClientStateChange(
|
| + notifier::PushClientState push_client_state) OVERRIDE;
|
| virtual void OnIncomingNotification(
|
| const notifier::Notification& notification) OVERRIDE;
|
|
|
| @@ -127,9 +129,8 @@ class P2PNotifier
|
| std::string unique_id_;
|
| // Whether we have called UpdateCredentials() yet.
|
| bool logged_in_;
|
| - // Whether |push_client_| has notified us that notifications are
|
| - // enabled.
|
| - bool notifications_enabled_;
|
| + // The current state.
|
| + SyncNotifierState state_;
|
| // Which set of clients should be sent notifications.
|
| P2PNotificationTarget send_notification_target_;
|
|
|
|
|