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

Side by Side Diff: remoting/protocol/chromium_port_allocator.h

Issue 653203005: Roll WebRTC 7546:7549. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Decreased the number of gyp changes in this patch since thats the only major change (the reset is j… Created 6 years, 1 month 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 REMOTING_PROTOCOL_CHROMIUM_PORT_ALLOCATOR_H_ 5 #ifndef REMOTING_PROTOCOL_CHROMIUM_PORT_ALLOCATOR_H_
6 #define REMOTING_PROTOCOL_CHROMIUM_PORT_ALLOCATOR_H_ 6 #define REMOTING_PROTOCOL_CHROMIUM_PORT_ALLOCATOR_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h" 12 #include "third_party/webrtc/p2p/client/httpportallocator.h"
13 13
14 namespace net { 14 namespace net {
15 class URLRequestContextGetter; 15 class URLRequestContextGetter;
16 } // namespace net 16 } // namespace net
17 17
18 namespace remoting { 18 namespace remoting {
19 namespace protocol { 19 namespace protocol {
20 20
21 struct NetworkSettings; 21 struct NetworkSettings;
22 22
(...skipping 25 matching lines...) Expand all
48 scoped_ptr<rtc::NetworkManager> network_manager_; 48 scoped_ptr<rtc::NetworkManager> network_manager_;
49 scoped_ptr<rtc::PacketSocketFactory> socket_factory_; 49 scoped_ptr<rtc::PacketSocketFactory> socket_factory_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(ChromiumPortAllocator); 51 DISALLOW_COPY_AND_ASSIGN(ChromiumPortAllocator);
52 }; 52 };
53 53
54 } // namespace protocol 54 } // namespace protocol
55 } // namespace remoting 55 } // namespace remoting
56 56
57 #endif // REMOTING_HOST_HOST_PORT_ALLOCATOR_H_ 57 #endif // REMOTING_HOST_HOST_PORT_ALLOCATOR_H_
OLDNEW
« no previous file with comments | « remoting/host/register_support_host_request_unittest.cc ('k') | remoting/protocol/chromium_socket_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698