| 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 #include <string> | 6 #include <string> | 
| 7 #include <vector> | 7 #include <vector> | 
| 8 | 8 | 
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" | 
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" | 
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 202   IPC_STRUCT_TRAITS_MEMBER(mtu) | 202   IPC_STRUCT_TRAITS_MEMBER(mtu) | 
| 203 IPC_STRUCT_TRAITS_END() | 203 IPC_STRUCT_TRAITS_END() | 
| 204 #endif  // !defined(OS_NACL) | 204 #endif  // !defined(OS_NACL) | 
| 205 | 205 | 
| 206 // These are from the browser to the plugin. | 206 // These are from the browser to the plugin. | 
| 207 // Loads the given plugin. | 207 // Loads the given plugin. | 
| 208 IPC_MESSAGE_CONTROL1(PpapiMsg_LoadPlugin, FilePath /* path */) | 208 IPC_MESSAGE_CONTROL1(PpapiMsg_LoadPlugin, FilePath /* path */) | 
| 209 | 209 | 
| 210 // Creates a channel to talk to a renderer. The plugin will respond with | 210 // Creates a channel to talk to a renderer. The plugin will respond with | 
| 211 // PpapiHostMsg_ChannelCreated. | 211 // PpapiHostMsg_ChannelCreated. | 
| 212 IPC_MESSAGE_CONTROL3(PpapiMsg_CreateChannel, | 212 IPC_MESSAGE_CONTROL2(PpapiMsg_CreateChannel, | 
| 213                      base::ProcessHandle /* host_process_handle */, |  | 
| 214                      int /* renderer_id */, | 213                      int /* renderer_id */, | 
| 215                      bool /* incognito */) | 214                      bool /* incognito */) | 
| 216 | 215 | 
| 217 // Each plugin may be referenced by multiple renderers. We need the instance | 216 // Each plugin may be referenced by multiple renderers. We need the instance | 
| 218 // IDs to be unique within a plugin, despite coming from different renderers, | 217 // IDs to be unique within a plugin, despite coming from different renderers, | 
| 219 // and unique within a renderer, despite going to different plugins. This means | 218 // and unique within a renderer, despite going to different plugins. This means | 
| 220 // that neither the renderer nor the plugin can generate instance IDs without | 219 // that neither the renderer nor the plugin can generate instance IDs without | 
| 221 // consulting the other. | 220 // consulting the other. | 
| 222 // | 221 // | 
| 223 // We resolve this by having the renderer generate a unique instance ID inside | 222 // We resolve this by having the renderer generate a unique instance ID inside | 
| (...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1327 // PPB_X509Certificate_Private | 1326 // PPB_X509Certificate_Private | 
| 1328 IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER, | 1327 IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER, | 
| 1329                             std::vector<char> /* der */, | 1328                             std::vector<char> /* der */, | 
| 1330                             bool /* succeeded */, | 1329                             bool /* succeeded */, | 
| 1331                             ppapi::PPB_X509Certificate_Fields /* result */) | 1330                             ppapi::PPB_X509Certificate_Fields /* result */) | 
| 1332 | 1331 | 
| 1333 // PPB_Font. | 1332 // PPB_Font. | 
| 1334 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, | 1333 IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, | 
| 1335                             std::string /* result */) | 1334                             std::string /* result */) | 
| 1336 #endif  // !defined(OS_NACL) | 1335 #endif  // !defined(OS_NACL) | 
| OLD | NEW | 
|---|