components/invalidation/push_client_channel.cc - Issue 348503002: Report InvalidatorState correctly from GCMNetworkChannel

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/invalidation/push_client_channel.cc

Issue 348503002: Report InvalidatorState correctly from GCMNetworkChannel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@GCM.ConnectionState

Patch Set: Rebase Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/invalidation/gcm_network_channel_unittest.cc ('k') | components/invalidation/sync_system_resources.h » ('j') | components/invalidation/sync_system_resources.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/invalidation/push_client_channel.cc

diff --git a/components/invalidation/push_client_channel.cc b/components/invalidation/push_client_channel.cc

index 3d12d485a232a8d38f3dd0742fbf2ce1f33caa9c..022993ea3b4d3e954b0cfc4e7858f1fb725fcc22 100644

--- a/components/invalidation/push_client_channel.cc

+++ b/components/invalidation/push_client_channel.cc

@@ -70,12 +70,14 @@ void PushClientChannel::SendMessage(const std::string& message) {

}

void PushClientChannel::OnNotificationsEnabled() {

- NotifyStateChange(INVALIDATIONS_ENABLED);

+ NotifyNetworkStatusChange(true);

+ NotifyChannelStateChange(INVALIDATIONS_ENABLED);

}

void PushClientChannel::OnNotificationsDisabled(

notifier::NotificationsDisabledReason reason) {

- NotifyStateChange(FromNotifierReason(reason));

+ NotifyNetworkStatusChange(false);

+ NotifyChannelStateChange(FromNotifierReason(reason));

}

void PushClientChannel::OnIncomingNotification(