chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h - Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService""

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: chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h

Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService"" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/

Patch Set: Created 7 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 | « chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc ('k') | chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h

===================================================================

--- chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h (revision 208727)

+++ chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h (working copy)

@@ -15,7 +15,7 @@

#include "sync/notifier/invalidation_handler.h"

namespace invalidation {

-class InvalidationService;

+class InvalidationFrontend;

}

namespace extensions {

@@ -32,7 +32,7 @@

// |extension_ids| is the set of extension IDs for which push messaging is

// enabled.

PushMessagingInvalidationHandler(

- invalidation::InvalidationService* service,

+ invalidation::InvalidationFrontend* service,

PushMessagingInvalidationHandlerDelegate* delegate);

virtual ~PushMessagingInvalidationHandler();

@@ -56,7 +56,7 @@

void UpdateRegistrations();

base::ThreadChecker thread_checker_;

- invalidation::InvalidationService* const service_;

+ invalidation::InvalidationFrontend* const service_;

std::set<std::string> registered_extensions_;

syncer::ObjectIdSet suppressed_ids_;

PushMessagingInvalidationHandlerDelegate* const delegate_;