| Index: jingle/notifier/listener/non_blocking_push_client.cc
|
| diff --git a/jingle/notifier/listener/non_blocking_push_client.cc b/jingle/notifier/listener/non_blocking_push_client.cc
|
| index 23a84029523362037bb064c27685984391a23296..9d871e8a87c481b480c243e8b22ba4986016aace 100644
|
| --- a/jingle/notifier/listener/non_blocking_push_client.cc
|
| +++ b/jingle/notifier/listener/non_blocking_push_client.cc
|
| @@ -39,8 +39,8 @@ class NonBlockingPushClient::Core
|
| void UpdateCredentials(const std::string& email, const std::string& token);
|
| void SendNotification(const Notification& data);
|
|
|
| - virtual void OnNotificationStateChange(
|
| - bool notifications_enabled) OVERRIDE;
|
| + virtual void OnPushClientStateChange(
|
| + PushClientState notification_state) OVERRIDE;
|
| virtual void OnIncomingNotification(
|
| const Notification& notification) OVERRIDE;
|
|
|
| @@ -109,13 +109,13 @@ void NonBlockingPushClient::Core::SendNotification(
|
| delegate_push_client_->SendNotification(notification);
|
| }
|
|
|
| -void NonBlockingPushClient::Core::OnNotificationStateChange(
|
| - bool notifications_enabled) {
|
| +void NonBlockingPushClient::Core::OnPushClientStateChange(
|
| + PushClientState notification_state) {
|
| DCHECK(delegate_task_runner_->BelongsToCurrentThread());
|
| parent_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NonBlockingPushClient::OnNotificationStateChange,
|
| - parent_push_client_, notifications_enabled));
|
| + base::Bind(&NonBlockingPushClient::OnPushClientStateChange,
|
| + parent_push_client_, notification_state));
|
| }
|
|
|
| void NonBlockingPushClient::Core::OnIncomingNotification(
|
| @@ -186,11 +186,11 @@ void NonBlockingPushClient::SendNotification(
|
| notification));
|
| }
|
|
|
| -void NonBlockingPushClient::OnNotificationStateChange(
|
| - bool notifications_enabled) {
|
| +void NonBlockingPushClient::OnPushClientStateChange(
|
| + PushClientState push_client_state) {
|
| DCHECK(non_thread_safe_.CalledOnValidThread());
|
| FOR_EACH_OBSERVER(PushClientObserver, observers_,
|
| - OnNotificationStateChange(notifications_enabled));
|
| + OnPushClientStateChange(push_client_state));
|
| }
|
|
|
| void NonBlockingPushClient::OnIncomingNotification(
|
|
|