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

Side by Side Diff: remoting/client/plugin/pepper_port_allocator.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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CLIENT_PLUGIN_PEPPER_PORT_ALLOCATOR_H_ 5 #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_PORT_ALLOCATOR_H_
6 #define REMOTING_CLIENT_PLUGIN_PEPPER_PORT_ALLOCATOR_H_ 6 #define REMOTING_CLIENT_PLUGIN_PEPPER_PORT_ALLOCATOR_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ppapi/cpp/instance_handle.h" 10 #include "ppapi/cpp/instance_handle.h"
(...skipping 19 matching lines...) Expand all
30 // cricket::HttpPortAllocatorBase overrides. 30 // cricket::HttpPortAllocatorBase overrides.
31 virtual cricket::PortAllocatorSession* CreateSessionInternal( 31 virtual cricket::PortAllocatorSession* CreateSessionInternal(
32 const std::string& content_name, 32 const std::string& content_name,
33 int component, 33 int component,
34 const std::string& ice_username_fragment, 34 const std::string& ice_username_fragment,
35 const std::string& ice_password) OVERRIDE; 35 const std::string& ice_password) OVERRIDE;
36 36
37 private: 37 private:
38 PepperPortAllocator( 38 PepperPortAllocator(
39 const pp::InstanceHandle& instance, 39 const pp::InstanceHandle& instance,
40 scoped_ptr<rtc::NetworkManager> network_manager, 40 scoped_ptr<talk_base::NetworkManager> network_manager,
41 scoped_ptr<rtc::PacketSocketFactory> socket_factory); 41 scoped_ptr<talk_base::PacketSocketFactory> socket_factory);
42 42
43 pp::InstanceHandle instance_; 43 pp::InstanceHandle instance_;
44 scoped_ptr<rtc::NetworkManager> network_manager_; 44 scoped_ptr<talk_base::NetworkManager> network_manager_;
45 scoped_ptr<rtc::PacketSocketFactory> socket_factory_; 45 scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(PepperPortAllocator); 47 DISALLOW_COPY_AND_ASSIGN(PepperPortAllocator);
48 }; 48 };
49 49
50 } // namespace remoting 50 } // namespace remoting
51 51
52 #endif // REMOTING_CLIENT_PLUGIN_PEPPER_PORT_ALLOCATOR_H_ 52 #endif // REMOTING_CLIENT_PLUGIN_PEPPER_PORT_ALLOCATOR_H_
OLDNEW
« no previous file with comments | « remoting/client/plugin/pepper_packet_socket_factory.cc ('k') | remoting/client/plugin/pepper_port_allocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698