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

Side by Side Diff: webrtc/sdk/android/src/jni/ownedfactoryandthreads.h

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 /* 1 /*
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 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_SDK_ANDROID_SRC_JNI_OWNEDFACTORYANDTHREADS_H_ 11 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_OWNEDFACTORYANDTHREADS_H_
12 #define WEBRTC_SDK_ANDROID_SRC_JNI_OWNEDFACTORYANDTHREADS_H_ 12 #define WEBRTC_SDK_ANDROID_SRC_JNI_OWNEDFACTORYANDTHREADS_H_
13 13
14 #include <jni.h> 14 #include <jni.h>
15 #include <memory> 15 #include <memory>
16 #include <utility> 16 #include <utility>
17 17
18 #include "webrtc/api/peerconnectioninterface.h" 18 #include "webrtc/api/peerconnectioninterface.h"
19 #include "webrtc/base/thread.h" 19 #include "webrtc/rtc_base/thread.h"
20 20
21 using cricket::WebRtcVideoDecoderFactory; 21 using cricket::WebRtcVideoDecoderFactory;
22 using cricket::WebRtcVideoEncoderFactory; 22 using cricket::WebRtcVideoEncoderFactory;
23 using rtc::Thread; 23 using rtc::Thread;
24 using webrtc::PeerConnectionFactoryInterface; 24 using webrtc::PeerConnectionFactoryInterface;
25 25
26 namespace webrtc_jni { 26 namespace webrtc_jni {
27 27
28 PeerConnectionFactoryInterface* factoryFromJava(jlong j_p); 28 PeerConnectionFactoryInterface* factoryFromJava(jlong j_p);
29 29
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 const std::unique_ptr<Thread> signaling_thread_; 71 const std::unique_ptr<Thread> signaling_thread_;
72 WebRtcVideoEncoderFactory* encoder_factory_; 72 WebRtcVideoEncoderFactory* encoder_factory_;
73 WebRtcVideoDecoderFactory* decoder_factory_; 73 WebRtcVideoDecoderFactory* decoder_factory_;
74 rtc::NetworkMonitorFactory* network_monitor_factory_; 74 rtc::NetworkMonitorFactory* network_monitor_factory_;
75 PeerConnectionFactoryInterface* factory_; // Const after ctor except dtor. 75 PeerConnectionFactoryInterface* factory_; // Const after ctor except dtor.
76 }; 76 };
77 77
78 } // namespace webrtc_jni 78 } // namespace webrtc_jni
79 79
80 #endif // WEBRTC_SDK_ANDROID_SRC_JNI_OWNEDFACTORYANDTHREADS_H_ 80 #endif // WEBRTC_SDK_ANDROID_SRC_JNI_OWNEDFACTORYANDTHREADS_H_
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/native_handle_impl.cc ('k') | webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698