Index: content/common/browser_plugin/browser_plugin_messages.h |
diff --git a/content/common/browser_plugin/browser_plugin_messages.h b/content/common/browser_plugin/browser_plugin_messages.h |
index 0d1313780022e0be1441cc50e68c5ec037478023..0359d77d34ff8015fc56c6c12b0b46c19a8c8093 100644 |
--- a/content/common/browser_plugin/browser_plugin_messages.h |
+++ b/content/common/browser_plugin/browser_plugin_messages.h |
@@ -8,7 +8,6 @@ |
#include "base/basictypes.h" |
#include "base/process/process.h" |
-#include "base/values.h" |
#include "content/common/content_export.h" |
#include "content/common/content_param_traits.h" |
#include "content/common/cursors/webcursor.h" |
@@ -135,10 +134,9 @@ IPC_MESSAGE_ROUTED3( |
// |params| is the state of the BrowserPlugin taking ownership of |
// the guest. If a guest doesn't already exist with the given |instance_id|, |
// a new one will be created. |
-IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_Attach, |
+IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_Attach, |
int /* instance_id */, |
- BrowserPluginHostMsg_Attach_Params /* params */, |
- base::DictionaryValue /* extra_params */) |
+ BrowserPluginHostMsg_Attach_Params /* params */) |
// Tells the guest to focus or defocus itself. |
IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_SetFocus, |
@@ -213,7 +211,9 @@ IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ResizeGuest, |
// This message is sent in response to a completed attachment of a guest |
// to a BrowserPlugin. |
-IPC_MESSAGE_CONTROL1(BrowserPluginMsg_Attach_ACK, int /* instance_id */) |
+IPC_MESSAGE_CONTROL2(BrowserPluginMsg_Attach_ACK, |
+ int /* browser_plugin_instance_id */, |
+ int /* instance_id */) |
// Once the swapped out guest RenderView has been created in the embedder render |
// process, the browser process informs the embedder of its routing ID. |