diff options
author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-22 22:17:22 +0000 |
---|---|---|
committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-22 22:17:22 +0000 |
commit | b838eeae926063bc732785681300e086bdf2a3db (patch) | |
tree | d740e2008b624682d0c781dea3b1898e31dc0fd0 /ppapi/proxy | |
parent | f384a72559724b6d75ad443734a7bbf797be1828 (diff) | |
download | chromium_src-b838eeae926063bc732785681300e086bdf2a3db.zip chromium_src-b838eeae926063bc732785681300e086bdf2a3db.tar.gz chromium_src-b838eeae926063bc732785681300e086bdf2a3db.tar.bz2 |
Move PPB_TCPSocket out of dev.
BUG=247225
TEST=None
Review URL: https://chromiumcodereview.appspot.com/17314012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r-- | ppapi/proxy/interface_list.cc | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppapi_messages.h | 6 | ||||
-rw-r--r-- | ppapi/proxy/ppb_tcp_socket_private_proxy.cc | 4 | ||||
-rw-r--r-- | ppapi/proxy/ppb_tcp_socket_proxy.cc | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index 87a7359..0944a60 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -22,7 +22,6 @@ #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_tcp_socket_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" @@ -51,6 +50,7 @@ #include "ppapi/c/ppb_mouse_lock.h" #include "ppapi/c/ppb_net_address.h" #include "ppapi/c/ppb_opengles2.h" +#include "ppapi/c/ppb_tcp_socket.h" #include "ppapi/c/ppb_url_loader.h" #include "ppapi/c/ppb_url_request_info.h" #include "ppapi/c/ppb_url_response_info.h" diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index a977dca..753fa02 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -21,7 +21,6 @@ #include "ipc/ipc_platform_file.h" #include "ppapi/c/dev/pp_video_capture_dev.h" #include "ppapi/c/dev/pp_video_dev.h" -#include "ppapi/c/dev/ppb_tcp_socket_dev.h" #include "ppapi/c/dev/ppb_text_input_dev.h" #include "ppapi/c/dev/ppb_truetype_font_dev.h" #include "ppapi/c/dev/ppb_udp_socket_dev.h" @@ -38,6 +37,7 @@ #include "ppapi/c/pp_time.h" #include "ppapi/c/ppb_audio_config.h" #include "ppapi/c/ppb_image_data.h" +#include "ppapi/c/ppb_tcp_socket.h" #include "ppapi/c/private/pp_content_decryptor.h" #include "ppapi/c/private/pp_private_font_charset.h" #include "ppapi/c/private/ppb_flash.h" @@ -96,7 +96,7 @@ IPC_ENUM_TRAITS(PP_ResourceString) IPC_ENUM_TRAITS_MAX_VALUE(PP_TalkEvent, PP_TALKEVENT_NUM_EVENTS - 1) IPC_ENUM_TRAITS_MAX_VALUE(PP_TalkPermission, PP_TALKPERMISSION_NUM_PERMISSIONS - 1) -IPC_ENUM_TRAITS_MAX_VALUE(PP_TCPSocket_Option_Dev, +IPC_ENUM_TRAITS_MAX_VALUE(PP_TCPSocket_Option, PP_TCPSOCKET_OPTION_RECV_BUFFER_SIZE) IPC_ENUM_TRAITS(PP_TextInput_Type) IPC_ENUM_TRAITS(PP_TrueTypeFontFamily_Dev) @@ -1222,7 +1222,7 @@ IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBTCPSocket_Disconnect, uint32 /* socket_id */) IPC_MESSAGE_CONTROL3(PpapiHostMsg_PPBTCPSocket_SetOption, uint32 /* socket_id */, - PP_TCPSocket_Option_Dev /* name */, + PP_TCPSocket_Option /* name */, ppapi::SocketOptionData /* value */) // PPB_TCPServerSocket_Private. diff --git a/ppapi/proxy/ppb_tcp_socket_private_proxy.cc b/ppapi/proxy/ppb_tcp_socket_private_proxy.cc index 7075657..58199fd 100644 --- a/ppapi/proxy/ppb_tcp_socket_private_proxy.cc +++ b/ppapi/proxy/ppb_tcp_socket_private_proxy.cc @@ -47,7 +47,7 @@ class TCPSocket : public TCPSocketPrivateImpl { virtual void SendRead(int32_t bytes_to_read) OVERRIDE; virtual void SendWrite(const std::string& buffer) OVERRIDE; virtual void SendDisconnect() OVERRIDE; - virtual void SendSetOption(PP_TCPSocket_Option_Dev name, + virtual void SendSetOption(PP_TCPSocket_Option name, const SocketOptionData& value) OVERRIDE; private: @@ -119,7 +119,7 @@ void TCPSocket::SendDisconnect() { SendToBrowser(new PpapiHostMsg_PPBTCPSocket_Disconnect(socket_id_)); } -void TCPSocket::SendSetOption(PP_TCPSocket_Option_Dev name, +void TCPSocket::SendSetOption(PP_TCPSocket_Option name, const SocketOptionData& value) { SendToBrowser( new PpapiHostMsg_PPBTCPSocket_SetOption(socket_id_, name, value)); diff --git a/ppapi/proxy/ppb_tcp_socket_proxy.cc b/ppapi/proxy/ppb_tcp_socket_proxy.cc index 6e41c91..2ec1660 100644 --- a/ppapi/proxy/ppb_tcp_socket_proxy.cc +++ b/ppapi/proxy/ppb_tcp_socket_proxy.cc @@ -51,7 +51,7 @@ class TCPSocket : public thunk::PPB_TCPSocket_API, int32_t bytes_to_write, scoped_refptr<TrackedCallback> callback) OVERRIDE; virtual void Close() OVERRIDE; - virtual int32_t SetOption(PP_TCPSocket_Option_Dev name, + virtual int32_t SetOption(PP_TCPSocket_Option name, const PP_Var& value, scoped_refptr<TrackedCallback> callback) OVERRIDE; @@ -67,7 +67,7 @@ class TCPSocket : public thunk::PPB_TCPSocket_API, virtual void SendRead(int32_t bytes_to_read) OVERRIDE; virtual void SendWrite(const std::string& buffer) OVERRIDE; virtual void SendDisconnect() OVERRIDE; - virtual void SendSetOption(PP_TCPSocket_Option_Dev name, + virtual void SendSetOption(PP_TCPSocket_Option name, const SocketOptionData& value) OVERRIDE; virtual Resource* GetOwnerResource() OVERRIDE; @@ -144,7 +144,7 @@ void TCPSocket::Close() { DisconnectImpl(); } -int32_t TCPSocket::SetOption(PP_TCPSocket_Option_Dev name, +int32_t TCPSocket::SetOption(PP_TCPSocket_Option name, const PP_Var& value, scoped_refptr<TrackedCallback> callback) { return SetOptionImpl(name, value, callback); @@ -183,7 +183,7 @@ void TCPSocket::SendDisconnect() { SendToBrowser(new PpapiHostMsg_PPBTCPSocket_Disconnect(socket_id_)); } -void TCPSocket::SendSetOption(PP_TCPSocket_Option_Dev name, +void TCPSocket::SendSetOption(PP_TCPSocket_Option name, const SocketOptionData& value) { SendToBrowser( new PpapiHostMsg_PPBTCPSocket_SetOption(socket_id_, name, value)); |