| Index: sync/notifier/sync_invalidation_client.h
|
| diff --git a/sync/notifier/chrome_invalidation_client.h b/sync/notifier/sync_invalidation_client.h
|
| similarity index 90%
|
| rename from sync/notifier/chrome_invalidation_client.h
|
| rename to sync/notifier/sync_invalidation_client.h
|
| index fc6c43dfae70d4abe9ae647aea952e0b1c2eb887..2544c57f76c279ad5812006b3dd71782b5c6d7a1 100644
|
| --- a/sync/notifier/chrome_invalidation_client.h
|
| +++ b/sync/notifier/sync_invalidation_client.h
|
| @@ -5,8 +5,8 @@
|
| // A simple wrapper around invalidation::InvalidationClient that
|
| // handles all the startup/shutdown details and hookups.
|
|
|
| -#ifndef SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
|
| -#define SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
|
| +#ifndef SYNC_NOTIFIER_SYNC_INVALIDATION_CLIENT_H_
|
| +#define SYNC_NOTIFIER_SYNC_INVALIDATION_CLIENT_H_
|
|
|
| #include <string>
|
|
|
| @@ -19,11 +19,11 @@
|
| #include "google/cacheinvalidation/include/invalidation-listener.h"
|
| #include "jingle/notifier/listener/push_client_observer.h"
|
| #include "sync/internal_api/public/util/weak_handle.h"
|
| -#include "sync/notifier/chrome_system_resources.h"
|
| #include "sync/notifier/invalidation_state_tracker.h"
|
| #include "sync/notifier/notifications_disabled_reason.h"
|
| #include "sync/notifier/object_id_state_map.h"
|
| #include "sync/notifier/state_writer.h"
|
| +#include "sync/notifier/sync_system_resources.h"
|
|
|
| namespace buzz {
|
| class XmppTaskParentInterface;
|
| @@ -37,9 +37,9 @@ namespace syncer {
|
|
|
| class RegistrationManager;
|
|
|
| -// ChromeInvalidationClient is not thread-safe and lives on the sync
|
| +// SyncInvalidationClient is not thread-safe and lives on the sync
|
| // thread.
|
| -class ChromeInvalidationClient
|
| +class SyncInvalidationClient
|
| : public invalidation::InvalidationListener,
|
| public StateWriter,
|
| public notifier::PushClientObserver,
|
| @@ -64,11 +64,11 @@ class ChromeInvalidationClient
|
| NotificationsDisabledReason reason) = 0;
|
| };
|
|
|
| - explicit ChromeInvalidationClient(
|
| + explicit SyncInvalidationClient(
|
| scoped_ptr<notifier::PushClient> push_client);
|
|
|
| // Calls Stop().
|
| - virtual ~ChromeInvalidationClient();
|
| + virtual ~SyncInvalidationClient();
|
|
|
| // Does not take ownership of |listener| or |state_writer|.
|
| // |invalidation_state_tracker| must be initialized.
|
| @@ -139,9 +139,9 @@ class ChromeInvalidationClient
|
|
|
| void EmitInvalidation(const ObjectIdStateMap& id_state_map);
|
|
|
| - // Owned by |chrome_system_resources_|.
|
| + // Owned by |sync_system_resources_|.
|
| notifier::PushClient* const push_client_;
|
| - ChromeSystemResources chrome_system_resources_;
|
| + SyncSystemResources sync_system_resources_;
|
| InvalidationVersionMap max_invalidation_versions_;
|
| WeakHandle<InvalidationStateTracker> invalidation_state_tracker_;
|
| Listener* listener_;
|
| @@ -155,9 +155,9 @@ class ChromeInvalidationClient
|
| NotificationsDisabledReason ticl_state_;
|
| NotificationsDisabledReason push_client_state_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ChromeInvalidationClient);
|
| + DISALLOW_COPY_AND_ASSIGN(SyncInvalidationClient);
|
| };
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
|
| +#endif // SYNC_NOTIFIER_SYNC_INVALIDATION_CLIENT_H_
|
|
|