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

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

Issue 18671004: PPAPI: Move IMEInputEvent and TextInput to stable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
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/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"
19 #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h" 18 #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h"
20 #include "ppapi/c/dev/ppb_memory_dev.h" 19 #include "ppapi/c/dev/ppb_memory_dev.h"
21 #include "ppapi/c/dev/ppb_opengles2ext_dev.h" 20 #include "ppapi/c/dev/ppb_opengles2ext_dev.h"
22 #include "ppapi/c/dev/ppb_printing_dev.h" 21 #include "ppapi/c/dev/ppb_printing_dev.h"
23 #include "ppapi/c/dev/ppb_resource_array_dev.h" 22 #include "ppapi/c/dev/ppb_resource_array_dev.h"
24 #include "ppapi/c/dev/ppb_testing_dev.h" 23 #include "ppapi/c/dev/ppb_testing_dev.h"
25 #include "ppapi/c/dev/ppb_text_input_dev.h"
26 #include "ppapi/c/dev/ppb_trace_event_dev.h" 24 #include "ppapi/c/dev/ppb_trace_event_dev.h"
27 #include "ppapi/c/dev/ppb_truetype_font_dev.h" 25 #include "ppapi/c/dev/ppb_truetype_font_dev.h"
28 #include "ppapi/c/dev/ppb_url_util_dev.h" 26 #include "ppapi/c/dev/ppb_url_util_dev.h"
29 #include "ppapi/c/dev/ppb_var_deprecated.h" 27 #include "ppapi/c/dev/ppb_var_deprecated.h"
30 #include "ppapi/c/dev/ppb_video_capture_dev.h" 28 #include "ppapi/c/dev/ppb_video_capture_dev.h"
31 #include "ppapi/c/dev/ppb_view_dev.h" 29 #include "ppapi/c/dev/ppb_view_dev.h"
32 #include "ppapi/c/extensions/dev/ppb_ext_alarms_dev.h" 30 #include "ppapi/c/extensions/dev/ppb_ext_alarms_dev.h"
33 #include "ppapi/c/extensions/dev/ppb_ext_socket_dev.h" 31 #include "ppapi/c/extensions/dev/ppb_ext_socket_dev.h"
32 #include "ppapi/c/pp_errors.h"
33 #include "ppapi/c/ppb_audio.h"
34 #include "ppapi/c/ppb_audio_config.h" 34 #include "ppapi/c/ppb_audio_config.h"
35 #include "ppapi/c/ppb_audio.h"
36 #include "ppapi/c/ppb_console.h" 35 #include "ppapi/c/ppb_console.h"
37 #include "ppapi/c/ppb_core.h" 36 #include "ppapi/c/ppb_core.h"
38 #include "ppapi/c/ppb_file_io.h" 37 #include "ppapi/c/ppb_file_io.h"
39 #include "ppapi/c/ppb_file_ref.h" 38 #include "ppapi/c/ppb_file_ref.h"
40 #include "ppapi/c/ppb_file_system.h" 39 #include "ppapi/c/ppb_file_system.h"
41 #include "ppapi/c/ppb_fullscreen.h" 40 #include "ppapi/c/ppb_fullscreen.h"
42 #include "ppapi/c/ppb_graphics_2d.h" 41 #include "ppapi/c/ppb_graphics_2d.h"
43 #include "ppapi/c/ppb_host_resolver.h" 42 #include "ppapi/c/ppb_host_resolver.h"
44 #include "ppapi/c/ppb_image_data.h" 43 #include "ppapi/c/ppb_image_data.h"
44 #include "ppapi/c/ppb_ime_input_event.h"
45 #include "ppapi/c/ppb_input_event.h" 45 #include "ppapi/c/ppb_input_event.h"
46 #include "ppapi/c/ppb_instance.h" 46 #include "ppapi/c/ppb_instance.h"
47 #include "ppapi/c/ppb_message_loop.h" 47 #include "ppapi/c/ppb_message_loop.h"
48 #include "ppapi/c/ppb_messaging.h" 48 #include "ppapi/c/ppb_messaging.h"
49 #include "ppapi/c/ppb_mouse_lock.h" 49 #include "ppapi/c/ppb_mouse_lock.h"
50 #include "ppapi/c/ppb_net_address.h" 50 #include "ppapi/c/ppb_net_address.h"
51 #include "ppapi/c/ppb_network_proxy.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_text_input.h"
54 #include "ppapi/c/ppb_udp_socket.h" 55 #include "ppapi/c/ppb_udp_socket.h"
55 #include "ppapi/c/ppb_url_loader.h" 56 #include "ppapi/c/ppb_url_loader.h"
56 #include "ppapi/c/ppb_url_request_info.h" 57 #include "ppapi/c/ppb_url_request_info.h"
57 #include "ppapi/c/ppb_url_response_info.h" 58 #include "ppapi/c/ppb_url_response_info.h"
58 #include "ppapi/c/ppb_var.h" 59 #include "ppapi/c/ppb_var.h"
59 #include "ppapi/c/ppb_var_array.h" 60 #include "ppapi/c/ppb_var_array.h"
60 #include "ppapi/c/ppb_var_array_buffer.h" 61 #include "ppapi/c/ppb_var_array_buffer.h"
61 #include "ppapi/c/ppb_var_dictionary.h" 62 #include "ppapi/c/ppb_var_dictionary.h"
62 #include "ppapi/c/ppb_view.h" 63 #include "ppapi/c/ppb_view.h"
63 #include "ppapi/c/pp_errors.h"
64 #include "ppapi/c/ppp_instance.h" 64 #include "ppapi/c/ppp_instance.h"
65 #include "ppapi/c/private/ppb_content_decryptor_private.h" 65 #include "ppapi/c/private/ppb_content_decryptor_private.h"
66 #include "ppapi/c/private/ppb_ext_crx_file_system_private.h" 66 #include "ppapi/c/private/ppb_ext_crx_file_system_private.h"
67 #include "ppapi/c/private/ppb_file_io_private.h" 67 #include "ppapi/c/private/ppb_file_io_private.h"
68 #include "ppapi/c/private/ppb_file_ref_private.h" 68 #include "ppapi/c/private/ppb_file_ref_private.h"
69 #include "ppapi/c/private/ppb_flash_clipboard.h" 69 #include "ppapi/c/private/ppb_flash_clipboard.h"
70 #include "ppapi/c/private/ppb_flash_file.h" 70 #include "ppapi/c/private/ppb_flash_file.h"
71 #include "ppapi/c/private/ppb_flash_font_file.h" 71 #include "ppapi/c/private/ppb_flash_font_file.h"
72 #include "ppapi/c/private/ppb_flash_fullscreen.h" 72 #include "ppapi/c/private/ppb_flash_fullscreen.h"
73 #include "ppapi/c/private/ppb_flash.h" 73 #include "ppapi/c/private/ppb_flash.h"
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 // TODO(brettw) move these to interface_list*.h 266 // TODO(brettw) move these to interface_list*.h
267 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>); 267 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>);
268 #if !defined(OS_NACL) 268 #if !defined(OS_NACL)
269 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE, 269 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE,
270 PPP_Instance_Proxy::GetInstanceInterface()); 270 PPP_Instance_Proxy::GetInstanceInterface());
271 #endif 271 #endif
272 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>); 272 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>);
273 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING, 273 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING,
274 PPP_Printing_Proxy::GetProxyInterface()); 274 PPP_Printing_Proxy::GetProxyInterface());
275 AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>); 275 AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>);
276 AddPPP(PPP_TEXTINPUT_DEV_INTERFACE, API_ID_PPP_TEXT_INPUT, 276 AddPPP(PPP_TEXTINPUT_INTERFACE, API_ID_PPP_TEXT_INPUT,
277 PPP_TextInput_Proxy::GetProxyInterface()); 277 PPP_TextInput_Proxy::GetProxyInterface());
278 278
279 // Old-style GetInfo PPP interfaces. 279 // Old-style GetInfo PPP interfaces.
280 // Do not add more stuff here, they should be added to interface_list*.h 280 // Do not add more stuff here, they should be added to interface_list*.h
281 // TODO(brettw) remove these. 281 // TODO(brettw) remove these.
282 AddPPP(PPP_InputEvent_Proxy::GetInfo()); 282 AddPPP(PPP_InputEvent_Proxy::GetInfo());
283 AddPPP(PPP_Messaging_Proxy::GetInfo()); 283 AddPPP(PPP_Messaging_Proxy::GetInfo());
284 AddPPP(PPP_MouseLock_Proxy::GetInfo()); 284 AddPPP(PPP_MouseLock_Proxy::GetInfo());
285 AddPPP(PPP_Graphics3D_Proxy::GetInfo()); 285 AddPPP(PPP_Graphics3D_Proxy::GetInfo());
286 #if !defined(OS_NACL) 286 #if !defined(OS_NACL)
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698