Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef COMPONENTS_GCM_DRIVER_COMMON_GCM_MESSAGES_H_ | 5 #ifndef COMPONENTS_GCM_DRIVER_COMMON_GCM_MESSAGES_H_ |
| 6 #define COMPONENTS_GCM_DRIVER_COMMON_GCM_MESSAGES_H_ | 6 #define COMPONENTS_GCM_DRIVER_COMMON_GCM_MESSAGES_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 29 | 29 |
| 30 static const int kMaximumTTL; | 30 static const int kMaximumTTL; |
| 31 }; | 31 }; |
| 32 | 32 |
| 33 // Message being received from the other party. | 33 // Message being received from the other party. |
| 34 struct GCM_DRIVER_EXPORT IncomingMessage { | 34 struct GCM_DRIVER_EXPORT IncomingMessage { |
| 35 IncomingMessage(); | 35 IncomingMessage(); |
| 36 IncomingMessage(const IncomingMessage& other); | 36 IncomingMessage(const IncomingMessage& other); |
| 37 ~IncomingMessage(); | 37 ~IncomingMessage(); |
| 38 | 38 |
| 39 // Message ID. | |
| 40 std::string id; | |
|
Peter Beverloo
2016/12/15 19:24:24
I'd very much prefer not to expose the message ID
harkness
2016/12/21 17:23:37
Now that the callback is created in the GCMClient,
| |
| 41 | |
| 39 MessageData data; | 42 MessageData data; |
| 40 std::string collapse_key; | 43 std::string collapse_key; |
| 41 std::string sender_id; | 44 std::string sender_id; |
| 42 std::string raw_data; | 45 std::string raw_data; |
| 43 | 46 |
| 44 // Whether the contents of the message have been decrypted, and are | 47 // Whether the contents of the message have been decrypted, and are |
| 45 // available in |raw_data|. | 48 // available in |raw_data|. |
| 46 bool decrypted; | 49 bool decrypted; |
| 47 }; | 50 }; |
| 48 | 51 |
| 49 } // namespace gcm | 52 } // namespace gcm |
| 50 | 53 |
| 51 #endif // COMPONENTS_GCM_DRIVER_COMMON_GCM_MESSAGES_H_ | 54 #endif // COMPONENTS_GCM_DRIVER_COMMON_GCM_MESSAGES_H_ |
| OLD | NEW |