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

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

Issue 9836131: Remove PPB_Flash_NetConnector and ENABLE_FLAPPER_HACKS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "ppapi/c/ppb_view.h" 48 #include "ppapi/c/ppb_view.h"
49 #include "ppapi/c/pp_errors.h" 49 #include "ppapi/c/pp_errors.h"
50 #include "ppapi/c/ppp_instance.h" 50 #include "ppapi/c/ppp_instance.h"
51 #include "ppapi/c/private/ppb_file_ref_private.h" 51 #include "ppapi/c/private/ppb_file_ref_private.h"
52 #include "ppapi/c/private/ppb_flash_clipboard.h" 52 #include "ppapi/c/private/ppb_flash_clipboard.h"
53 #include "ppapi/c/private/ppb_flash_file.h" 53 #include "ppapi/c/private/ppb_flash_file.h"
54 #include "ppapi/c/private/ppb_flash_fullscreen.h" 54 #include "ppapi/c/private/ppb_flash_fullscreen.h"
55 #include "ppapi/c/private/ppb_flash.h" 55 #include "ppapi/c/private/ppb_flash.h"
56 #include "ppapi/c/private/ppb_flash_menu.h" 56 #include "ppapi/c/private/ppb_flash_menu.h"
57 #include "ppapi/c/private/ppb_flash_message_loop.h" 57 #include "ppapi/c/private/ppb_flash_message_loop.h"
58 #include "ppapi/c/private/ppb_flash_net_connector.h"
59 #include "ppapi/c/private/ppb_flash_tcp_socket.h" 58 #include "ppapi/c/private/ppb_flash_tcp_socket.h"
60 #include "ppapi/c/private/ppb_net_address_private.h" 59 #include "ppapi/c/private/ppb_net_address_private.h"
61 #include "ppapi/c/private/ppb_network_list_private.h" 60 #include "ppapi/c/private/ppb_network_list_private.h"
62 #include "ppapi/c/private/ppb_network_monitor_private.h" 61 #include "ppapi/c/private/ppb_network_monitor_private.h"
63 #include "ppapi/c/private/ppb_pdf.h" 62 #include "ppapi/c/private/ppb_pdf.h"
64 #include "ppapi/c/private/ppb_talk_private.h" 63 #include "ppapi/c/private/ppb_talk_private.h"
65 #include "ppapi/c/private/ppb_tcp_socket_private.h" 64 #include "ppapi/c/private/ppb_tcp_socket_private.h"
66 #include "ppapi/c/private/ppb_udp_socket_private.h" 65 #include "ppapi/c/private/ppb_udp_socket_private.h"
67 #include "ppapi/c/trusted/ppb_broker_trusted.h" 66 #include "ppapi/c/trusted/ppb_broker_trusted.h"
68 #include "ppapi/c/trusted/ppb_browser_font_trusted.h" 67 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"
69 #include "ppapi/c/trusted/ppb_char_set_trusted.h" 68 #include "ppapi/c/trusted/ppb_char_set_trusted.h"
70 #include "ppapi/c/trusted/ppb_file_io_trusted.h" 69 #include "ppapi/c/trusted/ppb_file_io_trusted.h"
71 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" 70 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
72 #include "ppapi/proxy/interface_proxy.h" 71 #include "ppapi/proxy/interface_proxy.h"
73 #include "ppapi/proxy/ppb_audio_input_proxy.h" 72 #include "ppapi/proxy/ppb_audio_input_proxy.h"
74 #include "ppapi/proxy/ppb_audio_proxy.h" 73 #include "ppapi/proxy/ppb_audio_proxy.h"
75 #include "ppapi/proxy/ppb_broker_proxy.h" 74 #include "ppapi/proxy/ppb_broker_proxy.h"
76 #include "ppapi/proxy/ppb_buffer_proxy.h" 75 #include "ppapi/proxy/ppb_buffer_proxy.h"
77 #include "ppapi/proxy/ppb_core_proxy.h" 76 #include "ppapi/proxy/ppb_core_proxy.h"
78 #include "ppapi/proxy/ppb_cursor_control_proxy.h" 77 #include "ppapi/proxy/ppb_cursor_control_proxy.h"
79 #include "ppapi/proxy/ppb_file_chooser_proxy.h" 78 #include "ppapi/proxy/ppb_file_chooser_proxy.h"
80 #include "ppapi/proxy/ppb_file_io_proxy.h" 79 #include "ppapi/proxy/ppb_file_io_proxy.h"
81 #include "ppapi/proxy/ppb_file_ref_proxy.h" 80 #include "ppapi/proxy/ppb_file_ref_proxy.h"
82 #include "ppapi/proxy/ppb_file_system_proxy.h" 81 #include "ppapi/proxy/ppb_file_system_proxy.h"
83 #include "ppapi/proxy/ppb_flash_clipboard_proxy.h" 82 #include "ppapi/proxy/ppb_flash_clipboard_proxy.h"
84 #include "ppapi/proxy/ppb_flash_file_proxy.h" 83 #include "ppapi/proxy/ppb_flash_file_proxy.h"
85 #include "ppapi/proxy/ppb_flash_menu_proxy.h" 84 #include "ppapi/proxy/ppb_flash_menu_proxy.h"
86 #include "ppapi/proxy/ppb_flash_message_loop_proxy.h" 85 #include "ppapi/proxy/ppb_flash_message_loop_proxy.h"
87 #include "ppapi/proxy/ppb_flash_net_connector_proxy.h"
88 #include "ppapi/proxy/ppb_flash_proxy.h" 86 #include "ppapi/proxy/ppb_flash_proxy.h"
89 #include "ppapi/proxy/ppb_graphics_2d_proxy.h" 87 #include "ppapi/proxy/ppb_graphics_2d_proxy.h"
90 #include "ppapi/proxy/ppb_graphics_3d_proxy.h" 88 #include "ppapi/proxy/ppb_graphics_3d_proxy.h"
91 #include "ppapi/proxy/ppb_host_resolver_private_proxy.h" 89 #include "ppapi/proxy/ppb_host_resolver_private_proxy.h"
92 #include "ppapi/proxy/ppb_image_data_proxy.h" 90 #include "ppapi/proxy/ppb_image_data_proxy.h"
93 #include "ppapi/proxy/ppb_instance_proxy.h" 91 #include "ppapi/proxy/ppb_instance_proxy.h"
94 #include "ppapi/proxy/ppb_message_loop_proxy.h" 92 #include "ppapi/proxy/ppb_message_loop_proxy.h"
95 #include "ppapi/proxy/ppb_network_monitor_private_proxy.h" 93 #include "ppapi/proxy/ppb_network_monitor_private_proxy.h"
96 #include "ppapi/proxy/ppb_pdf_proxy.h" 94 #include "ppapi/proxy/ppb_pdf_proxy.h"
97 #include "ppapi/proxy/ppb_talk_private_proxy.h" 95 #include "ppapi/proxy/ppb_talk_private_proxy.h"
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 thunk::GetPPB_Flash_Menu_0_2_Thunk()); 326 thunk::GetPPB_Flash_Menu_0_2_Thunk());
329 327
330 AddProxy(API_ID_PPB_FLASH_MESSAGELOOP, 328 AddProxy(API_ID_PPB_FLASH_MESSAGELOOP,
331 &ProxyFactory<PPB_Flash_MessageLoop_Proxy>); 329 &ProxyFactory<PPB_Flash_MessageLoop_Proxy>);
332 AddPPB(PPB_FLASH_MESSAGELOOP_INTERFACE_0_1, API_ID_PPB_FLASH_MESSAGELOOP, 330 AddPPB(PPB_FLASH_MESSAGELOOP_INTERFACE_0_1, API_ID_PPB_FLASH_MESSAGELOOP,
333 thunk::GetPPB_Flash_MessageLoop_0_1_Thunk()); 331 thunk::GetPPB_Flash_MessageLoop_0_1_Thunk());
334 332
335 // Only add the interface; PPB_TCPSocket_Private provides the API ID's proxy. 333 // Only add the interface; PPB_TCPSocket_Private provides the API ID's proxy.
336 AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE_0_2, API_ID_PPB_TCPSOCKET_PRIVATE, 334 AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE_0_2, API_ID_PPB_TCPSOCKET_PRIVATE,
337 thunk::GetPPB_TCPSocket_Private_0_3_Thunk()); 335 thunk::GetPPB_TCPSocket_Private_0_3_Thunk());
338
339 #ifdef ENABLE_FLAPPER_HACKS
340 AddProxy(API_ID_PPB_FLASH_NETCONNECTOR,
341 &ProxyFactory<PPB_Flash_NetConnector_Proxy>);
342 AddPPB(PPB_FLASH_NETCONNECTOR_INTERFACE_0_2, API_ID_PPB_FLASH_NETCONNECTOR,
343 thunk::GetPPB_Flash_NetConnector_0_2_Thunk());
344 #endif
345 #endif // !defined(OS_NACL) 336 #endif // !defined(OS_NACL)
346 } 337 }
347 338
348 void InterfaceList::AddProxy(ApiID id, 339 void InterfaceList::AddProxy(ApiID id,
349 InterfaceProxy::Factory factory) { 340 InterfaceProxy::Factory factory) {
350 // For interfaces with no corresponding _Proxy objects, the macros will 341 // For interfaces with no corresponding _Proxy objects, the macros will
351 // generate calls to this function with API_ID_NONE. This means we 342 // generate calls to this function with API_ID_NONE. This means we
352 // should just skip adding a factory for these functions. 343 // should just skip adding a factory for these functions.
353 if (id == API_ID_NONE) 344 if (id == API_ID_NONE)
354 return; 345 return;
(...skipping 25 matching lines...) Expand all
380 AddPPB(info->name, info->id, info->interface_ptr); 371 AddPPB(info->name, info->id, info->interface_ptr);
381 } 372 }
382 373
383 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { 374 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {
384 AddProxy(info->id, info->create_proxy); 375 AddProxy(info->id, info->create_proxy);
385 AddPPP(info->name, info->id, info->interface_ptr); 376 AddPPP(info->name, info->id, info->interface_ptr);
386 } 377 }
387 378
388 } // namespace proxy 379 } // namespace proxy
389 } // namespace ppapi 380 } // 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