| Index: remoting/jingle_glue/chromium_socket_factory.h
|
| diff --git a/remoting/client/plugin/pepper_packet_socket_factory.h b/remoting/jingle_glue/chromium_socket_factory.h
|
| similarity index 62%
|
| copy from remoting/client/plugin/pepper_packet_socket_factory.h
|
| copy to remoting/jingle_glue/chromium_socket_factory.h
|
| index ec9634f1506dcd538ecf1120157146a41fd03f49..f142ad254fdafb7e03b82c60ca1942ef6249b6ab 100644
|
| --- a/remoting/client/plugin/pepper_packet_socket_factory.h
|
| +++ b/remoting/jingle_glue/chromium_socket_factory.h
|
| @@ -2,27 +2,25 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef REMOTING_CLIENT_PLUGIN_PEPPER_PACKET_SOCKET_FACTORY_H_
|
| -#define REMOTING_CLIENT_PLUGIN_PEPPER_PACKET_SOCKET_FACTORY_H_
|
| +#ifndef REMOTING_JINGLE_GLUE_CHROMIUM_SOCKET_FACTORY_H_
|
| +#define REMOTING_JINGLE_GLUE_CHROMIUM_SOCKET_FACTORY_H_
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "ppapi/cpp/instance_handle.h"
|
| #include "third_party/libjingle/source/talk/base/packetsocketfactory.h"
|
|
|
| namespace remoting {
|
|
|
| -class PepperPacketSocketFactory : public talk_base::PacketSocketFactory {
|
| +class ChromiumPacketSocketFactory : public talk_base::PacketSocketFactory {
|
| public:
|
| - explicit PepperPacketSocketFactory(const pp::InstanceHandle& instance);
|
| - virtual ~PepperPacketSocketFactory();
|
| + explicit ChromiumPacketSocketFactory();
|
| + virtual ~ChromiumPacketSocketFactory();
|
|
|
| virtual talk_base::AsyncPacketSocket* CreateUdpSocket(
|
| const talk_base::SocketAddress& local_address,
|
| int min_port, int max_port) OVERRIDE;
|
| virtual talk_base::AsyncPacketSocket* CreateServerTcpSocket(
|
| const talk_base::SocketAddress& local_address,
|
| - int min_port,
|
| - int max_port,
|
| + int min_port, int max_port,
|
| bool ssl) OVERRIDE;
|
| virtual talk_base::AsyncPacketSocket* CreateClientTcpSocket(
|
| const talk_base::SocketAddress& local_address,
|
| @@ -32,11 +30,9 @@ class PepperPacketSocketFactory : public talk_base::PacketSocketFactory {
|
| bool ssl) OVERRIDE;
|
|
|
| private:
|
| - const pp::InstanceHandle pp_instance_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(PepperPacketSocketFactory);
|
| + DISALLOW_COPY_AND_ASSIGN(ChromiumPacketSocketFactory);
|
| };
|
|
|
| } // namespace remoting
|
|
|
| -#endif // REMOTING_CLIENT_PLUGIN_PEPPER_PACKET_SOCKET_FACTORY_H_
|
| +#endif // REMOTING_JINGLE_GLUE_CHROMIUM_SOCKET_FACTORY_H_
|
|
|