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

Side by Side Diff: webrtc/rtc_base/proxyserver.cc

Issue 2962303003: Revert "Update includes for webrtc/{base => rtc_base} rename (3/3)" (Closed)
Patch Set: Created 3 years, 5 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 | « webrtc/rtc_base/proxyserver.h ('k') | webrtc/rtc_base/ptr_util_unittest.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 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/rtc_base/proxyserver.h" 11 #include "webrtc/base/proxyserver.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 14
15 #include "webrtc/rtc_base/checks.h" 15 #include "webrtc/base/checks.h"
16 #include "webrtc/rtc_base/socketfactory.h" 16 #include "webrtc/base/socketfactory.h"
17 17
18 namespace rtc { 18 namespace rtc {
19 19
20 // ProxyServer 20 // ProxyServer
21 ProxyServer::ProxyServer( 21 ProxyServer::ProxyServer(
22 SocketFactory* int_factory, const SocketAddress& int_addr, 22 SocketFactory* int_factory, const SocketAddress& int_addr,
23 SocketFactory* ext_factory, const SocketAddress& ext_ip) 23 SocketFactory* ext_factory, const SocketAddress& ext_ip)
24 : ext_factory_(ext_factory), ext_ip_(ext_ip.ipaddr(), 0), // strip off port 24 : ext_factory_(ext_factory), ext_ip_(ext_ip.ipaddr(), 0), // strip off port
25 server_socket_(int_factory->CreateAsyncSocket(int_addr.family(), 25 server_socket_(int_factory->CreateAsyncSocket(int_addr.family(),
26 SOCK_STREAM)) { 26 SOCK_STREAM)) {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 void ProxyBinding::Destroy() { 148 void ProxyBinding::Destroy() {
149 SignalDestroyed(this); 149 SignalDestroyed(this);
150 } 150 }
151 151
152 AsyncProxyServerSocket* SocksProxyServer::WrapSocket(AsyncSocket* socket) { 152 AsyncProxyServerSocket* SocksProxyServer::WrapSocket(AsyncSocket* socket) {
153 return new AsyncSocksProxyServerSocket(socket); 153 return new AsyncSocksProxyServerSocket(socket);
154 } 154 }
155 155
156 } // namespace rtc 156 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/rtc_base/proxyserver.h ('k') | webrtc/rtc_base/ptr_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698