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

Side by Side Diff: ppapi/proxy/interface_list.cc

Issue 10827280: Add PPAPI decryptor implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix yet another link error, and rebase once again. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/ppapi_sources.gypi ('k') | ppapi/proxy/ppapi_messages.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 #include "ppapi/proxy/interface_list.h" 5 #include "ppapi/proxy/interface_list.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "ppapi/c/dev/ppb_audio_input_dev.h" 8 #include "ppapi/c/dev/ppb_audio_input_dev.h"
9 #include "ppapi/c/dev/ppb_buffer_dev.h" 9 #include "ppapi/c/dev/ppb_buffer_dev.h"
10 #include "ppapi/c/dev/ppb_char_set_dev.h" 10 #include "ppapi/c/dev/ppb_char_set_dev.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "ppapi/c/ppb_mouse_lock.h" 43 #include "ppapi/c/ppb_mouse_lock.h"
44 #include "ppapi/c/ppb_opengles2.h" 44 #include "ppapi/c/ppb_opengles2.h"
45 #include "ppapi/c/ppb_url_loader.h" 45 #include "ppapi/c/ppb_url_loader.h"
46 #include "ppapi/c/ppb_url_request_info.h" 46 #include "ppapi/c/ppb_url_request_info.h"
47 #include "ppapi/c/ppb_url_response_info.h" 47 #include "ppapi/c/ppb_url_response_info.h"
48 #include "ppapi/c/ppb_var.h" 48 #include "ppapi/c/ppb_var.h"
49 #include "ppapi/c/ppb_var_array_buffer.h" 49 #include "ppapi/c/ppb_var_array_buffer.h"
50 #include "ppapi/c/ppb_view.h" 50 #include "ppapi/c/ppb_view.h"
51 #include "ppapi/c/pp_errors.h" 51 #include "ppapi/c/pp_errors.h"
52 #include "ppapi/c/ppp_instance.h" 52 #include "ppapi/c/ppp_instance.h"
53 #include "ppapi/c/private/ppb_content_decryptor_private.h"
53 #include "ppapi/c/private/ppb_file_ref_private.h" 54 #include "ppapi/c/private/ppb_file_ref_private.h"
54 #include "ppapi/c/private/ppb_flash_clipboard.h" 55 #include "ppapi/c/private/ppb_flash_clipboard.h"
55 #include "ppapi/c/private/ppb_flash_file.h" 56 #include "ppapi/c/private/ppb_flash_file.h"
56 #include "ppapi/c/private/ppb_flash_fullscreen.h" 57 #include "ppapi/c/private/ppb_flash_fullscreen.h"
57 #include "ppapi/c/private/ppb_flash.h" 58 #include "ppapi/c/private/ppb_flash.h"
58 #include "ppapi/c/private/ppb_flash_device_id.h" 59 #include "ppapi/c/private/ppb_flash_device_id.h"
59 #include "ppapi/c/private/ppb_flash_menu.h" 60 #include "ppapi/c/private/ppb_flash_menu.h"
60 #include "ppapi/c/private/ppb_flash_message_loop.h" 61 #include "ppapi/c/private/ppb_flash_message_loop.h"
61 #include "ppapi/c/private/ppb_flash_print.h" 62 #include "ppapi/c/private/ppb_flash_print.h"
62 #include "ppapi/c/private/ppb_flash_tcp_socket.h" 63 #include "ppapi/c/private/ppb_flash_tcp_socket.h"
63 #include "ppapi/c/private/ppb_net_address_private.h" 64 #include "ppapi/c/private/ppb_net_address_private.h"
64 #include "ppapi/c/private/ppb_network_list_private.h" 65 #include "ppapi/c/private/ppb_network_list_private.h"
65 #include "ppapi/c/private/ppb_network_monitor_private.h" 66 #include "ppapi/c/private/ppb_network_monitor_private.h"
66 #include "ppapi/c/private/ppb_pdf.h" 67 #include "ppapi/c/private/ppb_pdf.h"
67 #include "ppapi/c/private/ppb_talk_private.h" 68 #include "ppapi/c/private/ppb_talk_private.h"
68 #include "ppapi/c/private/ppb_tcp_socket_private.h" 69 #include "ppapi/c/private/ppb_tcp_socket_private.h"
69 #include "ppapi/c/private/ppb_udp_socket_private.h" 70 #include "ppapi/c/private/ppb_udp_socket_private.h"
70 #include "ppapi/c/private/ppb_x509_certificate_private.h" 71 #include "ppapi/c/private/ppb_x509_certificate_private.h"
72 #include "ppapi/c/private/ppp_content_decryptor_private.h"
71 #include "ppapi/c/trusted/ppb_broker_trusted.h" 73 #include "ppapi/c/trusted/ppb_broker_trusted.h"
72 #include "ppapi/c/trusted/ppb_browser_font_trusted.h" 74 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"
73 #include "ppapi/c/trusted/ppb_char_set_trusted.h" 75 #include "ppapi/c/trusted/ppb_char_set_trusted.h"
74 #include "ppapi/c/trusted/ppb_file_io_trusted.h" 76 #include "ppapi/c/trusted/ppb_file_io_trusted.h"
75 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" 77 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
76 #include "ppapi/proxy/interface_proxy.h" 78 #include "ppapi/proxy/interface_proxy.h"
77 #include "ppapi/proxy/ppb_audio_input_proxy.h" 79 #include "ppapi/proxy/ppb_audio_input_proxy.h"
78 #include "ppapi/proxy/ppb_audio_proxy.h" 80 #include "ppapi/proxy/ppb_audio_proxy.h"
79 #include "ppapi/proxy/ppb_broker_proxy.h" 81 #include "ppapi/proxy/ppb_broker_proxy.h"
80 #include "ppapi/proxy/ppb_buffer_proxy.h" 82 #include "ppapi/proxy/ppb_buffer_proxy.h"
(...skipping 18 matching lines...) Expand all
99 #include "ppapi/proxy/ppb_tcp_socket_private_proxy.h" 101 #include "ppapi/proxy/ppb_tcp_socket_private_proxy.h"
100 #include "ppapi/proxy/ppb_testing_proxy.h" 102 #include "ppapi/proxy/ppb_testing_proxy.h"
101 #include "ppapi/proxy/ppb_udp_socket_private_proxy.h" 103 #include "ppapi/proxy/ppb_udp_socket_private_proxy.h"
102 #include "ppapi/proxy/ppb_url_loader_proxy.h" 104 #include "ppapi/proxy/ppb_url_loader_proxy.h"
103 #include "ppapi/proxy/ppb_url_response_info_proxy.h" 105 #include "ppapi/proxy/ppb_url_response_info_proxy.h"
104 #include "ppapi/proxy/ppb_var_deprecated_proxy.h" 106 #include "ppapi/proxy/ppb_var_deprecated_proxy.h"
105 #include "ppapi/proxy/ppb_video_capture_proxy.h" 107 #include "ppapi/proxy/ppb_video_capture_proxy.h"
106 #include "ppapi/proxy/ppb_video_decoder_proxy.h" 108 #include "ppapi/proxy/ppb_video_decoder_proxy.h"
107 #include "ppapi/proxy/ppb_x509_certificate_private_proxy.h" 109 #include "ppapi/proxy/ppb_x509_certificate_private_proxy.h"
108 #include "ppapi/proxy/ppp_class_proxy.h" 110 #include "ppapi/proxy/ppp_class_proxy.h"
111 #include "ppapi/proxy/ppp_content_decryptor_private_proxy.h"
109 #include "ppapi/proxy/ppp_graphics_3d_proxy.h" 112 #include "ppapi/proxy/ppp_graphics_3d_proxy.h"
110 #include "ppapi/proxy/ppp_input_event_proxy.h" 113 #include "ppapi/proxy/ppp_input_event_proxy.h"
111 #include "ppapi/proxy/ppp_instance_private_proxy.h" 114 #include "ppapi/proxy/ppp_instance_private_proxy.h"
112 #include "ppapi/proxy/ppp_instance_proxy.h" 115 #include "ppapi/proxy/ppp_instance_proxy.h"
113 #include "ppapi/proxy/ppp_messaging_proxy.h" 116 #include "ppapi/proxy/ppp_messaging_proxy.h"
114 #include "ppapi/proxy/ppp_mouse_lock_proxy.h" 117 #include "ppapi/proxy/ppp_mouse_lock_proxy.h"
115 #include "ppapi/proxy/ppp_printing_proxy.h" 118 #include "ppapi/proxy/ppp_printing_proxy.h"
116 #include "ppapi/proxy/ppp_text_input_proxy.h" 119 #include "ppapi/proxy/ppp_text_input_proxy.h"
117 #include "ppapi/proxy/ppp_video_decoder_proxy.h" 120 #include "ppapi/proxy/ppp_video_decoder_proxy.h"
118 #include "ppapi/proxy/resource_creation_proxy.h" 121 #include "ppapi/proxy/resource_creation_proxy.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 226
224 #if !defined(OS_NACL) 227 #if !defined(OS_NACL)
225 // PPB (browser) interfaces. 228 // PPB (browser) interfaces.
226 // Do not add more stuff here, they should be added to interface_list*.h 229 // Do not add more stuff here, they should be added to interface_list*.h
227 // TODO(brettw) remove these. 230 // TODO(brettw) remove these.
228 AddPPB(PPB_Instance_Proxy::GetInfoPrivate()); 231 AddPPB(PPB_Instance_Proxy::GetInfoPrivate());
229 AddPPB(PPB_PDF_Proxy::GetInfo()); 232 AddPPB(PPB_PDF_Proxy::GetInfo());
230 AddPPB(PPB_Testing_Proxy::GetInfo()); 233 AddPPB(PPB_Testing_Proxy::GetInfo());
231 AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo()); 234 AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo());
232 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo()); 235 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo());
236
237 // TODO(tomfinegan): Figure out where to put these once we refactor things
238 // to load the PPP interface struct from the PPB interface.
239 AddProxy(API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
240 &ProxyFactory<PPP_ContentDecryptor_Private_Proxy>);
241 AddPPP(PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE,
242 API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
243 PPP_ContentDecryptor_Private_Proxy::GetProxyInterface());
233 #endif 244 #endif
234 245
235 // PPP (plugin) interfaces. 246 // PPP (plugin) interfaces.
236 // TODO(brettw) move these to interface_list*.h 247 // TODO(brettw) move these to interface_list*.h
237 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>); 248 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>);
238 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE, 249 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE,
239 PPP_Instance_Proxy::GetInstanceInterface()); 250 PPP_Instance_Proxy::GetInstanceInterface());
240 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>); 251 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>);
241 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING, 252 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING,
242 PPP_Printing_Proxy::GetProxyInterface()); 253 PPP_Printing_Proxy::GetProxyInterface());
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 AddPPB(info->name, info->id, info->interface_ptr); 352 AddPPB(info->name, info->id, info->interface_ptr);
342 } 353 }
343 354
344 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { 355 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {
345 AddProxy(info->id, info->create_proxy); 356 AddProxy(info->id, info->create_proxy);
346 AddPPP(info->name, info->id, info->interface_ptr); 357 AddPPP(info->name, info->id, info->interface_ptr);
347 } 358 }
348 359
349 } // namespace proxy 360 } // namespace proxy
350 } // namespace ppapi 361 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/ppapi_sources.gypi ('k') | ppapi/proxy/ppapi_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698