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

Side by Side Diff: ppapi/thunk/interfaces_ppb_private.h

Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased and addressed TODOs related to integration of this CL. Created 8 years, 1 month 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
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 // Please see inteface_ppb_public_stable for the documentation on the format of 5 // Please see inteface_ppb_public_stable for the documentation on the format of
6 // this file. 6 // this file.
7 7
8 #include "ppapi/thunk/interfaces_preamble.h" 8 #include "ppapi/thunk/interfaces_preamble.h"
9 9
10 PROXIED_API(PPB_HostResolver_Private) 10 PROXIED_API(PPB_HostResolver_Private)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 #if !defined(OS_NACL) 49 #if !defined(OS_NACL)
50 PROXIED_API(PPB_Broker) 50 PROXIED_API(PPB_Broker)
51 PROXIED_API(PPB_Talk_Private) 51 PROXIED_API(PPB_Talk_Private)
52 52
53 PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2, 53 PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2,
54 PPB_BrokerTrusted_0_2) 54 PPB_BrokerTrusted_0_2)
55 PROXIED_IFACE(PPB_Instance, PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0, 55 PROXIED_IFACE(PPB_Instance, PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0,
56 PPB_BrowserFont_Trusted_1_0) 56 PPB_BrowserFont_Trusted_1_0)
57 PROXIED_IFACE(PPB_Instance, 57 PROXIED_IFACE(PPB_Instance,
58 PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_5, 58 PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_6,
59 PPB_ContentDecryptor_Private_0_5) 59 PPB_ContentDecryptor_Private_0_6)
60 PROXIED_IFACE(PPB_Instance, PPB_CHARSET_TRUSTED_INTERFACE_1_0, 60 PROXIED_IFACE(PPB_Instance, PPB_CHARSET_TRUSTED_INTERFACE_1_0,
61 PPB_CharSet_Trusted_1_0) 61 PPB_CharSet_Trusted_1_0)
62 PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5, 62 PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5,
63 PPB_FileChooserTrusted_0_5) 63 PPB_FileChooserTrusted_0_5)
64 PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6, 64 PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6,
65 PPB_FileChooserTrusted_0_6) 65 PPB_FileChooserTrusted_0_6)
66 PROXIED_IFACE(PPB_FileRef, PPB_FILEREFPRIVATE_INTERFACE_0_1, 66 PROXIED_IFACE(PPB_FileRef, PPB_FILEREFPRIVATE_INTERFACE_0_1,
67 PPB_FileRefPrivate_0_1) 67 PPB_FileRefPrivate_0_1)
68 // This uses the FileIO API which is declared in the public stable file. 68 // This uses the FileIO API which is declared in the public stable file.
69 PROXIED_IFACE(PPB_FileIO, PPB_FILEIOTRUSTED_INTERFACE_0_4, 69 PROXIED_IFACE(PPB_FileIO, PPB_FILEIOTRUSTED_INTERFACE_0_4,
70 PPB_FileIOTrusted_0_4) 70 PPB_FileIOTrusted_0_4)
71 PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_0_1, 71 PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_0_1,
72 PPB_FlashFullscreen_0_1) 72 PPB_FlashFullscreen_0_1)
73 PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_1_0, 73 PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE_1_0,
74 PPB_FlashFullscreen_0_1) 74 PPB_FlashFullscreen_0_1)
75 PROXIED_IFACE(PPB_Talk_Private, PPB_TALK_PRIVATE_INTERFACE_1_0, 75 PROXIED_IFACE(PPB_Talk_Private, PPB_TALK_PRIVATE_INTERFACE_1_0,
76 PPB_Talk_Private_1_0) 76 PPB_Talk_Private_1_0)
77 77
78 // Hack to keep font working. The Font 0.6 API is binary compatible with 78 // Hack to keep font working. The Font 0.6 API is binary compatible with
79 // BrowserFont 1.0, so just map the string to the same thing. 79 // BrowserFont 1.0, so just map the string to the same thing.
80 // TODO(brettw) remove support for the old Font API. 80 // TODO(brettw) remove support for the old Font API.
81 PROXIED_IFACE(PPB_Instance, PPB_FONT_DEV_INTERFACE_0_6, 81 PROXIED_IFACE(PPB_Instance, PPB_FONT_DEV_INTERFACE_0_6,
82 PPB_BrowserFont_Trusted_1_0) 82 PPB_BrowserFont_Trusted_1_0)
83 #endif // !defined(OS_NACL) 83 #endif // !defined(OS_NACL)
84 84
85 #include "ppapi/thunk/interfaces_postamble.h" 85 #include "ppapi/thunk/interfaces_postamble.h"
OLDNEW
« no previous file with comments | « ppapi/proxy/ppp_content_decryptor_private_proxy.cc ('k') | ppapi/thunk/ppb_content_decryptor_private_thunk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698