| Index: ppapi/proxy/interface_list.cc
|
| diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
|
| index 0c84ae88e50b2a9977d23ccd316e9272252f2377..129dab4a3140a455e248c7eb039f15661f771a12 100644
|
| --- a/ppapi/proxy/interface_list.cc
|
| +++ b/ppapi/proxy/interface_list.cc
|
| @@ -15,14 +15,12 @@
|
| #include "ppapi/c/dev/ppb_font_dev.h"
|
| #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
|
| #include "ppapi/c/dev/ppb_graphics_2d_dev.h"
|
| -#include "ppapi/c/dev/ppb_ime_input_event_dev.h"
|
| #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h"
|
| #include "ppapi/c/dev/ppb_memory_dev.h"
|
| #include "ppapi/c/dev/ppb_opengles2ext_dev.h"
|
| #include "ppapi/c/dev/ppb_printing_dev.h"
|
| #include "ppapi/c/dev/ppb_resource_array_dev.h"
|
| #include "ppapi/c/dev/ppb_testing_dev.h"
|
| -#include "ppapi/c/dev/ppb_text_input_dev.h"
|
| #include "ppapi/c/dev/ppb_trace_event_dev.h"
|
| #include "ppapi/c/dev/ppb_truetype_font_dev.h"
|
| #include "ppapi/c/dev/ppb_url_util_dev.h"
|
| @@ -31,8 +29,9 @@
|
| #include "ppapi/c/dev/ppb_view_dev.h"
|
| #include "ppapi/c/extensions/dev/ppb_ext_alarms_dev.h"
|
| #include "ppapi/c/extensions/dev/ppb_ext_socket_dev.h"
|
| -#include "ppapi/c/ppb_audio_config.h"
|
| +#include "ppapi/c/pp_errors.h"
|
| #include "ppapi/c/ppb_audio.h"
|
| +#include "ppapi/c/ppb_audio_config.h"
|
| #include "ppapi/c/ppb_console.h"
|
| #include "ppapi/c/ppb_core.h"
|
| #include "ppapi/c/ppb_file_io.h"
|
| @@ -42,6 +41,7 @@
|
| #include "ppapi/c/ppb_graphics_2d.h"
|
| #include "ppapi/c/ppb_host_resolver.h"
|
| #include "ppapi/c/ppb_image_data.h"
|
| +#include "ppapi/c/ppb_ime_input_event.h"
|
| #include "ppapi/c/ppb_input_event.h"
|
| #include "ppapi/c/ppb_instance.h"
|
| #include "ppapi/c/ppb_message_loop.h"
|
| @@ -51,6 +51,7 @@
|
| #include "ppapi/c/ppb_network_proxy.h"
|
| #include "ppapi/c/ppb_opengles2.h"
|
| #include "ppapi/c/ppb_tcp_socket.h"
|
| +#include "ppapi/c/ppb_text_input.h"
|
| #include "ppapi/c/ppb_udp_socket.h"
|
| #include "ppapi/c/ppb_url_loader.h"
|
| #include "ppapi/c/ppb_url_request_info.h"
|
| @@ -60,7 +61,6 @@
|
| #include "ppapi/c/ppb_var_array_buffer.h"
|
| #include "ppapi/c/ppb_var_dictionary.h"
|
| #include "ppapi/c/ppb_view.h"
|
| -#include "ppapi/c/pp_errors.h"
|
| #include "ppapi/c/ppp_instance.h"
|
| #include "ppapi/c/private/ppb_content_decryptor_private.h"
|
| #include "ppapi/c/private/ppb_ext_crx_file_system_private.h"
|
| @@ -273,7 +273,7 @@ InterfaceList::InterfaceList() {
|
| AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING,
|
| PPP_Printing_Proxy::GetProxyInterface());
|
| AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>);
|
| - AddPPP(PPP_TEXTINPUT_DEV_INTERFACE, API_ID_PPP_TEXT_INPUT,
|
| + AddPPP(PPP_TEXTINPUT_INTERFACE, API_ID_PPP_TEXT_INPUT,
|
| PPP_TextInput_Proxy::GetProxyInterface());
|
|
|
| // Old-style GetInfo PPP interfaces.
|
|
|