ppapi/proxy/interface_list.cc - Issue 8561003: Revert 110602 - Revert 110587 - Microphone support for Pepper Flash.

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

Issue 8561003: Revert 110602 - Revert 110587 - Microphone support for Pepper Flash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 1 month 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

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « ppapi/ppapi_shared.gypi ('k') | ppapi/proxy/ppapi_messages.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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_buffer_dev.h"	9 #include "ppapi/c/dev/ppb_buffer_dev.h"

9 #include "ppapi/c/dev/ppb_char_set_dev.h"	10 #include "ppapi/c/dev/ppb_char_set_dev.h"

10 #include "ppapi/c/dev/ppb_console_dev.h"	11 #include "ppapi/c/dev/ppb_console_dev.h"

11 #include "ppapi/c/dev/ppb_context_3d_dev.h"	12 #include "ppapi/c/dev/ppb_context_3d_dev.h"

12 #include "ppapi/c/dev/ppb_crypto_dev.h"	13 #include "ppapi/c/dev/ppb_crypto_dev.h"

13 #include "ppapi/c/dev/ppb_cursor_control_dev.h"	14 #include "ppapi/c/dev/ppb_cursor_control_dev.h"

14 #include "ppapi/c/dev/ppb_font_dev.h"	15 #include "ppapi/c/dev/ppb_font_dev.h"

15 #include "ppapi/c/dev/ppb_fullscreen_dev.h"	16 #include "ppapi/c/dev/ppb_fullscreen_dev.h"

16 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"	17 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"

17 #include "ppapi/c/dev/ppb_ime_input_event_dev.h"	18 #include "ppapi/c/dev/ppb_ime_input_event_dev.h"

(...skipping 30 matching lines...) Expand all Loading...
48 #include "ppapi/c/private/ppb_flash_menu.h"	49 #include "ppapi/c/private/ppb_flash_menu.h"

49 #include "ppapi/c/private/ppb_flash_net_connector.h"	50 #include "ppapi/c/private/ppb_flash_net_connector.h"

50 #include "ppapi/c/private/ppb_flash_tcp_socket.h"	51 #include "ppapi/c/private/ppb_flash_tcp_socket.h"

51 #include "ppapi/c/private/ppb_net_address_private.h"	52 #include "ppapi/c/private/ppb_net_address_private.h"

52 #include "ppapi/c/private/ppb_pdf.h"	53 #include "ppapi/c/private/ppb_pdf.h"

53 #include "ppapi/c/private/ppb_tcp_socket_private.h"	54 #include "ppapi/c/private/ppb_tcp_socket_private.h"

54 #include "ppapi/c/private/ppb_udp_socket_private.h"	55 #include "ppapi/c/private/ppb_udp_socket_private.h"

55 #include "ppapi/c/trusted/ppb_broker_trusted.h"	56 #include "ppapi/c/trusted/ppb_broker_trusted.h"

56 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"	57 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"

57 #include "ppapi/proxy/interface_proxy.h"	58 #include "ppapi/proxy/interface_proxy.h"

	59 #include "ppapi/proxy/ppb_audio_input_proxy.h"

58 #include "ppapi/proxy/ppb_audio_proxy.h"	60 #include "ppapi/proxy/ppb_audio_proxy.h"

59 #include "ppapi/proxy/ppb_broker_proxy.h"	61 #include "ppapi/proxy/ppb_broker_proxy.h"

60 #include "ppapi/proxy/ppb_buffer_proxy.h"	62 #include "ppapi/proxy/ppb_buffer_proxy.h"

61 #include "ppapi/proxy/ppb_context_3d_proxy.h"	63 #include "ppapi/proxy/ppb_context_3d_proxy.h"

62 #include "ppapi/proxy/ppb_core_proxy.h"	64 #include "ppapi/proxy/ppb_core_proxy.h"

63 #include "ppapi/proxy/ppb_cursor_control_proxy.h"	65 #include "ppapi/proxy/ppb_cursor_control_proxy.h"

64 #include "ppapi/proxy/ppb_file_chooser_proxy.h"	66 #include "ppapi/proxy/ppb_file_chooser_proxy.h"

65 #include "ppapi/proxy/ppb_file_ref_proxy.h"	67 #include "ppapi/proxy/ppb_file_ref_proxy.h"

66 #include "ppapi/proxy/ppb_file_system_proxy.h"	68 #include "ppapi/proxy/ppb_file_system_proxy.h"

67 #include "ppapi/proxy/ppb_flash_clipboard_proxy.h"	69 #include "ppapi/proxy/ppb_flash_clipboard_proxy.h"

(...skipping 244 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
312 AddPPB(info->name, info->id, info->interface_ptr);	314 AddPPB(info->name, info->id, info->interface_ptr);

313 }	315 }

314	316

315 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {	317 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {

316 AddProxy(info->id, info->create_proxy);	318 AddProxy(info->id, info->create_proxy);

317 AddPPP(info->name, info->id, info->interface_ptr);	319 AddPPP(info->name, info->id, info->interface_ptr);

318 }	320 }

319	321

320 } // namespace proxy	322 } // namespace proxy

321 } // namespace ppapi	323 } // namespace ppapi

OLD	NEW