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

Unified Diff: ppapi/proxy/interface_list.cc

Issue 10827280: Add PPAPI decryptor implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Partially address xhwang's comments, and fix some StringVar crashiness Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/proxy/interface_list.cc
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index fbd59c3be5da86d2d0fe3e82d45d9ee7220db622..5f3165ec63eee66eaa505f17fc350486bf11daf6 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"
@@ -73,6 +74,7 @@
#include "ppapi/c/trusted/ppb_char_set_trusted.h"
#include "ppapi/c/trusted/ppb_file_io_trusted.h"
#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
+#include "ppapi/c/private/ppp_content_decryptor_private.h"
dmichael (off chromium) 2012/08/15 17:44:37 nit: this should be with the other private stuff
Tom Finegan 2012/08/16 03:10:48 Done.
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/proxy/ppb_audio_input_proxy.h"
#include "ppapi/proxy/ppb_audio_proxy.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): per brettw's comments above and below, where am I
+ // supposed to put this?
dmichael (off chromium) 2012/08/15 17:44:37 This is OK for now. This will probably go away (an
Tom Finegan 2012/08/16 03:10:48 Done.
+ 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.

Powered by Google App Engine
This is Rietveld 408576698