| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Multiply-included message header, no traditional include guard. | 5 // Multiply-included message header, no traditional include guard. |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/process.h" | 10 #include "base/process.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 // instance within an embedder. | 47 // instance within an embedder. |
| 48 // This identifier exists prior to the existence of the routing ID and the | 48 // This identifier exists prior to the existence of the routing ID and the |
| 49 // PP_Instance identifier. | 49 // PP_Instance identifier. |
| 50 // The purpose of this message is to tell the browser to map a PP_Instance | 50 // The purpose of this message is to tell the browser to map a PP_Instance |
| 51 // identifier to BrowserPlugin identifier. | 51 // identifier to BrowserPlugin identifier. |
| 52 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_MapInstance, | 52 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_MapInstance, |
| 53 int /* container_id */, | 53 int /* container_id */, |
| 54 PP_Instance /* instance */) | 54 PP_Instance /* instance */) |
| 55 | 55 |
| 56 // ----------------------------------------------------------------------------- | 56 // ----------------------------------------------------------------------------- |
| 57 // These messages are from the browser process to the guest renderer. | 57 // These messages are from the embedder render process to the guest render |
| 58 // process. |
| 58 | 59 |
| 59 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_CompleteNavigation, | 60 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_GuestReady, |
| 60 int /* guest_routing_id */, | 61 PP_Instance /* instance */, |
| 61 PP_Instance /* instance */) | 62 int /* embedder_container_id */) |
| 62 | 63 |
| 63 // ----------------------------------------------------------------------------- | 64 // ----------------------------------------------------------------------------- |
| 64 // These messages are from the guest renderer to the browser process | 65 // These messages are from the guest renderer to the browser process |
| 65 | 66 |
| 66 IPC_MESSAGE_ROUTED1(BrowserPluginHostMsg_ConnectToChannel, | 67 IPC_MESSAGE_ROUTED1(BrowserPluginHostMsg_ConnectToChannel, |
| 67 IPC::ChannelHandle /* handle */) | 68 IPC::ChannelHandle /* handle */) |
| 68 | 69 |
| 69 // A embedder sends this message to the browser when it wants | 70 // A embedder sends this message to the browser when it wants |
| 70 // to resize a guest plugin container so that the guest is relaid out | 71 // to resize a guest plugin container so that the guest is relaid out |
| 71 // according to the new size. | 72 // according to the new size. |
| 72 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ResizeGuest, | 73 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ResizeGuest, |
| 73 int32, /* width */ | 74 int32, /* width */ |
| 74 int32 /* height */) | 75 int32 /* height */) |
| 75 | 76 |
| 76 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_NavigateFromGuest, | 77 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_NavigateFromGuest, |
| 77 PP_Instance /* instance */, | 78 PP_Instance /* instance */, |
| 78 std::string /* src */) | 79 std::string /* src */) |
| 79 | 80 |
| 80 // ----------------------------------------------------------------------------- | 81 // ----------------------------------------------------------------------------- |
| 81 // These messages are from the browser process to the embedder. | 82 // These messages are from the browser process to the embedder. |
| 82 | 83 |
| 83 // A guest instance is ready to be placed. | 84 // A guest instance is ready to be placed. |
| 84 IPC_MESSAGE_CONTROL3(BrowserPluginMsg_LoadGuest, | 85 IPC_MESSAGE_CONTROL3(BrowserPluginMsg_LoadGuest, |
| 85 int /* instance id */, | 86 int /* instance id */, |
| 86 int /* guest_process_id */, | 87 int /* guest_process_id */, |
| 87 IPC::ChannelHandle /* channel_handle */) | 88 IPC::ChannelHandle /* channel_handle */) |
| 88 | 89 |
| OLD | NEW |