| Index: components/invalidation/invalidation_notifier.h
|
| diff --git a/sync/notifier/invalidation_notifier.h b/components/invalidation/invalidation_notifier.h
|
| similarity index 89%
|
| rename from sync/notifier/invalidation_notifier.h
|
| rename to components/invalidation/invalidation_notifier.h
|
| index 3add4a85985772951cb683a1aee723fa651f61de..93257050d27af7f1da67f402b30bc2c0b96dbea6 100644
|
| --- a/sync/notifier/invalidation_notifier.h
|
| +++ b/components/invalidation/invalidation_notifier.h
|
| @@ -9,8 +9,8 @@
|
| // You probably don't want to use this directly; use
|
| // NonBlockingInvalidator.
|
|
|
| -#ifndef SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
|
| -#define SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
|
| +#ifndef COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_
|
| +#define COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_
|
|
|
| #include <string>
|
|
|
| @@ -18,13 +18,13 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/threading/non_thread_safe.h"
|
| -#include "sync/base/sync_export.h"
|
| +#include "components/invalidation/invalidation_export.h"
|
| +#include "components/invalidation/invalidator_registrar.h"
|
| +#include "components/invalidation/sync_invalidation_listener.h"
|
| #include "sync/internal_api/public/base/model_type.h"
|
| #include "sync/internal_api/public/util/weak_handle.h"
|
| #include "sync/notifier/invalidation_state_tracker.h"
|
| #include "sync/notifier/invalidator.h"
|
| -#include "sync/notifier/invalidator_registrar.h"
|
| -#include "sync/notifier/sync_invalidation_listener.h"
|
|
|
| namespace notifier {
|
| class PushClient;
|
| @@ -33,7 +33,7 @@ class PushClient;
|
| namespace syncer {
|
|
|
| // This class must live on the IO thread.
|
| -class SYNC_EXPORT_PRIVATE InvalidationNotifier
|
| +class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier
|
| : public Invalidator,
|
| public SyncInvalidationListener::Delegate,
|
| public base::NonThreadSafe {
|
| @@ -105,4 +105,4 @@ class SYNC_EXPORT_PRIVATE InvalidationNotifier
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
|
| +#endif // COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_
|
|
|