Index: extensions/common/extension_messages.h |
diff --git a/extensions/common/extension_messages.h b/extensions/common/extension_messages.h |
index 320bda7ac3622a32fcd3a76fae908b12b0f5ba33..86fa14db210538cd02f5c2ae8d869f650e87b48a 100644 |
--- a/extensions/common/extension_messages.h |
+++ b/extensions/common/extension_messages.h |
@@ -674,15 +674,20 @@ IPC_MESSAGE_CONTROL4(ExtensionHostMsg_RemoveFilteredListener, |
IPC_MESSAGE_ROUTED1(ExtensionHostMsg_EventAck, int /* message_id */) |
// Open a channel to all listening contexts owned by the extension with |
-// the given ID. This always returns a valid port ID which can be used for |
-// sending messages. If an error occurred, the opener will be notified |
-// asynchronously. |
-IPC_SYNC_MESSAGE_CONTROL4_1(ExtensionHostMsg_OpenChannelToExtension, |
- int /* frame_routing_id */, |
- ExtensionMsg_ExternalConnectionInfo, |
- std::string /* channel_name */, |
- bool /* include_tls_channel_id */, |
- int /* port_id */) |
+// the given ID. This responds asynchronously with ExtensionMsg_AssignPortId. |
+// If an error occurred, the opener will be notified asynchronously. |
+IPC_MESSAGE_CONTROL5(ExtensionHostMsg_OpenChannelToExtension, |
+ int /* frame_routing_id */, |
+ ExtensionMsg_ExternalConnectionInfo, |
+ std::string /* channel_name */, |
+ bool /* include_tls_channel_id */, |
+ int /* request_id */) |
+ |
+// The response to a request to open an extension message port, including the |
+// global port id and the request id. |
+IPC_MESSAGE_ROUTED2(ExtensionMsg_AssignPortId, |
+ int /*port_id, */, |
nasko
2016/09/09 21:11:34
nit: /* port_id
Devlin
2016/09/10 00:42:38
Done.
|
+ int /* request_id */) |
IPC_SYNC_MESSAGE_CONTROL2_1(ExtensionHostMsg_OpenChannelToNativeApp, |
int /* frame_routing_id */, |