Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Side by Side Diff: content/renderer/p2p/ipc_socket_factory.h

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/p2p/ipc_network_manager.cc ('k') | content/renderer/p2p/ipc_socket_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
6 #define CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_ 6 #define CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
11 #include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h" 11 #include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 class P2PSocketDispatcher; 15 class P2PSocketDispatcher;
16 16
17 // IpcPacketSocketFactory implements rtc::PacketSocketFactory 17 // IpcPacketSocketFactory implements talk_base::PacketSocketFactory
18 // interface for libjingle using IPC-based P2P sockets. The class must 18 // interface for libjingle using IPC-based P2P sockets. The class must
19 // be used on a thread that is a libjingle thread (implements 19 // be used on a thread that is a libjingle thread (implements
20 // rtc::Thread) and also has associated base::MessageLoop. Each 20 // talk_base::Thread) and also has associated base::MessageLoop. Each
21 // socket created by the factory must be used on the thread it was 21 // socket created by the factory must be used on the thread it was
22 // created on. 22 // created on.
23 class IpcPacketSocketFactory : public rtc::PacketSocketFactory { 23 class IpcPacketSocketFactory : public talk_base::PacketSocketFactory {
24 public: 24 public:
25 CONTENT_EXPORT explicit IpcPacketSocketFactory( 25 CONTENT_EXPORT explicit IpcPacketSocketFactory(
26 P2PSocketDispatcher* socket_dispatcher); 26 P2PSocketDispatcher* socket_dispatcher);
27 virtual ~IpcPacketSocketFactory(); 27 virtual ~IpcPacketSocketFactory();
28 28
29 virtual rtc::AsyncPacketSocket* CreateUdpSocket( 29 virtual talk_base::AsyncPacketSocket* CreateUdpSocket(
30 const rtc::SocketAddress& local_address, 30 const talk_base::SocketAddress& local_address,
31 int min_port, int max_port) OVERRIDE; 31 int min_port, int max_port) OVERRIDE;
32 virtual rtc::AsyncPacketSocket* CreateServerTcpSocket( 32 virtual talk_base::AsyncPacketSocket* CreateServerTcpSocket(
33 const rtc::SocketAddress& local_address, 33 const talk_base::SocketAddress& local_address,
34 int min_port, 34 int min_port,
35 int max_port, 35 int max_port,
36 int opts) OVERRIDE; 36 int opts) OVERRIDE;
37 virtual rtc::AsyncPacketSocket* CreateClientTcpSocket( 37 virtual talk_base::AsyncPacketSocket* CreateClientTcpSocket(
38 const rtc::SocketAddress& local_address, 38 const talk_base::SocketAddress& local_address,
39 const rtc::SocketAddress& remote_address, 39 const talk_base::SocketAddress& remote_address,
40 const rtc::ProxyInfo& proxy_info, 40 const talk_base::ProxyInfo& proxy_info,
41 const std::string& user_agent, 41 const std::string& user_agent,
42 int opts) OVERRIDE; 42 int opts) OVERRIDE;
43 virtual rtc::AsyncResolverInterface* CreateAsyncResolver() OVERRIDE; 43 virtual talk_base::AsyncResolverInterface* CreateAsyncResolver() OVERRIDE;
44 44
45 private: 45 private:
46 P2PSocketDispatcher* socket_dispatcher_; 46 P2PSocketDispatcher* socket_dispatcher_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(IpcPacketSocketFactory); 48 DISALLOW_COPY_AND_ASSIGN(IpcPacketSocketFactory);
49 }; 49 };
50 50
51 } // namespace content 51 } // namespace content
52 52
53 #endif // CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_ 53 #endif // CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_
OLDNEW
« no previous file with comments | « content/renderer/p2p/ipc_network_manager.cc ('k') | content/renderer/p2p/ipc_socket_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698