| Index: components/invalidation/registration_manager.h
|
| diff --git a/sync/notifier/registration_manager.h b/components/invalidation/registration_manager.h
|
| similarity index 94%
|
| rename from sync/notifier/registration_manager.h
|
| rename to components/invalidation/registration_manager.h
|
| index e190a7fad55caeb38e947981190524ca074f3c42..42bc18fa09af518007a1d751da67f6ce943dbe1c 100644
|
| --- a/sync/notifier/registration_manager.h
|
| +++ b/components/invalidation/registration_manager.h
|
| @@ -5,8 +5,8 @@
|
| // A class that manages the registration of types for server-issued
|
| // notifications.
|
|
|
| -#ifndef SYNC_NOTIFIER_REGISTRATION_MANAGER_H_
|
| -#define SYNC_NOTIFIER_REGISTRATION_MANAGER_H_
|
| +#ifndef COMPONENTS_INVALIDATION_REGISTRATION_MANAGER_H_
|
| +#define COMPONENTS_INVALIDATION_REGISTRATION_MANAGER_H_
|
|
|
| #include <map>
|
|
|
| @@ -15,10 +15,10 @@
|
| #include "base/time/time.h"
|
| #include "base/timer/timer.h"
|
| // For invalidation::InvalidationListener::RegistrationState.
|
| +#include "components/invalidation/invalidation_export.h"
|
| #include "google/cacheinvalidation/include/invalidation-listener.h"
|
| #include "google/cacheinvalidation/include/types.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/notifier/invalidation_util.h"
|
| +#include "sync/internal_api/public/base/invalidation_util.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -32,7 +32,8 @@ using ::invalidation::InvalidationListener;
|
| // implementations include the syncer thread (both versions) and XMPP
|
| // retries. The most sophisticated one is URLRequestThrottler; making
|
| // that generic should work for everyone.
|
| -class SYNC_EXPORT_PRIVATE RegistrationManager : public base::NonThreadSafe {
|
| +class INVALIDATION_EXPORT_PRIVATE RegistrationManager
|
| + : public base::NonThreadSafe {
|
| public:
|
| // Constants for exponential backoff (used by tests).
|
| static const int kInitialRegistrationDelaySeconds;
|
| @@ -184,4 +185,4 @@ class SYNC_EXPORT_PRIVATE RegistrationManager : public base::NonThreadSafe {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_NOTIFIER_REGISTRATION_MANAGER_H_
|
| +#endif // COMPONENTS_INVALIDATION_REGISTRATION_MANAGER_H_
|
|
|