ppapi/proxy/interface_list.cc - Issue 17962002: Merge 208513 "PPAPI: Move PPB_NetworkProxy out of Dev"

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

Issue 17962002: Merge 208513 "PPAPI: Move PPB_NetworkProxy out of Dev" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/

Patch Set: Created 7 years, 6 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/tests/all_c_includes.h » ('j') | no next file with comments »

OLD	NEW
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/lazy_instance.h"	7 #include "base/lazy_instance.h"

8 #include "base/memory/singleton.h"	8 #include "base/memory/singleton.h"

9 #include "ppapi/c/dev/ppb_audio_input_dev.h"	9 #include "ppapi/c/dev/ppb_audio_input_dev.h"

10 #include "ppapi/c/dev/ppb_buffer_dev.h"	10 #include "ppapi/c/dev/ppb_buffer_dev.h"

11 #include "ppapi/c/dev/ppb_char_set_dev.h"	11 #include "ppapi/c/dev/ppb_char_set_dev.h"

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

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

14 #include "ppapi/c/dev/ppb_device_ref_dev.h"	14 #include "ppapi/c/dev/ppb_device_ref_dev.h"

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

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

17 #include "ppapi/c/dev/ppb_graphics_2d_dev.h"	17 #include "ppapi/c/dev/ppb_graphics_2d_dev.h"

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

19 #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h"	19 #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h"

20 #include "ppapi/c/dev/ppb_memory_dev.h"	20 #include "ppapi/c/dev/ppb_memory_dev.h"

21 #include "ppapi/c/dev/ppb_network_proxy_dev.h"

22 #include "ppapi/c/dev/ppb_opengles2ext_dev.h"	21 #include "ppapi/c/dev/ppb_opengles2ext_dev.h"

23 #include "ppapi/c/dev/ppb_printing_dev.h"	22 #include "ppapi/c/dev/ppb_printing_dev.h"

24 #include "ppapi/c/dev/ppb_resource_array_dev.h"	23 #include "ppapi/c/dev/ppb_resource_array_dev.h"

25 #include "ppapi/c/dev/ppb_testing_dev.h"	24 #include "ppapi/c/dev/ppb_testing_dev.h"

26 #include "ppapi/c/dev/ppb_text_input_dev.h"	25 #include "ppapi/c/dev/ppb_text_input_dev.h"

27 #include "ppapi/c/dev/ppb_trace_event_dev.h"	26 #include "ppapi/c/dev/ppb_trace_event_dev.h"

28 #include "ppapi/c/dev/ppb_truetype_font_dev.h"	27 #include "ppapi/c/dev/ppb_truetype_font_dev.h"

29 #include "ppapi/c/dev/ppb_url_util_dev.h"	28 #include "ppapi/c/dev/ppb_url_util_dev.h"

30 #include "ppapi/c/dev/ppb_var_deprecated.h"	29 #include "ppapi/c/dev/ppb_var_deprecated.h"

31 #include "ppapi/c/dev/ppb_video_capture_dev.h"	30 #include "ppapi/c/dev/ppb_video_capture_dev.h"

(...skipping 10 matching lines...) Expand all Loading...
42 #include "ppapi/c/ppb_fullscreen.h"	41 #include "ppapi/c/ppb_fullscreen.h"

43 #include "ppapi/c/ppb_graphics_2d.h"	42 #include "ppapi/c/ppb_graphics_2d.h"

44 #include "ppapi/c/ppb_host_resolver.h"	43 #include "ppapi/c/ppb_host_resolver.h"

45 #include "ppapi/c/ppb_image_data.h"	44 #include "ppapi/c/ppb_image_data.h"

46 #include "ppapi/c/ppb_input_event.h"	45 #include "ppapi/c/ppb_input_event.h"

47 #include "ppapi/c/ppb_instance.h"	46 #include "ppapi/c/ppb_instance.h"

48 #include "ppapi/c/ppb_message_loop.h"	47 #include "ppapi/c/ppb_message_loop.h"

49 #include "ppapi/c/ppb_messaging.h"	48 #include "ppapi/c/ppb_messaging.h"

50 #include "ppapi/c/ppb_mouse_lock.h"	49 #include "ppapi/c/ppb_mouse_lock.h"

51 #include "ppapi/c/ppb_net_address.h"	50 #include "ppapi/c/ppb_net_address.h"

	51 #include "ppapi/c/ppb_network_proxy.h"

52 #include "ppapi/c/ppb_opengles2.h"	52 #include "ppapi/c/ppb_opengles2.h"

53 #include "ppapi/c/ppb_tcp_socket.h"	53 #include "ppapi/c/ppb_tcp_socket.h"

54 #include "ppapi/c/ppb_udp_socket.h"	54 #include "ppapi/c/ppb_udp_socket.h"

55 #include "ppapi/c/ppb_url_loader.h"	55 #include "ppapi/c/ppb_url_loader.h"

56 #include "ppapi/c/ppb_url_request_info.h"	56 #include "ppapi/c/ppb_url_request_info.h"

57 #include "ppapi/c/ppb_url_response_info.h"	57 #include "ppapi/c/ppb_url_response_info.h"

58 #include "ppapi/c/ppb_var.h"	58 #include "ppapi/c/ppb_var.h"

59 #include "ppapi/c/ppb_var_array.h"	59 #include "ppapi/c/ppb_var_array.h"

60 #include "ppapi/c/ppb_var_array_buffer.h"	60 #include "ppapi/c/ppb_var_array_buffer.h"

61 #include "ppapi/c/ppb_var_dictionary.h"	61 #include "ppapi/c/ppb_var_dictionary.h"

(...skipping 321 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
383 AddPPB(info->name, info->id, info->interface_ptr, perm);	383 AddPPB(info->name, info->id, info->interface_ptr, perm);

384 }	384 }

385	385

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

387 AddProxy(info->id, info->create_proxy);	387 AddProxy(info->id, info->create_proxy);

388 AddPPP(info->name, info->id, info->interface_ptr);	388 AddPPP(info->name, info->id, info->interface_ptr);

389 }	389 }

390	390

391 } // namespace proxy	391 } // namespace proxy

392 } // namespace ppapi	392 } // namespace ppapi

OLD	NEW