summaryrefslogtreecommitdiffstats
path: root/sync/notifier/chrome_invalidation_client.h
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 18:15:53 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 18:15:53 +0000
commitb62f3e2d6dd96598cb1c46fa8a204ab76aad1a48 (patch)
tree3646d72518c6b73b916132cf25e45b0f65a14a39 /sync/notifier/chrome_invalidation_client.h
parent74a5da941800db7be37bba080d5b6a351ccc47e1 (diff)
downloadchromium_src-b62f3e2d6dd96598cb1c46fa8a204ab76aad1a48.zip
chromium_src-b62f3e2d6dd96598cb1c46fa8a204ab76aad1a48.tar.gz
chromium_src-b62f3e2d6dd96598cb1c46fa8a204ab76aad1a48.tar.bz2
Revert 137685 (broke check_deps on linux builder) - Rename InvalidationVersionTracker to InvalidationStateTracker in preparation
to add more methods to that class. BUG=124140 Review URL: https://chromiumcodereview.appspot.com/10407014 TBR=munjal@chromium.org Review URL: https://chromiumcodereview.appspot.com/10391186 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/notifier/chrome_invalidation_client.h')
-rw-r--r--sync/notifier/chrome_invalidation_client.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sync/notifier/chrome_invalidation_client.h b/sync/notifier/chrome_invalidation_client.h
index 45f5037..b1c8438 100644
--- a/sync/notifier/chrome_invalidation_client.h
+++ b/sync/notifier/chrome_invalidation_client.h
@@ -18,7 +18,7 @@
#include "base/threading/non_thread_safe.h"
#include "google/cacheinvalidation/include/invalidation-listener.h"
#include "sync/notifier/chrome_system_resources.h"
-#include "sync/notifier/invalidation_state_tracker.h"
+#include "sync/notifier/invalidation_version_tracker.h"
#include "sync/notifier/state_writer.h"
#include "sync/syncable/model_type.h"
#include "sync/syncable/model_type_payload_map.h"
@@ -57,14 +57,14 @@ class ChromeInvalidationClient
virtual ~ChromeInvalidationClient();
// Does not take ownership of |listener| or |state_writer|.
- // |invalidation_state_tracker| must be initialized.
+ // |invalidation_version_tracker| must be initialized.
// |base_task| must still be non-NULL.
void Start(
const std::string& client_id, const std::string& client_info,
const std::string& state,
const InvalidationVersionMap& initial_max_invalidation_versions,
- const browser_sync::WeakHandle<InvalidationStateTracker>&
- invalidation_state_tracker,
+ const browser_sync::WeakHandle<InvalidationVersionTracker>&
+ invalidation_version_tracker,
Listener* listener,
StateWriter* state_writer,
base::WeakPtr<buzz::XmppTaskParentInterface> base_task);
@@ -122,8 +122,8 @@ class ChromeInvalidationClient
base::NonThreadSafe non_thread_safe_;
ChromeSystemResources chrome_system_resources_;
InvalidationVersionMap max_invalidation_versions_;
- browser_sync::WeakHandle<InvalidationStateTracker>
- invalidation_state_tracker_;
+ browser_sync::WeakHandle<InvalidationVersionTracker>
+ invalidation_version_tracker_;
Listener* listener_;
StateWriter* state_writer_;
scoped_ptr<invalidation::InvalidationClient> invalidation_client_;