summaryrefslogtreecommitdiffstats
path: root/chrome/common/render_messages_internal.h
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-26 23:19:03 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-26 23:19:03 +0000
commit1136a60c7d8e06859369f906e2581648e93e967e (patch)
tree6a029b3d4fc3b5ad095ba3d74d4c610fd3603d48 /chrome/common/render_messages_internal.h
parentfc331b1dce8781192f8c89cfc8629b6c5b82c47a (diff)
downloadchromium_src-1136a60c7d8e06859369f906e2581648e93e967e.zip
chromium_src-1136a60c7d8e06859369f906e2581648e93e967e.tar.gz
chromium_src-1136a60c7d8e06859369f906e2581648e93e967e.tar.bz2
Make render_view_host compile on Mac & Linux, add to the build.
Review URL: http://codereview.chromium.org/18600 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/render_messages_internal.h')
-rw-r--r--chrome/common/render_messages_internal.h26
1 files changed, 11 insertions, 15 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 1081e54..ec0edd2 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -43,7 +43,15 @@ IPC_BEGIN_MESSAGES(View, 1)
// Tells the renderer to create a new view.
// This message is slightly different, the view it takes is the view to
// create, the message itself is sent as a non-view control message.
- IPC_MESSAGE_CONTROL4(ViewMsg_New, HWND, HANDLE, WebPreferences, int32)
+ IPC_MESSAGE_CONTROL4(ViewMsg_New,
+ HWND /* plugin_hwnd */,
+ HANDLE /* modal_dialog_event */,
+ WebPreferences /* preferences */,
+ int32 /* routing_id */)
+#elif defined(OS_POSIX)
+ IPC_MESSAGE_CONTROL2(ViewMsg_New,
+ WebPreferences, /* preferences */
+ int32 /* routing_id */)
#endif // defined(OS_WIN)
// Tells the renderer to set its maximum cache size to the supplied value
@@ -495,7 +503,6 @@ IPC_END_MESSAGES(View)
// These are messages sent from the renderer to the browser process.
IPC_BEGIN_MESSAGES(ViewHost, 2)
-#if defined(OS_WIN)
// Sent by the renderer when it is creating a new window. The browser creates
// a tab for it and responds with a ViewMsg_CreatingNew_ACK. If route_id is
// MSG_ROUTING_NONE, the view couldn't be created. modal_dialog_event is set
@@ -504,16 +511,7 @@ IPC_BEGIN_MESSAGES(ViewHost, 2)
int /* opener_id */,
bool /* user_gesture */,
int /* route_id */,
- HANDLE /* modal_dialog_event */)
-#else // defined(OS_WIN)
- // On POSIX, we don't use the cross process events for modal dialogs. At some
- // point, we won't use them on any platform, but for now we just define a
- // message without the last parameter.
- IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_CreateWindow,
- int /* opener_id */,
- bool /* user_gesture */,
- int /* route_id */)
-#endif
+ ModalDialogEvent /* modal_dialog_event */)
// Similar to ViewHostMsg_CreateView, except used for sub-widgets, like
// <select> dropdowns. This message is sent to the WebContents that
@@ -523,13 +521,11 @@ IPC_BEGIN_MESSAGES(ViewHost, 2)
bool /* focus on show */,
int /* route_id */)
-#if defined(OS_WIN)
// These two messages are sent as a result of the above two, in the browser
// process, from RenderWidgetHelper to RenderViewHost.
IPC_MESSAGE_ROUTED2(ViewHostMsg_CreateWindowWithRoute,
int /* route_id */,
- HANDLE /* modal_dialog_event */)
-#endif // defined(OS_WIN)
+ ModalDialogEvent /* modal_dialog_event */)
IPC_MESSAGE_ROUTED2(ViewHostMsg_CreateWidgetWithRoute,
int /* route_id */,