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

Side by Side Diff: webrtc/pc/mediasession.h

Issue 1783263002: Replace scoped_ptr with unique_ptr in webrtc/pc/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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/pc/channelmanager.h ('k') | webrtc/pc/mediasession.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 // Types and classes used in media session descriptions. 11 // Types and classes used in media session descriptions.
12 12
13 #ifndef TALK_SESSION_MEDIA_MEDIASESSION_H_ 13 #ifndef TALK_SESSION_MEDIA_MEDIASESSION_H_
14 #define TALK_SESSION_MEDIA_MEDIASESSION_H_ 14 #define TALK_SESSION_MEDIA_MEDIASESSION_H_
15 15
16 #include <algorithm> 16 #include <algorithm>
17 #include <map> 17 #include <map>
18 #include <string> 18 #include <string>
19 #include <vector> 19 #include <vector>
20 20
21 #include "webrtc/base/scoped_ptr.h"
22 #include "webrtc/media/base/codec.h" 21 #include "webrtc/media/base/codec.h"
23 #include "webrtc/media/base/cryptoparams.h" 22 #include "webrtc/media/base/cryptoparams.h"
24 #include "webrtc/media/base/mediachannel.h" 23 #include "webrtc/media/base/mediachannel.h"
25 #include "webrtc/media/base/mediaconstants.h" 24 #include "webrtc/media/base/mediaconstants.h"
26 #include "webrtc/media/base/mediaengine.h" // For DataChannelType 25 #include "webrtc/media/base/mediaengine.h" // For DataChannelType
27 #include "webrtc/media/base/streamparams.h" 26 #include "webrtc/media/base/streamparams.h"
28 #include "webrtc/p2p/base/sessiondescription.h" 27 #include "webrtc/p2p/base/sessiondescription.h"
29 #include "webrtc/p2p/base/transport.h" 28 #include "webrtc/p2p/base/transport.h"
30 #include "webrtc/p2p/base/transportdescriptionfactory.h" 29 #include "webrtc/p2p/base/transportdescriptionfactory.h"
31 30
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 void GetSupportedVideoCryptoSuiteNames( 542 void GetSupportedVideoCryptoSuiteNames(
544 std::vector<std::string>* crypto_suite_names); 543 std::vector<std::string>* crypto_suite_names);
545 void GetSupportedDataCryptoSuiteNames( 544 void GetSupportedDataCryptoSuiteNames(
546 std::vector<std::string>* crypto_suite_names); 545 std::vector<std::string>* crypto_suite_names);
547 void GetDefaultSrtpCryptoSuiteNames( 546 void GetDefaultSrtpCryptoSuiteNames(
548 std::vector<std::string>* crypto_suite_names); 547 std::vector<std::string>* crypto_suite_names);
549 548
550 } // namespace cricket 549 } // namespace cricket
551 550
552 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_ 551 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_
OLDNEW
« no previous file with comments | « webrtc/pc/channelmanager.h ('k') | webrtc/pc/mediasession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698