chrome/browser/extensions/api/push_messaging/push_messaging_api.cc - Issue 255273002: First step towards invalidations componentization

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_api.cc

Issue 255273002: First step towards invalidations componentization (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to fix merge conflict Created 6 years, 7 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:

Index: chrome/browser/extensions/api/push_messaging/push_messaging_api.cc

diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc

index 5180d8581a450f66cba56c7b9dfc264f1304fdde..95684dd9cdd03156ecbccdd23daa3460e15c7c99 100644

--- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc

+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc

@@ -16,12 +16,12 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/token_cache/token_cache_service.h"

#include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"

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

#include "chrome/browser/invalidation/invalidation_service_factory.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

#include "chrome/browser/signin/signin_manager_factory.h"

#include "chrome/common/extensions/api/push_messaging.h"

+#include "components/invalidation/invalidation_service.h"

#include "components/signin/core/browser/profile_oauth2_token_service.h"

#include "components/signin/core/browser/signin_manager.h"

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