| Index: content/browser/renderer_host/pepper/pepper_udp_socket.h
|
| diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket.h b/content/browser/renderer_host/pepper/pepper_udp_socket.h
|
| index ceb4aede0f4c4426a47da5bb52132f26323acdae..737953388d9567df9de3d8c29506489ef63a111b 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_udp_socket.h
|
| +++ b/content/browser/renderer_host/pepper/pepper_udp_socket.h
|
| @@ -5,66 +5,38 @@
|
| #ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_UDP_SOCKET_H_
|
| #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_UDP_SOCKET_H_
|
|
|
| -#include <string>
|
| -
|
| #include "base/basictypes.h"
|
| -#include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "net/base/completion_callback.h"
|
| -#include "net/base/ip_endpoint.h"
|
| -#include "ppapi/c/pp_stdint.h"
|
| -
|
| -struct PP_NetAddress_Private;
|
| -
|
| -namespace net {
|
| -class IOBuffer;
|
| -class UDPServerSocket;
|
| -}
|
| +#include "base/compiler_specific.h"
|
| +#include "content/browser/renderer_host/pepper/pepper_udp_socket_private_shared.h"
|
|
|
| namespace content {
|
| class PepperMessageFilter;
|
|
|
| // PepperUDPSocket is used by PepperMessageFilter to handle requests from
|
| // the Pepper UDP socket API (PPB_UDPSocket_Private).
|
| -class PepperUDPSocket {
|
| +class PepperUDPSocket : public PepperUDPSocketPrivateShared {
|
| public:
|
| PepperUDPSocket(PepperMessageFilter* manager,
|
| int32 routing_id,
|
| uint32 plugin_dispatcher_id,
|
| uint32 socket_id);
|
| - ~PepperUDPSocket();
|
| + virtual ~PepperUDPSocket();
|
|
|
| int routing_id() { return routing_id_; }
|
|
|
| - void AllowAddressReuse(bool value);
|
| - void AllowBroadcast(bool value);
|
| - void Bind(const PP_NetAddress_Private& addr);
|
| - void RecvFrom(int32_t num_bytes);
|
| - void SendTo(const std::string& data, const PP_NetAddress_Private& addr);
|
| - void SendBindACKError();
|
| - void SendSendToACKError();
|
| -
|
| private:
|
| - void SendRecvFromACKError();
|
| -
|
| - void OnBindCompleted(int result);
|
| - void OnRecvFromCompleted(int result);
|
| - void OnSendToCompleted(int result);
|
| + // PepperUDPSocketPrivateShared implementation.
|
| + virtual void SendBindReply(bool succeeded,
|
| + const PP_NetAddress_Private& addr) OVERRIDE;
|
| + virtual void SendRecvFromReply(bool succeeded,
|
| + const std::string& data,
|
| + const PP_NetAddress_Private& addr) OVERRIDE;
|
| + virtual void SendSendToReply(bool succeeded, int32_t bytes_written) OVERRIDE;
|
|
|
| PepperMessageFilter* manager_;
|
| int32 routing_id_;
|
| uint32 plugin_dispatcher_id_;
|
| uint32 socket_id_;
|
| - bool allow_address_reuse_;
|
| - bool allow_broadcast_;
|
| -
|
| - scoped_ptr<net::UDPServerSocket> socket_;
|
| -
|
| - scoped_refptr<net::IOBuffer> recvfrom_buffer_;
|
| - scoped_refptr<net::IOBuffer> sendto_buffer_;
|
| -
|
| - net::IPEndPoint recvfrom_address_;
|
| - net::IPEndPoint bound_address_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PepperUDPSocket);
|
| };
|
|
|