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

Side by Side Diff: webrtc/api/audiotrack.h

Issue 1942823002: Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix additional scoped_ptr uses that had been added Created 4 years, 7 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 | « talk/LICENSE_THIRD_PARTY ('k') | webrtc/api/jsepsessiondescription.h » ('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 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 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 #ifndef WEBRTC_API_AUDIOTRACK_H_ 11 #ifndef WEBRTC_API_AUDIOTRACK_H_
12 #define WEBRTC_API_AUDIOTRACK_H_ 12 #define WEBRTC_API_AUDIOTRACK_H_
13 13
14 #include <string> 14 #include <string>
15 15
16 #include "webrtc/api/mediastreaminterface.h" 16 #include "webrtc/api/mediastreaminterface.h"
17 #include "webrtc/api/mediastreamtrack.h" 17 #include "webrtc/api/mediastreamtrack.h"
18 #include "webrtc/api/notifier.h" 18 #include "webrtc/api/notifier.h"
19 #include "webrtc/base/constructormagic.h" 19 #include "webrtc/base/constructormagic.h"
20 #include "webrtc/base/scoped_ptr.h"
21 #include "webrtc/base/scoped_ref_ptr.h" 20 #include "webrtc/base/scoped_ref_ptr.h"
22 #include "webrtc/base/thread_checker.h" 21 #include "webrtc/base/thread_checker.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 24
26 class AudioTrack : public MediaStreamTrack<AudioTrackInterface>, 25 class AudioTrack : public MediaStreamTrack<AudioTrackInterface>,
27 public ObserverInterface { 26 public ObserverInterface {
28 protected: 27 protected:
29 // Protected ctor to force use of factory method. 28 // Protected ctor to force use of factory method.
30 AudioTrack(const std::string& label, 29 AudioTrack(const std::string& label,
(...skipping 20 matching lines...) Expand all
51 50
52 private: 51 private:
53 const rtc::scoped_refptr<AudioSourceInterface> audio_source_; 52 const rtc::scoped_refptr<AudioSourceInterface> audio_source_;
54 rtc::ThreadChecker thread_checker_; 53 rtc::ThreadChecker thread_checker_;
55 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioTrack); 54 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioTrack);
56 }; 55 };
57 56
58 } // namespace webrtc 57 } // namespace webrtc
59 58
60 #endif // WEBRTC_API_AUDIOTRACK_H_ 59 #endif // WEBRTC_API_AUDIOTRACK_H_
OLDNEW
« no previous file with comments | « talk/LICENSE_THIRD_PARTY ('k') | webrtc/api/jsepsessiondescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698