diff options
| author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 23:24:32 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 23:24:32 +0000 |
| commit | 3ebb3eb23535757d0525eec1dc903dd237571104 (patch) | |
| tree | 961b5616d23086ccc42bff031103b96c2c3ff145 /chrome/common | |
| parent | 54ff8593182da0591ecb2715bcf42aec51f4f3db (diff) | |
| download | chromium_src-3ebb3eb23535757d0525eec1dc903dd237571104.zip chromium_src-3ebb3eb23535757d0525eec1dc903dd237571104.tar.gz chromium_src-3ebb3eb23535757d0525eec1dc903dd237571104.tar.bz2 | |
Reverting 20683.
Review URL: http://codereview.chromium.org/155539
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/ipc_message_utils.h | 6 | ||||
| -rw-r--r-- | chrome/common/render_messages_internal.h | 12 |
2 files changed, 4 insertions, 14 deletions
diff --git a/chrome/common/ipc_message_utils.h b/chrome/common/ipc_message_utils.h index 8661507..ee199e2 100644 --- a/chrome/common/ipc_message_utils.h +++ b/chrome/common/ipc_message_utils.h @@ -179,10 +179,8 @@ struct ParamTraits<long> { } }; -#if defined(OS_LINUX) || defined(OS_WIN) -// On Linux, unsigned long is used for serializing X window ids. -// On Windows, it's used for serializing process ids. -// On Mac, it conflicts with some other definition. +#if defined(OS_LINUX) +// unsigned long is used for serializing X window ids. template <> struct ParamTraits<unsigned long> { typedef unsigned long param_type; diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 5410091..d3046d0 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -945,15 +945,8 @@ IPC_BEGIN_MESSAGES(ViewHost) FilePath /* plugin_path */) #if defined(OS_LINUX) - // A renderer sends this when it needs a browser-side widget for - // hosting a windowed plugin. The PID is the PID of the *plugin* - // process, which is used to associate the browser-side container with - // the lifetime of the plugin process. - IPC_SYNC_MESSAGE_ROUTED1_1(ViewHostMsg_CreatePluginContainer, - base::ProcessId /* pid */, + IPC_SYNC_MESSAGE_ROUTED0_1(ViewHostMsg_CreatePluginContainer, gfx::PluginWindowHandle /* container */) - - // Destroy a plugin container previously created using CreatePluginContainer. IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_DestroyPluginContainer, gfx::PluginWindowHandle /* container */) #endif @@ -1159,8 +1152,7 @@ IPC_BEGIN_MESSAGES(ViewHost) // Sent by the renderer process to indicate that a plugin instance has // crashed. - IPC_MESSAGE_ROUTED2(ViewHostMsg_CrashedPlugin, - base::ProcessId /* plugin process id */, + IPC_MESSAGE_ROUTED1(ViewHostMsg_CrashedPlugin, FilePath /* plugin_path */) // Displays a JavaScript out-of-memory message in the infobar. |