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

Side by Side Diff: webrtc/p2p/base/transportdescriptionfactory.cc

Issue 1358413003: Revert of TransportController refactoring. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 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
« no previous file with comments | « webrtc/p2p/base/transportcontroller_unittest.cc ('k') | webrtc/p2p/p2p.gyp » ('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 2012 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2012 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/p2p/base/transportdescriptionfactory.h" 11 #include "webrtc/p2p/base/transportdescriptionfactory.h"
12 12
13 #include "webrtc/p2p/base/transportdescription.h" 13 #include "webrtc/p2p/base/transportdescription.h"
14 #include "webrtc/base/helpers.h" 14 #include "webrtc/base/helpers.h"
15 #include "webrtc/base/logging.h" 15 #include "webrtc/base/logging.h"
16 #include "webrtc/base/messagedigest.h" 16 #include "webrtc/base/messagedigest.h"
17 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/base/sslfingerprint.h" 18 #include "webrtc/base/sslfingerprint.h"
18 19
19 namespace cricket { 20 namespace cricket {
20 21
21 TransportDescriptionFactory::TransportDescriptionFactory() 22 TransportDescriptionFactory::TransportDescriptionFactory()
22 : secure_(SEC_DISABLED) { 23 : secure_(SEC_DISABLED) {
23 } 24 }
24 25
25 TransportDescription* TransportDescriptionFactory::CreateOffer( 26 TransportDescription* TransportDescriptionFactory::CreateOffer(
26 const TransportOptions& options, 27 const TransportOptions& options,
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 << digest_alg; 118 << digest_alg;
118 return false; 119 return false;
119 } 120 }
120 121
121 // Assign security role. 122 // Assign security role.
122 desc->connection_role = role; 123 desc->connection_role = role;
123 return true; 124 return true;
124 } 125 }
125 126
126 } // namespace cricket 127 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/transportcontroller_unittest.cc ('k') | webrtc/p2p/p2p.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698