Index: content/common/frame_messages.h |
=================================================================== |
--- content/common/frame_messages.h (revision 247964) |
+++ content/common/frame_messages.h (working copy) |
@@ -8,6 +8,7 @@ |
#include "content/common/content_export.h" |
#include "content/common/frame_param.h" |
#include "content/public/common/common_param_traits.h" |
+#include "content/public/common/context_menu_params.h" |
#include "ipc/ipc_message_macros.h" |
#include "url/gurl.h" |
@@ -16,6 +17,53 @@ |
#define IPC_MESSAGE_START FrameMsgStart |
+IPC_ENUM_TRAITS(blink::WebContextMenuData::MediaType) |
+IPC_ENUM_TRAITS(ui::MenuSourceType) |
+ |
+IPC_STRUCT_TRAITS_BEGIN(content::ContextMenuParams) |
+ IPC_STRUCT_TRAITS_MEMBER(media_type) |
+ IPC_STRUCT_TRAITS_MEMBER(x) |
+ IPC_STRUCT_TRAITS_MEMBER(y) |
+ IPC_STRUCT_TRAITS_MEMBER(link_url) |
+ IPC_STRUCT_TRAITS_MEMBER(link_text) |
+ IPC_STRUCT_TRAITS_MEMBER(unfiltered_link_url) |
+ IPC_STRUCT_TRAITS_MEMBER(src_url) |
+ IPC_STRUCT_TRAITS_MEMBER(has_image_contents) |
+ IPC_STRUCT_TRAITS_MEMBER(page_url) |
+ IPC_STRUCT_TRAITS_MEMBER(keyword_url) |
+ IPC_STRUCT_TRAITS_MEMBER(frame_url) |
+ IPC_STRUCT_TRAITS_MEMBER(frame_id) |
+ IPC_STRUCT_TRAITS_MEMBER(frame_page_state) |
+ IPC_STRUCT_TRAITS_MEMBER(media_flags) |
+ IPC_STRUCT_TRAITS_MEMBER(selection_text) |
+ IPC_STRUCT_TRAITS_MEMBER(misspelled_word) |
+ IPC_STRUCT_TRAITS_MEMBER(misspelling_hash) |
+ IPC_STRUCT_TRAITS_MEMBER(dictionary_suggestions) |
+ IPC_STRUCT_TRAITS_MEMBER(speech_input_enabled) |
+ IPC_STRUCT_TRAITS_MEMBER(spellcheck_enabled) |
+ IPC_STRUCT_TRAITS_MEMBER(is_editable) |
+ IPC_STRUCT_TRAITS_MEMBER(writing_direction_default) |
+ IPC_STRUCT_TRAITS_MEMBER(writing_direction_left_to_right) |
+ IPC_STRUCT_TRAITS_MEMBER(writing_direction_right_to_left) |
+ IPC_STRUCT_TRAITS_MEMBER(edit_flags) |
+ IPC_STRUCT_TRAITS_MEMBER(security_info) |
+ IPC_STRUCT_TRAITS_MEMBER(frame_charset) |
+ IPC_STRUCT_TRAITS_MEMBER(referrer_policy) |
+ IPC_STRUCT_TRAITS_MEMBER(custom_context) |
+ IPC_STRUCT_TRAITS_MEMBER(custom_items) |
+ IPC_STRUCT_TRAITS_MEMBER(source_type) |
+#if defined(OS_ANDROID) |
+ IPC_STRUCT_TRAITS_MEMBER(selection_start) |
+ IPC_STRUCT_TRAITS_MEMBER(selection_end) |
+#endif |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(content::CustomContextMenuContext) |
+ IPC_STRUCT_TRAITS_MEMBER(is_pepper_menu) |
+ IPC_STRUCT_TRAITS_MEMBER(request_id) |
+ IPC_STRUCT_TRAITS_MEMBER(render_widget_id) |
+IPC_STRUCT_TRAITS_END() |
+ |
IPC_STRUCT_BEGIN(FrameHostMsg_DidFailProvisionalLoadWithError_Params) |
// The frame ID for the failure report. |
IPC_STRUCT_MEMBER(int64, frame_id) |
@@ -57,6 +105,16 @@ |
IPC_MESSAGE_ROUTED1(FrameMsg_CompositorFrameSwapped, |
FrameMsg_CompositorFrameSwapped_Params /* params */) |
+// Sent in response to a FrameHostMsg_ContextMenu to let the renderer know that |
+// the menu has been closed. |
+IPC_MESSAGE_ROUTED1(FrameMsg_ContextMenuClosed, |
+ content::CustomContextMenuContext /* custom_context */) |
+ |
+// Executes custom context menu action that was provided from WebKit. |
nasko
2014/01/31 00:38:17
nit: Blink?
jam
2014/01/31 00:45:53
Done.
|
+IPC_MESSAGE_ROUTED2(FrameMsg_CustomContextMenuAction, |
+ content::CustomContextMenuContext /* custom_context */, |
+ unsigned /* action */) |
+ |
// ----------------------------------------------------------------------------- |
// Messages sent from the renderer to the browser. |
@@ -166,3 +224,9 @@ |
// running the unload event handler. Expects a SwapOut_ACK message when |
// finished. |
IPC_MESSAGE_ROUTED0(FrameMsg_SwapOut) |
+ |
+// Used to tell the parent that the user right clicked on an area of the |
+// content area, and a context menu should be shown for it. The params |
+// object contains information about the node(s) that were selected when the |
+// user right clicked. |
+IPC_MESSAGE_ROUTED1(FrameHostMsg_ContextMenu, content::ContextMenuParams) |