| Index: ppapi/proxy/interface_list.cc
|
| diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
|
| index fbd59c3be5da86d2d0fe3e82d45d9ee7220db622..fd7256ae3a7aa2572191e817a1b59ebc06bf9af9 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"
|
| @@ -244,6 +247,14 @@ InterfaceList::InterfaceList() {
|
| AddPPP(PPP_TEXTINPUT_DEV_INTERFACE, API_ID_PPP_TEXT_INPUT,
|
| PPP_TextInput_Proxy::GetProxyInterface());
|
|
|
| + // 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());
|
| +
|
| // Old-style GetInfo PPP interfaces.
|
| // Do not add more stuff here, they should be added to interface_list*.h
|
| // TODO(brettw) remove these.
|
|
|