components/invalidation/sync_system_resources.cc - Issue 315433002: Retry: 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: components/invalidation/sync_system_resources.cc

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

Patch Set: Undo gyp hack Created 6 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:

Index: components/invalidation/sync_system_resources.cc

diff --git a/sync/notifier/sync_system_resources.cc b/components/invalidation/sync_system_resources.cc

similarity index 97%

rename from sync/notifier/sync_system_resources.cc

rename to components/invalidation/sync_system_resources.cc

index 5df110d5e033acc924d574ffa3fdd4fbe48b6c6e..1e7f3d4e59cf3ca87be0b9a28d8f54b453097933 100644

--- a/sync/notifier/sync_system_resources.cc

+++ b/components/invalidation/sync_system_resources.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

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

#include <cstdlib>

#include <cstring>

@@ -14,13 +14,13 @@

#include "base/stl_util.h"

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

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

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

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

#include "google/cacheinvalidation/deps/callback.h"

#include "google/cacheinvalidation/include/types.h"

#include "jingle/notifier/listener/push_client.h"

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

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

#include "sync/notifier/invalidation_util.h"

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

namespace syncer {