summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/interface_list.cc
diff options
context:
space:
mode:
authortomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 00:18:43 +0000
committertomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 00:18:43 +0000
commite5aeef0767ea5676d3c7a512f74d350d4c298b1d (patch)
treee4f98de266c46fac108dd80a25cbefc28898f05e /ppapi/proxy/interface_list.cc
parent7831d657839f81c88af9f7a7257870b2e7ce0e0d (diff)
downloadchromium_src-e5aeef0767ea5676d3c7a512f74d350d4c298b1d.zip
chromium_src-e5aeef0767ea5676d3c7a512f74d350d4c298b1d.tar.gz
chromium_src-e5aeef0767ea5676d3c7a512f74d350d4c298b1d.tar.bz2
Add PPAPI decryptor implementation.
BUG=138139 TEST=none Review URL: https://chromiumcodereview.appspot.com/10827280 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/interface_list.cc')
-rw-r--r--ppapi/proxy/interface_list.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index fbd59c3..129901c 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -50,6 +50,7 @@
#include "ppapi/c/ppb_view.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/private/ppb_content_decryptor_private.h"
#include "ppapi/c/private/ppb_file_ref_private.h"
#include "ppapi/c/private/ppb_flash_clipboard.h"
#include "ppapi/c/private/ppb_flash_file.h"
@@ -68,6 +69,7 @@
#include "ppapi/c/private/ppb_tcp_socket_private.h"
#include "ppapi/c/private/ppb_udp_socket_private.h"
#include "ppapi/c/private/ppb_x509_certificate_private.h"
+#include "ppapi/c/private/ppp_content_decryptor_private.h"
#include "ppapi/c/trusted/ppb_broker_trusted.h"
#include "ppapi/c/trusted/ppb_browser_font_trusted.h"
#include "ppapi/c/trusted/ppb_char_set_trusted.h"
@@ -106,6 +108,7 @@
#include "ppapi/proxy/ppb_video_decoder_proxy.h"
#include "ppapi/proxy/ppb_x509_certificate_private_proxy.h"
#include "ppapi/proxy/ppp_class_proxy.h"
+#include "ppapi/proxy/ppp_content_decryptor_private_proxy.h"
#include "ppapi/proxy/ppp_graphics_3d_proxy.h"
#include "ppapi/proxy/ppp_input_event_proxy.h"
#include "ppapi/proxy/ppp_instance_private_proxy.h"
@@ -230,6 +233,14 @@ InterfaceList::InterfaceList() {
AddPPB(PPB_Testing_Proxy::GetInfo());
AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo());
AddPPB(PPB_Var_Deprecated_Proxy::GetInfo());
+
+ // TODO(tomfinegan): Figure out where to put these once we refactor things
+ // to load the PPP interface struct from the PPB interface.
+ AddProxy(API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
+ &ProxyFactory<PPP_ContentDecryptor_Private_Proxy>);
+ AddPPP(PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE,
+ API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
+ PPP_ContentDecryptor_Private_Proxy::GetProxyInterface());
#endif
// PPP (plugin) interfaces.