chrome/browser/invalidation/ticl_invalidation_service.cc - Issue 308413002: Revert of Move some sync/notifier to components/invalidation

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/ticl_invalidation_service.cc

Issue 308413002: Revert of Move some sync/notifier to components/invalidation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/invalidation/ticl_invalidation_service.cc

diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc b/chrome/browser/invalidation/ticl_invalidation_service.cc

index 487bdb903f7fb2eb2f05c42084c8d8988f0ee4d2..f2f5cf3c7d41c851684c89c42b802c07c8b21a02 100644

--- a/chrome/browser/invalidation/ticl_invalidation_service.cc

+++ b/chrome/browser/invalidation/ticl_invalidation_service.cc

@@ -10,12 +10,13 @@

#include "chrome/common/chrome_content_client.h"

#include "components/gcm_driver/gcm_driver.h"

#include "components/invalidation/invalidation_service_util.h"

-#include "components/invalidation/non_blocking_invalidator.h"

#include "google_apis/gaia/gaia_constants.h"

#include "net/url_request/url_request_context_getter.h"

-#include "sync/internal_api/public/base/invalidator_state.h"

+#include "sync/notifier/gcm_network_channel_delegate.h"

#include "sync/notifier/invalidation_util.h"

#include "sync/notifier/invalidator.h"

+#include "sync/notifier/invalidator_state.h"

+#include "sync/notifier/non_blocking_invalidator.h"

#include "sync/notifier/object_id_invalidation_map.h"

static const char* kOAuth2Scopes[] = {