diff options
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/plugin_messages_internal.h | 22 | ||||
| -rw-r--r-- | chrome/common/render_messages_internal.h | 7 |
2 files changed, 28 insertions, 1 deletions
diff --git a/chrome/common/plugin_messages_internal.h b/chrome/common/plugin_messages_internal.h index 9eed897..dc853c2 100644 --- a/chrome/common/plugin_messages_internal.h +++ b/chrome/common/plugin_messages_internal.h @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/gfx/native_widget_types.h" #include "base/shared_memory.h" #include "build/build_config.h" #include "chrome/common/ipc_message_macros.h" @@ -97,6 +98,16 @@ IPC_BEGIN_MESSAGES(PluginProcessHost) HWND /* caller window */) #endif +#if defined(OS_LINUX) + // On Linux, the mapping between NativeViewId and X window ids + // is known only to the browser. This message lets the plugin process + // ask about a NativeViewId that was provided by the renderer. + // It will get 0 back if it's a bogus input. + IPC_SYNC_MESSAGE_CONTROL1_1(PluginProcessHostMsg_MapNativeViewId, + gfx::NativeViewId /* input: native view id */, + gfx::PluginWindowHandle /* output: X window id */) +#endif + IPC_END_MESSAGES(PluginProcessHost) @@ -219,7 +230,16 @@ IPC_BEGIN_MESSAGES(PluginHost) // The window parameter is a handle to the window if the plugin is a windowed // plugin. It is NULL for windowless plugins. IPC_SYNC_MESSAGE_ROUTED1_0(PluginHostMsg_SetWindow, - gfx::NativeViewId /* window */) + gfx::PluginWindowHandle /* window */) + +#if defined(OS_LINUX) + // Asks the renderer to create a plugin container (GtkSocket). + IPC_SYNC_MESSAGE_ROUTED0_1(PluginHostMsg_CreatePluginContainer, + gfx::PluginWindowHandle /* container */) + // Asks the renderer to destroy a plugin container (GtkSocket). + IPC_SYNC_MESSAGE_ROUTED1_0(PluginHostMsg_DestroyPluginContainer, + gfx::PluginWindowHandle /* container */) +#endif #if defined(OS_WIN) // The modal_loop_pump_messages_event parameter is an event handle which is diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index d04c3a5..d6ff653 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -929,6 +929,13 @@ IPC_BEGIN_MESSAGES(ViewHost) IPC::ChannelHandle /* handle to channel */, FilePath /* plugin_path */) +#if defined(OS_LINUX) + IPC_SYNC_MESSAGE_ROUTED0_1(ViewHostMsg_CreatePluginContainer, + gfx::PluginWindowHandle /* container */) + IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_DestroyPluginContainer, + gfx::PluginWindowHandle /* container */) +#endif + // Clipboard IPC messages // This message is used when the object list does not contain a bitmap. |