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

Side by Side Diff: webrtc/modules/utility/include/jvm_android.h

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: 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 (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_ 11 #ifndef WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
12 #define WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_ 12 #define WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
13 13
14 #include <jni.h> 14 #include <jni.h>
15 15
16 #include <memory> 16 #include <memory>
17 #include <string> 17 #include <string>
18 18
19 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/modules/utility/include/helpers_android.h" 20 #include "webrtc/modules/utility/include/helpers_android.h"
20 #include "webrtc/rtc_base/thread_checker.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 // The JNI interface pointer (JNIEnv) is valid only in the current thread. 24 // The JNI interface pointer (JNIEnv) is valid only in the current thread.
25 // Should another thread need to access the Java VM, it must first call 25 // Should another thread need to access the Java VM, it must first call
26 // AttachCurrentThread() to attach itself to the VM and obtain a JNI interface 26 // AttachCurrentThread() to attach itself to the VM and obtain a JNI interface
27 // pointer. The native thread remains attached to the VM until it calls 27 // pointer. The native thread remains attached to the VM until it calls
28 // DetachCurrentThread() to detach. 28 // DetachCurrentThread() to detach.
29 class AttachCurrentThreadIfNeeded { 29 class AttachCurrentThreadIfNeeded {
30 public: 30 public:
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 private: 179 private:
180 JNIEnv* jni() const { return GetEnv(jvm_); } 180 JNIEnv* jni() const { return GetEnv(jvm_); }
181 181
182 rtc::ThreadChecker thread_checker_; 182 rtc::ThreadChecker thread_checker_;
183 JavaVM* const jvm_; 183 JavaVM* const jvm_;
184 }; 184 };
185 185
186 } // namespace webrtc 186 } // namespace webrtc
187 187
188 #endif // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_ 188 #endif // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc ('k') | webrtc/modules/utility/include/mock/mock_process_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698