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

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

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix last incorrectly wrapped pragma message Created 5 years, 1 month 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_SOURCE_JVM_H_ 11 #ifndef WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
12 #define WEBRTC_MODULES_UTILITY_SOURCE_JVM_H_ 12 #define WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
13
14 #pragma message("WARNING: utility/interface is DEPRECATED; use utility/include")
13 15
14 #include <jni.h> 16 #include <jni.h>
15 #include <string> 17 #include <string>
16 18
17 #include "webrtc/base/scoped_ptr.h" 19 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/base/thread_checker.h" 20 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/modules/utility/interface/helpers_android.h" 21 #include "webrtc/modules/utility/include/helpers_android.h"
20 22
21 namespace webrtc { 23 namespace webrtc {
22 24
23 // The JNI interface pointer (JNIEnv) is valid only in the current thread. 25 // The JNI interface pointer (JNIEnv) is valid only in the current thread.
24 // Should another thread need to access the Java VM, it must first call 26 // Should another thread need to access the Java VM, it must first call
25 // AttachCurrentThread() to attach itself to the VM and obtain a JNI interface 27 // AttachCurrentThread() to attach itself to the VM and obtain a JNI interface
26 // pointer. The native thread remains attached to the VM until it calls 28 // pointer. The native thread remains attached to the VM until it calls
27 // DetachCurrentThread() to detach. 29 // DetachCurrentThread() to detach.
28 class AttachCurrentThreadIfNeeded { 30 class AttachCurrentThreadIfNeeded {
29 public: 31 public:
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 private: 177 private:
176 JNIEnv* jni() const { return GetEnv(jvm_); } 178 JNIEnv* jni() const { return GetEnv(jvm_); }
177 179
178 rtc::ThreadChecker thread_checker_; 180 rtc::ThreadChecker thread_checker_;
179 JavaVM* const jvm_; 181 JavaVM* const jvm_;
180 jobject context_; 182 jobject context_;
181 }; 183 };
182 184
183 } // namespace webrtc 185 } // namespace webrtc
184 186
185 #endif // WEBRTC_MODULES_UTILITY_SOURCE_JVM_H_ 187 #endif // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
OLDNEW
« no previous file with comments | « webrtc/modules/utility/interface/helpers_ios.h ('k') | webrtc/modules/utility/interface/mock/mock_process_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698