diff options
author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 00:16:12 +0000 |
---|---|---|
committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 00:16:12 +0000 |
commit | e4097c8d5848463fcd3e25f124f017d027b3ccf1 (patch) | |
tree | 22c0bbe14e059923b5ace391c3a2473112241359 /google_apis/gcm | |
parent | f880cb6a95cc4c3810de87490b7434811f210897 (diff) | |
download | chromium_src-e4097c8d5848463fcd3e25f124f017d027b3ccf1.zip chromium_src-e4097c8d5848463fcd3e25f124f017d027b3ccf1.tar.gz chromium_src-e4097c8d5848463fcd3e25f124f017d027b3ccf1.tar.bz2 |
[GCM] Add GCMClient interface and dummy implementation
BUG=284553
TEST=none due to no real implementation added yet
R=fgorski@chromium.org, zea@chromium.org
Review URL: https://codereview.chromium.org/62803002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/gcm')
-rw-r--r-- | google_apis/gcm/gcm.gyp | 5 | ||||
-rw-r--r-- | google_apis/gcm/gcm_client.cc | 45 | ||||
-rw-r--r-- | google_apis/gcm/gcm_client.h | 192 | ||||
-rw-r--r-- | google_apis/gcm/gcm_client_impl.cc | 39 | ||||
-rw-r--r-- | google_apis/gcm/gcm_client_impl.h | 39 |
5 files changed, 320 insertions, 0 deletions
diff --git a/google_apis/gcm/gcm.gyp b/google_apis/gcm/gcm.gyp index f04fbee..6344d48 100644 --- a/google_apis/gcm/gcm.gyp +++ b/google_apis/gcm/gcm.gyp @@ -30,6 +30,7 @@ ], 'dependencies': [ '../../base/base.gyp:base', + '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../net/net.gyp:net', '../../third_party/protobuf/protobuf.gyp:protobuf_lite' ], @@ -40,6 +41,10 @@ 'base/socket_stream.cc', 'engine/connection_handler.h', 'engine/connection_handler.cc', + 'gcm_client.cc', + 'gcm_client.h', + 'gcm_client_impl.cc', + 'gcm_client_impl.h', 'protocol/mcs.proto', ], 'includes': [ diff --git a/google_apis/gcm/gcm_client.cc b/google_apis/gcm/gcm_client.cc new file mode 100644 index 0000000..e437a30 --- /dev/null +++ b/google_apis/gcm/gcm_client.cc @@ -0,0 +1,45 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "google_apis/gcm/gcm_client.h" + +#include "base/lazy_instance.h" +#include "google_apis/gcm/gcm_client_impl.h" + +namespace gcm { + +namespace { + +static base::LazyInstance<GCMClientImpl>::Leaky g_gcm_client = + LAZY_INSTANCE_INITIALIZER; +static GCMClient* g_gcm_client_override = NULL; + +} // namespace + +GCMClient::OutgoingMessage::OutgoingMessage() + : time_to_live(0) { +} + +GCMClient::OutgoingMessage::~OutgoingMessage() { +} + +GCMClient::IncomingMessage::IncomingMessage() { +} + +GCMClient::IncomingMessage::~IncomingMessage() { +} + +// static +GCMClient* GCMClient::Get() { + if (g_gcm_client_override) + return g_gcm_client_override; + return g_gcm_client.Pointer(); +} + +// static +void GCMClient::SetForTesting(GCMClient* client) { + g_gcm_client_override = client; +} + +} // namespace gcm diff --git a/google_apis/gcm/gcm_client.h b/google_apis/gcm/gcm_client.h new file mode 100644 index 0000000..4336732 --- /dev/null +++ b/google_apis/gcm/gcm_client.h @@ -0,0 +1,192 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef GOOGLE_APIS_GCM_GCM_CLIENT_H_ +#define GOOGLE_APIS_GCM_GCM_CLIENT_H_ + +#include <map> +#include <string> +#include <vector> + +#include "base/basictypes.h" +#include "google_apis/gcm/base/gcm_export.h" + +namespace base { +class TaskRunner; +} + +namespace gcm { + +// Interface that encapsulates the network communications with the Google Cloud +// Messaging server. This interface is not supposed to be thread-safe. +class GCM_EXPORT GCMClient { + public: + enum Result { + // Successful operation. + SUCCESS, + // Network socket error. + NETWORK_ERROR, + // Problem at the server. + SERVER_ERROR, + // Exceeded the specified TTL during message sending. + TTL_EXCEEDED, + // Other errors. + UNKNOWN_ERROR + }; + + // Message data consisting of key-value pairs. + typedef const std::map<std::string, std::string> MessageData; + + // Message to be delivered to the other party. + struct OutgoingMessage { + OutgoingMessage(); + ~OutgoingMessage(); + + // Message ID. + std::string id; + // In seconds. + int time_to_live; + MessageData data; + }; + + // Message being received from the other party. + struct IncomingMessage { + IncomingMessage(); + ~IncomingMessage(); + + MessageData data; + }; + + // The check-in info for the user. Returned by the server. + struct CheckInInfo { + CheckInInfo() : android_id(0), secret(0) {} + bool IsValid() const { return android_id != 0 && secret != 0; } + + uint64 android_id; + uint64 secret; + }; + + // A delegate interface that allows the GCMClient instance to interact with + // its caller, i.e. notifying asynchronous event. + class Delegate { + public: + // Called when the user has been checked in successfully or an error occurs. + // |checkin_info|: valid if the checkin completed successfully. + // |result|: the type of the error if an error occured, success otherwise. + virtual void OnAddUserFinished(const CheckInInfo& checkin_info, + Result result) = 0; + + // Called when the registration completed successfully or an error occurs. + // |app_id|: application ID. + // |registration_id|: non-empty if the registration completed successfully. + // |result|: the type of the error if an error occured, success otherwise. + virtual void OnRegisterFinished(const std::string& app_id, + const std::string& registration_id, + Result result) = 0; + + // Called when the unregistration completed successfully or an error occurs. + // |app_id|: application ID. + // |result|: the type of the error if an error occured, success otherwise. + virtual void OnUnregisterFinished(const std::string& app_id, + Result result) = 0; + + // Called when the message is scheduled to send successfully or an error + // occurs. + // |app_id|: application ID. + // |message_id|: ID of the message being sent. + // |result|: the type of the error if an error occured, success otherwise. + virtual void OnSendFinished(const std::string& app_id, + const std::string& message_id, + Result result) = 0; + + // Called when a message has been received. + // |app_id|: application ID. + // |sender_id|: the registration ID of the sender. + // |message|: message received. + virtual void OnMessageReceived(const std::string& app_id, + const std::string& sender_id, + const IncomingMessage& message) = 0; + + // Called when some messages have been deleted from the server. + // |app_id|: application ID. + virtual void OnMessagesDeleted(const std::string& app_id) = 0; + + // Called when a message failed to send to the server. + // |app_id|: application ID. + // |message_id|: ID of the message being sent. + // |result|: the type of the error if an error occured, success otherwise. + virtual void OnMessageSendError(const std::string& app_id, + const std::string& message_id, + Result result) = 0; + + // Returns the checkin info associated with this user. The delegate class + // is expected to persist the checkin info that is provided by + // OnAddUserFinished. + virtual CheckInInfo GetCheckInInfo() const = 0; + + // Called when the loading from the persistent store is done. The loading + // is triggered asynchronously when GCMClient is created. + virtual void OnLoadingCompleted() = 0; + + // Returns a task runner for file operations that may block. This is used + // in writing to or reading from the persistent store. + virtual base::TaskRunner* GetFileTaskRunner() = 0; + }; + + // Returns the single instance. Multiple profiles share the same client + // that makes use of the same MCS connection. + static GCMClient* Get(); + + // Passes a mocked instance for testing purpose. + static void SetForTesting(GCMClient* client); + + // Checks in the user to use GCM. If the device has not been checked in, it + // will be done first. + // |username|: the username (email address) used to check in with the server. + // |delegate|: the delegate whose methods will be called asynchronously in + // response to events and messages. + virtual void AddUser(const std::string& username, Delegate* delegate) = 0; + + // Registers the application for GCM. Delegate::OnRegisterFinished will be + // called asynchronously upon completion. + // |username|: the username (email address) passed in AddUser. + // |app_id|: application ID. + // |cert|: SHA-1 of public key of the application, in base16 format. + // |sender_ids|: list of IDs of the servers that are allowed to send the + // messages to the application. These IDs are assigned by the + // Google API Console. + virtual void Register(const std::string& username, + const std::string& app_id, + const std::string& cert, + const std::vector<std::string>& sender_ids) = 0; + + // Unregisters the application from GCM when it is uninstalled. + // Delegate::OnUnregisterFinished will be called asynchronously upon + // completion. + // |username|: the username (email address) passed in AddUser. + // |app_id|: application ID. + virtual void Unregister(const std::string& username, + const std::string& app_id) = 0; + + // Sends a message to a given receiver. Delegate::OnSendFinished will be + // called asynchronously upon completion. + // |username|: the username (email address) passed in AddUser. + // |app_id|: application ID. + // |receiver_id|: registration ID of the receiver party. + // |message|: message to be sent. + virtual void Send(const std::string& username, + const std::string& app_id, + const std::string& receiver_id, + const OutgoingMessage& message) = 0; + + // Returns true if the loading from the persistent store is still in progress. + virtual bool IsLoading() const = 0; + + protected: + virtual ~GCMClient() {} +}; + +} // namespace gcm + +#endif // GOOGLE_APIS_GCM_GCM_CLIENT_H_ diff --git a/google_apis/gcm/gcm_client_impl.cc b/google_apis/gcm/gcm_client_impl.cc new file mode 100644 index 0000000..6dc17ae --- /dev/null +++ b/google_apis/gcm/gcm_client_impl.cc @@ -0,0 +1,39 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "google_apis/gcm/gcm_client_impl.h" + +namespace gcm { + +GCMClientImpl::GCMClientImpl() { +} + +GCMClientImpl::~GCMClientImpl() { +} + +void GCMClientImpl::AddUser(const std::string& username, + Delegate* delegate) { +} + +void GCMClientImpl::Register(const std::string& username, + const std::string& app_id, + const std::string& cert, + const std::vector<std::string>& sender_ids) { +} + +void GCMClientImpl::Unregister(const std::string& username, + const std::string& app_id) { +} + +void GCMClientImpl::Send(const std::string& username, + const std::string& app_id, + const std::string& receiver_id, + const OutgoingMessage& message) { +} + +bool GCMClientImpl::IsLoading() const { + return false; +} + +} // namespace gcm diff --git a/google_apis/gcm/gcm_client_impl.h b/google_apis/gcm/gcm_client_impl.h new file mode 100644 index 0000000..ddab15a --- /dev/null +++ b/google_apis/gcm/gcm_client_impl.h @@ -0,0 +1,39 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_ +#define GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_ + +#include "base/compiler_specific.h" +#include "google_apis/gcm/gcm_client.h" + +namespace gcm { + +class GCMClientImpl : public GCMClient { + public: + GCMClientImpl(); + virtual ~GCMClientImpl(); + + // Overridden from GCMClient: + virtual void AddUser(const std::string& username, + Delegate* delegate) OVERRIDE; + virtual void Register(const std::string& username, + const std::string& app_id, + const std::string& cert, + const std::vector<std::string>& sender_ids) OVERRIDE; + virtual void Unregister(const std::string& username, + const std::string& app_id) OVERRIDE; + virtual void Send(const std::string& username, + const std::string& app_id, + const std::string& receiver_id, + const OutgoingMessage& message) OVERRIDE; + virtual bool IsLoading() const OVERRIDE; + + private: + DISALLOW_COPY_AND_ASSIGN(GCMClientImpl); +}; + +} // namespace gcm + +#endif // GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_ |