chrome/browser/invalidation/invalidation_service_android.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/invalidation/invalidation_service_android.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/invalidation/invalidation_service.h ('k') | chrome/browser/invalidation/invalidation_service_android_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/invalidation/invalidation_service_android.h

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

--- chrome/browser/invalidation/invalidation_service_android.h (revision 208727)

+++ chrome/browser/invalidation/invalidation_service_android.h (working copy)

@@ -8,7 +8,7 @@

#include "base/basictypes.h"

#include "base/compiler_specific.h"

#include "base/threading/non_thread_safe.h"

-#include "chrome/browser/invalidation/invalidation_service.h"

+#include "chrome/browser/invalidation/invalidation_frontend.h"

#include "components/browser_context_keyed_service/browser_context_keyed_service.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

@@ -24,7 +24,8 @@

// around Android's invalidations service.

class InvalidationServiceAndroid

: public base::NonThreadSafe,

- public InvalidationService,

+ public BrowserContextKeyedService,

+ public InvalidationFrontend,

public content::NotificationObserver {

public:

explicit InvalidationServiceAndroid(Profile* profile);

@@ -46,7 +47,7 @@

const invalidation::ObjectId& id,

const syncer::AckHandle& ack_handle) OVERRIDE;

virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE;

- virtual std::string GetInvalidatorClientId() const OVERRIDE;

+ virtual std::string GetInvalidatorClientId() const;

// content::NotificationObserver implementation.

virtual void Observe(int type,