components/invalidation/ticl_invalidation_service.cc - Issue 387733004: Move 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: components/invalidation/ticl_invalidation_service.cc

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

Patch Set: Add dep on dynamic_annotations (see crbug.com/392532) Created 6 years, 5 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: components/invalidation/ticl_invalidation_service.cc

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

index 6654fc8c9067b7f982abf1d58edfea68faeea2ef..8a63af318f5ca2b43af701233f040620fd64d63d 100644

--- a/components/invalidation/ticl_invalidation_service.cc

+++ b/components/invalidation/ticl_invalidation_service.cc

@@ -9,13 +9,13 @@

#include "components/gcm_driver/gcm_driver.h"

#include "components/invalidation/gcm_invalidation_bridge.h"

#include "components/invalidation/invalidation_service_util.h"

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

#include "components/invalidation/non_blocking_invalidator.h"

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

#include "google_apis/gaia/gaia_constants.h"

#include "net/url_request/url_request_context_getter.h"

+#include "sync/internal_api/public/base/invalidation_util.h"

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

-#include "sync/notifier/invalidation_util.h"

-#include "sync/notifier/invalidator.h"

-#include "sync/notifier/object_id_invalidation_map.h"

static const char* kOAuth2Scopes[] = {

GaiaConstants::kGoogleTalkOAuth2Scope