summaryrefslogtreecommitdiffstats
path: root/extensions/common/extension_messages.h
diff options
context:
space:
mode:
authorrob <rob@robwu.nl>2014-11-20 18:04:48 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-21 02:05:12 +0000
commit248d6a8456fdf67fa11be00e35105642f1871a9b (patch)
treeb8f3e127cab0e2442c249f47f426b8cef737d6b5 /extensions/common/extension_messages.h
parent8327f71beb19d287e8367e3e6df2dc55ebf984fa (diff)
downloadchromium_src-248d6a8456fdf67fa11be00e35105642f1871a9b.zip
chromium_src-248d6a8456fdf67fa11be00e35105642f1871a9b.tar.gz
chromium_src-248d6a8456fdf67fa11be00e35105642f1871a9b.tar.bz2
Add frameId to MessageSender (extension messaging API).
Moved IPC for extension messaging from RenderView to RenderFrame. BUG=264286 R=kalman@chromium.org Review URL: https://codereview.chromium.org/709933002 Cr-Commit-Position: refs/heads/master@{#305148}
Diffstat (limited to 'extensions/common/extension_messages.h')
-rw-r--r--extensions/common/extension_messages.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/extensions/common/extension_messages.h b/extensions/common/extension_messages.h
index b99bc3a..d3b8c3b 100644
--- a/extensions/common/extension_messages.h
+++ b/extensions/common/extension_messages.h
@@ -147,6 +147,17 @@ IPC_STRUCT_BEGIN(ExtensionMsg_ExecuteCode_Params)
IPC_STRUCT_MEMBER(bool, user_gesture)
IPC_STRUCT_END()
+// Struct containing information about the sender of connect() calls that
+// originate from a tab.
+IPC_STRUCT_BEGIN(ExtensionMsg_TabConnectionInfo)
+ // The tab from where the connection was created.
+ IPC_STRUCT_MEMBER(base::DictionaryValue, tab)
+
+ // The ID of the frame that initiated the connection.
+ // 0 if main frame, positive otherwise. -1 if not initiated from a frame.
+ IPC_STRUCT_MEMBER(int, frame_id)
+IPC_STRUCT_END()
+
// Struct containing the data for external connections to extensions. Used to
// handle the IPCs initiated by both connect() and onConnect().
IPC_STRUCT_BEGIN(ExtensionMsg_ExternalConnectionInfo)
@@ -485,7 +496,7 @@ IPC_MESSAGE_ROUTED2(ExtensionMsg_GetAppInstallStateResponse,
IPC_MESSAGE_ROUTED5(ExtensionMsg_DispatchOnConnect,
int /* target_port_id */,
std::string /* channel_name */,
- base::DictionaryValue /* source_tab */,
+ ExtensionMsg_TabConnectionInfo /* source */,
ExtensionMsg_ExternalConnectionInfo,
std::string /* tls_channel_id */)