Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: ppapi/proxy/ppapi_messages.h

Issue 10984094: Hook up PpapiPermissions in more places. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/plugin_main_nacl.cc ('k') | ppapi/proxy/ppapi_param_traits.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer) 252 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer)
253 IPC_STRUCT_TRAITS_MEMBER(resource) 253 IPC_STRUCT_TRAITS_MEMBER(resource)
254 IPC_STRUCT_TRAITS_MEMBER(handle) 254 IPC_STRUCT_TRAITS_MEMBER(handle)
255 IPC_STRUCT_TRAITS_MEMBER(size) 255 IPC_STRUCT_TRAITS_MEMBER(size)
256 IPC_STRUCT_TRAITS_END() 256 IPC_STRUCT_TRAITS_END()
257 257
258 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 258 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
259 259
260 // These are from the browser to the plugin. 260 // These are from the browser to the plugin.
261 // Loads the given plugin. 261 // Loads the given plugin.
262 IPC_MESSAGE_CONTROL1(PpapiMsg_LoadPlugin, FilePath /* path */) 262 IPC_MESSAGE_CONTROL2(PpapiMsg_LoadPlugin,
263 FilePath /* path */,
264 ppapi::PpapiPermissions /* permissions */)
263 265
264 // Creates a channel to talk to a renderer. The plugin will respond with 266 // Creates a channel to talk to a renderer. The plugin will respond with
265 // PpapiHostMsg_ChannelCreated. 267 // PpapiHostMsg_ChannelCreated.
266 IPC_MESSAGE_CONTROL2(PpapiMsg_CreateChannel, 268 IPC_MESSAGE_CONTROL2(PpapiMsg_CreateChannel,
267 int /* renderer_id */, 269 int /* renderer_id */,
268 bool /* incognito */) 270 bool /* incognito */)
269 271
270 // Creates a channel to talk to a renderer. This message is only used by the 272 // Creates a channel to talk to a renderer. This message is only used by the
271 // NaCl IPC proxy. It is intercepted by NaClIPCAdapter, which creates the 273 // NaCl IPC proxy. It is intercepted by NaClIPCAdapter, which creates the
272 // actual channel and rewrites the message for the untrusted side. 274 // actual channel and rewrites the message for the untrusted side.
273 IPC_MESSAGE_CONTROL3(PpapiMsg_CreateNaClChannel, 275 IPC_MESSAGE_CONTROL4(PpapiMsg_CreateNaClChannel,
274 int /* renderer_id */, 276 int /* renderer_id */,
277 ppapi::PpapiPermissions /* permissions */,
275 bool /* incognito */, 278 bool /* incognito */,
276 ppapi::proxy::SerializedHandle /* channel_handle */) 279 ppapi::proxy::SerializedHandle /* channel_handle */)
277 280
278 // Each plugin may be referenced by multiple renderers. We need the instance 281 // Each plugin may be referenced by multiple renderers. We need the instance
279 // IDs to be unique within a plugin, despite coming from different renderers, 282 // IDs to be unique within a plugin, despite coming from different renderers,
280 // and unique within a renderer, despite going to different plugins. This means 283 // and unique within a renderer, despite going to different plugins. This means
281 // that neither the renderer nor the plugin can generate instance IDs without 284 // that neither the renderer nor the plugin can generate instance IDs without
282 // consulting the other. 285 // consulting the other.
283 // 286 //
284 // We resolve this by having the renderer generate a unique instance ID inside 287 // We resolve this by having the renderer generate a unique instance ID inside
(...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1568 1571
1569 // Reply to a RequestMemory call. This supplies the shared memory handle. The 1572 // Reply to a RequestMemory call. This supplies the shared memory handle. The
1570 // actual handle is passed in the ReplyParams struct. 1573 // actual handle is passed in the ReplyParams struct.
1571 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Gamepad_SendMemory) 1574 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Gamepad_SendMemory)
1572 1575
1573 // Printing. 1576 // Printing.
1574 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_Create) 1577 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_Create)
1575 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_GetDefaultPrintSettings) 1578 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_GetDefaultPrintSettings)
1576 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply, 1579 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply,
1577 PP_PrintSettings_Dev /* print_settings */) 1580 PP_PrintSettings_Dev /* print_settings */)
OLDNEW
« no previous file with comments | « ppapi/proxy/plugin_main_nacl.cc ('k') | ppapi/proxy/ppapi_param_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698