diff options
Diffstat (limited to 'content')
6 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc index 573ff03..56eec74 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc @@ -363,7 +363,7 @@ void PepperMessageFilter::OnTCPDisconnect(uint32 socket_id) { } void PepperMessageFilter::OnTCPSetOption(uint32 socket_id, - PP_TCPSocket_Option_Dev name, + PP_TCPSocket_Option name, const ppapi::SocketOptionData& value) { TCPSocketMap::iterator iter = tcp_sockets_.find(socket_id); if (iter == tcp_sockets_.end()) { diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h index 02c7abb..dcb45bcd 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_message_filter.h @@ -23,9 +23,9 @@ #include "net/http/transport_security_state.h" #include "net/socket/stream_socket.h" #include "net/ssl/ssl_config_service.h" -#include "ppapi/c/dev/ppb_tcp_socket_dev.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" +#include "ppapi/c/ppb_tcp_socket.h" #include "ppapi/c/private/ppb_flash.h" #include "ppapi/host/ppapi_host.h" #include "ppapi/shared_impl/ppapi_permissions.h" @@ -147,7 +147,7 @@ class PepperMessageFilter void OnTCPWrite(uint32 socket_id, const std::string& data); void OnTCPDisconnect(uint32 socket_id); void OnTCPSetOption(uint32 socket_id, - PP_TCPSocket_Option_Dev name, + PP_TCPSocket_Option name, const ppapi::SocketOptionData& value); void OnTCPServerListen(int32 routing_id, uint32 plugin_dispatcher_id, diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc index 2dfb41b..f05be87 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc +++ b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc @@ -219,7 +219,7 @@ void PepperTCPSocket::Write(const std::string& data) { DoWrite(); } -void PepperTCPSocket::SetOption(PP_TCPSocket_Option_Dev name, +void PepperTCPSocket::SetOption(PP_TCPSocket_Option name, const ppapi::SocketOptionData& value) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket.h b/content/browser/renderer_host/pepper/pepper_tcp_socket.h index 5292d6a..986afb0 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_socket.h +++ b/content/browser/renderer_host/pepper/pepper_tcp_socket.h @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" -#include "ppapi/c/dev/ppb_tcp_socket_dev.h" #include "ppapi/c/pp_stdint.h" +#include "ppapi/c/ppb_tcp_socket.h" struct PP_NetAddress_Private; @@ -65,7 +65,7 @@ class PepperTCPSocket { const std::vector<std::vector<char> >& untrusted_certs); void Read(int32 bytes_to_read); void Write(const std::string& data); - void SetOption(PP_TCPSocket_Option_Dev name, + void SetOption(PP_TCPSocket_Option name, const ppapi::SocketOptionData& value); void SendConnectACKError(int32_t error); diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 0793387..16a6155 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -1213,7 +1213,7 @@ void PepperPluginDelegateImpl::TCPSocketDisconnect(uint32 socket_id) { void PepperPluginDelegateImpl::TCPSocketSetOption( uint32 socket_id, - PP_TCPSocket_Option_Dev name, + PP_TCPSocket_Option name, const ppapi::SocketOptionData& value) { DCHECK(tcp_sockets_.Lookup(socket_id)); render_view_->Send( diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.h b/content/renderer/pepper/pepper_plugin_delegate_impl.h index 83f9f82..974c7fb 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.h +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.h @@ -284,7 +284,7 @@ class PepperPluginDelegateImpl virtual void TCPSocketDisconnect(uint32 socket_id) OVERRIDE; virtual void TCPSocketSetOption( uint32 socket_id, - PP_TCPSocket_Option_Dev name, + PP_TCPSocket_Option name, const ppapi::SocketOptionData& value) OVERRIDE; virtual void RegisterTCPSocket( webkit::ppapi::PPB_TCPSocket_Private_Impl* socket, |