Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: third_party/mojo/src/mojo/edk/system/message_in_transit.h

Issue 1310103002: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/mojo/src/mojo/edk/system/message_in_transit.h
diff --git a/third_party/mojo/src/mojo/edk/system/message_in_transit.h b/third_party/mojo/src/mojo/edk/system/message_in_transit.h
index 063c8d61f6c5fa13a618abb918f564b5bb0d50b3..c61cfd67a37f0f06398bf65c36ac3e6e9f96534d 100644
--- a/third_party/mojo/src/mojo/edk/system/message_in_transit.h
+++ b/third_party/mojo/src/mojo/edk/system/message_in_transit.h
@@ -80,11 +80,18 @@ class MOJO_SYSTEM_IMPL_EXPORT MessageInTransit {
CONNECTION_MANAGER_ALLOW_CONNECT = 0,
CONNECTION_MANAGER_CANCEL_CONNECT = 1,
CONNECTION_MANAGER_CONNECT = 2,
- // Subtypes for type |Type::CONNECTION_MANAGER_ACK| (failure acks never have
- // any message contents; success acks for "connect" always have a
- // |ProcessIdentifier| as data and *may* have a platform handle attached):
+ // Subtypes for type |Type::CONNECTION_MANAGER_ACK|, corresponding to
+ // |ConnectionManager::Result| values (failure and non-"connect" acks never
+ // have any message contents; success acks for "connect" always have a
+ // |ProcessIdentifier| as data and also a platform handle attached for "new
+ // connection"):
+ // TODO(vtl): FIXME -- probably, in the "connect, reuse connection" case,
+ // we'll have to send more information.
CONNECTION_MANAGER_ACK_FAILURE = 0,
CONNECTION_MANAGER_ACK_SUCCESS = 1,
+ CONNECTION_MANAGER_ACK_SUCCESS_CONNECT_SAME_PROCESS = 2,
+ CONNECTION_MANAGER_ACK_SUCCESS_CONNECT_NEW_CONNECTION = 3,
+ CONNECTION_MANAGER_ACK_SUCCESS_CONNECT_REUSE_CONNECTION = 4,
};
// Messages (the header and data) must always be aligned to a multiple of this

Powered by Google App Engine
This is Rietveld 408576698