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

Side by Side Diff: content/renderer/media/webrtc/peer_connection_dependency_factory.cc

Issue 670683003: Standardize usage of virtual/override/final in content/renderer/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 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 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" 5 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 public: 116 public:
117 P2PPortAllocatorFactory( 117 P2PPortAllocatorFactory(
118 P2PSocketDispatcher* socket_dispatcher, 118 P2PSocketDispatcher* socket_dispatcher,
119 rtc::NetworkManager* network_manager, 119 rtc::NetworkManager* network_manager,
120 rtc::PacketSocketFactory* socket_factory) 120 rtc::PacketSocketFactory* socket_factory)
121 : socket_dispatcher_(socket_dispatcher), 121 : socket_dispatcher_(socket_dispatcher),
122 network_manager_(network_manager), 122 network_manager_(network_manager),
123 socket_factory_(socket_factory) { 123 socket_factory_(socket_factory) {
124 } 124 }
125 125
126 virtual cricket::PortAllocator* CreatePortAllocator( 126 cricket::PortAllocator* CreatePortAllocator(
127 const std::vector<StunConfiguration>& stun_servers, 127 const std::vector<StunConfiguration>& stun_servers,
128 const std::vector<TurnConfiguration>& turn_configurations) override { 128 const std::vector<TurnConfiguration>& turn_configurations) override {
129 P2PPortAllocator::Config config; 129 P2PPortAllocator::Config config;
130 for (size_t i = 0; i < stun_servers.size(); ++i) { 130 for (size_t i = 0; i < stun_servers.size(); ++i) {
131 config.stun_servers.insert(rtc::SocketAddress( 131 config.stun_servers.insert(rtc::SocketAddress(
132 stun_servers[i].server.hostname(), 132 stun_servers[i].server.hostname(),
133 stun_servers[i].server.port())); 133 stun_servers[i].server.port()));
134 } 134 }
135 for (size_t i = 0; i < turn_configurations.size(); ++i) { 135 for (size_t i = 0; i < turn_configurations.size(); ++i) {
136 P2PPortAllocator::Config::RelayServerConfig relay_config; 136 P2PPortAllocator::Config::RelayServerConfig relay_config;
137 relay_config.server_address = turn_configurations[i].server.hostname(); 137 relay_config.server_address = turn_configurations[i].server.hostname();
138 relay_config.port = turn_configurations[i].server.port(); 138 relay_config.port = turn_configurations[i].server.port();
139 relay_config.username = turn_configurations[i].username; 139 relay_config.username = turn_configurations[i].username;
140 relay_config.password = turn_configurations[i].password; 140 relay_config.password = turn_configurations[i].password;
141 relay_config.transport_type = turn_configurations[i].transport_type; 141 relay_config.transport_type = turn_configurations[i].transport_type;
142 relay_config.secure = turn_configurations[i].secure; 142 relay_config.secure = turn_configurations[i].secure;
143 config.relays.push_back(relay_config); 143 config.relays.push_back(relay_config);
144 144
145 // Use turn servers as stun servers. 145 // Use turn servers as stun servers.
146 config.stun_servers.insert(rtc::SocketAddress( 146 config.stun_servers.insert(rtc::SocketAddress(
147 turn_configurations[i].server.hostname(), 147 turn_configurations[i].server.hostname(),
148 turn_configurations[i].server.port())); 148 turn_configurations[i].server.port()));
149 } 149 }
150 150
151 return new P2PPortAllocator( 151 return new P2PPortAllocator(
152 socket_dispatcher_.get(), network_manager_, socket_factory_, config); 152 socket_dispatcher_.get(), network_manager_, socket_factory_, config);
153 } 153 }
154 154
155 protected: 155 protected:
156 virtual ~P2PPortAllocatorFactory() {} 156 ~P2PPortAllocatorFactory() override {}
157 157
158 private: 158 private:
159 scoped_refptr<P2PSocketDispatcher> socket_dispatcher_; 159 scoped_refptr<P2PSocketDispatcher> socket_dispatcher_;
160 // |network_manager_| and |socket_factory_| are a weak references, owned by 160 // |network_manager_| and |socket_factory_| are a weak references, owned by
161 // PeerConnectionDependencyFactory. 161 // PeerConnectionDependencyFactory.
162 rtc::NetworkManager* network_manager_; 162 rtc::NetworkManager* network_manager_;
163 rtc::PacketSocketFactory* socket_factory_; 163 rtc::PacketSocketFactory* socket_factory_;
164 }; 164 };
165 165
166 PeerConnectionDependencyFactory::PeerConnectionDependencyFactory( 166 PeerConnectionDependencyFactory::PeerConnectionDependencyFactory(
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 } 649 }
650 650
651 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() { 651 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
652 if (audio_device_.get()) 652 if (audio_device_.get())
653 return; 653 return;
654 654
655 audio_device_ = new WebRtcAudioDeviceImpl(); 655 audio_device_ = new WebRtcAudioDeviceImpl();
656 } 656 }
657 657
658 } // namespace content 658 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698