Index: google_apis/gcm/engine/mcs_client.h |
diff --git a/google_apis/gcm/engine/mcs_client.h b/google_apis/gcm/engine/mcs_client.h |
index 8087e4ec5b4dac533c727fe6e3750cf025b00e25..2cd63c6f576973508928187f20cbc5ccd29dfcb3 100644 |
--- a/google_apis/gcm/engine/mcs_client.h |
+++ b/google_apis/gcm/engine/mcs_client.h |
@@ -17,7 +17,7 @@ |
#include "google_apis/gcm/base/gcm_export.h" |
#include "google_apis/gcm/base/mcs_message.h" |
#include "google_apis/gcm/engine/connection_handler.h" |
-#include "google_apis/gcm/engine/rmq_store.h" |
+#include "google_apis/gcm/engine/gcm_store.h" |
namespace google { |
namespace protobuf { |
@@ -41,10 +41,10 @@ struct ReliablePacketInfo; |
class GCM_EXPORT MCSClient { |
public: |
enum State { |
- UNINITIALIZED, // Uninitialized. |
- LOADED, // RMQ Load finished, waiting to connect. |
- CONNECTING, // Connection in progress. |
- CONNECTED, // Connected and running. |
+ UNINITIALIZED, // Uninitialized. |
+ LOADED, // GCM Load finished, waiting to connect. |
+ CONNECTING, // Connection in progress. |
+ CONNECTED, // Connected and running. |
}; |
// Callback for informing MCSClient status. It is valid for this to be |
@@ -64,22 +64,22 @@ class GCM_EXPORT MCSClient { |
typedef base::Callback<void(const std::string& message_id)> |
OnMessageSentCallback; |
- MCSClient(ConnectionFactory* connection_factory, RMQStore* rmq_store); |
+ MCSClient(ConnectionFactory* connection_factory, GCMStore* gcm_store); |
virtual ~MCSClient(); |
// Initialize the client. Will load any previous id/token information as well |
- // as unacknowledged message information from the RMQ storage, if it exists, |
+ // as unacknowledged message information from the GCM storage, if it exists, |
// passing the id/token information back via |initialization_callback| along |
- // with a |success == true| result. If no RMQ information is present (and |
- // this is therefore a fresh client), a clean RMQ store will be created and |
+ // with a |success == true| result. If no GCM information is present (and |
+ // this is therefore a fresh client), a clean GCM store will be created and |
// values of 0 will be returned via |initialization_callback| with |
// |success == true|. |
- /// If an error loading the RMQ store is encountered, |
+ /// If an error loading the GCM store is encountered, |
// |initialization_callback| will be invoked with |success == false|. |
void Initialize(const InitializationCompleteCallback& initialization_callback, |
const OnMessageReceivedCallback& message_received_callback, |
const OnMessageSentCallback& message_sent_callback, |
- const RMQStore::LoadResult& load_result); |
+ const GCMStore::LoadResult& load_result); |
// Logs the client into the server. Client must be initialized. |
// |android_id| and |security_token| are optional if this is not a new |
@@ -90,12 +90,12 @@ class GCM_EXPORT MCSClient { |
// |initialization_callback| to be invoked with |success = false|. |
void Login(uint64 android_id, uint64 security_token); |
- // Sends a message, with or without reliable message queueing (RMQ) support. |
+ // Sends a message, with or without reliable message queueing (GCM) support. |
Nicolas Zea
2013/12/27 20:03:06
nit: leave as RMQ, here and below
fgorski
2013/12/27 22:20:39
Done, but I'll leave the one below as GCM, given t
|
// Will asynchronously invoke the OnMessageSent callback regardless. |
// TODO(zea): support TTL. |
void SendMessage(const MCSMessage& message, bool use_rmq); |
- // Disconnects the client and permanently destroys the persistent RMQ store. |
+ // Disconnects the client and permanently destroys the persistent GCM store. |
// WARNING: This is permanent, and the client must be recreated with new |
// credentials afterwards. |
void Destroy(); |
@@ -120,8 +120,8 @@ class GCM_EXPORT MCSClient { |
// Send a heartbeat to the MCS server. |
void SendHeartbeat(); |
- // RMQ Store callback. |
- void OnRMQUpdateFinished(bool success); |
+ // GCM Store callback. |
+ void OnGCMUpdateFinished(bool success); |
// Attempt to send a message. |
void MaybeSendMessage(); |
@@ -207,7 +207,7 @@ class GCM_EXPORT MCSClient { |
PersistentIdList restored_unackeds_server_ids_; |
// The reliable message queue persistent store. Owned by the caller. |
Nicolas Zea
2013/12/27 20:03:06
nit: update comment.
fgorski
2013/12/27 22:20:39
Done.
|
- RMQStore* rmq_store_; |
+ GCMStore* gcm_store_; |
// ----- Heartbeats ----- |
// The current heartbeat interval. |